[packages/pflogsumm] - up to 1.1.6

[mrozowik]

commit cff9b4f0967bfe68b25cc0a93031e0092eb3d156
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Wed Feb 25 14:07:23 2026 +0000

    - up to 1.1.6

 pflogsumm-amavis-rejects.patch | 18 +++++++++---------
 pflogsumm.spec                 | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/pflogsumm.spec b/pflogsumm.spec
index e9fd3b9..e28a34e 100644
--- a/pflogsumm.spec
+++ b/pflogsumm.spec
@@ -1,12 +1,12 @@
 Summary:	Postfix log entry summarizer
 Summary(pl.UTF-8):	Analizator logów Postfiksa
 Name:		pflogsumm
-Version:	1.1.3
+Version:	1.1.6
 Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://jimsun.linxnet.com/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	5e3fb28dfb5b7f4a8b6b9bf2abde9542
+# Source0-md5:	7b919a8d07f69dcd62dd9f3e2fb3b702
 Source1:	%{name}.sysconfig
 Source2:	%{name}.cron
 Patch0:		%{name}-amavis-rejects.patch
@@ -32,10 +32,12 @@ Postfix.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1,/etc/{cron.daily,sysconfig}}
 
-install pflogsumm.pl $RPM_BUILD_ROOT%{_sbindir}
-install pflogsumm.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install {pffrombyto,pflogsumm,pftobyfrom} $RPM_BUILD_ROOT%{_sbindir}
+install {pffrombyto.1,pflogsumm.1,pftobyfrom.1} $RPM_BUILD_ROOT%{_mandir}/man1
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/00-%{name}
+# backward filename compatibility
+ln -s pflogsumm $RPM_BUILD_ROOT%{_sbindir}/pflogsumm.pl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog pflogsumm-faq.txt README ToDo
-%attr(755,root,root) %{_sbindir}/pflogsumm.pl
+%attr(755,root,root) %{_sbindir}/pffrombyto
+%attr(755,root,root) %{_sbindir}/pflogsumm
+%{_sbindir}/pflogsumm.pl
+%attr(755,root,root) %{_sbindir}/pftobyfrom
 %attr(750,root,root) /etc/cron.daily/00-%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %{_mandir}/man1/*
diff --git a/pflogsumm-amavis-rejects.patch b/pflogsumm-amavis-rejects.patch
index 204fd21..d87ddd3 100644
--- a/pflogsumm-amavis-rejects.patch
+++ b/pflogsumm-amavis-rejects.patch
@@ -1,19 +1,19 @@
---- pflogsumm-1.1.0/pflogsumm.pl.orig	2003-12-12 15:40:19.000000000 +0100
-+++ pflogsumm-1.1.0/pflogsumm.pl	2005-09-09 13:43:06.930343120 +0200
-@@ -1510,6 +1510,8 @@
- 	    $rejReas =~ s/(Client host|Sender address) .+? blocked/blocked/o;
+--- pflogsumm-1.1.6/pflogsumm~	2025-05-22 18:57:37.000000000 +0000
++++ pflogsumm-1.1.6/pflogsumm	2026-02-25 13:51:56.598001231 +0000
+@@ -1667,6 +1667,8 @@
+ 	    $rejReas =~ s/(client|Client host|Sender address) .+? blocked/blocked/;
  	} elsif($rejTyp eq "MAIL") {	# *more* special treatment :-( grrrr...
- 	    $rejReas =~ s/^\d{3} (?:<.+>: )?([^;:]+)[;:]?.*$/$1/o;
+ 	    $rejReas =~ s/^\d{3} (?:<.+>: )?([^;:]+)[;:]?.*$/$1/;
 +	} elsif($rejTyp eq "END-OF-MESSAGE") {
-+	    $rejReas =~ s/^(\d{3} [\d\. ]*Message content rejected, .*)[:,].*/$1/o;
++	    $rejReas =~ s/^(\d{3} [\d\. ]*Message content rejected, .*)[:,].*/$1/;
  	} else {
- 	    $rejReas =~ s/^(?:.*[:;] )?([^,]+).*$/$1/o;
+ 	    $rejReas =~ s/^(?:.*[:;] )?([^,]+).*$/$1/;
  	}
-@@ -1559,6 +1563,10 @@
+@@ -1718,6 +1720,10 @@
  	my $rejData = gimme_domain($rejFrom);
  	$rejData .= "  ($from)" if($rejAddFrom);
  	++$rejects->{$rejTyp}{$rejReas}{$rejData};
-+    } elsif($rejReas =~ s/^(\d{3} [\d\. ]*Message content rejected, .*)[:,].*/$1/o) {
++    } elsif($rejReas =~ s/^(\d{3} [\d\. ]*Message content rejected, .*)[:,].*/$1/) {
 +	my $rejData = gimme_domain($rejFrom);
 +	$rejData .= "  ($from)" if($rejAddFrom);
 +	++$rejects->{$rejTyp}{$rejReas}{$rejData};
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pflogsumm.git/commitdiff/cff9b4f0967bfe68b25cc0a93031e0092eb3d156