diff -Nru ubuntu-advantage-tools-28~23.04/debian/changelog ubuntu-advantage-tools-28.1~23.04/debian/changelog --- ubuntu-advantage-tools-28~23.04/debian/changelog 2023-06-22 21:06:04.000000000 +0000 +++ ubuntu-advantage-tools-28.1~23.04/debian/changelog 2023-06-27 00:49:57.000000000 +0000 @@ -1,8 +1,18 @@ -ubuntu-advantage-tools (28~23.04) lunar; urgency=medium +ubuntu-advantage-tools (28.1~23.04) lunar; urgency=medium * Backport new upstream release: (LP: #2017949) to lunar - -- Grant Orndorff Thu, 22 Jun 2023 17:06:04 -0400 + -- Grant Orndorff Mon, 26 Jun 2023 20:49:57 -0400 + +ubuntu-advantage-tools (28.1) mantic; urgency=medium + + * New upstream release 28.1 (LP: #2017949) + - fips: ensure shim-signed is updated to the version in the fips repo + if necessary + - status: fix bug where an existing status cache could influence the + simulated status output + + -- Grant Orndorff Mon, 26 Jun 2023 15:05:11 -0400 ubuntu-advantage-tools (28) mantic; urgency=medium diff -Nru ubuntu-advantage-tools-28~23.04/uaclient/entitlements/fips.py ubuntu-advantage-tools-28.1~23.04/uaclient/entitlements/fips.py --- ubuntu-advantage-tools-28~23.04/uaclient/entitlements/fips.py 2023-06-22 20:32:35.000000000 +0000 +++ ubuntu-advantage-tools-28.1~23.04/uaclient/entitlements/fips.py 2023-06-27 00:49:57.000000000 +0000 @@ -27,6 +27,7 @@ "strongswan-hmac", "openssh-client", "openssh-server", + "shim-signed", ] CONDITIONAL_PACKAGES_OPENSSH_HMAC = [ "openssh-client-hmac", @@ -112,6 +113,7 @@ "libgcrypt20", "libgcrypt20-hmac", "fips-initramfs-generic", + "shim-signed", ] @property diff -Nru ubuntu-advantage-tools-28~23.04/uaclient/status.py ubuntu-advantage-tools-28.1~23.04/uaclient/status.py --- ubuntu-advantage-tools-28~23.04/uaclient/status.py 2023-06-22 20:32:35.000000000 +0000 +++ ubuntu-advantage-tools-28.1~23.04/uaclient/status.py 2023-06-27 00:49:57.000000000 +0000 @@ -507,20 +507,14 @@ event.info("This token is not valid.\n" + message.msg + "\n") ret = 1 - status_cache = cfg.read_cache("status-cache") - if status_cache: - resources = status_cache.get("services") - else: - resources = get_available_resources(cfg) - - entitlements = contract_info.get("resourceEntitlements", []) - + resources = get_available_resources(cfg) inapplicable_resources = [ resource["name"] for resource in sorted(resources, key=lambda x: x["name"]) if not resource["available"] ] + entitlements = contract_info.get("resourceEntitlements", []) for resource in resources: entitlement_name = resource.get("name", "") try: diff -Nru ubuntu-advantage-tools-28~23.04/uaclient/version.py ubuntu-advantage-tools-28.1~23.04/uaclient/version.py --- ubuntu-advantage-tools-28~23.04/uaclient/version.py 2023-06-22 20:32:35.000000000 +0000 +++ ubuntu-advantage-tools-28.1~23.04/uaclient/version.py 2023-06-27 00:49:57.000000000 +0000 @@ -15,7 +15,7 @@ from uaclient.exceptions import ProcessExecutionError from uaclient.system import subp -__VERSION__ = "28" +__VERSION__ = "28.1" PACKAGED_VERSION = "@@PACKAGED_VERSION@@" CANDIDATE_REGEX = r"Candidate: (?P.*?)\n"