committing changes in /etc after apt run

Package changes:
-fonts-noto-color-emoji 0~20180424-0ubuntu1 all
+fonts-noto-color-emoji 0~20180810-0ubuntu1 all
-gnome-settings-daemon-schemas 3.28.1-0ubuntu1 all
+gnome-settings-daemon-schemas 3.28.1-0ubuntu1.1 all
-kmod 24-1ubuntu3 amd64
+kmod 24-1ubuntu3.1 amd64
-libkmod2 24-1ubuntu3 amd64
+libkmod2 24-1ubuntu3.1 amd64
-libxkbcommon-x11-0 0.8.0-1 amd64
-libxkbcommon0 0.8.0-1 amd64
+libxkbcommon-x11-0 0.8.0-1ubuntu0.1 amd64
+libxkbcommon0 0.8.0-1ubuntu0.1 amd64
-openssh-client 1:7.6p1-4 amd64
-openssh-server 1:7.6p1-4 amd64
-openssh-sftp-server 1:7.6p1-4 amd64
+openssh-client 1:7.6p1-4ubuntu0.1 amd64
+openssh-server 1:7.6p1-4ubuntu0.1 amd64
+openssh-sftp-server 1:7.6p1-4ubuntu0.1 amd64
-ppp 2.4.7-2+2ubuntu1 amd64
+ppp 2.4.7-2+2ubuntu1.1 amd64
-spamassassin 3.4.1-8build1 all
+spamassassin 3.4.2-0ubuntu0.18.04.1 all
-ssh-askpass-gnome 1:7.6p1-4 amd64
+ssh-askpass-gnome 1:7.6p1-4ubuntu0.1 amd64
-xdg-utils 1.1.2-1ubuntu2.2 all
+xdg-utils 1.1.2-1ubuntu2.3 all

diff --git a/.etckeeper b/.etckeeper
index ad19d2b1a74706f9faf2f191ae94c5dfed15c639..5c980c4a2817c338c324489a358a3f0b75d03e3c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2718,6 +2718,7 @@ maybe chmod 0644 'spamassassin/v320.pre'
 maybe chmod 0644 'spamassassin/v330.pre'
 maybe chmod 0644 'spamassassin/v340.pre'
 maybe chmod 0644 'spamassassin/v341.pre'
+maybe chmod 0644 'spamassassin/v342.pre'
 maybe chmod 0755 'speech-dispatcher'
 maybe chmod 0755 'speech-dispatcher/clients'
 maybe chmod 0644 'speech-dispatcher/clients/emacs.conf'

diff --git a/init.d/spamassassin b/init.d/spamassassin
index 9fb9c06277c894e5b4524aceb3e325a1a55ec356..dc4b28471451908d951bb352c9644ceaf9b170c6 100755 (executable)
--- a/init.d/spamassassin
+++ b/init.d/spamassassin
@@ -51,30 +51,30 @@ case "$1" in
   start)
        check_enabled
        echo -n "Starting $DESC: "
-       start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+       start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
            $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
        echo "$NAME."
        ;;
 
   stop)
        echo -n "Stopping $DESC: "
-       start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON --oknodo
+       start-stop-daemon --stop --pidfile $PIDFILE --name $NAME --oknodo
        echo "$NAME."
        ;;
 
   reload|force-reload)
        check_enabled
        echo -n "Reloading $DESC: "
-       start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $DAEMON
+       start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $NAME
        echo "$NAME."
        ;;
 
   restart)
        check_enabled
        echo -n "Restarting $DESC: "
-       start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON \
+       start-stop-daemon --stop --pidfile $PIDFILE --name $NAME \
            --retry 5 --oknodo
-       start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+       start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
            $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
 
        echo "$NAME."

diff --git a/modprobe.d/blacklist.conf b/modprobe.d/blacklist.conf
index 08b38541bf4b06650d79036acc962b280596cf15..eecdf12865475957b88061e78e4967229d01ec16 100644 (file)
--- a/modprobe.d/blacklist.conf
+++ b/modprobe.d/blacklist.conf
@@ -25,9 +25,6 @@ blacklist snd_intel8x0m
 # Conflicts with dvb driver (which is better for handling this device)
 blacklist snd_aw2
 
-# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306)
-blacklist i2c_i801
-
 # replaced by p54pci
 blacklist prism54
 

diff --git a/spamassassin/v342.pre b/spamassassin/v342.pre
new file mode 100644 (file)
index 0000000..4ab7736
--- /dev/null
+++ b/spamassassin/v342.pre
@@ -0,0 +1,36 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.1,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# HashBL - Use EBL email blocklist
+# loadplugin Mail::SpamAssassin::Plugin::HashBL
+
+# ResourceLimits - assure your spamd child processes
+# do not exceed specified CPU or memory limit
+# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+
+
+# FromNameSpoof - help stop spam that tries to spoof other domains using 
+# the from name
+# loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+
+# Phishing - finds uris used in phishing campaigns detected by
+# OpenPhish or PhishTank feeds.
+# loadplugin Mail::SpamAssassin::Plugin::Phishing
+
+# allow URI rules to look at DKIM headers if they exist
+parse_dkim_uris 1