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

diff --git a/.etckeeper b/.etckeeper
index 0dbbbf2799725e7a151f48c32d5677b630d324b1..ba8a6f9dab2b211cd5249d185001729cf64473db 100755 (executable)
--- 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 (file)
index 0000000..e69de29

diff --git a/apparmor.d/ubuntu_pro_apt_news b/apparmor.d/ubuntu_pro_apt_news
new file mode 100644 (file)
index 0000000..c4aab7b
--- /dev/null
+++ b/apparmor.d/ubuntu_pro_apt_news
@@ -0,0 +1,40 @@
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+profile ubuntu_pro_apt_news flags=(attach_disconnected) {
+  include <abstractions/base>
+  include <abstractions/nameservice>
+  include <abstractions/openssl>
+  include <abstractions/python>
+
+  # 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 5ded6f8f7a59fcb212f4894cd8b8a22dab5c5cfb..ccdff4be929cd86b67a4b79199bc62da810f5713 100644 (file)
--- 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 e956e0ae3810cdc6a8b6d6997b9b241e53d4ca60..125b31d09f9a05e09c7c881bc91fa359be7f5eeb 100644 (file)
--- 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-advantage-tools
deleted file mode 100644 (file)
index 7c64857..0000000
--- a/logrotate.d/ubuntu-advantage-tools
+++ /dev/null
@@ -1,12 +0,0 @@
-# use the root group by default, since this is the owning group
-# of /var/log/ubuntu-advantage*.log files.
-/var/log/ubuntu-advantage*.log {
-    su root root
-    create 0644 root root
-    rotate 6
-    monthly
-    compress
-    delaycompress
-    missingok
-    notifempty
-}

diff --git a/logrotate.d/ubuntu-pro-client b/logrotate.d/ubuntu-pro-client
new file mode 100644 (file)
index 0000000..7c64857
--- /dev/null
+++ b/logrotate.d/ubuntu-pro-client
@@ -0,0 +1,12 @@
+# use the root group by default, since this is the owning group
+# of /var/log/ubuntu-advantage*.log files.
+/var/log/ubuntu-advantage*.log {
+    su root root
+    create 0644 root root
+    rotate 6
+    monthly
+    compress
+    delaycompress
+    missingok
+    notifempty
+}

diff --git a/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg b/update-manager/release-upgrades.d/ubuntu-advantage-upgrades.cfg
index c7da279afe12df2af4d134268b2b06c9e27b9f5e..c811ae032c2570abc7fe48677efc498bdf271b0c 100644 (file)
--- 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