Bug#345079: diff for 0.8.3.2 NMU

[Julien Danjou]

Hi,

Attached is the diff for my greylistd 0.8.3.2 NMU.

-- 
Julien Danjou
// Λ̊ <[EMAIL PROTECTED]>   http://julien.danjou.info
// 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD
// Tomorrow I was nothing, yesterday I'll be.

diff -Nru /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/changelog 
/tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/changelog
--- /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/changelog  2006-08-25 
14:22:47.000000000 +0200
+++ /tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/changelog  2006-11-03 
12:13:17.000000000 +0100
@@ -1,3 +1,11 @@
+greylistd (0.8.3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix hangs in postinst (Closes: #345079)
+  * Now use python-support
+
+ -- Julien Danjou <[EMAIL PROTECTED]>  Fri,  3 Nov 2006 12:12:32 +0100
+
 greylistd (0.8.3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/control 
/tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/control
--- /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/control    2006-08-25 
14:37:04.000000000 +0200
+++ /tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/control    2006-11-03 
12:12:26.000000000 +0100
@@ -2,7 +2,7 @@
 Section: mail
 Priority: optional
 Maintainer: Tor Slettnes <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.3)
 Build-Depends-Indep: python
 Standards-Version: 3.7.2
 
diff -Nru /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/postinst 
/tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/postinst
--- /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/postinst   2005-01-18 
01:15:57.000000000 +0100
+++ /tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/postinst   2006-11-03 
12:09:08.000000000 +0100
@@ -104,13 +104,13 @@
        adduser --system --group --disabled-password \
            --home "$datadir" --no-create-home "$username"
 
-
     ### If we are using Exim 4, and the Debian-exim user is not in the
     ### group, add it and then restart Exim.
+    restart_exim=no
     if running_exim4 && add_user Debian-exim "$groupname"
     then
         db_get "$owner/restartexim"
-       $RET && invoke-rc.d exim4 restart
+       $RET && restart_exim=yes
 
     ### Otherwise, if we are updating from 0.7 or prior versions, we add
     ### the greylist user from the "ugid" DebConf setting
@@ -121,6 +121,9 @@
 
     fi
 
+    db_stop || true
+    [ "$restart_exim" != 'no' ] && invoke-rc.d exim4 restart
+
     ### Create working directories
     for dir in "$datadir" "$rundir"
     do
diff -Nru /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/rules 
/tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/rules
--- /tmp/PvjfczIynR/greylistd-0.8.3.1/debian/rules      2006-08-25 
14:38:51.000000000 +0200
+++ /tmp/saHnWBJU7g/greylistd-0.8.3.2/debian/rules      2006-11-03 
12:12:08.000000000 +0100
@@ -57,6 +57,7 @@
        dh_compress
        dh_fixperms
 #      dh_perl
+       dh_pysupport
        dh_python
 #      dh_makeshlibs
        dh_installdeb

signature.asc
Description: Digital signature