From: Sven Hoexter Date: Wed, 4 Jan 2023 12:36:44 +0000 (+0100) Subject: releasing package pflogsumm version 1.1.5-8 X-Git-Tag: debian/1.1.5-8^0 X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=commitdiff_plain;h=HEAD;hp=b0f4f9469a2a1e26a25048fc9f82adb3af22f170 releasing package pflogsumm version 1.1.5-8 --- 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 e4c4ec2..90682e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +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) + * 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. + * Update debian/watch file to version 4. + + -- Sven Hoexter Wed, 04 Jan 2023 13:36:16 +0100 + +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 + 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 Thu, 09 Apr 2020 15:02:41 +0200 + pflogsumm (1.1.5-5) unstable; urgency=medium * Add patch to count milter rejects provided by Matus Uhlar. diff --git a/debian/control b/debian/control index 394f48e..3d56ce8 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: pflogsumm Section: admin Priority: optional Maintainer: Sven Hoexter -Build-Depends-Indep: quilt -Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.3.0 +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 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. 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/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'}); 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" 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) 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@