From: root Date: Thu, 16 Nov 2023 23:01:21 +0000 (+0100) Subject: committing changes in /etc made by "/usr/sbin/synaptic --hide-main-window --non-inter... X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=dcec3f3b0284e5fad4852aaaf5375218756a061a;p=config%2Fbruni%2Fetc-mint-new1.git committing changes in /etc made by "/usr/sbin/synaptic --hide-main-window --non-interactive --parent-window-id 83886094 -o Synaptic::closeZvt=true --set-selections-file /tmp/tmp_pf0409m" Packages with configuration changes: -ubuntu-advantage-tools 29.4~22.04 amd64 +ubuntu-advantage-tools 30~22.04 amd64 Package changes: -ubuntu-advantage-tools 29.4~22.04 amd64 +ubuntu-advantage-tools 30~22.04 amd64 +ubuntu-pro-client-l10n 30~22.04 amd64 --- diff --git a/.etckeeper b/.etckeeper index d5389a6..469eef8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -592,6 +592,8 @@ 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-pro-esm-apps' +maybe chmod 0644 'apt/preferences.d/ubuntu-pro-esm-infra' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub' maybe chmod 0644 'apt/sources.list' maybe chmod 0755 'apt/sources.list.d' @@ -3327,7 +3329,6 @@ maybe chmod 0644 'timidity/timgm6mb.cfg' maybe chmod 0755 'tmpfiles.d' maybe chmod 0644 'tmpfiles.d/screen-cleanup.conf' maybe chmod 0755 'ubuntu-advantage' -maybe chmod 0644 'ubuntu-advantage/help_data.yaml' maybe chmod 0644 'ubuntu-advantage/uaclient.conf' maybe chmod 0644 'ucf.conf' maybe chmod 0755 'udev' diff --git a/apt/preferences.d/ubuntu-pro-esm-apps b/apt/preferences.d/ubuntu-pro-esm-apps new file mode 100644 index 0000000..5ded6f8 --- /dev/null +++ b/apt/preferences.d/ubuntu-pro-esm-apps @@ -0,0 +1,11 @@ +# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools +# package. It has no effect if Ubuntu Pro services are not in use since no +# other apt repositories are expected to match o=UbuntuESMApps. +# +# Pin esm-apps packages to a slightly higher value than the default, +# so those are preferred over a non-ESM package from the archive when the +# service is enabled. + +Package: * +Pin: release o=UbuntuESMApps +Pin-Priority: 510 diff --git a/apt/preferences.d/ubuntu-pro-esm-infra b/apt/preferences.d/ubuntu-pro-esm-infra new file mode 100644 index 0000000..e956e0a --- /dev/null +++ b/apt/preferences.d/ubuntu-pro-esm-infra @@ -0,0 +1,10 @@ +# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools +# package. It has no effect if Ubuntu Pro services are not in use since no +# other apt repositories are expected to match o=UbuntuESM. +# +# Pin esm-infra packages to a slightly higher value than the default, +# so those are preferred over a non-ESM package from the archive when the +# service is enabled. +Package: * +Pin: release o=UbuntuESM +Pin-Priority: 510 diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml deleted file mode 100644 index 61b81df..0000000 --- a/ubuntu-advantage/help_data.yaml +++ /dev/null @@ -1,109 +0,0 @@ -anbox-cloud: - help: | - Anbox Cloud lets you stream mobile apps securely, at any scale, to any - device, letting you focus on your apps. Run Android in system - containers on public or private clouds with ultra low streaming - latency. When the anbox-cloud service is enabled, by default, the - Appliance variant is enabled. Enabling this service allows - orchestration to provision a PPA with the Anbox Cloud resources. This - step also configures the Anbox Management Service (AMS) with the - necessary image server credentials. To learn more about Anbox Cloud, - see https://anbox-cloud.io - -cc-eal: - help: | - Common Criteria is an Information Technology Security Evaluation standard - (ISO/IEC IS 15408) for computer security certification. Ubuntu 16.04 has - been evaluated to assurance level EAL2 through CSEC. The evaluation was - performed on Intel x86_64, IBM Power8 and IBM Z hardware platforms. - -cis: - help: | - Ubuntu Security Guide is a tool for hardening and auditing and allows for - environment-specific customizations. It enables compliance with profiles - such as DISA-STIG and the CIS benchmarks. Find out more at - https://ubuntu.com/security/certifications/docs/usg - - -esm-apps: - help: | - 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: | - 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: | - FIPS 140-2 is a set of publicly announced cryptographic standards - developed by the National Institute of Standards and Technology - applicable for FedRAMP, HIPAA, PCI and ISO compliance use cases. - Note that "fips" does not provide security patching. For fips certified - modules with security patches please refer to fips-updates. The modules - are certified on Intel x86_64 and IBM Z hardware platforms for Ubuntu - 18.04 and Intel x86_64, IBM Power8 and IBM Z hardware platforms for - Ubuntu 16.04. Below is the list of fips certified components per an - Ubuntu Version. You can find out more at - https://ubuntu.com/security/certifications#fips - -fips-updates: - help: | - fips-updates installs fips modules including all security patches - for those modules that have been provided since their certification date. - You can find out more at https://ubuntu.com/security/certifications#fips. - -landscape: - help: | - Landscape Client can be installed on this machine and enrolled in - Canonical's Landscape SaaS: https://landscape.canonical.com - or a self-hosted Landscape: https://ubuntu.com/landscape/install - Landscape allows you to manage many machines as easily as one, - with an intuitive dashboard and API interface for automation, - hardening, auditing, and more. Find out more about Landscape at - https://ubuntu.com/landscape - -livepatch: - help: | - Livepatch provides selected high and critical kernel CVE fixes and other - non-security bug fixes as kernel livepatches. Livepatches are applied - without rebooting a machine which drastically limits the need for - unscheduled system reboots. Due to the nature of fips compliance, - livepatches cannot be enabled on fips-enabled systems. You can find out - more about Ubuntu Kernel Livepatch service at - https://ubuntu.com/security/livepatch - -realtime-kernel: - help: | - The Real-time kernel is an Ubuntu kernel with PREEMPT_RT patches integrated. - It services latency-dependent use cases by providing deterministic response times. - The Real-time kernel meets stringent preemption specifications and is suitable for - telco applications and dedicated devices in industrial automation and robotics. - The Real-time kernel is currently incompatible with FIPS and Livepatch. - -ros: - help: | - ros provides access to a private PPA which includes security-related - updates for available high and critical CVE fixes for Robot Operating - System (ROS) packages. For access to ROS ESM and security updates, both - esm-infra and esm-apps services will also be enabled. To get additional - non-security updates, enable ros-updates. You can find out more about the - ROS ESM service at https://ubuntu.com/robotics/ros-esm - -ros-updates: - help: | - ros-updates provides access to a private PPA which includes - non-security-related updates for Robot Operating System (ROS) packages. - For full access to ROS ESM, security and non-security updates, - the esm-infra, esm-apps, and ros services will also be enabled. You can - find out more about the ROS ESM service at - https://ubuntu.com/robotics/ros-esm