[svn-buildpackage] Tagging postfwd 1.20-1

debian/README.Debian

@@ -58,4 +58,10 @@ In order to avoid the startup of the daemon on an unconfigured machine,
 automatic startup, on boot, is disabled by default. To enable it just edit the
 file /etc/default/postfwd and set the "startup" variable to 1.
 
+4. CHOOSING WHICH POSTFWD VERSION TO USE
+----------------------------------------
+
+Since some time, there is also a prefork version available, called postfwd2.
+You can use update-alternatives to choose between 'postfwd1' and 'postfwd2'.
+
  -- Jan Wagner <waja@cyconet.org>  Mon, 10 Mar 2008 22:37:44 +0100

debian/README.source

@@ -0,0 +1,3 @@
+We use dpatch for patch handling inside our package(s).  Please see
+/usr/share/doc/dpatch/README.source.gz (if you have installed dpatch) for
+documentation about dpatch.

debian/changelog

@@ -1,3 +1,46 @@
+postfwd (1.20-1) unstable; urgency=low
+
+  * New upstream release
+    - Release contains postfwd1 and postfwd2 now (Closes: #582969)
+    - new --umask setting allows to set filepermissions for pidfiles and unix
+      domain sockets
+    - Rate limit code rewritten
+    - rbl checks disabled for ipv6 addresses, cidr compare will switch to
+      default (regex/string)
+    - rbl check could fail on multiple dnsbl answers
+  * Add dpatch infrastructure
+  * Provide update-alternatives for choosing the postfwd variant
+  * Install also CHANGELOG2
+  * Bump Standards-Version to 3.9.1, no changes needed
+
+ -- Jan Wagner <waja@cyconet.org>  Thu, 10 Feb 2011 08:38:04 +0100
+
+postfwd (1.18-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixed bug when comparing sender and recipient addresses, like
+      "sender=$$recipient"
+
+ -- Jan Wagner <waja@cyconet.org>  Thu, 29 Apr 2010 08:46:25 +0200
+
+postfwd (1.17-1) unstable; urgency=low
+
+  * New upstream release
+    - Net::DNS internal errors will now be handled gracefully
+    - default for options --dns_max_ns_a_lookups and --dns_max_mx_a_lookups of
+      100
+    - Fixed variable substitution when the '=' operator is used
+
+ -- Jan Wagner <waja@cyconet.org>  Mon, 22 Mar 2010 09:02:31 +0100
+
+postfwd (1.16-2) unstable; urgency=low
+
+  * Bump Standards-Version to 3.8.4, no changes needed
+  * Migrate Vcs-Fields over to scm.uncompleted.org
+  * Add 1.0 to debian/source/format
+
+ -- Jan Wagner <waja@cyconet.org>  Wed, 10 Mar 2010 12:35:57 +0100
+
 postfwd (1.16-1) unstable; urgency=low
 
   * NEW upstream release

debian/control

@@ -2,15 +2,16 @@ Source: postfwd
 Section: mail
 Priority: optional
 Maintainer: Jan Wagner <waja@cyconet.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch
 Homepage: http://www.postfwd.org/
-Vcs-Browser: https://trac.cyconet.org/debian/browser/debian/postfwd
+Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd
-Vcs-Svn: https://trac.cyconet.org/svn/debian/postfwd
+Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: postfwd
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, adduser, libnet-dns-perl, libnet-server-perl
+Conflicts: postfwd2
 Description: Postfix policyd to combine complex restrictions in a ruleset
  Postfwd is written in perl to combine complex postfix restrictions in a
  ruleset similar to those of the most firewalls. The program uses the postfix

debian/postfwd.docs

@@ -1,2 +1,3 @@
 doc/postfwd.html
 doc/postfwd.txt
+doc/CHANGELOG2

debian/postfwd.init

@@ -58,7 +58,8 @@ then
 fi
 
 # Check whether we have to drop privileges.
-if [ -n "$RUNAS" ]; then
+if [ -n "$RUNAS" ]
+then
         if ! getent passwd "$RUNAS" >/dev/null; then
                 RUNAS=""
         fi

debian/postfwd.postinst

@@ -54,4 +54,10 @@ case "$1" in
 		;;
 esac
 
+update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd1 100 \
+                    --slave /usr/share/man/man1/postfwd.1.gz postfwd.1.gz \
+                    /usr/share/man/man1/postfwd1.1.gz
+update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd2 120 \
+                    --slave /usr/share/man/man1/postfwd.2.gz postfwd.2.gz \
+                    /usr/share/man/man1/postfwd2.1.gz
 #DEBHELPER#

debian/postfwd.prerm

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
+	update-alternatives --remove postfwd /usr/sbin/postfwd1
+	update-alternatives --remove postfwd /usr/sbin/postfwd2
+fi
+
+#DEBHELPER#

debian/rules

@@ -4,9 +4,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build:
+include /usr/share/dpatch/dpatch.make
 
-clean:
+build: patch-stamp
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -16,7 +18,12 @@ install: build
 	dh_testroot
 	dh_clean -k
 
-	install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd
+	# install binaries
+	install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd1
+	install -D -m 644 sbin/postfwd2 debian/postfwd/usr/sbin/postfwd2
+	# install man page
+	mkdir -p debian/tmp/
+	cp man/man8/postfwd.8 debian/tmp/postfwd1.8
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -26,8 +33,8 @@ binary-indep: build install
 	dh_installdocs tools
 	dh_installexamples etc/postfwd.cf.sample debian/example-cfg*
 	dh_installinit -- defaults 19 21
-	dh_installman man/man8/postfwd.8
+	dh_installman man/man8/postfwd2.8
-	dh_link
+	dh_installman debian/tmp/postfwd1.8
 	dh_compress
 	dh_fixperms
 	dh_perl

debian/source/format

@@ -0,0 +1 @@
+1.0