[Pkg-dspam-misc] Bug#488924: release team opinion on big diffs
Kurt B. Kaiser
kbk at shore.net
Thu Sep 11 23:05:38 UTC 2008
On Sat, Sep 06 2008, Marc 'HE' Brockschmidt wrote:
> Please prepre a minimal fix. Thanks.
OK, here is a cherry-picked version with minimal changes.
Matthijs is tied up, so a sponsor would be appreciated.
http://mentors.debian.net/debian/pool/main/d/dspam/dspam_3.6.8-9.dsc
==================================================================
-8 -9 interdiff:
diff -u dspam-3.6.8/debian/control dspam-3.6.8/debian/control
--- dspam-3.6.8/debian/control
+++ dspam-3.6.8/debian/control
@@ -25,7 +25,7 @@
Priority: extra
Architecture: all
Depends: dspam, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph3d-perl
-Suggests: libapache2-mod-perl2, libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-openid | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-radius | libapache2-mod-auth-shadow | libapache2-mod-auth-sys-group
+Suggests: apache2-suexec (>= 2.2.9-3), libapache2-mod-perl2, libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-openid | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-radius | libapache2-mod-auth-shadow | libapache2-mod-auth-sys-group
Description: DSPAM is a scalable and statistical anti-spam filter
DSPAM is a dedicated statistical filter with minimal resources. It includes
many new algorithms to fight against spam including:
@@ -35,8 +35,7 @@
* Bayesian Noise Reduction
.
This package includes the webfrontend for dspam. This can be used together
- with the several database backends including PostgreSQL, MySQL, Berkerley 4
- and sqlite3.
+ with several database backends including PostgreSQL, MySQL, and sqlite3.
Package: libdspam7
Section: libs
diff -u dspam-3.6.8/debian/libdspam7-drv-mysql.cron.daily dspam-3.6.8/debian/libdspam7-drv-mysql.cron.daily
--- dspam-3.6.8/debian/libdspam7-drv-mysql.cron.daily
+++ dspam-3.6.8/debian/libdspam7-drv-mysql.cron.daily
@@ -7,6 +7,9 @@
PURGE=/usr/share/doc/libdspam7-drv-mysql/purge-4.1.sql
MYSQLCONF_PASSWD=/var/run/libdspam7-drv-mysql.cron.passwd
+# If the purge doesn't exist, don't do anything.
+[ ! -f "$PURGE" ] && exit 0
+
if grep -q "^StorageDriver.*mysql_drv.so" $DSPAMCONF; then
if [ -x /usr/bin/mysql ]; then
MYSQL_USER="`grep "^MySQLUser" $MYSQLCONF | awk '{print $2}'`"
@@ -17,7 +20,7 @@
UMASK_OLD="`umask`"
umask 077
[ -e "$MYSQLCONF_PASSWD" ] && rm "$MYSQLCONF_PASSWD"
- echo -e "[client]\npassword=$MYSQL_PASS" > "$MYSQLCONF_PASSWD"
+ (echo "[client]"; echo "password=$MYSQL_PASS") > "$MYSQLCONF_PASSWD"
umask "$UMASK_OLD"
# If host is empty or starting with a / assume it's localhost.
@@ -26,7 +29,7 @@
/usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD \
--user=$MYSQL_USER $MYSQL_DB < $PURGE
else
- /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
+ /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER $MYSQL_DB < $PURGE
fi
rm "$MYSQLCONF_PASSWD"
diff -u dspam-3.6.8/debian/dspam.init dspam-3.6.8/debian/dspam.init
--- dspam-3.6.8/debian/dspam.init
+++ dspam-3.6.8/debian/dspam.init
@@ -42,7 +42,7 @@
# 1 if daemon was already running
# 2 if daemon could not be started
start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER --exec $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $OPTIONS || return 2
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER --exec $DAEMON -- $OPTIONS || return 2
}
# Stop the daemon
diff -u dspam-3.6.8/debian/changelog dspam-3.6.8/debian/changelog
--- dspam-3.6.8/debian/changelog
+++ dspam-3.6.8/debian/changelog
@@ -1,3 +1,24 @@
+dspam (3.6.8-9) unstable; urgency=low
+
+ [ Kurt B. Kaiser ]
+ * (This is a maintenance release for lenny from pkg-dspam/branches/lenny)
+ * Add apache2-suexec (>= 2.2.9-3) as webfrontend Suggests: (Closes: #488924).
+ * Acknowledge NMU. Thanks Peter Eisentraut (Closes: #473027, #480602).
+ * Fix a regression in #455052, #469668: force removal of the /usr/share/dspam
+ directory with dspam-webfrontend.preinst for versions prior to 3.6.8-9.
+ * Fix regression from #388140: remote mySQL server fails (Closes: #481755)
+ * /etc/init.d/dspam ignored $USER (LP: #232543)(Closes: #483868)
+ * cron shouldn't try to clean mysql db if dspam was removed (Closes: 484889)
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Thu, 11 Sep 2008 17:45:18 -0400
+
+dspam (3.6.8-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixed bashism in debian/libdspam7-drv-mysql.cron.daily (Closes: #473027)
+
+ -- Peter Eisentraut <petere at debian.org> Tue, 15 Jul 2008 13:13:03 +0200
+
dspam (3.6.8-8) unstable; urgency=high
[ Matthijs Mohlmann ]
only in patch2:
unchanged:
--- dspam-3.6.8.orig/debian/dspam-webfrontend.preinst
+++ dspam-3.6.8/debian/dspam-webfrontend.preinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade)
+ if dpkg --compare-versions "$2" lt "3.6.8-9"; then
+ # remove bad symlinks created in previous package versions
+ # by removing the dspam directory:
+ rm -rf /usr/share/dspam
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
More information about the Pkg-dspam-misc
mailing list