diff -Nru vrfydmn-0.11.0/debian/changelog vrfydmn-0.11.0/debian/changelog --- vrfydmn-0.11.0/debian/changelog 2022-10-15 10:56:12.000000000 +0000 +++ vrfydmn-0.11.0/debian/changelog 2024-02-28 13:59:03.000000000 +0000 @@ -1,3 +1,21 @@ +vrfydmn (0.11.0-3) unstable; urgency=medium + + [ Debian Janitor ] + * Bump debhelper from old 12 to 13. + + Rename debian/vrfydmn.tmpfile to debian/vrfydmn.tmpfiles. + + [ Scott Kitterman ] + * Swap DPT to Maintainer and myself to Uploaders + * Update rundir in postinst to /run + * Add misc Pre-Depends + * Drop obsolete Depends on lsb-base + * Correct existing user check in postinst (Closes: #1010353) + * Init script improvements (Closes: #1012121) + * Bump standards-version to 4.6.2 without further change + * Update debian/vrfydmn.tmpfiles to point to /run instead of /var/run + + -- Scott Kitterman Wed, 28 Feb 2024 08:59:03 -0500 + vrfydmn (0.11.0-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru vrfydmn-0.11.0/debian/control vrfydmn-0.11.0/debian/control --- vrfydmn-0.11.0/debian/control 2021-09-17 03:41:44.000000000 +0000 +++ vrfydmn-0.11.0/debian/control 2024-02-28 13:59:03.000000000 +0000 @@ -1,17 +1,18 @@ Source: vrfydmn Section: mail Priority: optional -Maintainer: Scott Kitterman -Uploaders: Debian Python Team -Build-Depends: debhelper-compat (= 12), python3, dh-python -Standards-Version: 4.4.1 +Maintainer: Debian Python Team +Uploaders: Scott Kitterman +Build-Depends: debhelper-compat (= 13), python3, dh-python +Standards-Version: 4.6.2 Homepage: https://github.com/croessner/vrfydmn Vcs-Git: https://salsa.debian.org/python-team/packages/vrfydmn.git Vcs-Browser: https://salsa.debian.org/python-team/packages/vrfydmn Package: vrfydmn Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, python3-milter, lsb-base, adduser +Pre-Depends: ${misc:Pre-Depends} +Depends: ${python3:Depends}, ${misc:Depends}, python3-milter, adduser Recommends: python3-setproctitle Suggests: python3-ldap, python3-mysqldb, memcached Description: Milter for ensuring email message from matches mail from diff -Nru vrfydmn-0.11.0/debian/vrfydmn.init vrfydmn-0.11.0/debian/vrfydmn.init --- vrfydmn-0.11.0/debian/vrfydmn.init 2021-09-17 03:41:44.000000000 +0000 +++ vrfydmn-0.11.0/debian/vrfydmn.init 2024-02-28 13:54:15.000000000 +0000 @@ -8,40 +8,32 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start vrfydmn daemon -# Description: Start up vrfydmn, a anti-spoofing milter for Postfix +# Description: Start up vrfydmn, an anti-spoofing milter ### END INIT INFO . /lib/lsb/init-functions NAME=vrfydmn - -# Include defaults if available -if [ -f /etc/default/vrfydmn ] ; then - . /etc/default/vrfydmn -else -RUNDIR=/var/run/vrfydmn -SOCKET=local:$RUNDIR/vrfydmn.sock +RUNDIR=/run/${NAME} +SOCKET=local:${RUNDIR}/${NAME}.sock USER=vrfydmn GROUP=vrfydmn -PIDFILE=$RUNDIR/$NAME.pid -fi - +PIDFILE=${RUNDIR}/${NAME}.pid COMMAND="/usr/sbin/${NAME}" +# Include defaults if available +if [ -f /etc/default/${NAME} ] ; then + . /etc/default/${NAME} +fi + start_daemon() { - mkdir -p /var/run/${NAME} - chown $USER:$GROUP /var/run/${NAME} + mkdir -p ${RUNDIR} + chown $USER:$GROUP ${RUNDIR} echo "Starting ${NAME}" start-stop-daemon --start --pidfile "${PIDFILE}" \ --exec ${COMMAND} -- -p "${PIDFILE}" -s $SOCKET \ - -u $USER -g $GROUP - return $? -} - -stop_daemon() { - echo "Stopping ${NAME}" - killproc -p ${PIDFILE} ${COMMAND} + -u $USER -g $GROUP $EXTRAAFTER return $? } @@ -64,7 +56,7 @@ $0 stop && $0 start ;; status) - status_of_proc -p ${PIDFILE} vrfydmn vrfydmn && exit 0 || exit $? + status_of_proc -p ${PIDFILE} ${NAME} ${NAME} && exit 0 || exit $? ;; *) echo "Usage: ${NAME} {start|stop|restart|reload|status}" >&2 diff -Nru vrfydmn-0.11.0/debian/vrfydmn.postinst vrfydmn-0.11.0/debian/vrfydmn.postinst --- vrfydmn-0.11.0/debian/vrfydmn.postinst 2021-09-17 03:41:44.000000000 +0000 +++ vrfydmn-0.11.0/debian/vrfydmn.postinst 2024-02-28 13:47:25.000000000 +0000 @@ -2,7 +2,7 @@ set -e -RUNDIR=/var/run/vrfydmn +RUNDIR=/run/vrfydmn USER=vrfydmn GROUP=vrfydmn @@ -20,8 +20,8 @@ } if [ "$1" = "configure" ]; then - if ! id -u opendkim >/dev/null 2>&1; then - adduser --quiet --system --group --home /var/run/vrfydmn vrfydmn + if ! id -u vrfydmn >/dev/null 2>&1; then + adduser --quiet --system --group --home /run/vrfydmn vrfydmn fi # Create the run directory if it doesn't exist @@ -32,8 +32,8 @@ fi # Set ownership if the admin has not overriden it. - if ! dpkg-statoverride --list /var/run/vrfydmn >/dev/null; then - chown vrfydmn:vrfydmn /var/run/vrfydmn + if ! dpkg-statoverride --list /run/vrfydmn >/dev/null; then + chown vrfydmn:vrfydmn /run/vrfydmn fi # Upgrade /etc/default to systemd override files diff -Nru vrfydmn-0.11.0/debian/vrfydmn.tmpfile vrfydmn-0.11.0/debian/vrfydmn.tmpfile --- vrfydmn-0.11.0/debian/vrfydmn.tmpfile 2021-09-17 03:41:44.000000000 +0000 +++ vrfydmn-0.11.0/debian/vrfydmn.tmpfile 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d /var/run/vrfydmn 0750 vrfydmn vrfydmn - - diff -Nru vrfydmn-0.11.0/debian/vrfydmn.tmpfiles vrfydmn-0.11.0/debian/vrfydmn.tmpfiles --- vrfydmn-0.11.0/debian/vrfydmn.tmpfiles 1970-01-01 00:00:00.000000000 +0000 +++ vrfydmn-0.11.0/debian/vrfydmn.tmpfiles 2024-02-28 13:59:03.000000000 +0000 @@ -0,0 +1 @@ +d /run/vrfydmn 0750 vrfydmn vrfydmn - -