From d0e202f3caf352bbc72318dfa89f46d8d1b44871 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 13 Mar 2024 23:47:42 +0100 Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt full-upgrade" Packages with configuration changes: +ubuntu-pro-client 31.2~22.04 amd64 Package changes: -ubuntu-advantage-tools 30~22.04 amd64 +ubuntu-advantage-tools 31.2~22.04 all -ubuntu-pro-client-l10n 30~22.04 amd64 +ubuntu-pro-client 31.2~22.04 amd64 +ubuntu-pro-client-l10n 31.2~22.04 amd64 --- .etckeeper | 4 +- apparmor.d/local/ubuntu_pro_apt_news | 0 apparmor.d/ubuntu_pro_apt_news | 40 +++++++++++++++++++ apt/preferences.d/ubuntu-pro-esm-apps | 2 +- apt/preferences.d/ubuntu-pro-esm-infra | 2 +- ...untu-advantage-tools => ubuntu-pro-client} | 0 .../ubuntu-advantage-upgrades.cfg | 2 +- 7 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 apparmor.d/local/ubuntu_pro_apt_news create mode 100644 apparmor.d/ubuntu_pro_apt_news rename logrotate.d/{ubuntu-advantage-tools => ubuntu-pro-client} (100%) diff --git a/.etckeeper b/.etckeeper index 0dbbbf2..ba8a6f9 100755 --- a/.etckeeper +++ b/.etckeeper @@ -436,6 +436,7 @@ maybe chmod 0644 'apparmor.d/local/sbin.dhclient' maybe chmod 0644 'apparmor.d/local/sbin.klogd' maybe chmod 0644 'apparmor.d/local/sbin.syslog-ng' maybe chmod 0644 'apparmor.d/local/sbin.syslogd' +maybe chmod 0644 'apparmor.d/local/ubuntu_pro_apt_news' maybe chmod 0644 'apparmor.d/local/usr.bin.chromium-browser' maybe chmod 0644 'apparmor.d/local/usr.bin.evince' maybe chmod 0644 'apparmor.d/local/usr.bin.firefox' @@ -513,6 +514,7 @@ maybe chmod 0644 'apparmor.d/tunables/sys' maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs' maybe chmod 0755 'apparmor.d/tunables/xdg-user-dirs.d' maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs.d/site.local' +maybe chmod 0644 'apparmor.d/ubuntu_pro_apt_news' maybe chmod 0644 'apparmor.d/usr.bin.chromium-browser' maybe chmod 0644 'apparmor.d/usr.bin.evince' maybe chmod 0644 'apparmor.d/usr.bin.firefox' @@ -2544,7 +2546,7 @@ maybe chmod 0644 'logrotate.d/rsyslog' maybe chmod 0644 'logrotate.d/samba' maybe chmod 0644 'logrotate.d/sane-utils' maybe chmod 0644 'logrotate.d/speech-dispatcher' -maybe chmod 0644 'logrotate.d/ubuntu-advantage-tools' +maybe chmod 0644 'logrotate.d/ubuntu-pro-client' maybe chmod 0644 'logrotate.d/ufw' maybe chmod 0644 'logrotate.d/ulogd2' maybe chmod 0644 'logrotate.d/winbind' diff --git a/apparmor.d/local/ubuntu_pro_apt_news b/apparmor.d/local/ubuntu_pro_apt_news new file mode 100644 index 0000000..e69de29 diff --git a/apparmor.d/ubuntu_pro_apt_news b/apparmor.d/ubuntu_pro_apt_news new file mode 100644 index 0000000..c4aab7b --- /dev/null +++ b/apparmor.d/ubuntu_pro_apt_news @@ -0,0 +1,40 @@ + +abi , + +include + +profile ubuntu_pro_apt_news flags=(attach_disconnected) { + include + include + include + include + + # Needed because apt-news calls apt_pkg.init() which tries to + # switch to the _apt system user/group. + capability setgid, + capability setuid, + capability dac_read_search, + + /etc/apt/** r, + /etc/default/apport r, + /etc/ubuntu-advantage/* r, + /usr/bin/python3.{1,}[0-9] mrix, + + /usr/lib/apt/methods/http mrix, + /usr/lib/apt/methods/https mrix, + /usr/lib/ubuntu-advantage/apt_news.py r, + /usr/share/dpkg/* r, + /var/log/ubuntu-advantage.log rw, + /var/lib/ubuntu-advantage/** r, + /var/lib/ubuntu-advantage/messages/ rw, + /var/lib/ubuntu-advantage/messages/* rw, + /run/ubuntu-advantage/ rw, + /run/ubuntu-advantage/* rw, + + /tmp/** r, + + owner @{PROC}/@{pid}/fd/ r, + @{PROC}/@{pid}/cgroup r, + + +} \ No newline at end of file diff --git a/apt/preferences.d/ubuntu-pro-esm-apps b/apt/preferences.d/ubuntu-pro-esm-apps index 5ded6f8..ccdff4b 100644 --- a/apt/preferences.d/ubuntu-pro-esm-apps +++ b/apt/preferences.d/ubuntu-pro-esm-apps @@ -1,4 +1,4 @@ -# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools +# This file is used by Ubuntu Pro and supplied by the ubuntu-pro-client # package. It has no effect if Ubuntu Pro services are not in use since no # other apt repositories are expected to match o=UbuntuESMApps. # diff --git a/apt/preferences.d/ubuntu-pro-esm-infra b/apt/preferences.d/ubuntu-pro-esm-infra index e956e0a..125b31d 100644 --- a/apt/preferences.d/ubuntu-pro-esm-infra +++ b/apt/preferences.d/ubuntu-pro-esm-infra @@ -1,4 +1,4 @@ -# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools +# This file is used by Ubuntu Pro and supplied by the ubuntu-pro-client # package. It has no effect if Ubuntu Pro services are not in use since no # other apt repositories are expected to match o=UbuntuESM. # diff --git a/logrotate.d/ubuntu-advantage-tools b/logrotate.d/ubuntu-pro-client similarity index 100% rename from logrotate.d/ubuntu-advantage-tools rename to logrotate.d/ubuntu-pro-client diff --git a/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg b/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg index c7da279..c811ae0 100644 --- a/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg +++ b/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg @@ -1,4 +1,4 @@ [Sources] Pockets=security,updates,proposed,backports,infra-security,infra-updates,apps-security,apps-updates [Distro] -PostInstallScripts=./xorg_fix_proprietary.py, /usr/lib/ubuntu-advantage/upgrade_lts_contract.py +PostInstallScripts=./xorg_fix_proprietary.py, /usr/lib/ubuntu-advantage/convert_list_to_deb822.py, /usr/lib/ubuntu-advantage/upgrade_lts_contract.py -- 2.39.5