From dc428dba6006976f76d2c1a95273303e07120e3a Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 26 Sep 2011 13:23:56 +0000 Subject: [PATCH 01/11] split hapolicy into own binary package --- debian/changelog | 5 +++-- debian/control | 10 ++++++++++ debian/hapolicy.docs | 4 ++++ debian/hapolicy.manpages | 1 + debian/{README.Debian => postfwd.README.Debian} | 0 debian/postfwd.docs | 3 --- debian/postfwd.manpages | 1 - debian/rules | 8 ++++---- 8 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 debian/hapolicy.docs create mode 100644 debian/hapolicy.manpages rename debian/{README.Debian => postfwd.README.Debian} (100%) diff --git a/debian/changelog b/debian/changelog index 13805e8..e90e8ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ postfwd (1.30-1) UNRELEASED; urgency=low * New upstream release - - new parser enhancement is able to omit the trailing "\" for multi-line rules + - new parser enhancement is able to omit the trailing "\" for multi-line + rules - new plugin interface (BETA) - Time::HiRes is used if available - multiple rate limits for the same items are supported now @@ -13,7 +14,7 @@ postfwd (1.30-1) UNRELEASED; urgency=low - documentation updates and fixes * Suppress output on restarting via init script (Closes: #636782), thanks Martin F. Krafft for reporting - * Ship hapolicy and manpage + * Add hapolicy and manpage into separate binary package * Reorganize documentation - Add new files from upstream to documentation - Add 10_hapolicy_manpage.dpatch to have a manpage for hapolicy diff --git a/debian/control b/debian/control index f340b80..baadf00 100644 --- a/debian/control +++ b/debian/control @@ -19,3 +19,13 @@ Description: Postfix policyd to combine complex restrictions in a ruleset message has been accepted. It allows you to choose an action (e.g. reject, dunno) for a combination of several smtp parameters (like sender and recipient address, size or the client's TLS fingerprint). + +Package: hapolicy +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends} +Description: Balancing and fallback postfix policy delegation service + Hapolicy enables high availability, weighted loadbalancing and a fallback + action for postfix policy delegation services. Invoked via postfix spawn + it acts as a wrapper that queries other policy servers via tcp connection. + The order of the service queries can be influenced by assigning a specific + priority and weight to each service. diff --git a/debian/hapolicy.docs b/debian/hapolicy.docs new file mode 100644 index 0000000..120886a --- /dev/null +++ b/debian/hapolicy.docs @@ -0,0 +1,4 @@ +doc/hapolicy.html +doc/hapolicy.txt +tools/hapolicy/hapolicy.* +tools/hapolicy/hapolicy[0-9a-zA-Z.]* diff --git a/debian/hapolicy.manpages b/debian/hapolicy.manpages new file mode 100644 index 0000000..e093172 --- /dev/null +++ b/debian/hapolicy.manpages @@ -0,0 +1 @@ +man/man8/hapolicy.1 diff --git a/debian/README.Debian b/debian/postfwd.README.Debian similarity index 100% rename from debian/README.Debian rename to debian/postfwd.README.Debian diff --git a/debian/postfwd.docs b/debian/postfwd.docs index 310cce4..43e9ffb 100644 --- a/debian/postfwd.docs +++ b/debian/postfwd.docs @@ -1,9 +1,6 @@ -#doc/postfwd.html -#doc/postfwd.txt doc/postfwd2.CHANGELOG doc/*.html doc/*.txt -tools/hapolicy/hapolicy.* tools/*.pl tools/*.sample plugins/*.sample diff --git a/debian/postfwd.manpages b/debian/postfwd.manpages index 2c9c21f..638a3b9 100644 --- a/debian/postfwd.manpages +++ b/debian/postfwd.manpages @@ -1,3 +1,2 @@ debian/tmp/postfwd1.8 man/man8/postfwd2.8 -man/man8/hapolicy.1 diff --git a/debian/rules b/debian/rules index a8c064d..9c09d4a 100755 --- a/debian/rules +++ b/debian/rules @@ -21,19 +21,19 @@ install: build # 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 -D -m 644 tools/hapolicy/hapolicy debian/postfwd/usr/sbin/hapolicy + install -D -m 644 tools/hapolicy/hapolicy debian/hapolicy/usr/sbin/hapolicy # install man page mkdir -p debian/tmp/ cp man/man8/postfwd.8 debian/tmp/postfwd1.8 - pod2man debian/postfwd/usr/sbin/hapolicy man/man8/hapolicy.1 + pod2man debian/hapolicy/usr/sbin/hapolicy man/man8/hapolicy.1 # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot dh_installchangelogs doc/postfwd.CHANGELOG - dh_installdocs -Xhapolicy - dh_installdocs tools/hapolicy/hapolicy[0-9a-zA-Z.]* + dh_installdocs -ppostfwd -Xhapolicy + dh_installdocs -phapolicy tools/hapolicy/hapolicy[0-9a-zA-Z.]* dh_installexamples etc/postfwd.cf.sample debian/example-cfg* dh_installinit -- defaults 19 21 dh_installman From c3275db7c36af73bc8b2b6e4533db112ab9d6cb7 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 21 Dec 2011 21:28:24 +0000 Subject: [PATCH 02/11] new upstream --- debian/changelog | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e90e8ce..45a8ac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,18 @@ -postfwd (1.30-1) UNRELEASED; urgency=low +postfwd (1.32-1) unstable; urgency=low * New upstream release + - new option --save_rates= allows to load and save rate limit counters + to disk on program start and termination. + - the --debugitem="sender=example\.org$" option allows verbose logging for + particular requests + - the debug() action allows verbose logging for certain rules + - nested commands are possible now + - new mail(server/helo/from/to/subject/body) action. + - single cache items can be wiped + - sasl_username is logged if available + - rate limit action is executed, if the first request exceeds the limit + - exceeded ratecounters will not be kept permanently anymore + - rate limits are evaluated at ruleset stage now - new parser enhancement is able to omit the trailing "\" for multi-line rules - new plugin interface (BETA) @@ -20,7 +32,7 @@ postfwd (1.30-1) UNRELEASED; urgency=low - Add 10_hapolicy_manpage.dpatch to have a manpage for hapolicy - Changelogs where renamed by upstream - -- Jan Wagner Thu, 10 Feb 2011 08:40:51 +0100 + -- Jan Wagner Wed, 21 Dec 2011 22:27:27 +0100 postfwd (1.20-1) unstable; urgency=low From 2c1e833af28d477fb51d7080af0ea8aadc59a926 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 21 Dec 2011 21:35:05 +0000 Subject: [PATCH 03/11] cleanup changelog --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45a8ac3..b177a64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ postfwd (1.32-1) unstable; urgency=low * New upstream release - - new option --save_rates= allows to load and save rate limit counters + - new option --save_rates= is able to load and save rate limit counters to disk on program start and termination. - the --debugitem="sender=example\.org$" option allows verbose logging for particular requests - - the debug() action allows verbose logging for certain rules + - the debug() action enables verbose logging for certain rules - nested commands are possible now - new mail(server/helo/from/to/subject/body) action. - single cache items can be wiped @@ -29,7 +29,6 @@ postfwd (1.32-1) unstable; urgency=low * Add hapolicy and manpage into separate binary package * Reorganize documentation - Add new files from upstream to documentation - - Add 10_hapolicy_manpage.dpatch to have a manpage for hapolicy - Changelogs where renamed by upstream -- Jan Wagner Wed, 21 Dec 2011 22:27:27 +0100 From 22e7f49b13782bea60352e5fc3fbf9784840f228 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 21 Dec 2011 21:35:54 +0000 Subject: [PATCH 04/11] bump standards --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b177a64..da71b4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ postfwd (1.32-1) unstable; urgency=low * Reorganize documentation - Add new files from upstream to documentation - Changelogs where renamed by upstream + * Bump Standards-Version to 3.9.2, no changes needed -- Jan Wagner Wed, 21 Dec 2011 22:27:27 +0100 diff --git a/debian/control b/debian/control index baadf00..85cbbd2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5), dpatch Homepage: http://www.postfwd.org/ Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Package: postfwd Architecture: all From 894bae2f8ca1a2cd126e6254e8846f2a60dc7f7c Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 23 Dec 2011 08:24:47 +0000 Subject: [PATCH 05/11] new changelog entry --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index da71b4d..03f9703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +postfwd (1.32-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 + postfwd (1.32-1) unstable; urgency=low * New upstream release From a18ff31a2697caf54f8a3424b2148f23dae1a15b Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:05:18 +0000 Subject: [PATCH 06/11] packaging format 3.0 (quilt) --- debian/README.source | 3 --- debian/changelog | 2 +- debian/compat | 2 +- debian/control | 2 +- debian/rules | 6 ++---- debian/source/format | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index f0fe49a..0000000 --- a/debian/README.source +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/debian/changelog b/debian/changelog index 03f9703..9032f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ postfwd (1.32-2) UNRELEASED; urgency=low - * NOT RELEASED YET + * Switch over to packaging format 3.0 (quilt) (Closes: #664409) -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 85cbbd2..dcaff42 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: postfwd Section: mail Priority: optional Maintainer: Jan Wagner -Build-Depends: debhelper (>= 5), dpatch +Build-Depends: debhelper (>= 9), dpatch Homepage: http://www.postfwd.org/ Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk diff --git a/debian/rules b/debian/rules index 9c09d4a..34a3c35 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +build: -build: patch-stamp - -clean: unpatch +clean: dh_testdir dh_testroot dh_clean diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) From 414c73aa104eaf8123f2e35818a68f40c34c8d41 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:07:13 +0000 Subject: [PATCH 07/11] bump standards to 3.9.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9032f0a..f004499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ postfwd (1.32-2) UNRELEASED; urgency=low * Switch over to packaging format 3.0 (quilt) (Closes: #664409) + * Updating standards version to 3.9.3, no changes needed -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 diff --git a/debian/control b/debian/control index dcaff42..8c157fa 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), dpatch Homepage: http://www.postfwd.org/ Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Package: postfwd Architecture: all From 65ebbf4ec2feffb7edb0cbee7fafd435902c0e8d Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:11:13 +0000 Subject: [PATCH 08/11] drop dpatch --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f004499..40119b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ postfwd (1.32-2) UNRELEASED; urgency=low * Switch over to packaging format 3.0 (quilt) (Closes: #664409) * Updating standards version to 3.9.3, no changes needed + * Remove build-dependency of dpatch -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 diff --git a/debian/control b/debian/control index 8c157fa..fa3da27 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: postfwd Section: mail Priority: optional Maintainer: Jan Wagner -Build-Depends: debhelper (>= 9), dpatch +Build-Depends: debhelper (>= 9) Homepage: http://www.postfwd.org/ Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk From 3591935d0e2e176753aea5d8d2eec287844a7df4 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:14:57 +0000 Subject: [PATCH 09/11] use dh_prep --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 40119b2..e9ef4e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ postfwd (1.32-2) UNRELEASED; urgency=low * Switch over to packaging format 3.0 (quilt) (Closes: #664409) * Updating standards version to 3.9.3, no changes needed * Remove build-dependency of dpatch + * Use dh_prep instead of dh_clean -k -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 diff --git a/debian/rules b/debian/rules index 34a3c35..a56d6f5 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep # install binaries install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd1 From 098742a9367a9b155159f9b18a4d1b53704aacf3 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:18:46 +0000 Subject: [PATCH 10/11] Add build-arch and build-indep --- debian/changelog | 1 + debian/rules | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e9ef4e8..f95600a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ postfwd (1.32-2) UNRELEASED; urgency=low * Updating standards version to 3.9.3, no changes needed * Remove build-dependency of dpatch * Use dh_prep instead of dh_clean -k + * Add build-arch and build-indep targets to debian/rules -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 diff --git a/debian/rules b/debian/rules index a56d6f5..46f9092 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: +build: build-arch build-indep +build-arch: +build-indep: clean: dh_testdir From 5859580fc0175afd0ce3a8f0f393e9394829753f Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 29 Mar 2012 18:23:47 +0000 Subject: [PATCH 11/11] prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f95600a..a321083 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -postfwd (1.32-2) UNRELEASED; urgency=low +postfwd (1.32-2) unstable; urgency=low * Switch over to packaging format 3.0 (quilt) (Closes: #664409) * Updating standards version to 3.9.3, no changes needed @@ -6,7 +6,7 @@ postfwd (1.32-2) UNRELEASED; urgency=low * Use dh_prep instead of dh_clean -k * Add build-arch and build-indep targets to debian/rules - -- Jan Wagner Fri, 23 Dec 2011 09:24:04 +0100 + -- Jan Wagner Thu, 29 Mar 2012 20:22:17 +0200 postfwd (1.32-1) unstable; urgency=low