committing changes in /etc after apt run

Package changes:
-aptitude 0.8.5-1 amd64
-aptitude-common 0.8.5-1 all
+aptitude 0.8.6-1 amd64
+aptitude-common 0.8.6-1 all
-bash 4.4-4 amd64
+bash 4.4-4+b1 amd64
-bc 1.06.95-9+b2 amd64
+bc 1.06.95-9+b3 amd64
-coreutils 8.26-2 amd64
+coreutils 8.26-3 amd64
-cron 3.0pl1-128 amd64
+cron 3.0pl1-128+b1 amd64
-dc 1.06.95-9+b2 amd64
-dctrl-tools 2.24-2 amd64
+dc 1.06.95-9+b3 amd64
+dctrl-tools 2.24-2+b1 amd64
-devscripts 2.17.1 amd64
+devscripts 2.17.2 amd64
-diffstat 1.61-1 amd64
+diffstat 1.61-1+b1 amd64
-dirmngr 2.1.18-3 amd64
+dirmngr 2.1.18-6 amd64
-dpkg 1.18.22 amd64
-dpkg-dev 1.18.22 all
+dpkg 1.18.23 amd64
+dpkg-dev 1.18.23 all
-figlet 2.2.5-2 amd64
+figlet 2.2.5-2+b1 amd64
-fortune-mod 1:1.99.1-7 amd64
+fortune-mod 1:1.99.1-7+b1 amd64
-geoip-database 20170111-1 all
+geoip-database 20170216-1 all
-gnupg 2.1.18-3 amd64
-gnupg-agent 2.1.18-3 amd64
-gnupg-l10n 2.1.18-3 all
-gpgv 2.1.18-3 amd64
+gnupg 2.1.18-6 amd64
+gnupg-agent 2.1.18-6 amd64
+gnupg-l10n 2.1.18-6 all
+gpgv 2.1.18-6 amd64
-gzip 1.6-5 amd64
+gzip 1.6-5+b1 amd64
-hostname 3.18 amd64
+hostname 3.18+b1 amd64
-insserv 1.14.0-5.4 amd64
+insserv 1.14.0-5.4+b1 amd64
-irqbalance 1.1.0-2.2 amd64
+irqbalance 1.1.0-2.3 amd64
-kbd 2.0.3-2 amd64
+kbd 2.0.3-2+b1 amd64
-libdpkg-perl 1.18.22 all
+libdpkg-perl 1.18.23 all
-libpam-systemd 232-18 amd64
+libpam-systemd 232-19 amd64
+libpgm-5.2-0 5.2.122~dfsg-2 amd64
-libsqlite3-0 3.16.2-2 amd64
+libsqlite3-0 3.16.2-3 amd64
-libsystemd0 232-18 amd64
+libsystemd0 232-19 amd64
-libudev1 232-18 amd64
+libudev1 232-19 amd64
-libxdmcp6 1:1.1.2-1.1 amd64
+libxdmcp6 1:1.1.2-3 amd64
-libzmq5 4.2.1-2 amd64
+libzmq5 4.2.1-3 amd64
-linux-image-amd64 4.9+78 amd64
-linux-libc-dev 4.9.6-3 amd64
+linux-image-4.9.0-2-amd64 4.9.13-1 amd64
+linux-image-amd64 4.9+79 amd64
+linux-libc-dev 4.9.13-1 amd64
-mawk 1.3.3-17 amd64
+mawk 1.3.3-17+b3 amd64
-openssh-client 1:7.4p1-6 amd64
-openssh-server 1:7.4p1-6 amd64
-openssh-sftp-server 1:7.4p1-6 amd64
+openssh-client 1:7.4p1-7 amd64
+openssh-server 1:7.4p1-7 amd64
+openssh-sftp-server 1:7.4p1-7 amd64
-patch 2.7.5-1 amd64
+patch 2.7.5-1+b2 amd64
-psmisc 22.21-2.1+b1 amd64
+psmisc 22.21-2.1+b2 amd64
-qemu-guest-agent 1:2.8+dfsg-2 amd64
+qemu-guest-agent 1:2.8+dfsg-3 amd64
-schroot 1.6.10-3 amd64
+schroot 1.6.10-3+b1 amd64
-ssmtp 2.64-8 amd64
+ssmtp 2.64-8+b2 amd64
-systemd 232-18 amd64
-systemd-sysv 232-18 amd64
+systemd 232-19 amd64
+systemd-sysv 232-19 amd64
-time 1.7-25.1 amd64
-tla 1.3.5+dfsg1-2 amd64
+time 1.7-25.1+b1 amd64
+tla 1.3.5+dfsg1-2+b1 amd64
-udev 232-18 amd64
+udev 232-19 amd64
-usbutils 1:007-4 amd64
+usbutils 1:007-4+b1 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
+vim 2:8.0.0197-3 amd64
+vim-common 2:8.0.0197-3 all
+vim-nox 2:8.0.0197-3 amd64
+vim-runtime 2:8.0.0197-3 all
+vim-tiny 2:8.0.0197-3 amd64
-wget 1.18-4 amd64
+wget 1.18-4.1 amd64
-xauth 1:1.0.9-1 amd64
-xdg-user-dirs 0.15-2 amd64
+xauth 1:1.0.9-1+b2 amd64
+xdg-user-dirs 0.15-2+b1 amd64
-xxd 2:8.0.0197-2 amd64
+xxd 2:8.0.0197-3 amd64
-zip 3.0-11 amd64
+zip 3.0-11+b1 amd64

