[pkg-dspam-commits] r112 - trunk/debian

[Jesus Climent]

Author: mooch
Date: Sun Sep 24 20:13:59 2006
New Revision: 112

Modified:
   trunk/debian/changelog
   trunk/debian/libdspam7-drv-mysql.cron.daily
   trunk/debian/libdspam7-drv-mysql.postrm
   trunk/debian/libdspam7-drv-pgsql.postrm

Log:
Cron: grep for mysql host for non-local mysql service
postrm's: remove the debconf loading, since dh_installdebconf takes care of it for purge
          check for ucf executable before purging the config


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sun Sep 24 20:13:59 2006
@@ -6,7 +6,15 @@
   * Update package descriptions. Neural networking was experimental is now
     removed from the upstream sources.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 27 Aug 2006 09:18:36 +0200
+  [ Jesus Climent ]
+  * Removed the call to debconf, since it is added by dh_installdebconf
+    automatically and takes care of checking if the package is installed on
+    purge time (Closes: #388225, #388226).
+  * Check for the existance of ucf before executing it on purge time.
+  * Use the defined MySQL host option in the config file to connect to an
+    non-local MySQL database server (Closes: #388140).
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 24 Sep 2006 23:04:21 +0300
 
 dspam (3.6.8-2) unstable; urgency=low
 

Modified: trunk/debian/libdspam7-drv-mysql.cron.daily
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.cron.daily	(original)
+++ trunk/debian/libdspam7-drv-mysql.cron.daily	Sun Sep 24 20:13:59 2006
@@ -11,7 +11,12 @@
     MYSQL_USER="`grep "^MySQLUser" $MYSQLCONF | awk '{print $2}'`"
     MYSQL_PASS="`grep "^MySQLPass" $MYSQLCONF | awk '{print $2}'`"
     MYSQL_DB="`grep "^MySQLDb" $MYSQLCONF | awk '{print $2}'`"
-    /usr/bin/mysql --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB < $PURGE
+    MYSQL_HOST="`grep "^MySQLServer" $MYSQLCONF | awk '{print $2}'`"
+    if [ -z "$MYSQL_HOST" ] ; then
+        /usr/bin/mysql --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB < $PURGE
+    else
+        /usr/bin/mysql --host=$MYSQL_HOST --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB < $PURGE
+    fi
   fi
 fi
 

Modified: trunk/debian/libdspam7-drv-mysql.postrm
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postrm	(original)
+++ trunk/debian/libdspam7-drv-mysql.postrm	Sun Sep 24 20:13:59 2006
@@ -4,9 +4,6 @@
 
 set -e
 
-# Load debconf
-. /usr/share/debconf/confmodule
-
 # Load dbconfig
 if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
   . /usr/share/dbconfig-common/dpkg/postrm.mysql
@@ -25,7 +22,9 @@
       rm -f /etc/dspam/dspam.d/mysql.conf$ext
     done
     rm -f /etc/dspam/dspam.d/mysql.conf
-    ucf --purge /etc/dspam/dspam.d/mysql.conf
+    if [ -x /usr/bin/ucf ]; then
+      ucf --purge /etc/dspam/dspam.d/mysql.conf
+    fi
   ;;
 
   *)

Modified: trunk/debian/libdspam7-drv-pgsql.postrm
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postrm	(original)
+++ trunk/debian/libdspam7-drv-pgsql.postrm	Sun Sep 24 20:13:59 2006
@@ -4,9 +4,6 @@
 
 set -e
 
-# Load debconf
-. /usr/share/debconf/confmodule
-
 # Load dbconfig
 if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
   . /usr/share/dbconfig-common/dpkg/postrm.pgsql
@@ -25,7 +22,9 @@
       rm -f /etc/dspam/dspam.d/pgsql.conf$ext
     done
     rm -f /etc/dspam/dspam.d/pgsql.conf
-    ucf --purge /etc/dspam/dspam.d/pgsql.conf
+    if [ -x /usr/bin/ucf ]; then
+      ucf --purge /etc/dspam/dspam.d/pgsql.conf
+    fi
   ;;
 
   *)