committing changes in /etc after apt run

Package changes:
-apt 1.4~rc2 amd64
-apt-listchanges 3.9 all
-apt-utils 1.4~rc2 amd64
+apt 1.4 amd64
+apt-listchanges 3.10 all
+apt-utils 1.4 amd64
-base-files 9.8 amd64
+base-files 9.9 amd64
-binutils 2.28-2 amd64
+binutils 2.28-3 amd64
-bsdmainutils 9.0.12 amd64
-bsdutils 1:2.29.1-1 amd64
+bsdmainutils 9.0.12+nmu1 amd64
+bsdutils 1:2.29.2-1 amd64
-cpp 4:6.3.0-2 amd64
-cpp-6 6.3.0-11 amd64
+cpp 4:6.3.0-4 amd64
+cpp-6 6.3.0-12 amd64
-dbus 1.10.16-1 amd64
+dbus 1.10.18-1 amd64
-dh-autoreconf 13 all
+dh-autoreconf 14 all
-eject 2.1.5+deb1+cvs20081104-13.1 amd64
+eject 2.1.5+deb1+cvs20081104-13.2 amd64
-g++ 4:6.3.0-2 amd64
-g++-6 6.3.0-11 amd64
+g++ 4:6.3.0-4 amd64
+g++-6 6.3.0-12 amd64
-gcc 4:6.3.0-2 amd64
+gcc 4:6.3.0-4 amd64
-gcc-6 6.3.0-11 amd64
-gcc-6-base 6.3.0-11 amd64
+gcc-6 6.3.0-12 amd64
+gcc-6-base 6.3.0-12 amd64
-initramfs-tools 0.127 all
-initramfs-tools-core 0.127 all
+initramfs-tools 0.128 all
+initramfs-tools-core 0.128 all
-iptables 1.6.0+snapshot20161117-5 amd64
+iptables 1.6.0+snapshot20161117-6 amd64
-libapt-inst2.0 1.4~rc2 amd64
+libapt-inst2.0 1.4 amd64
-libapt-pkg5.0 1.4~rc2 amd64
+libapt-pkg5.0 1.4 amd64
-libasan3 6.3.0-11 amd64
+libasan3 6.3.0-12 amd64
-libatomic1 6.3.0-11 amd64
+libatomic1 6.3.0-12 amd64
-libaudit-common 1:2.6.7-1 all
-libaudit1 1:2.6.7-1 amd64
+libaudit-common 1:2.6.7-2 all
+libaudit1 1:2.6.7-2 amd64
-libblkid1 2.29.1-1 amd64
+libblkid1 2.29.2-1 amd64
-libcc1-0 6.3.0-11 amd64
+libcc1-0 6.3.0-12 amd64
-libcilkrts5 6.3.0-11 amd64
+libcilkrts5 6.3.0-12 amd64
-libcurl3-gnutls 7.52.1-3 amd64
+libcurl3-gnutls 7.52.1-4 amd64
-libdbus-1-3 1.10.16-1 amd64
-libdebconfclient0 0.226 amd64
+libdbus-1-3 1.10.18-1 amd64
+libdebconfclient0 0.227 amd64
-libfdisk1 2.29.1-1 amd64
+libfdisk1 2.29.2-1 amd64
-libfreetype6 2.6.3-3+b2 amd64
+libfreetype6 2.6.3-3.1 amd64
-libgcc-6-dev 6.3.0-11 amd64
-libgcc1 1:6.3.0-11 amd64
+libgcc-6-dev 6.3.0-12 amd64
+libgcc1 1:6.3.0-12 amd64
-libgnutls-openssl27 3.5.8-3 amd64
-libgnutls30 3.5.8-3 amd64
-libgomp1 6.3.0-11 amd64
+libgnutls-openssl27 3.5.8-5 amd64
+libgnutls30 3.5.8-5 amd64
+libgomp1 6.3.0-12 amd64
-libicu57 57.1-5 amd64
+libicu57 57.1-6 amd64
-libip4tc0 1.6.0+snapshot20161117-5 amd64
-libip6tc0 1.6.0+snapshot20161117-5 amd64
+libip4tc0 1.6.0+snapshot20161117-6 amd64
+libip6tc0 1.6.0+snapshot20161117-6 amd64
-libiptc0 1.6.0+snapshot20161117-5 amd64
+libiptc0 1.6.0+snapshot20161117-6 amd64
-libitm1 6.3.0-11 amd64
+libitm1 6.3.0-12 amd64
-liblsan0 6.3.0-11 amd64
+liblsan0 6.3.0-12 amd64
-libmount1 2.29.1-1 amd64
+libmount1 2.29.2-1 amd64
-libmpx2 6.3.0-11 amd64
+libmpx2 6.3.0-12 amd64
-libpam-systemd 232-19 amd64
+libpam-systemd 232-22 amd64
-libquadmath0 6.3.0-11 amd64
+libquadmath0 6.3.0-12 amd64
-libsmartcols1 2.29.1-1 amd64
+libsmartcols1 2.29.2-1 amd64
-libsodium18 1.0.11-1 amd64
+libsodium18 1.0.11-2 amd64
-libstdc++-6-dev 6.3.0-11 amd64
-libstdc++6 6.3.0-11 amd64
+libstdc++-6-dev 6.3.0-12 amd64
+libstdc++6 6.3.0-12 amd64
-libsystemd0 232-19 amd64
+libsystemd0 232-22 amd64
-libtiff5 4.0.7-5 amd64
+libtiff5 4.0.7-6 amd64
-libtsan0 6.3.0-11 amd64
-libubsan0 6.3.0-11 amd64
-libudev1 232-19 amd64
+libtsan0 6.3.0-12 amd64
+libubsan0 6.3.0-12 amd64
+libudev1 232-22 amd64
-libuuid1 2.29.1-1 amd64
+libuuid1 2.29.2-1 amd64
-libxapian30 1.4.3-1 amd64
+libxapian30 1.4.3-2 amd64
-libxtables12 1.6.0+snapshot20161117-5 amd64
+libxtables12 1.6.0+snapshot20161117-6 amd64
-linux-image-4.9.0-2-amd64 4.9.13-1 amd64
+linux-image-4.9.0-2-amd64 4.9.18-1 amd64
-linux-libc-dev 4.9.13-1 amd64
+linux-libc-dev 4.9.18-1 amd64
-manpages 4.09-2 all
+manpages 4.10-2 all
-manpages-dev 4.09-2 all
+manpages-dev 4.10-2 all
-mount 2.29.1-1 amd64
+mount 2.29.2-1 amd64
-openssh-client 1:7.4p1-9 amd64
-openssh-server 1:7.4p1-9 amd64
-openssh-sftp-server 1:7.4p1-9 amd64
+openssh-client 1:7.4p1-10 amd64
+openssh-server 1:7.4p1-10 amd64
+openssh-sftp-server 1:7.4p1-10 amd64
-python-tz 2016.7-0.2 all
+python-tz 2016.7-0.3 all
-python3-tz 2016.7-0.2 all
+python3-tz 2016.7-0.3 all
-screen 4.5.0-4 amd64
+screen 4.5.0-5 amd64
-systemd 232-19 amd64
-systemd-sysv 232-19 amd64
+systemd 232-22 amd64
+systemd-sysv 232-22 amd64
-tzdata 2017a-1 all
+tzdata 2017b-1 all
-udev 232-19 amd64
+udev 232-22 amd64
-util-linux 2.29.1-1 amd64
+util-linux 2.29.2-1 amd64
-zsh 5.3.1-3+b1 amd64
-zsh-common 5.3.1-3 all
+zsh 5.3.1-4 amd64
+zsh-common 5.3.1-4 all

