-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Adrian von Bidder wrote:
| Thanks a lot, will look at it later.
|
| Can you resend as unified diff? I find these old-style diffs to be quite
| unreadable.
Ahh! This one is realy more readable :-)
by, Martin
- --
Powered by Debian GNU / Linux
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFCGbQAGxxhbGlQyAkRAooCAKCmUhJ96d8AOK/FJ5t93XkCzGpdgwCfTbq0
aCEOpoydIKr7ZCzVZReb78w=
=qiL0
-----END PGP SIGNATURE-----
diff -u -r postgrey-1.17.orig/debian/control postgrey-1.17/debian/control
--- postgrey-1.17.orig/debian/control 2005-02-20 23:40:51.000000000 +0100
+++ postgrey-1.17/debian/control 2005-02-20 23:41:12.000000000 +0100
@@ -9,7 +9,7 @@
Package: postgrey
Architecture: all
Depends: debconf, libberkeleydb-perl (>= 0.23-2), libnet-dns-perl,
- libnet-server-perl (>= 0.87), perl
+ libnet-server-perl (>= 0.87), perl, ucf
Recommends: postfix
Conflicts: postfix (<< 2.1)
Description: greylisting implementation for Postfix
diff -u -r postgrey-1.17.orig/debian/postinst postgrey-1.17/debian/postinst
--- postgrey-1.17.orig/debian/postinst 2005-02-20 23:40:51.000000000 +0100
+++ postgrey-1.17/debian/postinst 2005-02-20 23:41:12.000000000 +0100
@@ -29,6 +29,12 @@
--disabled-password --ingroup nogroup postgrey &&
chown postgrey "$NEWDIR"
chmod 0700 "$NEWDIR"
+
+ # ucf
+ /usr/bin/ucf --three-way --debconf-ok /usr/share/doc/postgrey/whitelist_clients \
+ /etc/postgrey/whitelist_clients
+ /usr/bin/ucf --three-way --debconf-ok /usr/share/doc/postgrey/whitelist_recipients \
+ /etc/postgrey/whitelist_recipients
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u -r postgrey-1.17.orig/debian/postrm postgrey-1.17/debian/postrm
--- postgrey-1.17.orig/debian/postrm 2005-02-20 23:40:51.000000000 +0100
+++ postgrey-1.17/debian/postrm 2005-02-20 23:41:12.000000000 +0100
@@ -16,9 +16,24 @@
if [ -d /var/lib/postgrey ]; then
rm -f /var/lib/postgrey/__db.* \
/var/lib/postgrey/log.* \
- /var/lib/postgrey/postgrey.*
+ /var/lib/postgrey/postgrey.* \
+ /var/lib/postgrey/postgrey_*
rmdir /var/lib/postgrey || true
fi
+
+ # ucf
+ ucf --purge /etc/postgrey/whitelist_clients
+ ucf --purge /etc/postgrey/whitelist_recipients
+
+ if [ -d /etc/postgrey ];then
+ rm -f /etc/postgrey/*~ \
+ /etc/postgrey/*.dpkg-* \
+ /etc/postgrey/whitelist_clients \
+ /etc/postgrey/whitelist_recipients
+ rmdir /etc/postfix || true
+ fi
+
+
;;
*)
diff -u -r postgrey-1.17.orig/debian/rules postgrey-1.17/debian/rules
--- postgrey-1.17.orig/debian/rules 2005-02-20 23:40:51.000000000 +0100
+++ postgrey-1.17/debian/rules 2005-02-20 23:41:12.000000000 +0100
@@ -26,15 +26,15 @@
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ dh_installdirs etc/postgrey
# for lack of an upstream Makefile
install -D postgrey $(BASE)/usr/sbin/postgrey
install -D contrib/postgreyreport $(BASE)/usr/bin/postgreyreport
install -m 0644 -D postgrey_whitelist_clients \
- $(BASE)/etc/postgrey/whitelist_clients
+ $(BASE)/usr/share/doc/postgrey/whitelist_clients
install -m 0644 -D postgrey_whitelist_recipients \
- $(BASE)/etc/postgrey/whitelist_recipients
+ $(BASE)/usr/share/doc/postgrey/whitelist_recipients
mkdir -p $(BASE)/usr/share/man/man{1,8}
pod2man --section=8 postgrey > $(BASE)/usr/share/man/man8/postgrey.8
pod2man --section=1 contrib/postgreyreport \
