diff -Nru ubuntu-advantage-tools-32~20.04/apport/source_ubuntu-advantage-tools.py ubuntu-advantage-tools-32.1~20.04/apport/source_ubuntu-advantage-tools.py --- ubuntu-advantage-tools-32~20.04/apport/source_ubuntu-advantage-tools.py 2024-04-23 13:37:02.000000000 +0000 +++ ubuntu-advantage-tools-32.1~20.04/apport/source_ubuntu-advantage-tools.py 2024-05-14 11:48:34.000000000 +0000 @@ -3,8 +3,9 @@ from apport.hookutils import attach_file_if_exists from uaclient import defaults -from uaclient.actions import collect_logs, APPARMOR_PROFILES +from uaclient.actions import APPARMOR_PROFILES, collect_logs from uaclient.config import UAConfig +from uaclient.files.state_files import timer_jobs_state_file def add_info(report, ui=None): @@ -26,7 +27,7 @@ *apparmor_files, os.path.basename(cfg.cfg_path), os.path.basename(cfg.log_file), - os.path.basename(cfg.data_path("jobs-status")), + os.path.basename(timer_jobs_state_file.path), os.path.basename(defaults.CONFIG_DEFAULTS["log_file"]), } for f in auto_include_log_files: diff -Nru ubuntu-advantage-tools-32~20.04/debian/apparmor/ubuntu_pro_apt_news.jinja2 ubuntu-advantage-tools-32.1~20.04/debian/apparmor/ubuntu_pro_apt_news.jinja2 --- ubuntu-advantage-tools-32~20.04/debian/apparmor/ubuntu_pro_apt_news.jinja2 2024-05-10 17:07:05.000000000 +0000 +++ ubuntu-advantage-tools-32.1~20.04/debian/apparmor/ubuntu_pro_apt_news.jinja2 2024-05-14 11:48:34.000000000 +0000 @@ -23,6 +23,10 @@ /etc/apt/** r, /etc/default/apport r, /etc/ubuntu-advantage/* r, + # GH: #3109 + # Allow reading the os-release file (possibly a symlink to /usr/lib). + /{etc/,usr/lib/}os-release r, + /usr/bin/python3.{1,}[0-9] mrix, {% if ubuntu_codename in ["focal"] %} # "import uuid" in focal triggers an uname call diff -Nru ubuntu-advantage-tools-32~20.04/debian/apparmor/ubuntu_pro_esm_cache.jinja2 ubuntu-advantage-tools-32.1~20.04/debian/apparmor/ubuntu_pro_esm_cache.jinja2 --- ubuntu-advantage-tools-32~20.04/debian/apparmor/ubuntu_pro_esm_cache.jinja2 2024-05-10 17:07:05.000000000 +0000 +++ ubuntu-advantage-tools-32.1~20.04/debian/apparmor/ubuntu_pro_esm_cache.jinja2 2024-05-14 11:48:34.000000000 +0000 @@ -27,6 +27,9 @@ /etc/apt/** r, /etc/machine-id r, /etc/ubuntu-advantage/uaclient.conf r, + # GH: #3109 + # Allow reading the os-release file (possibly a symlink to /usr/lib). + /{etc/,usr/lib/}os-release r, /run/ubuntu-advantage/ rw, /run/ubuntu-advantage/** rw, diff -Nru ubuntu-advantage-tools-32~20.04/debian/changelog ubuntu-advantage-tools-32.1~20.04/debian/changelog --- ubuntu-advantage-tools-32~20.04/debian/changelog 2024-05-10 17:19:11.000000000 +0000 +++ ubuntu-advantage-tools-32.1~20.04/debian/changelog 2024-05-14 11:48:34.000000000 +0000 @@ -1,8 +1,16 @@ -ubuntu-advantage-tools (32~20.04) focal; urgency=medium +ubuntu-advantage-tools (32.1~20.04) focal; urgency=medium * Backport new upstream release to focal (LP: #2060732) - -- Grant Orndorff Fri, 10 May 2024 12:19:11 -0500 + -- Lucas Moura Tue, 14 May 2024 13:48:34 +0200 + +ubuntu-advantage-tools (32.1) oracular; urgency=medium + + * d/apparmor: allow access for /etc/os-release on all supported + profiles (LP: #2065573) + * apport: get path for timer job status from the correct place (LP: #2065616) + + -- Lucas Moura Tue, 14 May 2024 11:22:35 +0200 ubuntu-advantage-tools (32) oracular; urgency=medium diff -Nru ubuntu-advantage-tools-32~20.04/uaclient/version.py ubuntu-advantage-tools-32.1~20.04/uaclient/version.py --- ubuntu-advantage-tools-32~20.04/uaclient/version.py 2024-04-23 13:37:02.000000000 +0000 +++ ubuntu-advantage-tools-32.1~20.04/uaclient/version.py 2024-05-14 11:48:34.000000000 +0000 @@ -15,7 +15,7 @@ from uaclient.exceptions import ProcessExecutionError from uaclient.system import subp -__VERSION__ = "32" +__VERSION__ = "32.1" PACKAGED_VERSION = "@@PACKAGED_VERSION@@"