diff --git a/.etckeeper b/.etckeeper
index 8908531e8deff038f8b0f67ea86c91c5eecb7283..2cce34aeb49b125874337fb7e168044171a018ef 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -740,6 +740,8 @@ maybe chmod 0644 'udev/udev.conf'
 maybe chmod 0755 'ufw'
 maybe chmod 0755 'ufw/applications.d'
 maybe chmod 0644 'ufw/applications.d/openssh-server'
+maybe chmod 0755 'update-motd.d'
+maybe chmod 0755 'update-motd.d/10-uname'
 maybe chmod 0644 'updatedb.conf'
 maybe chmod 0755 'vim'
 maybe chmod 0644 'vim/vimrc'

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 2565e3e02f341d4b269b5e06ad8119189c290130..b31a578304dfc1ae27b6427d60ab6daf608f8bb9 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -28,24 +28,22 @@ APT::NeverAutoRemove
 # dpkg list:
 rc  linux-image-4.6.0-1-amd64            4.6.2-2                        amd64        Linux 4.6 for 64-bit PCs
 rc  linux-image-4.8.0-1-amd64            4.8.7-1                        amd64        Linux 4.8 for 64-bit PCs (signed)
-ii  linux-image-4.8.0-2-amd64            4.8.15-2                       amd64        Linux 4.8 for 64-bit PCs (signed)
+rc  linux-image-4.8.0-2-amd64            4.8.15-2                       amd64        Linux 4.8 for 64-bit PCs (signed)
 ii  linux-image-4.9.0-1-amd64            4.9.6-3                        amd64        Linux 4.9 for 64-bit PCs (signed)
