[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110312.9a9050f+dfsg-1-6-g4449f7a

[Julien Valroff]

The following commit has been merged in the master branch:
commit 3530fa29eeda54a35e334b5dac8d764d41d7b4e6
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Apr 8 22:07:32 2011 +0200

    Some clean up in postinst scripts

diff --git a/debian/dspam.postinst b/debian/dspam.postinst
index c43470b..e9ebcd5 100644
--- a/debian/dspam.postinst
+++ b/debian/dspam.postinst
@@ -2,17 +2,11 @@
 
 set -e
 
-test $DEBIAN_SCRIPT_DEBUG && set -v -x
-
 set_dspam_perms() {
 
-    #touch /var/log/dspam.debug /var/log/sql.errors /var/log/dspam.messages
-    #chown dspam.dspam /var/log/dspam.debug /var/log/sql.errors /var/log/dspam.messages
-    #chmod 660 /var/log/dspam.debug /var/log/sql.errors /var/log/dspam.messages
-
-    ## If you add any other permission/ownership tweaks here, then
-    ## remember to add a corresponding remove operation to the
-    ## remove_dspam_perms() function, below
+    # If you add any other permission/ownership tweaks here, then
+    # remember to add a corresponding remove operation to the
+    # remove_dspam_perms() function, below
 
     # Database password info is contained in dspam.conf
     if ! dpkg-statoverride --list /etc/dspam/dspam.conf >/dev/null
diff --git a/debian/libdspam7-drv-mysql.postinst b/debian/libdspam7-drv-mysql.postinst
index 8c3a398..1359fd0 100644
--- a/debian/libdspam7-drv-mysql.postinst
+++ b/debian/libdspam7-drv-mysql.postinst
@@ -12,8 +12,6 @@ set -e
 
 # Set some variables
 dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
-dbc_generate_include_owner="dspam"
-dbc_generate_include_perms="640"
 dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/mysql.conf'"
 
 # Run dbconfig
diff --git a/debian/libdspam7-drv-pgsql.postinst b/debian/libdspam7-drv-pgsql.postinst
index 6e906f5..dc671ac 100644
--- a/debian/libdspam7-drv-pgsql.postinst
+++ b/debian/libdspam7-drv-pgsql.postinst
@@ -9,8 +9,6 @@ set -e
 
 # Set some variables
 dbc_generate_include=template:/etc/dspam/dspam.d/pgsql.conf
-dbc_generate_include_owner="dspam"
-dbc_generate_include_perms="640"
 dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/pgsql.conf'"
 
 # Load dbconfig (pgsql part)
diff --git a/debian/libdspam7.postinst b/debian/libdspam7.postinst
index d607832..5dd5516 100644
--- a/debian/libdspam7.postinst
+++ b/debian/libdspam7.postinst
@@ -2,22 +2,14 @@
 
 set -e
 
-test $DEBIAN_SCRIPT_DEBUG && set -v -x
-
-create_user() {
-    if [ -z "`getent group dspam`" ]; then
-        addgroup --quiet --system dspam
-        adduser --quiet --system --ingroup dspam --home /var/spool/dspam \
-            --no-create-home --disabled-password \
-            --gecos 'DSPAM' dspam
-    fi
-    rm -f /var/spool/dspam/temp 2>/dev/null
-    return 0
-}
-
 case "$1" in
     configure)
-        create_user
+        if [ -z "`getent group dspam`" ]; then
+            addgroup --quiet --system dspam
+            adduser --quiet --system --ingroup dspam --home /var/spool/dspam \
+                --no-create-home --disabled-password \
+                --gecos 'DSPAM' dspam
+        fi
     ;;
 
     reconfigure)

-- 
Debian packages for the DSPAM anti-spam filter