From: Frank Brehm Date: Thu, 22 Sep 2022 22:07:48 +0000 (+0200) Subject: committing changes in /etc made by "/usr/bin/apt full-upgrade -y" X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=23abc27e59af1906e007aa90d9c924570a668f53;p=config%2Fbruni%2Fetc-mint-new1.git 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 --- 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 0000000..c872560 Binary files /dev/null and b/apt/trusted.gpg.d/ubuntu-advantage-esm-apps.gpg differ 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