From 7900e70f5368cf86cd08971c34c6f1929f932d6c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 18 May 2022 00:25:40 +0200 Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt full-upgrade -y" Package changes: -apport 2.20.11-0ubuntu27.23 all +apport 2.20.11-0ubuntu27.24 all -apt 2.0.6 amd64 +apt 2.0.8 amd64 -apt-utils 2.0.6 amd64 +apt-utils 2.0.8 amd64 -libapt-pkg6.0 2.0.6 amd64 +libapt-pkg6.0 2.0.8 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 -libpcre3 2:8.39-12build1 amd64 -libpcrecpp0v5 2:8.39-12build1 amd64 +libpcre3 2:8.39-12ubuntu0.1 amd64 +libpcrecpp0v5 2:8.39-12ubuntu0.1 amd64 -lintian 2.62.0ubuntu2 all +lintian 2.62.0ubuntu2.1 all -needrestart 3.4-6 all +needrestart 3.4-6ubuntu0.1 all -python3-apport 2.20.11-0ubuntu27.23 all +python3-apport 2.20.11-0ubuntu27.24 all -python3-fb-tools 1.9.4+ubuntu20.04 all +python3-fb-tools 1.9.5+ubuntu20.04 all -python3-problem-report 2.20.11-0ubuntu27.23 all +python3-problem-report 2.20.11-0ubuntu27.24 all --- .etckeeper | 2 - apt/apt.conf.d/01autoremove-kernels | 39 -------------- init.d/apport | 9 ++-- kernel/postinst.d/apt-auto-removal | 83 ----------------------------- 4 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 apt/apt.conf.d/01autoremove-kernels delete mode 100755 kernel/postinst.d/apt-auto-removal diff --git a/.etckeeper b/.etckeeper index 9bc16b9..99e0d96 100755 --- a/.etckeeper +++ b/.etckeeper @@ -524,7 +524,6 @@ maybe chmod 0644 'apt/apt.conf.d/00mint' 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/10periodic' maybe chmod 0644 'apt/apt.conf.d/15update-stamp' @@ -2186,7 +2185,6 @@ maybe chmod 0755 'kernel/header_postinst.d' maybe chmod 0755 'kernel/header_postinst.d/dkms' 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/dkms' maybe chmod 0755 'kernel/postinst.d/initramfs-tools' maybe chmod 0755 'kernel/postinst.d/pm-utils' diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels deleted file mode 100644 index c3bbd3e..0000000 --- a/apt/apt.conf.d/01autoremove-kernels +++ /dev/null @@ -1,39 +0,0 @@ -// DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal -APT::NeverAutoRemove -{ - "^linux-.*-5\.4\.0-109-generic$"; - "^linux-.*-5\.4\.0-110-generic$"; - "^kfreebsd-.*-5\.4\.0-109-generic$"; - "^kfreebsd-.*-5\.4\.0-110-generic$"; - "^gnumach-.*-5\.4\.0-109-generic$"; - "^gnumach-.*-5\.4\.0-110-generic$"; - "^.*-modules-5\.4\.0-109-generic$"; - "^.*-modules-5\.4\.0-110-generic$"; - "^.*-kernel-5\.4\.0-109-generic$"; - "^.*-kernel-5\.4\.0-110-generic$"; -}; -/* Debug information: -# dpkg list: -ii linux-image-5.4.0-107-generic 5.4.0-107.121 amd64 Signed kernel image generic -ii linux-image-5.4.0-109-generic 5.4.0-109.123 amd64 Signed kernel image generic -iF linux-image-5.4.0-110-generic 5.4.0-110.124 amd64 Signed kernel image generic -ii linux-image-generic 5.4.0.110.114 amd64 Generic Linux kernel image -# list of installed kernel packages: -5.4.0-107-generic 5.4.0-107.121 -5.4.0-109-generic 5.4.0-109.123 -5.4.0-110-generic 5.4.0-110.124 -# list of different kernel versions: -5.4.0-110.124 -5.4.0-109.123 -5.4.0-107.121 -# Installing kernel: 5.4.0-110.124 (5.4.0-110-generic) -# Running kernel: 5.4.0-109.123 (5.4.0-109-generic) -# Last kernel: 5.4.0-110.124 -# Previous kernel: 5.4.0-109.123 -# Kernel versions list to keep: -5.4.0-109.123 -5.4.0-110.124 -# Kernel packages (version part) to protect: -5\.4\.0-109-generic -5\.4\.0-110-generic -*/ diff --git a/init.d/apport b/init.d/apport index 4997b83..1e10d02 100755 --- a/init.d/apport +++ b/init.d/apport @@ -50,13 +50,9 @@ do_start() rm -f /var/lib/pm-utils/resume-hang.log fi - # Old compatibility mode, switch later to second one - if true; then - echo "|$AGENT %p %s %c %d %P %E" > /proc/sys/kernel/core_pattern - else - echo "|$AGENT -p%p -s%s -c%c -d%d -P%P -E%E" > /proc/sys/kernel/core_pattern - fi + echo "|$AGENT -p%p -s%s -c%c -d%d -P%P -u%u -g%g -- %E" > /proc/sys/kernel/core_pattern echo 2 > /proc/sys/fs/suid_dumpable + echo 10 > /proc/sys/kernel/core_pipe_limit } # @@ -70,6 +66,7 @@ do_stop() # 2 if daemon could not be stopped # other if a failure occurred + echo 0 > /proc/sys/kernel/core_pipe_limit echo 0 > /proc/sys/fs/suid_dumpable # Check for a hung resume. If we find one try and grab everything diff --git a/kernel/postinst.d/apt-auto-removal b/kernel/postinst.d/apt-auto-removal deleted file mode 100755 index 2c32b0c..0000000 --- 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" -- 2.39.5