Here's the patch I plan to upload tomorrow unless someone objects.

Michael
-- 
Michael Meskes
Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org)
Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org
ICQ: 179140304, AIM/Yahoo: michaelmeskes, Jabber: [EMAIL PROTECTED]
Go VfL Borussia! Go SF 49ers! Use Debian GNU/Linux! Use PostgreSQL!
diff -u clamsmtp-1.8/debian/postrm clamsmtp-1.8/debian/postrm
--- clamsmtp-1.8/debian/postrm
+++ clamsmtp-1.8/debian/postrm
@@ -39 +39,3 @@
-db_stop || true
+if [ "$1" = "purge" ]; then
+	db_stop || true
+fi
diff -u clamsmtp-1.8/debian/clamsmtp.init clamsmtp-1.8/debian/clamsmtp.init
--- clamsmtp-1.8/debian/clamsmtp.init
+++ clamsmtp-1.8/debian/clamsmtp.init
@@ -51,6 +51,11 @@
 
 # Start the daemon
 d_start() {
+	if [ ! -d $RUNDIR ]; then
+                mkdir -p $RUNDIR
+                chown clamsmtp.clamsmtp $RUNDIR
+        fi
+
         start-stop-daemon --start \
             --pidfile ${PIDFILE} --quiet --oknodo \
             --exec ${DAEMON} -- ${DAEMON_OPTS}
diff -u clamsmtp-1.8/debian/changelog clamsmtp-1.8/debian/changelog
--- clamsmtp-1.8/debian/changelog
+++ clamsmtp-1.8/debian/changelog
@@ -1,3 +1,13 @@
+clamsmtp (1.8-5.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Create directory /var/run/clamsmtp in init script instead of postinst
+    script. (Closes: #505796)
+  * Only call db_top in postrm if the argument is "purge" because only then the
+    debconf stuff has been used. (Closes: #475185)
+
+ -- Michael Meskes <[EMAIL PROTECTED]>  Mon, 17 Nov 2008 13:56:50 +0100
+
 clamsmtp (1.8-5.3) unstable; urgency=low
 
   * Non-maintainer upload to solve release goal.
diff -u clamsmtp-1.8/debian/postinst clamsmtp-1.8/debian/postinst
--- clamsmtp-1.8/debian/postinst
+++ clamsmtp-1.8/debian/postinst
@@ -57,11 +57,6 @@
         install -o ${CUSER} -g ${CGROUP} -m 750 -d ${SPOOLDIR} || return 1
     fi
 
-    # Build the run directory if it doesn't exist
-    if [ ! -d ${RUNDIR} ] ; then
-        install -o ${CUSER} -g ${CGROUP} -m 755 -d ${RUNDIR} || return 2
-    fi
-
     return 0
 }
 
@@ -137,12 +132,6 @@
         chmod 750 ${SPOOLDIR} || return 1
     fi
 
-    # Run directory: Don't touch /var/run
-    if [ "x${RUNDIR}" != "x/var/run" ] ; then 
-        chown ${CUSER}':'${CGROUP} ${RUNDIR} || return 2
-        chmod 755 ${RUNDIR} || return 2
-    fi
-
   return 0
 }
 

Reply via email to