-iF  linux-image-4.9.0-2-amd64            4.9.13-1                       amd64        Linux 4.9 for 64-bit PCs (signed)
-iU  linux-image-amd64                    4.9+79                         amd64        Linux for 64-bit PCs (meta-package)
+iF  linux-image-4.9.0-2-amd64            4.9.18-1                       amd64        Linux 4.9 for 64-bit PCs (signed)
+ii  linux-image-amd64                    4.9+79                         amd64        Linux for 64-bit PCs (meta-package)
 # list of installed kernel packages:
-4.8.0-2-amd64 4.8.15-2
 4.9.0-1-amd64 4.9.6-3
-4.9.0-2-amd64 4.9.13-1
+4.9.0-2-amd64 4.9.18-1
 # list of different kernel versions:
-4.9.13-1
+4.9.18-1
 4.9.6-3
-4.8.15-2
-# Installing kernel: 4.9.13-1 (4.9.0-2-amd64)
-# Running kernel: 4.9.6-3 (4.9.0-1-amd64)
-# Last kernel: 4.9.13-1
+# Installing kernel: 4.9.18-1 (4.9.0-2-amd64)
+# Running kernel: 4.9.18-1 (4.9.0-2-amd64)
+# Last kernel: 4.9.18-1
 # Previous kernel: 4.9.6-3
 # Kernel versions list to keep:
-4.9.13-1
+4.9.18-1
 4.9.6-3
 # Kernel packages (version part) to protect:
 4\.9\.0-1-amd64

diff --git a/init.d/screen-cleanup b/init.d/screen-cleanup
index 19c55118f0d935f53f31e993fa61e5e63a18c1da..3eb41855c4dbea7e3bda69406d8c8e8d0f5f3be4 100755 (executable)
--- a/init.d/screen-cleanup
+++ b/init.d/screen-cleanup
@@ -19,7 +19,7 @@ set -e
 
 test -f /usr/bin/screen || exit 0
 
-SCREENDIR=/var/run/screen
+SCREENDIR=/run/screen
 
 case "$1" in
 start)

diff --git a/init.d/ssh b/init.d/ssh
index bda7a92b8d92e0c1c3c130705860a8610c448d37..70a6c38f2e3a6ed2fb664c0ad9538e447c2ea756 100755 (executable)
--- a/init.d/ssh
+++ b/init.d/ssh
@@ -66,9 +66,9 @@ check_dev_null() {
 
 check_privsep_dir() {
     # Create the PrivSep empty dir if necessary
-    if [ ! -d /var/run/sshd ]; then
-       mkdir /var/run/sshd
-       chmod 0755 /var/run/sshd
+    if [ ! -d /run/sshd ]; then
+       mkdir /run/sshd
+       chmod 0755 /run/sshd
     fi
 }
 
@@ -87,7 +87,7 @@ case "$1" in
        check_for_no_start
        check_dev_null
        log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true
-       if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
+       if start-stop-daemon --start --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
            log_end_msg 0 || true
        else
            log_end_msg 1 || true
@@ -96,7 +96,7 @@ case "$1" in
   stop)
        check_for_upstart 0
        log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
-       if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then
+       if start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid; then
            log_end_msg 0 || true
        else
            log_end_msg 1 || true