diff --git a/X11/Xsession.d/90gpg-agent b/X11/Xsession.d/90gpg-agent
index bc54b937d0dc4a5597985762d858475abd4a4075..8b45b05dba8ffb33da1f4cbcc49692af45492341 100644 (file)
--- a/X11/Xsession.d/90gpg-agent
+++ b/X11/Xsession.d/90gpg-agent
@@ -13,10 +13,10 @@
 # variables to be set in order to find the agent, so we will set those
 # here.
 
-agent_sock=$(gpgconf --list-dirs | grep ^agent-socket: | cut -d: -f2)
+agent_sock=$(gpgconf --list-dirs agent-socket)
 export GPG_AGENT_INFO=${agent_sock}:0:1
 if [ -n "$(gpgconf --list-options gpg-agent | \
       awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then
-    export SSH_AUTH_SOCK=${agent_sock}.ssh
+    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 fi
 

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 90ccfff5cac19abbc04b7e899918c91e338b3f81..2565e3e02f341d4b269b5e06ad8119189c290130 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,50 +1,53 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-4\.8\.0-2-amd64$";
    "^linux-image-4\.9\.0-1-amd64$";
-   "^linux-headers-4\.8\.0-2-amd64$";
+   "^linux-image-4\.9\.0-2-amd64$";
    "^linux-headers-4\.9\.0-1-amd64$";
-   "^linux-image-extra-4\.8\.0-2-amd64$";
+   "^linux-headers-4\.9\.0-2-amd64$";
    "^linux-image-extra-4\.9\.0-1-amd64$";
-   "^linux-signed-image-4\.8\.0-2-amd64$";
+   "^linux-image-extra-4\.9\.0-2-amd64$";
    "^linux-signed-image-4\.9\.0-1-amd64$";
-   "^kfreebsd-image-4\.8\.0-2-amd64$";
+   "^linux-signed-image-4\.9\.0-2-amd64$";
    "^kfreebsd-image-4\.9\.0-1-amd64$";
-   "^kfreebsd-headers-4\.8\.0-2-amd64$";
+   "^kfreebsd-image-4\.9\.0-2-amd64$";
    "^kfreebsd-headers-4\.9\.0-1-amd64$";
-   "^gnumach-image-4\.8\.0-2-amd64$";
+   "^kfreebsd-headers-4\.9\.0-2-amd64$";
    "^gnumach-image-4\.9\.0-1-amd64$";
-   "^.*-modules-4\.8\.0-2-amd64$";
+   "^gnumach-image-4\.9\.0-2-amd64$";
    "^.*-modules-4\.9\.0-1-amd64$";
-   "^.*-kernel-4\.8\.0-2-amd64$";
+   "^.*-modules-4\.9\.0-2-amd64$";
    "^.*-kernel-4\.9\.0-1-amd64$";
-   "^linux-backports-modules-.*-4\.8\.0-2-amd64$";
+   "^.*-kernel-4\.9\.0-2-amd64$";
    "^linux-backports-modules-.*-4\.9\.0-1-amd64$";
-   "^linux-tools-4\.8\.0-2-amd64$";
+   "^linux-backports-modules-.*-4\.9\.0-2-amd64$";
    "^linux-tools-4\.9\.0-1-amd64$";
+   "^linux-tools-4\.9\.0-2-amd64$";
 };
 /* Debug information:
 # 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)
-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)
+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)
+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)
 # 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
 # list of different kernel versions:
+4.9.13-1
 4.9.6-3
 4.8.15-2
-# Installing kernel: 4.9.6-3 (4.9.0-1-amd64)
+# 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.6-3
-# Previous kernel: 4.8.15-2
+# Last kernel: 4.9.13-1
+# Previous kernel: 4.9.6-3
 # Kernel versions list to keep:
-4.8.15-2
+4.9.13-1
 4.9.6-3
 # Kernel packages (version part) to protect:
-4\.8\.0-2-amd64
 4\.9\.0-1-amd64
+4\.9\.0-2-amd64
 */

diff --git a/ssh/sshd_config b/ssh/sshd_config
index 4aea6c729d6d3ce2166d2c8a37ff6e734e2624b1..bcf3ac1788d51619e8e2a80fae30ccc937494730 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -36,9 +36,8 @@
 
 #PubkeyAuthentication yes
 
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile     .ssh/authorized_keys
+# Expect .ssh/authorized_keys2 to be disregarded by default in future.
+#AuthorizedKeysFile    .ssh/authorized_keys .ssh/authorized_keys2
 
 #AuthorizedPrincipalsFile none
 

diff --git a/ssmtp/ssmtp.conf b/ssmtp/ssmtp.conf
index e6cc6dfeab2bc9390974d481cd7dc4cebd7ec1f8..b328efa619ce73e55a8a800ca188509dccaa3e91 100644 (file)
--- a/ssmtp/ssmtp.conf
+++ b/ssmtp/ssmtp.conf
@@ -18,4 +18,4 @@ hostname=lena.home.brehm-online.com
 # Are users allowed to set their own From: address?
 # YES - Allow the user to specify their own From: address
 # NO - Use the system generated From: address
-#FromLineOverride=YES
+FromLineOverride=NO