From: Frank Brehm Date: Mon, 17 Feb 2020 20:48:29 +0000 (+0100) Subject: committing changes in /etc made by "apt dist-upgrade -y" X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d6b2333455c858596afcdfe46a8c88dd738c057a;p=config%2Fsarah%2Fetc.git committing changes in /etc made by "apt dist-upgrade -y" Package changes: -base-files 10.3+deb10u2 amd64 +base-files 10.3+deb10u3 amd64 -clamav-base 0.101.4+dfsg-0+deb10u1 all -clamav-daemon 0.101.4+dfsg-0+deb10u1 amd64 -clamav-freshclam 0.101.4+dfsg-0+deb10u1 amd64 +clamav-base 0.102.1+dfsg-0+deb10u2 all +clamav-daemon 0.102.1+dfsg-0+deb10u2 amd64 +clamav-freshclam 0.102.1+dfsg-0+deb10u2 amd64 -console-common 0.7.90 all +console-common 0.7.90+deb10u1 all -e2fslibs 1.44.5-1+deb10u2 amd64 -e2fsprogs 1.44.5-1+deb10u2 amd64 +e2fslibs 1.44.5-1+deb10u3 amd64 +e2fsprogs 1.44.5-1+deb10u3 amd64 -git 1:2.20.1-2 amd64 -git-email 1:2.20.1-2 all -git-man 1:2.20.1-2 all +git 1:2.20.1-2+deb10u1 amd64 +git-email 1:2.20.1-2+deb10u1 all +git-man 1:2.20.1-2+deb10u1 all -guile-2.2-libs 2.2.4+1-2 amd64 +guile-2.2-libs 2.2.4+1-2+deb10u1 amd64 -libboost-atomic1.67.0 1.67.0-13 amd64 -libboost-chrono1.67.0 1.67.0-13 amd64 -libboost-date-time1.67.0 1.67.0-13 amd64 -libboost-iostreams1.67.0 1.67.0-13 amd64 -libboost-program-options1.67.0 1.67.0-13 amd64 -libboost-regex1.67.0 1.67.0-13 amd64 -libboost-system1.67.0 1.67.0-13 amd64 -libboost-thread1.67.0 1.67.0-13 amd64 +libboost-atomic1.67.0 1.67.0-13+deb10u1 amd64 +libboost-chrono1.67.0 1.67.0-13+deb10u1 amd64 +libboost-date-time1.67.0 1.67.0-13+deb10u1 amd64 +libboost-iostreams1.67.0 1.67.0-13+deb10u1 amd64 +libboost-program-options1.67.0 1.67.0-13+deb10u1 amd64 +libboost-regex1.67.0 1.67.0-13+deb10u1 amd64 +libboost-system1.67.0 1.67.0-13+deb10u1 amd64 +libboost-thread1.67.0 1.67.0-13+deb10u1 amd64 -libclamav9 0.101.4+dfsg-0+deb10u1 amd64 -libcom-err2 1.44.5-1+deb10u2 amd64 -libcomerr2 1.44.5-1+deb10u2 amd64 +libclamav9 0.102.1+dfsg-0+deb10u2 amd64 +libcom-err2 1.44.5-1+deb10u3 amd64 +libcomerr2 1.44.5-1+deb10u3 amd64 -libcups2 2.2.10-6+deb10u1 amd64 +libcups2 2.2.10-6+deb10u2 amd64 -libext2fs2 1.44.5-1+deb10u2 amd64 +libext2fs2 1.44.5-1+deb10u3 amd64 -libgnutls-openssl27 3.6.7-4 amd64 -libgnutls30 3.6.7-4 amd64 +libgnutls-openssl27 3.6.7-4+deb10u2 amd64 +libgnutls30 3.6.7-4+deb10u2 amd64 -libidn2-0 2.0.5-1 amd64 +libidn2-0 2.0.5-1+deb10u1 amd64 -libmariadb3 1:10.3.18-0+deb10u1 amd64 +libmariadb3 1:10.3.22-0+deb10u1 amd64 -libnss3 2:3.42.1-1+deb10u1 amd64 +libnss3 2:3.42.1-1+deb10u2 amd64 -libpam-systemd 241-7~deb10u2 amd64 +libpam-systemd 241-7~deb10u3 amd64 -libpq5 11.5-1+deb10u1 amd64 +libpq5 11.7-0+deb10u1 amd64 -libpython3.7-minimal 3.7.3-2 amd64 -libpython3.7-stdlib 3.7.3-2 amd64 +libpython3.7-minimal 3.7.3-2+deb10u1 amd64 +libpython3.7-stdlib 3.7.3-2+deb10u1 amd64 -libruby2.5 2.5.5-3 amd64 -libsasl2-2 2.1.27+dfsg-1 amd64 -libsasl2-modules-db 2.1.27+dfsg-1 amd64 +libruby2.5 2.5.5-3+deb10u1 amd64 +libsasl2-2 2.1.27+dfsg-1+deb10u1 amd64 +libsasl2-modules-db 2.1.27+dfsg-1+deb10u1 amd64 -libss2 1.44.5-1+deb10u2 amd64 +libss2 1.44.5-1+deb10u3 amd64 -libsystemd0 241-7~deb10u2 amd64 +libsystemd0 241-7~deb10u3 amd64 -libtiff5 4.0.10-4 amd64 -libtimedate-perl 2.3000-2 all +libtiff5 4.1.0+git191117-2~deb10u1 amd64 +libtimedate-perl 2.3000-2+deb10u1 all -libudev1 241-7~deb10u2 amd64 +libudev1 241-7~deb10u3 amd64 +linux-image-4.19.0-8-amd64 4.19.98-1 amd64 -linux-image-amd64 4.19+105+deb10u1 amd64 -linux-libc-dev 4.19.67-2+deb10u2 amd64 +linux-image-amd64 4.19+105+deb10u3 amd64 +linux-libc-dev 4.19.98-1 amd64 -mariadb-client 1:10.3.18-0+deb10u1 all +mariadb-client 1:10.3.22-0+deb10u1 all -mariadb-client-10.3 1:10.3.18-0+deb10u1 amd64 -mariadb-client-core-10.3 1:10.3.18-0+deb10u1 amd64 -mariadb-common 1:10.3.18-0+deb10u1 all -mariadb-server 1:10.3.18-0+deb10u1 all +mariadb-client-10.3 1:10.3.22-0+deb10u1 amd64 +mariadb-client-core-10.3 1:10.3.22-0+deb10u1 amd64 +mariadb-common 1:10.3.22-0+deb10u1 all +mariadb-server 1:10.3.22-0+deb10u1 all -mariadb-server-10.3 1:10.3.18-0+deb10u1 amd64 -mariadb-server-core-10.3 1:10.3.18-0+deb10u1 amd64 +mariadb-server-10.3 1:10.3.22-0+deb10u1 amd64 +mariadb-server-core-10.3 1:10.3.22-0+deb10u1 amd64 -openssh-client 1:7.9p1-10+deb10u1 amd64 -openssh-server 1:7.9p1-10+deb10u1 amd64 -openssh-sftp-server 1:7.9p1-10+deb10u1 amd64 +openssh-client 1:7.9p1-10+deb10u2 amd64 +openssh-server 1:7.9p1-10+deb10u2 amd64 +openssh-sftp-server 1:7.9p1-10+deb10u2 amd64 -postfix 3.4.7-0+deb10u1 amd64 -postfix-mysql 3.4.7-0+deb10u1 amd64 -postfix-pcre 3.4.7-0+deb10u1 amd64 -postfix-sqlite 3.4.7-0+deb10u1 amd64 +postfix 3.4.8-0+10debu1 amd64 +postfix-mysql 3.4.8-0+10debu1 amd64 +postfix-pcre 3.4.8-0+10debu1 amd64 +postfix-sqlite 3.4.8-0+10debu1 amd64 -python-apt 1.8.4 amd64 -python-apt-common 1.8.4 all +python-apt 1.8.4.1 amd64 +python-apt-common 1.8.4.1 all -python3-apt 1.8.4 amd64 +python3-apt 1.8.4.1 amd64 -python3.7 3.7.3-2 amd64 -python3.7-minimal 3.7.3-2 amd64 +python3.7 3.7.3-2+deb10u1 amd64 +python3.7-minimal 3.7.3-2+deb10u1 amd64 -ruby2.5 2.5.5-3 amd64 +ruby2.5 2.5.5-3+deb10u1 amd64 -salt-common 2019.2.2+ds-1 all -salt-minion 2019.2.2+ds-1 all +salt-common 3000+ds-1 all +salt-minion 3000+ds-1 all -spamassassin 3.4.2-1 all +spamassassin 3.4.2-1+deb10u2 all -sudo 1.8.27-1+deb10u1 amd64 +sudo 1.8.27-1+deb10u2 amd64 -systemd 241-7~deb10u2 amd64 -systemd-sysv 241-7~deb10u2 amd64 +systemd 241-7~deb10u3 amd64 +systemd-sysv 241-7~deb10u3 amd64 -udev 241-7~deb10u2 amd64 +udev 241-7~deb10u3 amd64 --- diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 653b4b6..af19013 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -2,61 +2,64 @@ APT::NeverAutoRemove { "^linux-image-4\.19\.0-6-amd64$"; - "^linux-image-4\.9\.0-11-amd64$"; + "^linux-image-4\.19\.0-8-amd64$"; "^linux-headers-4\.19\.0-6-amd64$"; - "^linux-headers-4\.9\.0-11-amd64$"; + "^linux-headers-4\.19\.0-8-amd64$"; "^linux-image-extra-4\.19\.0-6-amd64$"; - "^linux-image-extra-4\.9\.0-11-amd64$"; + "^linux-image-extra-4\.19\.0-8-amd64$"; "^linux-modules-4\.19\.0-6-amd64$"; - "^linux-modules-4\.9\.0-11-amd64$"; + "^linux-modules-4\.19\.0-8-amd64$"; "^linux-modules-extra-4\.19\.0-6-amd64$"; - "^linux-modules-extra-4\.9\.0-11-amd64$"; + "^linux-modules-extra-4\.19\.0-8-amd64$"; "^linux-signed-image-4\.19\.0-6-amd64$"; - "^linux-signed-image-4\.9\.0-11-amd64$"; + "^linux-signed-image-4\.19\.0-8-amd64$"; "^linux-image-unsigned-4\.19\.0-6-amd64$"; - "^linux-image-unsigned-4\.9\.0-11-amd64$"; + "^linux-image-unsigned-4\.19\.0-8-amd64$"; "^kfreebsd-image-4\.19\.0-6-amd64$"; - "^kfreebsd-image-4\.9\.0-11-amd64$"; + "^kfreebsd-image-4\.19\.0-8-amd64$"; "^kfreebsd-headers-4\.19\.0-6-amd64$"; - "^kfreebsd-headers-4\.9\.0-11-amd64$"; + "^kfreebsd-headers-4\.19\.0-8-amd64$"; "^gnumach-image-4\.19\.0-6-amd64$"; - "^gnumach-image-4\.9\.0-11-amd64$"; + "^gnumach-image-4\.19\.0-8-amd64$"; "^.*-modules-4\.19\.0-6-amd64$"; - "^.*-modules-4\.9\.0-11-amd64$"; + "^.*-modules-4\.19\.0-8-amd64$"; "^.*-kernel-4\.19\.0-6-amd64$"; - "^.*-kernel-4\.9\.0-11-amd64$"; + "^.*-kernel-4\.19\.0-8-amd64$"; "^linux-backports-modules-.*-4\.19\.0-6-amd64$"; - "^linux-backports-modules-.*-4\.9\.0-11-amd64$"; + "^linux-backports-modules-.*-4\.19\.0-8-amd64$"; "^linux-modules-.*-4\.19\.0-6-amd64$"; - "^linux-modules-.*-4\.9\.0-11-amd64$"; + "^linux-modules-.*-4\.19\.0-8-amd64$"; "^linux-tools-4\.19\.0-6-amd64$"; - "^linux-tools-4\.9\.0-11-amd64$"; + "^linux-tools-4\.19\.0-8-amd64$"; "^linux-cloud-tools-4\.19\.0-6-amd64$"; - "^linux-cloud-tools-4\.9\.0-11-amd64$"; + "^linux-cloud-tools-4\.19\.0-8-amd64$"; "^linux-buildinfo-4\.19\.0-6-amd64$"; - "^linux-buildinfo-4\.9\.0-11-amd64$"; + "^linux-buildinfo-4\.19\.0-8-amd64$"; "^linux-source-4\.19\.0-6-amd64$"; - "^linux-source-4\.9\.0-11-amd64$"; + "^linux-source-4\.19\.0-8-amd64$"; }; /* Debug information: # dpkg list: -iF linux-image-4.19.0-6-amd64 4.19.67-2+deb10u2 amd64 Linux 4.19 for 64-bit PCs (signed) +ii linux-image-4.19.0-6-amd64 4.19.67-2+deb10u2 amd64 Linux 4.19 for 64-bit PCs (signed) +iF linux-image-4.19.0-8-amd64 4.19.98-1 amd64 Linux 4.19 for 64-bit PCs (signed) ii linux-image-4.9.0-11-amd64 4.9.189-3+deb9u1 amd64 Linux 4.9 for 64-bit PCs -ii linux-image-amd64 4.19+105+deb10u1 amd64 Linux for 64-bit PCs (meta-package) +iU linux-image-amd64 4.19+105+deb10u3 amd64 Linux for 64-bit PCs (meta-package) # list of installed kernel packages: 4.19.0-6-amd64 4.19.67-2+deb10u2 +4.19.0-8-amd64 4.19.98-1 4.9.0-11-amd64 4.9.189-3+deb9u1 # list of different kernel versions: +4.19.98-1 4.19.67-2+deb10u2 4.9.189-3+deb9u1 -# Installing kernel: 4.19.67-2+deb10u2 (4.19.0-6-amd64) +# Installing kernel: 4.19.98-1 (4.19.0-8-amd64) # Running kernel: 4.19.67-2+deb10u2 (4.19.0-6-amd64) -# Last kernel: 4.19.67-2+deb10u2 -# Previous kernel: 4.9.189-3+deb9u1 +# Last kernel: 4.19.98-1 +# Previous kernel: 4.19.67-2+deb10u2 # Kernel versions list to keep: 4.19.67-2+deb10u2 -4.9.189-3+deb9u1 +4.19.98-1 # Kernel packages (version part) to protect: 4\.19\.0-6-amd64 -4\.9\.0-11-amd64 +4\.19\.0-8-amd64 */ diff --git a/debian_version b/debian_version index e2498ea..260e375 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -10.2 +10.3 diff --git a/init.d/postfix b/init.d/postfix index d783085..bc09928 100755 --- a/init.d/postfix +++ b/init.d/postfix @@ -39,16 +39,9 @@ running() { else POSTCONF="postmulti -i $INSTANCE -x postconf" fi - - queue=$($POSTCONF -hx queue_directory 2>/dev/null || echo /var/spool/postfix) - daemondir=$($POSTCONF -hx daemon_directory 2>/dev/null || echo /usr/lib/postfix/sbin) - if [ -f ${queue}/pid/master.pid ]; then - pid=$(sed 's/ //g' ${queue}/pid/master.pid) - # what directory does the executable live in. stupid prelink systems. - dir=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* -> //; s/\/[^\/]*$//') - if [ "X$dir" = "X${daemondir}" ]; then - echo y - fi + daemon_directory=$($POSTCONF -hx daemon_directory 2>/dev/null || echo /usr/lib/postfix/sbin) + if ! $daemon_directory/master -t 2>/dev/null ; then + echo y fi } diff --git a/salt/minion b/salt/minion index f2b6655..3950877 100644 --- a/salt/minion +++ b/salt/minion @@ -391,7 +391,7 @@ #mine_interval: 60 # Windows platforms lack posix IPC and must rely on slower TCP based inter- -# process communications. Set ipc_mode to 'tcp' on such systems +# process communications. ipc_mode is set to 'tcp' on such systems. #ipc_mode: ipc # Overwrite the default tcp ports used by the minion when ipc_mode is set to 'tcp' @@ -548,6 +548,11 @@ # - edit.vim # - hyper # +# List of grains to pass in start event when minion starts up: +#start_event_grains: +# - machine_id +# - uuid +# # Top file to execute if startup_states is 'top': #top_file: ''