diff -Nru nullmailer-2.1/debian/changelog nullmailer-2.1/debian/changelog --- nullmailer-2.1/debian/changelog 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/changelog 2018-03-17 01:48:17.000000000 +0000 @@ -1,7 +1,32 @@ +nullmailer (1:2.1-7) unstable; urgency=medium + + * upload to unstable + + -- David Bremner Fri, 16 Mar 2018 22:48:17 -0300 + +nullmailer (1:2.1-6) experimental; urgency=medium + + [ David Bremner] + * Drop "Recommends: rsyslog | system-log-daemon"; a typical user for + nullmailer is probably in minimizing installed packages. Logging is + available via the systemd journal. + * Replace "Priority: extra" with "Priority: optional" + * Assert conformance with standards version 4.1.2 + * Restore /etc/init.d/nullmailer, drop dependency on systemd-sysv + (Closes: #886121, #885537). + + [ Felix Lechner ] + * Removed patch fixing protocol test for TLS (was fixed in 2.1) + * Re-enabled patch avoid race conditions in tests + * Changed watch file to Github + + -- David Bremner Sat, 27 Jan 2018 12:06:09 -0400 + nullmailer (1:2.1-5) unstable; urgency=medium - * add SyslogFacility=mail to nullmailer.service; with an appropriately configured - syslog (e.g. rsyslog) this will also log to /var/log/mail (Closes: #885131). + * add SyslogFacility=mail to nullmailer.service; with an appropriately + configured syslog (e.g. rsyslog) this will also log to /var/log/mail + (Closes: #885131). -- David Bremner Sun, 24 Dec 2017 10:44:20 -0400 diff -Nru nullmailer-2.1/debian/control nullmailer-2.1/debian/control --- nullmailer-2.1/debian/control 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/control 2018-03-17 01:48:17.000000000 +0000 @@ -1,6 +1,6 @@ Source: nullmailer Section: mail -Priority: extra +Priority: optional Maintainer: David Bremner Uploaders: Felix Lechner Build-Depends: daemontools, @@ -8,13 +8,12 @@ libgnutls28-dev | libgnutls-dev, po-debconf, ucspi-tcp-ipv6 -Standards-Version: 4.1.0 +Standards-Version: 4.1.2 Homepage: http://untroubled.org/nullmailer/ Package: nullmailer Architecture: any -Depends: lsb-base, systemd-sysv, ${misc:Depends}, ${shlibs:Depends} -Recommends: rsyslog | system-log-daemon +Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends} Conflicts: mail-transport-agent Provides: mail-transport-agent Replaces: mail-transport-agent diff -Nru nullmailer-2.1/debian/install nullmailer-2.1/debian/install --- nullmailer-2.1/debian/install 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/logcheck etc diff -Nru nullmailer-2.1/debian/nullmailer.init nullmailer-2.1/debian/nullmailer.init --- nullmailer-2.1/debian/nullmailer.init 1970-01-01 00:00:00.000000000 +0000 +++ nullmailer-2.1/debian/nullmailer.init 2018-03-17 01:48:17.000000000 +0000 @@ -0,0 +1,65 @@ +#! /bin/bash + +### BEGIN INIT INFO +# Provides: nullmailer +# Required-Start: $remote_fs $syslog $network +# Required-Stop: $remote_fs $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: relay-only mail transport agent +# Description: Nullmailer is a replacement MTA which relays to a fixed +# set of smart relays. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/nullmailer-send +NAME=nullmailer +DESC=mail-transfer-agent +PIDFILE=/var/run/$NAME.pid + +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + log_begin_msg "Starting $DESC:" "$NAME" + # don't kill trigger if daemon already running + if ! pidofproc -p $PIDFILE $DAEMON; then + if [ ! -p /var/spool/nullmailer/trigger ]; then + rm -f /var/spool/nullmailer/trigger + mkfifo /var/spool/nullmailer/trigger + fi + chown mail:root /var/spool/nullmailer/trigger + chmod 0622 /var/spool/nullmailer/trigger + # --oknodo in case of race condition on daemon start + start-stop-daemon --start --quiet --user mail --chuid mail --no-close \ + --pidfile $PIDFILE --make-pidfile --background \ + --oknodo --exec "$DAEMON" > >(logger -p mail.notice -t nullmailer) 2>&1 + log_end_msg $? + else + log_end_msg $? "$NAME already running: $PIDS" + fi + ;; + stop) + log_begin_msg "Stopping $DESC:" "$NAME" + start-stop-daemon --stop --quiet --user mail --exec "$DAEMON" --pidfile $PIDFILE --oknodo + log_end_msg $? + ;; + restart|reload|force-reload) + $0 stop + sleep 1 + $0 start + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME + exit $? + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 diff -Nru nullmailer-2.1/debian/nullmailer.install nullmailer-2.1/debian/nullmailer.install --- nullmailer-2.1/debian/nullmailer.install 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/nullmailer.install 2018-03-17 01:48:17.000000000 +0000 @@ -1 +1,2 @@ debian/systemd/nullmailer.service lib/systemd/system/ +debian/logcheck etc diff -Nru nullmailer-2.1/debian/patches/series nullmailer-2.1/debian/patches/series --- nullmailer-2.1/debian/patches/series 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/patches/series 2018-03-17 01:48:17.000000000 +0000 @@ -1,4 +1,4 @@ -0002-Fix-protocol-return-value-when-built-with-TLS.patch +0001-Remove-race-conditions-from-tests.patch 0004-Sort-files-in-archive-reproducible-builds.patch 0004-Allow-unqualified-sender-address.patch 0005-Provide-for-etc-mailname.patch diff -Nru nullmailer-2.1/debian/watch nullmailer-2.1/debian/watch --- nullmailer-2.1/debian/watch 2017-12-24 14:44:20.000000000 +0000 +++ nullmailer-2.1/debian/watch 2018-03-17 01:48:17.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://untroubled.org/nullmailer/nullmailer-(.+)\.tar\.gz +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%nullmailer-$1.tar.gz%" \ + https://github.com/bruceg/nullmailer/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate