From d8295ec9b758e079ca00051f5cbdf81f186e657d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20H=C3=B6xter?= Date: Sat, 4 Apr 2020 19:56:06 +0200 Subject: [PATCH 01/11] Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberland for the fix. (Closes: 955627) --- debian/changelog | 8 ++++++++ debian/patches/postscreen-rejects | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c4ec2..c85c3fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pflogsumm (1.1.5-6) UNRELEASED; urgency=medium + + * Update postscreen-rejects patch with a fix for IPv6 + addresses. Kudos to Juri Haberland + for the fix. (Closes: 955627) + + -- Sven Hoexter Sat, 04 Apr 2020 19:46:48 +0200 + pflogsumm (1.1.5-5) unstable; urgency=medium * Add patch to count milter rejects provided by Matus Uhlar. diff --git a/debian/patches/postscreen-rejects b/debian/patches/postscreen-rejects index 74e56fd..a04f91b 100644 --- a/debian/patches/postscreen-rejects +++ b/debian/patches/postscreen-rejects @@ -1,4 +1,4 @@ -Index: pflogsumm.pl +Index: pflogsumm/pflogsumm.pl =================================================================== --- pflogsumm.orig/pflogsumm.pl +++ pflogsumm/pflogsumm.pl @@ -20,7 +20,8 @@ Index: pflogsumm.pl + unless((($domain, $ipAddr) = /^([^\[]*)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2|| + (($domain, $ipAddr) = /^([^\/]*)\/([0-9a-f.:]+)/i) == 2) { # more exhaustive method - ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/; +- ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/; ++ ($domain, $ipAddr) = /^([^\[\(\/]*)[\[\(\/]([^\]\)]+)[\]\)]:?\d*$/; } # "mach.host.dom"/"mach.host.do.co" to "host.dom"/"host.do.co" -- 2.39.2 From 64fad7b9045696bda526f5813317071b1c9a47a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20H=C3=B6xter?= Date: Thu, 9 Apr 2020 14:34:46 +0200 Subject: [PATCH 02/11] Update packaging to use source format 3.0 --- debian/README.source | 3 --- debian/changelog | 3 +++ debian/control | 3 +-- debian/gbp.conf | 1 + debian/rules | 2 +- debian/source/format | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 3d5f55c..0000000 --- a/debian/README.source +++ /dev/null @@ -1,3 +0,0 @@ -This package uses quilt to manage the patches in debian/patches. -For further information please install the quilt package and read -/usr/share/doc/quilt/README.source. diff --git a/debian/changelog b/debian/changelog index c85c3fa..10f699a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ pflogsumm (1.1.5-6) UNRELEASED; urgency=medium * Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberland for the fix. (Closes: 955627) + * Migrate from source format 1.0 to 3.0 (quilt). + * Define cleaner for git buildpackage. + * Update to Standards-Version 4.5.0 - no changes. -- Sven Hoexter Sat, 04 Apr 2020 19:46:48 +0200 diff --git a/debian/control b/debian/control index 394f48e..901ad68 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,8 @@ Source: pflogsumm Section: admin Priority: optional Maintainer: Sven Hoexter -Build-Depends-Indep: quilt Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Homepage: http://jimsun.linxnet.com/postfix_contrib.html Vcs-Git: https://git.sven.stormbind.net/pflogsumm.git Vcs-Browser: https://git.sven.stormbind.net/?p=sven/pflogsumm.git diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..0e094c9 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,3 @@ [DEFAULT] pristine-tar = True +cleaner = fakeroot debian/rules clean diff --git a/debian/rules b/debian/rules index de4566b..5ede039 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ --with quilt + dh $@ override_dh_auto_install: install --mode=755 pflogsumm.pl debian/pflogsumm/usr/sbin/pflogsumm 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) -- 2.39.2 From 725f743e4646978c32df378ea2ec2b7cd12ff287 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20H=C3=B6xter?= Date: Thu, 9 Apr 2020 15:03:01 +0200 Subject: [PATCH 03/11] releasing package pflogsumm version 1.1.5-6 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 10f699a..4968271 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -pflogsumm (1.1.5-6) UNRELEASED; urgency=medium +pflogsumm (1.1.5-6) unstable; urgency=medium * Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberland - for the fix. (Closes: 955627) + for the fix. (Closes: #955627) * Migrate from source format 1.0 to 3.0 (quilt). * Define cleaner for git buildpackage. * Update to Standards-Version 4.5.0 - no changes. - -- Sven Hoexter Sat, 04 Apr 2020 19:46:48 +0200 + -- Sven Hoexter Thu, 09 Apr 2020 15:02:41 +0200 pflogsumm (1.1.5-5) unstable; urgency=medium -- 2.39.2 From cf3df17037df6c2fb1eeb1e441aa6bdaa5fc7d0d Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 11 Apr 2020 13:12:52 +0200 Subject: [PATCH 04/11] releasing package pflogsumm version 1.1.5-7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4968271..1d8d663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pflogsumm (1.1.5-7) unstable; urgency=medium + + * Re-Release for a source only upload. Package is unchanged. + + -- Sven Hoexter Sat, 11 Apr 2020 13:12:19 +0200 + pflogsumm (1.1.5-6) unstable; urgency=medium * Update postscreen-rejects patch with a fix for IPv6 -- 2.39.2 From 4836e4ef662ca668c01ad388683bfd199c5e4c87 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:08:43 +0100 Subject: [PATCH 05/11] Fix milter-rejects patch regex. Kudos to Andreas Jaggi for the report and patch. (Closes: #1027829) --- debian/changelog | 7 +++++++ debian/patches/milter-rejects | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1d8d663..70fb577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pflogsumm (1.1.5-8) UNRELEASED; urgency=medium + + * Fix regex in milter-rejects patch. Kudos to Andreas Jaggi + for the report and patch. (Closes: #1027829) + + -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 + pflogsumm (1.1.5-7) unstable; urgency=medium * Re-Release for a source only upload. Package is unchanged. diff --git a/debian/patches/milter-rejects b/debian/patches/milter-rejects index 2e15cca..b03d9aa 100644 --- a/debian/patches/milter-rejects +++ b/debian/patches/milter-rejects @@ -7,7 +7,7 @@ Index: pflogsumm/pflogsumm.pl # regexp rejects happen in "cleanup" if($cmd eq "cleanup" && (my($rejSubTyp, $rejReas, $rejRmdr) = $logRmdr =~ - /\/cleanup\[\d+\]: .*?\b(reject|warning|hold|discard): (header|body) (.*)$/) == 3) -+ /\/cleanup\[\d+\]: .*?\b((?:milter-)reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3) ++ /\/cleanup\[\d+\]: .*?\b((?:milter-)?reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3) { $rejRmdr =~ s/( from \S+?)?; from=<.*$// unless($opts{'verbMsgDetail'}); $rejRmdr = string_trimmer($rejRmdr, 64, $opts{'verbMsgDetail'}); -- 2.39.2 From 0798fc0dd3b3197bdd756dc3f438c6c37732a107 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:12:20 +0100 Subject: [PATCH 06/11] Update debian/copyright for 2023. --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 70fb577..2356b8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium * Fix regex in milter-rejects patch. Kudos to Andreas Jaggi for the report and patch. (Closes: #1027829) + * Update debian/copyright for 2023. -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 diff --git a/debian/copyright b/debian/copyright index 749ca99..dd05877 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ Upstream Author: James S. Seymour Copyright: The debian directory of this package is -Copyright 2010-2018 Sven Hoexter +Copyright 2010-2023 Sven Hoexter All of the programs, applications, and utilities (hereinafter referred to as "programs") are Copyright (C) 1998-2010 James S. Seymour. -- 2.39.2 From 1a04a5af6f776bd966852438b662f5d6efe0e178 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:13:29 +0100 Subject: [PATCH 07/11] Increase debhelper compat level from v12 to v13. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2356b8b..1e953bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium * Fix regex in milter-rejects patch. Kudos to Andreas Jaggi for the report and patch. (Closes: #1027829) * Update debian/copyright for 2023. + * Increase debhelper compat level from v12 to v13. -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 diff --git a/debian/control b/debian/control index 901ad68..8b7ca73 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pflogsumm Section: admin Priority: optional Maintainer: Sven Hoexter -Build-Depends: debhelper-compat (= 12) +Build-Depends: debhelper-compat (= 13) Standards-Version: 4.5.0 Homepage: http://jimsun.linxnet.com/postfix_contrib.html Vcs-Git: https://git.sven.stormbind.net/pflogsumm.git -- 2.39.2 From d9729f40b583e241e1b8f312936b9a24ecaacee2 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:14:15 +0100 Subject: [PATCH 08/11] Update Standards-Version to 4.6.2, no changes required. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1e953bc..8248670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium for the report and patch. (Closes: #1027829) * Update debian/copyright for 2023. * Increase debhelper compat level from v12 to v13. + * Update Standards-Version to 4.6.2, no changes required. -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 diff --git a/debian/control b/debian/control index 8b7ca73..fcf32e1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Sven Hoexter Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Homepage: http://jimsun.linxnet.com/postfix_contrib.html Vcs-Git: https://git.sven.stormbind.net/pflogsumm.git Vcs-Browser: https://git.sven.stormbind.net/?p=sven/pflogsumm.git -- 2.39.2 From ff971d41d83692a42c7ca363d67f1b9162f83343 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:15:04 +0100 Subject: [PATCH 09/11] Add Rules-Requires-Root: no in debian/control. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8248670..0adc0d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium * Update debian/copyright for 2023. * Increase debhelper compat level from v12 to v13. * Update Standards-Version to 4.6.2, no changes required. + * Add Rules-Requires-Root: no in debian/control. -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 diff --git a/debian/control b/debian/control index fcf32e1..3d56ce8 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Sven Hoexter Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.2 +Rules-Requires-Root: no Homepage: http://jimsun.linxnet.com/postfix_contrib.html Vcs-Git: https://git.sven.stormbind.net/pflogsumm.git Vcs-Browser: https://git.sven.stormbind.net/?p=sven/pflogsumm.git -- 2.39.2 From 35ffcf634d67cdc433fe400024028a8bef059cf7 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:36:09 +0100 Subject: [PATCH 10/11] Update debian/watch file to version 4. --- debian/changelog | 1 + debian/watch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0adc0d8..4526e8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium * Increase debhelper compat level from v12 to v13. * Update Standards-Version to 4.6.2, no changes required. * Add Rules-Requires-Root: no in debian/control. + * Update debian/watch file to version 4. -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 diff --git a/debian/watch b/debian/watch index 4bd14ca..60da2b2 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=3 -ftp://jimsun.linxnet.com/pub/postfix_contrib/pflogsumm-([\d\.]+)\.tar\.gz +version=4 +ftp://jimsun.linxnet.com/pub/postfix_contrib/pflogsumm-@ANY_VERSION@@ARCHIVE_EXT@ -- 2.39.2 From 2362a871634e3839413af8b56fcea5e7116a225d Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 4 Jan 2023 13:36:44 +0100 Subject: [PATCH 11/11] releasing package pflogsumm version 1.1.5-8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4526e8e..90682e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pflogsumm (1.1.5-8) UNRELEASED; urgency=medium +pflogsumm (1.1.5-8) unstable; urgency=medium * Fix regex in milter-rejects patch. Kudos to Andreas Jaggi for the report and patch. (Closes: #1027829) @@ -8,7 +8,7 @@ pflogsumm (1.1.5-8) UNRELEASED; urgency=medium * Add Rules-Requires-Root: no in debian/control. * Update debian/watch file to version 4. - -- Sven Hoexter Wed, 04 Jan 2023 13:08:05 +0100 + -- Sven Hoexter Wed, 04 Jan 2023 13:36:16 +0100 pflogsumm (1.1.5-7) unstable; urgency=medium -- 2.39.2