@@ -108,7 +108,7 @@ case "$1" in
        check_for_no_start
        check_config
        log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
-       if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd; then
+       if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd; then
            log_end_msg 0 || true
        else
            log_end_msg 1 || true
@@ -120,10 +120,10 @@ case "$1" in
        check_privsep_dir
        check_config
        log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
-       start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
+       start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /run/sshd.pid
        check_for_no_start log_end_msg
        check_dev_null log_end_msg
-       if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
+       if start-stop-daemon --start --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
            log_end_msg 0 || true
        else
            log_end_msg 1 || true
@@ -136,13 +136,13 @@ case "$1" in
        check_config
        log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
        RET=0
-       start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid || RET="$?"
+       start-stop-daemon --stop --quiet --retry 30 --pidfile /run/sshd.pid || RET="$?"
        case $RET in
            0)
                # old daemon stopped
                check_for_no_start log_end_msg
                check_dev_null log_end_msg
-               if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
+               if start-stop-daemon --start --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
                    log_end_msg 0 || true
                else
                    log_end_msg 1 || true
@@ -163,7 +163,7 @@ case "$1" in
 
   status)
        check_for_upstart 1
-       status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
+       status_of_proc -p /run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
        ;;
 
   *)

diff --git a/init/ssh.conf b/init/ssh.conf
index b34cbff5deb2610e87b392f07add29a723d96e16..9b0e95450637993b55e4ccabd1a418a25a57360f 100644 (file)
--- a/init/ssh.conf
+++ b/init/ssh.conf
@@ -21,7 +21,7 @@ pre-start script
     test -x /usr/sbin/sshd || { stop; exit 0; }
     test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
 
-    mkdir -p -m0755 /var/run/sshd
+    mkdir -p -m0755 /run/sshd
 end script
 
 # if you used to set SSHD_OPTS in /etc/default/ssh, you can change the

diff --git a/kernel/postinst.d/apt-auto-removal b/kernel/postinst.d/apt-auto-removal
index df9048cd61a9470a477ed7c119a625f4a1beef8d..2c32b0c9db1b6a077aad3ab55a080196c5c00ad8 100755 (executable)
--- a/kernel/postinst.d/apt-auto-removal
+++ b/kernel/postinst.d/apt-auto-removal
@@ -29,6 +29,11 @@ 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)"
 
@@ -62,7 +67,7 @@ $list
 # list of different kernel versions:
 $debverlist
 # Installing kernel: $installed_version ($1)
-# Running kernel: $running_version ($unamer)
+# Running kernel: ${running_version:-ignored} (${unamer:-ignored})
 # Last kernel: $latest_version
 # Previous kernel: $previous_version
 # Kernel versions list to keep:

diff --git a/network/if-up.d/openssh-server b/network/if-up.d/openssh-server
index 915284cc65ee3c862852b4b1a2de2396e0d683c7..525c2153b9086792d6f9057ee23cfca52d021f0e 100755 (executable)
--- a/network/if-up.d/openssh-server
+++ b/network/if-up.d/openssh-server
@@ -25,8 +25,8 @@ if [ ! -e /usr/sbin/sshd ]; then
        exit 0
 fi
 
-if [ ! -f /var/run/sshd.pid ] || \
-   [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" != sshd ]; then
+if [ ! -f /run/sshd.pid ] || \
+   [ "$(ps -p "$(cat /run/sshd.pid)" -o comm=)" != sshd ]; then
        exit 0
 fi
 

diff --git a/systemd/resolved.conf b/systemd/resolved.conf
index b2340a5bdd587f31d0258c6b112aeecb70e5c380..614fce47a052fbc5f9314b8585e4df9b54bbf9d5 100644 (file)
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -16,6 +16,6 @@
 #FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
 #Domains=
 #LLMNR=yes
-#DNSSEC=allow-downgrade
+#DNSSEC=no
 #Cache=yes
 #DNSStubListener=udp

diff --git a/update-motd.d/10-uname b/update-motd.d/10-uname
new file mode 100755 (executable)
index 0000000..92773ce
--- /dev/null
+++ b/update-motd.d/10-uname
@@ -0,0 +1,2 @@
+#!/bin/sh
+uname -snrvm