committing changes in /etc after apt run

Package changes:
-apt 1.4~beta4 amd64
+apt 1.4~rc1 amd64
-apt-utils 1.4~beta4 amd64
+apt-utils 1.4~rc1 amd64
-chrony 3.0-2 amd64
+chrony 3.0-3 amd64
-cpp-6 6.3.0-5 amd64
+cpp-6 6.3.0-6 amd64
-debootstrap 1.0.87 all
+debootstrap 1.0.88 all
-dpkg 1.18.18 amd64
-dpkg-dev 1.18.18 all
+dpkg 1.18.22 amd64
+dpkg-dev 1.18.22 all
-e2fslibs 1.43.3-1 amd64
-e2fsprogs 1.43.3-1 amd64
+e2fslibs 1.43.4-2 amd64
+e2fsprogs 1.43.4-2 amd64
-g++-6 6.3.0-5 amd64
+g++-6 6.3.0-6 amd64
-gcc-6 6.3.0-5 amd64
-gcc-6-base 6.3.0-5 amd64
+gcc-6 6.3.0-6 amd64
+gcc-6-base 6.3.0-6 amd64
-libapt-inst2.0 1.4~beta4 amd64
+libapt-inst2.0 1.4~rc1 amd64
-libapt-pkg5.0 1.4~beta4 amd64
+libapt-pkg5.0 1.4~rc1 amd64
-libasan3 6.3.0-5 amd64
+libasan3 6.3.0-6 amd64
-libatomic1 6.3.0-5 amd64
+libatomic1 6.3.0-6 amd64
-libcc1-0 6.3.0-5 amd64
+libcc1-0 6.3.0-6 amd64
-libcilkrts5 6.3.0-5 amd64
+libcilkrts5 6.3.0-6 amd64
-libcomerr2 1.43.3-1 amd64
+libcomerr2 1.43.4-2 amd64
-libdpkg-perl 1.18.18 all
+libdpkg-perl 1.18.22 all
-libgcc-6-dev 6.3.0-5 amd64
-libgcc1 1:6.3.0-5 amd64
+libgcc-6-dev 6.3.0-6 amd64
+libgcc1 1:6.3.0-6 amd64
-libgnutls-openssl27 3.5.8-1 amd64
-libgnutls30 3.5.8-1 amd64
-libgomp1 6.3.0-5 amd64
+libgnutls-openssl27 3.5.8-3 amd64
+libgnutls30 3.5.8-3 amd64
+libgomp1 6.3.0-6 amd64
-libitm1 6.3.0-5 amd64
+libitm1 6.3.0-6 amd64
-liblsan0 6.3.0-5 amd64
+liblsan0 6.3.0-6 amd64
-libmpx2 6.3.0-5 amd64
+libmpx2 6.3.0-6 amd64
-libquadmath0 6.3.0-5 amd64
+libquadmath0 6.3.0-6 amd64
-libserf-1-1 1.3.9-1 amd64
+libserf-1-1 1.3.9-1+b1 amd64
-libss2 1.43.3-1 amd64
+libss2 1.43.4-2 amd64
-libssl1.1 1.1.0c-2 amd64
-libstdc++-6-dev 6.3.0-5 amd64
-libstdc++6 6.3.0-5 amd64
+libssl1.1 1.1.0d-2 amd64
+libstdc++-6-dev 6.3.0-6 amd64
+libstdc++6 6.3.0-6 amd64
-libtsan0 6.3.0-5 amd64
-libubsan0 6.3.0-5 amd64
+libtsan0 6.3.0-6 amd64
+libubsan0 6.3.0-6 amd64
-lintian 2.5.50 all
+lintian 2.5.50.1 all
-linux-image-4.9.0-1-amd64 4.9.2-2 amd64
+linux-image-4.9.0-1-amd64 4.9.6-3 amd64
-linux-libc-dev 4.9.2-2 amd64
+linux-libc-dev 4.9.6-3 amd64
-openssl 1.1.0c-2 amd64
+openssl 1.1.0d-2 amd64
-pinentry-curses 1.0.0-1 amd64
+pinentry-curses 1.0.0-2 amd64
-rdnssd 1.0.3-2 amd64
+rdnssd 1.0.3-3 amd64
-sed 4.3-3 amd64
+sed 4.4-1 amd64
-vim 2:8.0.0197-1 amd64
-vim-common 2:8.0.0197-1 all
-vim-nox 2:8.0.0197-1 amd64
-vim-runtime 2:8.0.0197-1 all
-vim-tiny 2:8.0.0197-1 amd64
+vim 2:8.0.0197-2 amd64
+vim-common 2:8.0.0197-2 all
+vim-nox 2:8.0.0197-2 amd64
+vim-runtime 2:8.0.0197-2 all
+vim-tiny 2:8.0.0197-2 amd64
-xxd 2:8.0.0197-1 amd64
+xxd 2:8.0.0197-2 amd64

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 22e6a7878867ac510a74357dbcca417242089abd..90ccfff5cac19abbc04b7e899918c91e338b3f81 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -27,25 +27,23 @@ APT::NeverAutoRemove
 /* Debug information:
 # dpkg list:
 rc  linux-image-4.6.0-1-amd64            4.6.2-2                     amd64        Linux 4.6 for 64-bit PCs
-ii  linux-image-4.8.0-1-amd64            4.8.7-1                     amd64        Linux 4.8 for 64-bit PCs (signed)
+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)
-iF  linux-image-4.9.0-1-amd64            4.9.2-2                     amd64        Linux 4.9 for 64-bit PCs (signed)
-iU  linux-image-amd64                    4.9+78                      amd64        Linux for 64-bit PCs (meta-package)
+iF  linux-image-4.9.0-1-amd64            4.9.6-3                     amd64        Linux 4.9 for 64-bit PCs (signed)
+ii  linux-image-amd64                    4.9+78                      amd64        Linux for 64-bit PCs (meta-package)
 # list of installed kernel packages:
-4.8.0-1-amd64 4.8.7-1
 4.8.0-2-amd64 4.8.15-2
-4.9.0-1-amd64 4.9.2-2
+4.9.0-1-amd64 4.9.6-3
 # list of different kernel versions:
-4.9.2-2
+4.9.6-3
 4.8.15-2
-4.8.7-1
-# Installing kernel: 4.9.2-2 (4.9.0-1-amd64)
-# Running kernel: 4.8.15-2 (4.8.0-2-amd64)
-# Last kernel: 4.9.2-2
+# Installing kernel: 4.9.6-3 (4.9.0-1-amd64)
+# Running kernel: 4.9.6-3 (4.9.0-1-amd64)
+# Last kernel: 4.9.6-3
 # Previous kernel: 4.8.15-2
 # Kernel versions list to keep:
 4.8.15-2
-4.9.2-2
+4.9.6-3
 # Kernel packages (version part) to protect:
 4\.8\.0-2-amd64
 4\.9\.0-1-amd64

diff --git a/rdnssd/merge-hook b/rdnssd/merge-hook
index d88134653fb17e308c33737b68854e754e365542..1042d39b0d479e8d2a1dbe62509ec822fd5d1909 100755 (executable)
--- a/rdnssd/merge-hook
+++ b/rdnssd/merge-hook
@@ -3,7 +3,7 @@
 # resolv.conf merge hook for Debian rdnssd
 
 # *************************************************************************
-# *  Copyright © 2007-2009 Pierre Ynard.                                  *
+# *  Copyright © 2007-2009, 2017 Pierre Ynard.                            *
 # *  This program is free software: you can redistribute and/or modify    *
 # *  it under the terms of the GNU General Public License as published by *
 # *  the Free Software Foundation, versions 2 or 3 of the license.        *
@@ -26,9 +26,6 @@ if [ -x /sbin/resolvconf ]; then
        exit 0
 fi
 
-# Debian modification, awk is in /usr/bin
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
 # Max number of nameserver options taken into account. Should be as
 # defined in <resolv.h>
 MAXNS=3
@@ -59,13 +56,18 @@ if [ $limit -lt $room ]; then
        limit=$room
 fi
 
-# Merge and write the result
+# Merge and write the result. Let rdnssd assume ownership of all IPv6
+# nameservers, and remove extraneous IPv6 entries as expired. However
+# DHCPv4 most often sets up search list entries, and rdnssd cannot
+# clobber these lest it causes counterintuitive breakage. There is no
+# easy way to properly merge and manage DNSSL entries here, so just drop
+# them.
 
 {
        sed -e "/$RE_NSV4OR6/d" < $resolvconf
-        [ $limit -gt 0 ] && sed -e "${limit}q" < $myresolvconf
+       grep -m $limit "$RE_NSV4OR6" < $myresolvconf || [ $? -le 1 ]
        sed -ne "/$RE_NSV4/p" < $resolvconf
-} | awk '!a[$0]++' > $resolvconf.tmp
+} > $resolvconf.tmp
 
 mv -f $resolvconf.tmp $resolvconf