From 23abc27e59af1906e007aa90d9c924570a668f53 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 23 Sep 2022 00:07:48 +0200
Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt full-upgrade
 -y"

Packages with configuration changes:
-ubuntu-advantage-tools 27.10.1~22.04.1 amd64
+ubuntu-advantage-tools 27.11~22.04.1 amd64

Package changes:
-libpcre2-16-0 10.39-3build1 amd64
-libpcre2-32-0 10.39-3build1 amd64
-libpcre2-8-0 10.39-3build1 amd64
-libpcre2-8-0 10.39-3build1 i386
-libpcre2-dev 10.39-3build1 amd64
-libpcre2-posix3 10.39-3build1 amd64
+libpcre2-16-0 10.39-3ubuntu0.1 amd64
+libpcre2-32-0 10.39-3ubuntu0.1 amd64
+libpcre2-8-0 10.39-3ubuntu0.1 amd64
+libpcre2-8-0 10.39-3ubuntu0.1 i386
+libpcre2-dev 10.39-3ubuntu0.1 amd64
+libpcre2-posix3 10.39-3ubuntu0.1 amd64
-linux-headers-5.15.0-47-generic 5.15.0-47.51 amd64
-python3-oauthlib 3.2.0-1 all
+python3-oauthlib 3.2.0-1ubuntu0.1 all
-ubuntu-advantage-tools 27.10.1~22.04.1 amd64
+ubuntu-advantage-tools 27.11~22.04.1 amd64
---
 .etckeeper                                    |   3 +++
 apt/preferences.d/ubuntu-esm-apps             |   4 ++++
 apt/sources.list.d/ubuntu-esm-apps.list       |   6 +++++
 .../ubuntu-advantage-esm-apps.gpg             | Bin 0 -> 2236 bytes
 ubuntu-advantage/help_data.yaml               |  21 +++++++++---------
 ubuntu-advantage/uaclient.conf                |   6 ++---
 6 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 apt/preferences.d/ubuntu-esm-apps
 create mode 100644 apt/sources.list.d/ubuntu-esm-apps.list
 create mode 100644 apt/trusted.gpg.d/ubuntu-advantage-esm-apps.gpg

diff --git a/.etckeeper b/.etckeeper
index 471ea66..2e9c7fb 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -584,6 +584,7 @@ maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/preferences.d/nosnap.pref'
 maybe chmod 0644 'apt/preferences.d/official-extra-repositories.pref'
 maybe chmod 0644 'apt/preferences.d/official-package-repositories.pref'
+maybe chmod 0644 'apt/preferences.d/ubuntu-esm-apps'
 maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub'
 maybe chmod 0644 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
@@ -633,6 +634,7 @@ maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list'
 maybe chmod 0664 'apt/sources.list.d/plexmediaserver.list'
 maybe chmod 0644 'apt/sources.list.d/team-xbmc-ppa-jammy.list'
 maybe chmod 0644 'apt/sources.list.d/teams.list'
+maybe chmod 0644 'apt/sources.list.d/ubuntu-esm-apps.list'
 maybe chmod 0644 'apt/sources.list.d/vscode.list'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
@@ -648,6 +650,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/puppet-keyring.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/puppet-tools-keyring.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/repo.uhu-banane.de.gpg-key2.asc'
 maybe chmod 0644 'apt/trusted.gpg.d/team-xbmc.asc'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-advantage-esm-apps.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-defaults.chroot.key.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2016-dbgsym.gpg'
diff --git a/apt/preferences.d/ubuntu-esm-apps b/apt/preferences.d/ubuntu-esm-apps
new file mode 100644
index 0000000..724c261
--- /dev/null
+++ b/apt/preferences.d/ubuntu-esm-apps
@@ -0,0 +1,4 @@
+# Written by ubuntu-advantage-tools
+Package: *
+Pin: release o=UbuntuESMApps, n=jammy
+Pin-Priority: never
diff --git a/apt/sources.list.d/ubuntu-esm-apps.list b/apt/sources.list.d/ubuntu-esm-apps.list
new file mode 100644
index 0000000..2b29163
--- /dev/null
+++ b/apt/sources.list.d/ubuntu-esm-apps.list
@@ -0,0 +1,6 @@
+# Written by ubuntu-advantage-tools
+deb https://esm.ubuntu.com/apps/ubuntu jammy-apps-security main
+# deb-src https://esm.ubuntu.com/apps/ubuntu jammy-apps-security main
+
+deb https://esm.ubuntu.com/apps/ubuntu jammy-apps-updates main
+# deb-src https://esm.ubuntu.com/apps/ubuntu jammy-apps-updates main
diff --git a/apt/trusted.gpg.d/ubuntu-advantage-esm-apps.gpg b/apt/trusted.gpg.d/ubuntu-advantage-esm-apps.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..c8725601b81520919298e37aa5b7b43262b7ba60
GIT binary patch
literal 2236
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
K;8i}b0ssTnEhi8F

literal 0
HcmV?d00001

diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml
index c301573..1b66441 100644
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -15,22 +15,21 @@ cis:
 
 esm-apps:
     help: |
-      UA Apps: Extended Security Maintenance is enabled by default on entitled
-      workloads. It provides access to a private PPA which includes available
-      high and critical CVE fixes for Ubuntu LTS packages in the Ubuntu Main
-      and Ubuntu Universe repositories from the Ubuntu LTS release date until
+      Expanded Security Maintenance for Applications is enabled by default
+      on entitled workloads. It provides access to a private PPA which includes
+      available high and critical CVE fixes for Ubuntu LTS packages in the Ubuntu
+      Main and Ubuntu Universe repositories from the Ubuntu LTS release date until
       its end of life. You can find out more about the esm service at
       https://ubuntu.com/security/esm
 
 esm-infra:
    help: |
-     esm-infra provides access to a private ppa which includes available high
-     and critical CVE fixes for Ubuntu LTS packages in the Ubuntu Main
-     repository between the end of the standard Ubuntu LTS security
-     maintenance and its end of life. It is enabled by default with
-     Extended Security Maintenance (ESM) for UA Apps and UA Infra.
-     You can find our more about the esm service at
-     https://ubuntu.com/security/esm
+     Expanded Security Maintenance for Infrastructure provides access
+     to a private ppa which includes available high and critical CVE fixes
+     for Ubuntu LTS packages in the Ubuntu Main repository between the end
+     of the standard Ubuntu LTS security maintenance and its end of life.
+     It is enabled by default with Ubuntu Pro. You can find out more about
+     the service at https://ubuntu.com/security/esm
 
 fips:
     help: |
diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index ec088bd..c5b5404 100644
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -1,6 +1,6 @@
-# Ubuntu-Advantage client config file.
-# If you modify this file, run "ua refresh config" to ensure changes are
-# picked up by Ubuntu-Advantage client.
+# Ubuntu Pro Client config file.
+# If you modify this file, run "pro refresh config" to ensure changes are
+# picked up by Ubuntu Pro Client.
 
 contract_url: https://contracts.canonical.com
 data_dir: /var/lib/ubuntu-advantage
-- 
2.39.5