Hi, here's the diff for the NMU I'm just uploading:
debdiff qpopper_4.0.5-4sarge1.dsc qpopper_4.0.5-4.1.dsc debian/README.Debian | 5 --- qpopper-4.0.5/debian/changelog | 11 +++++++ debian/postinst | 43 ----------------------------- qpopper-4.0.5/debian/control | 4 -- debian/postrm | 35 ----------------------- qpopper-4.0.5/debian/qpopper-drac.postinst | 4 +- qpopper-4.0.5/debian/qpopper.postrm | 2 - 7 files changed, 15 insertions(+), 89 deletions(-) reverted: --- qpopper-4.0.5/debian/README.Debian +++ qpopper-4.0.5.orig/debian/README.Debian @@ -1,5 +0,0 @@ -There is a new qpopper-drac package. Please read documents of drac -package for drac support. ;-) - - Yu Guanghui <[EMAIL PROTECTED]> - 2002-02-06 diff -u qpopper-4.0.5/debian/changelog qpopper-4.0.5/debian/changelog --- qpopper-4.0.5/debian/changelog +++ qpopper-4.0.5/debian/changelog @@ -1,3 +1,14 @@ +qpopper (4.0.5-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Always set permissions on /var/spool/pop/ in qpopper-drac.postinst + (Closes: #313537). + * Drop unused debian/post{rm,inst}. + * Drop README.Debian. + * Bump Standards-Version. + + -- Christoph Berg <[EMAIL PROTECTED]> Wed, 25 Jan 2006 12:13:37 +0100 + qpopper (4.0.5-4sarge1) testing-security; urgency=high * Non-maintainer upload by the Security Team reverted: --- qpopper-4.0.5/debian/postinst +++ qpopper-4.0.5.orig/debian/postinst @@ -1,43 +0,0 @@ -#! /bin/sh -# -# Remove the original pop3 entry from /etc/inetd.conf, and add ours. -# - -case "$1" in - configure) - ;; - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 - ;; - *) - exit 0 - ;; -esac -umask 022 - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -# Compatibility symlinks into /usr/doc -if [ -d /usr/doc -a ! -e /usr/doc/qpopper \ - -a -d /usr/share/doc/qpopper ] -then - ln -sf ../share/doc/qpopper /usr/doc/qpopper -fi - -# Make sure /var/spool/pop is there, and mode drwxrwsr-x root mail -if [ ! -d /var/spool/pop ] -then - mkdir -p /var/spool/pop - chgrp mail /var/spool/pop - chmod 2775 /var/spool/pop -fi - -# Check if we have already been installed. -grep "^pop-3.*/in.qpopper" /etc/inetd.conf > /dev/null 2>&1 && exit 0 - -# Install the qpopper. -update-inetd --remove '^pop-3' -update-inetd --group MAIL --add \ - 'pop-3\t\tstream\ttcp\tnowait\troot\t/usr/sbin/tcpd\t/usr/sbin/in.qpopper -f /etc/qpopper.conf' - -#DEBHELPER# diff -u qpopper-4.0.5/debian/control qpopper-4.0.5/debian/control --- qpopper-4.0.5/debian/control +++ qpopper-4.0.5/debian/control @@ -3,7 +3,7 @@ Section: mail Priority: extra Maintainer: Yu Guanghui <[EMAIL PROTECTED]> -Standards-Version: 3.5.8 +Standards-Version: 3.6.2 Package: qpopper Architecture: any @@ -34,2 +33,0 @@ - . - Please read the README.Debian of drac package to setup your MTA. reverted: --- qpopper-4.0.5/debian/postrm +++ qpopper-4.0.5.orig/debian/postrm @@ -1,35 +0,0 @@ -#! /bin/sh -# -# Remove the qpopper entry from /etc/inittab and -# restore the original one. -# - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -case "$1" in - purge) - rm -f /etc/pop.auth.* - exit 0 - ;; - remove) - ;; - *) - # Do nothing... - exit 0 - ;; -esac - -update-inetd --remove '^pop-3' - -if [ -x /usr/sbin/in.pop3d ] -then - update-inetd --group MAIL --add \ - 'pop-3\t\tstream\ttcp\tnowait\troot\t/usr/sbin/tcpd\t/usr/sbin/in.pop3d' -fi - -if [ -f /var/run/inetd.pid ] -then - kill -s HUP `cat /var/run/inetd.pid` 2>/dev/null -fi - -#DEBHELPER# diff -u qpopper-4.0.5/debian/qpopper-drac.postinst qpopper-4.0.5/debian/qpopper-drac.postinst --- qpopper-4.0.5/debian/qpopper-drac.postinst +++ qpopper-4.0.5/debian/qpopper-drac.postinst @@ -21,9 +21,9 @@ if [ ! -d /var/spool/pop ] then mkdir -p /var/spool/pop - chgrp mail /var/spool/pop - chmod 2775 /var/spool/pop fi +chgrp mail /var/spool/pop +chmod 2775 /var/spool/pop # Check if we have already been installed. grep "^pop-3.*/in.qpopper" /etc/inetd.conf > /dev/null 2>&1 && exit 0 diff -u qpopper-4.0.5/debian/qpopper.postrm qpopper-4.0.5/debian/qpopper.postrm --- qpopper-4.0.5/debian/qpopper.postrm +++ qpopper-4.0.5/debian/qpopper.postrm @@ -1,6 +1,6 @@ #! /bin/sh # -# Remove the qpopper entry from /etc/inittab and +# Remove the qpopper entry from /etc/inetd.conf and # restore the original one. # Christoph -- [EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature