From b15139dbfbf4cd47c212677d2e4d392793541987 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 20 May 2022 07:49:14 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -apt 2.0.6 amd64 +apt 2.0.8 amd64 -apt-transport-https 2.0.6 all -apt-utils 2.0.6 amd64 +apt-transport-https 2.0.8 all +apt-utils 2.0.8 amd64 -curl 7.68.0-1ubuntu2.10 amd64 +curl 7.68.0-1ubuntu2.11 amd64 -libapt-pkg6.0 2.0.6 amd64 +libapt-pkg6.0 2.0.8 amd64 -libc-bin 2.31-0ubuntu9.7 amd64 -libc-dev-bin 2.31-0ubuntu9.7 amd64 -libc6 2.31-0ubuntu9.7 amd64 -libc6-dev 2.31-0ubuntu9.7 amd64 +libc-bin 2.31-0ubuntu9.9 amd64 +libc-dev-bin 2.31-0ubuntu9.9 amd64 +libc6 2.31-0ubuntu9.9 amd64 +libc6-dev 2.31-0ubuntu9.9 amd64 -libcurl3-gnutls 7.68.0-1ubuntu2.10 amd64 -libcurl4 7.68.0-1ubuntu2.10 amd64 +libcurl3-gnutls 7.68.0-1ubuntu2.11 amd64 +libcurl4 7.68.0-1ubuntu2.11 amd64 -libldap-2.4-2 2.4.49+dfsg-2ubuntu1.8 amd64 -libldap-common 2.4.49+dfsg-2ubuntu1.8 all +libldap-2.4-2 2.4.49+dfsg-2ubuntu1.9 amd64 +libldap-common 2.4.49+dfsg-2ubuntu1.9 all -libnss-systemd 245.4-4ubuntu3.16 amd64 +libnss-systemd 245.4-4ubuntu3.17 amd64 -libpam-systemd 245.4-4ubuntu3.16 amd64 +libpam-systemd 245.4-4ubuntu3.17 amd64 -libpcre3 2:8.39-12build1 amd64 +libpcre3 2:8.39-12ubuntu0.1 amd64 -libsystemd0 245.4-4ubuntu3.16 amd64 +libsystemd0 245.4-4ubuntu3.17 amd64 -libtiff5 4.1.0+git191117-2ubuntu0.20.04.2 amd64 +libtiff5 4.1.0+git191117-2ubuntu0.20.04.3 amd64 -libudev1 245.4-4ubuntu3.16 amd64 +libudev1 245.4-4ubuntu3.17 amd64 -libxml2 2.9.10+dfsg-5ubuntu0.20.04.2 amd64 +libxml2 2.9.10+dfsg-5ubuntu0.20.04.3 amd64 -linux-firmware 1.187.30 all +linux-firmware 1.187.31 all -linux-libc-dev 5.4.0-109.123 amd64 +linux-libc-dev 5.4.0-110.124 amd64 -locales 2.31-0ubuntu9.7 all -login 1:4.8.1-1ubuntu5.20.04.1 amd64 +locales 2.31-0ubuntu9.9 all +login 1:4.8.1-1ubuntu5.20.04.2 amd64 -openssh-client 1:8.2p1-4ubuntu0.4 amd64 -openssh-server 1:8.2p1-4ubuntu0.4 amd64 -openssh-sftp-server 1:8.2p1-4ubuntu0.4 amd64 +openssh-client 1:8.2p1-4ubuntu0.5 amd64 +openssh-server 1:8.2p1-4ubuntu0.5 amd64 +openssh-sftp-server 1:8.2p1-4ubuntu0.5 amd64 -passwd 1:4.8.1-1ubuntu5.20.04.1 amd64 +passwd 1:4.8.1-1ubuntu5.20.04.2 amd64 -systemd 245.4-4ubuntu3.16 amd64 -systemd-sysv 245.4-4ubuntu3.16 amd64 -systemd-timesyncd 245.4-4ubuntu3.16 amd64 +systemd 245.4-4ubuntu3.17 amd64 +systemd-sysv 245.4-4ubuntu3.17 amd64 +systemd-timesyncd 245.4-4ubuntu3.17 amd64 -ubuntu-advantage-tools 27.7~20.04.1 amd64 +ubuntu-advantage-tools 27.8~20.04.1 amd64 -udev 245.4-4ubuntu3.16 amd64 +udev 245.4-4ubuntu3.17 amd64 --- .etckeeper | 3 +- apt/apt.conf.d/01autoremove-kernels | 44 --------------- kernel/postinst.d/apt-auto-removal | 83 ----------------------------- letsencrypt/.certbot.lock | 0 ubuntu-advantage/help_data.yaml | 10 ++++ 5 files changed, 11 insertions(+), 129 deletions(-) delete mode 100644 apt/apt.conf.d/01autoremove-kernels delete mode 100755 kernel/postinst.d/apt-auto-removal create mode 100644 letsencrypt/.certbot.lock diff --git a/.etckeeper b/.etckeeper index 2995fe270..6324ee695 100755 --- a/.etckeeper +++ b/.etckeeper @@ -674,7 +674,6 @@ maybe chmod 0755 'apt/apt.conf.d' maybe chmod 0644 'apt/apt.conf.d/00trustcdrom' maybe chmod 0644 'apt/apt.conf.d/01-vendor-ubuntu' maybe chmod 0644 'apt/apt.conf.d/01autoremove' -maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels' maybe chmod 0644 'apt/apt.conf.d/05etckeeper' maybe chmod 0644 'apt/apt.conf.d/20apt-esm-hook.conf' maybe chmod 0644 'apt/apt.conf.d/20apt-show-versions' @@ -1605,7 +1604,6 @@ maybe chmod 0755 'kernel' maybe chmod 0644 'kernel-img.conf' maybe chmod 0755 'kernel/install.d' maybe chmod 0755 'kernel/postinst.d' -maybe chmod 0755 'kernel/postinst.d/apt-auto-removal' maybe chmod 0755 'kernel/postinst.d/initramfs-tools' maybe chmod 0755 'kernel/postinst.d/xx-update-initrd-links' maybe chmod 0755 'kernel/postinst.d/zz-update-grub' @@ -1626,6 +1624,7 @@ maybe chmod 0755 'ldap/schema' maybe chmod 0644 'ldap/schema/amavis.schema' maybe chmod 0644 'legal' maybe chmod 0755 'letsencrypt' +maybe chmod 0600 'letsencrypt/.certbot.lock' maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt' maybe chmod 0700 'letsencrypt/accounts' maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org' diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels deleted file mode 100644 index 3e8034094..000000000 --- a/apt/apt.conf.d/01autoremove-kernels +++ /dev/null @@ -1,44 +0,0 @@ -// DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal -APT::NeverAutoRemove -{ - "^linux-.*-5\.4\.0-81-generic$"; - "^linux-.*-5\.4\.0-94-generic$"; - "^kfreebsd-.*-5\.4\.0-81-generic$"; - "^kfreebsd-.*-5\.4\.0-94-generic$"; - "^gnumach-.*-5\.4\.0-81-generic$"; - "^gnumach-.*-5\.4\.0-94-generic$"; - "^.*-modules-5\.4\.0-81-generic$"; - "^.*-modules-5\.4\.0-94-generic$"; - "^.*-kernel-5\.4\.0-81-generic$"; - "^.*-kernel-5\.4\.0-94-generic$"; -}; -/* Debug information: -# dpkg list: -rc linux-image-4.15.0-109-generic 4.15.0-109.110 amd64 Signed kernel image generic -rc linux-image-4.15.0-38-generic 4.15.0-38.41 amd64 Signed kernel image generic -rc linux-image-4.15.0-64-generic 4.15.0-64.73 amd64 Signed kernel image generic -rc linux-image-5.4.0-40-generic 5.4.0-40.44 amd64 Signed kernel image generic -rc linux-image-5.4.0-48-generic 5.4.0-48.52 amd64 Signed kernel image generic -ii linux-image-5.4.0-52-generic 5.4.0-52.57 amd64 Signed kernel image generic -ii linux-image-5.4.0-81-generic 5.4.0-81.91 amd64 Signed kernel image generic -iF linux-image-5.4.0-94-generic 5.4.0-94.106 amd64 Signed kernel image generic -ii linux-image-generic 5.4.0.94.98 amd64 Generic Linux kernel image -# list of installed kernel packages: -5.4.0-52-generic 5.4.0-52.57 -5.4.0-81-generic 5.4.0-81.91 -5.4.0-94-generic 5.4.0-94.106 -# list of different kernel versions: -5.4.0-94.106 -5.4.0-81.91 -5.4.0-52.57 -# Installing kernel: 5.4.0-94.106 (5.4.0-94-generic) -# Running kernel: 5.4.0-81.91 (5.4.0-81-generic) -# Last kernel: 5.4.0-94.106 -# Previous kernel: 5.4.0-81.91 -# Kernel versions list to keep: -5.4.0-81.91 -5.4.0-94.106 -# Kernel packages (version part) to protect: -5\.4\.0-81-generic -5\.4\.0-94-generic -*/ diff --git a/kernel/postinst.d/apt-auto-removal b/kernel/postinst.d/apt-auto-removal deleted file mode 100755 index 2c32b0c9d..000000000 --- a/kernel/postinst.d/apt-auto-removal +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -set -e -# Mark as not-for-autoremoval those kernel packages that are: -# - the currently booted version -# - the kernel version we've been called for -# - the latest kernel version (as determined by debian version number) -# - the second-latest kernel version -# -# In the common case this results in two kernels saved (booted into the -# second-latest kernel, we install the latest kernel in an upgrade), but -# can save up to four. Kernel refers here to a distinct release, which can -# potentially be installed in multiple flavours counting as one kernel. - -eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) -test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" -config_file="${APT_CONF_D}/01autoremove-kernels" - -eval $(apt-config shell DPKG Dir::bin::dpkg/f) -test -n "$DPKG" || DPKG="/usr/bin/dpkg" - -list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+(linux|kfreebsd|gnumach)-image-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2,$3; }' \ - | sed -e 's#^\(linux\|kfreebsd\|gnumach\)-image-##' -e 's#:[^:]\+ # #')" -debverlist="$(echo "$list" | cut -d' ' -f 2 | sort --unique --reverse --version-sort)" - -if [ -n "$1" ]; then - installed_version="$(echo "$list" | awk "\$1 == \"$1\" { print \$2;exit; }")" -fi -unamer="$(uname -r | tr '[A-Z]' '[a-z]')" -if [ -n "$unamer" ]; then - running_version="$(echo "$list" | awk "\$1 == \"$unamer\" { print \$2;exit; }")" -fi -# ignore the currently running version if attempting a reproducible build -if [ -n "${SOURCE_DATE_EPOCH}" ]; then - unamer="" - running_version="" -fi -latest_version="$(echo "$debverlist" | sed -n 1p)" -previous_version="$(echo "$debverlist" | sed -n 2p)" - -debkernels="$(echo "$latest_version -$installed_version -$running_version -$previous_version" | sort -u | sed -e '/^$/ d')" -kernels="$( (echo "$1 -$unamer"; for deb in $debkernels; do echo "$list" | awk "\$2 == \"$deb\" { print \$1; }"; done; ) \ - | sed -e 's#\([\.\+]\)#\\\1#g' -e '/^$/ d' | sort -u)" - -generateconfig() { - cat < "${config_file}.dpkg-new" -mv -f "${config_file}.dpkg-new" "$config_file" -chmod 444 "$config_file" diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml index d5d6486c7..c3015736d 100644 --- a/ubuntu-advantage/help_data.yaml +++ b/ubuntu-advantage/help_data.yaml @@ -61,6 +61,16 @@ livepatch: more about Ubuntu Kernel Livepatch service at https://ubuntu.com/security/livepatch +realtime-kernel: + help: | + The real-time kernel is a beta version of the 22.04 Ubuntu kernel with the + PREEMPT_RT patchset integrated for x86_64 and ARM64. It services extreme + latency-dependent use cases and provides deterministic response times to + service events. By meeting stringent preemption specifications, the + real-time kernel is suitable for telco applications and embedded devices + in industrial automation and robotics. To enroll in the beta program, visit + https://ubuntu.com/realtime-kernel + ros: help: | ros provides access to a private PPA which includes security-related -- 2.43.0