New upstream version 1.2.1

diff --git a/ChangeLog b/ChangeLog
index 110f13df94dbc2a28c0b0f2cfd9e0342d40b3da9..4bae11089eb09052caef8ea29bfb367376c3dcd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,32 @@ ChangeLog for pflogsumm
      feed for update notifications.]
 
 
+rel-1.2.1      20260422
+
+    This release begins the next Beta cycle following the 1.2.0 Production
+    release.
+
+    Minor reject messages improvement: Now includes client domain or IP
+    address in "Sender address rejected..." reports and --rej-add-to will
+    add the intended destination address.
+
+rel-1.2.0      20260422
+
+    This release promotes 1.1.15 from Beta to Production status; no code
+    changes have been made since that version.
+
+    The changes since 1.1.6, the last Production release, are substantive,
+    including:
+
+        - Config-file support
+        - Enhanced TLS reporting
+        - Improved parsing accuracy
+       - Codebase refactoring for improved maintainability and robustness
+        - Numerous usability improvements
+
+    The only other difference with this release is the addition of a
+    LICENSE file.
+
 rel-1.1.15     20260313
 
     Breaking Changes
@@ -53,8 +79,8 @@ rel-1.1.15    20260313
 
        Added --ssl-tls-stats to report
 
-           • SMTP TLS stats
-           • SMTPD TLS/SSL errors
+           - SMTP TLS stats
+           - SMTPD TLS/SSL errors
 
            by remote host.
 
@@ -66,7 +92,7 @@ rel-1.1.15    20260313
     Several reports (messages expired, deferrals, others) now list only
     FQDNs, rather than FQDNs and associated IP addresses, for reduced noise.
 
-    Major refactoring—eliminating no-op branches, duplicated code,
+    Major refactoring--eliminating no-op branches, duplicated code,
     questionable logic, and streamlining many regular expressions.
     Extensive regression testing revealed no change in report output
     beyond what's noted above.
@@ -269,7 +295,7 @@ rel-1.1.8   20250525
 
        I *suspect* that, with an earlier fix I applied, that undefined
        value will no longer occur, but this fix certainly won't hurt
-       anything—just in case.
+       anything--just in case.
 
     Added -srs-mung option. Thanks and a tip o' the hat to Tom Hendrikx
     (tom-at-whyscreem-dot-net) for the contribution.
@@ -367,7 +393,7 @@ rel-1.1.6   20250522
     Now matches "traditional" log date strings with either leading space
     or leading zero on single-digit days. (Debian bug report 1068425)
 
-    Improvement to "unprocessed" debugging code—used for maintenance only.
+    Improvement to "unprocessed" debugging code--used for maintenance only.
 
 rel-1.1.5      20120205
 

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..41a1ccf
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+
+                             LICENSE
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You may have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+    USA.
+    
+    An on-line copy of the GNU General Public License can be found
+    http://www.fsf.org/copyleft/gpl.html.
+

diff --git a/pffrombyto.1 b/pffrombyto.1
index f86816993dc7091671667258c7cea1c42a974673..ecba53e56f90b5c34e68f92354eeda520b73a7c7 100644 (file)
--- a/pffrombyto.1
+++ b/pffrombyto.1
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PFFROMBYTO 1"
-.TH PFFROMBYTO 1 2025-05-22 1.1.15 "User Contributed Perl Documentation"
+.TH PFFROMBYTO 1 2025-05-22 1.2.1 "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/pflogsumm b/pflogsumm
index 7e6fe963890c47be938a38cf91ebe751501bb3de..40bb5a1f61e230088e53ed58f8fccbc7368bb5e9 100755 (executable)
--- a/pflogsumm
+++ b/pflogsumm
@@ -6,7 +6,7 @@ eval 'exec perl -S $0 "$@"'
 
 pflogsumm - Produce Postfix MTA logfile summary
 
-Copyright (C) 1998-2025 by James S. Seymour, Release 1.1.15
+Copyright (C) 1998-2026 by James S. Seymour, Release 1.2.1
 
 =head1 SYNOPSIS
     pflogsumm [--config <file>] [--bounce-detail <cnt>] [--colwidth <n>]
@@ -581,7 +581,7 @@ eval { require Config::Simple };
 my $haveConfigSimple = $@ ? 0 : 1;
 
 my $mailqCmd = "mailq";
-my $release = "1.1.15";
+my $release = "1.2.1";
 
 # Used for regression testing, so new features can be selectively
 # disabled.
@@ -2658,8 +2658,13 @@ sub proc_smtpd_reject {
     if($rejReas =~ m/^Sender address rejected:/) {
        # Sender address rejected: Domain not found
        # Sender address rejected: need fully-qualified address
-       my $rejData = $from;
-       $rejData .= "  ($to)" if($opts{'rej-add-to'} && $to);
+       my $rejData;
+       $rejData = gimme_domain($rejFrom) if $rejFrom;
+       if($opts{'rej-add-to'}) {
+           $rejData .= " ($from -> $to)" if($opts{'rej-add-to'} && $to);
+       } else {
+           $rejData .= " (<$from)";
+       }
        ++$rejects->{$rejTyp}{$rejReas}{$rejData};
     } elsif($rejReas =~ m/^(Recipient address rejected:|User unknown( |$))/) {
        # Recipient address rejected: Domain not found

diff --git a/pflogsumm.1 b/pflogsumm.1
index ae8ec55ff196f7f55fd40cb15e5e57a21794147d..1d9f39221e183b8fcf36ed5489d3de51b239a3e1 100644 (file)
--- a/pflogsumm.1
+++ b/pflogsumm.1
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PFLOGSUMM 1"
-.TH PFLOGSUMM 1 2026-03-13 1.1.15 "User Contributed Perl Documentation"
+.TH PFLOGSUMM 1 2026-04-22 1.2.1 "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -63,7 +63,7 @@
 .SH NAME
 pflogsumm \- Produce Postfix MTA logfile summary
 .PP
-Copyright (C) 1998\-2025 by James S. Seymour, Release 1.1.15
+Copyright (C) 1998\-2026 by James S. Seymour, Release 1.2.1
 .SH "SYNOPSIS pflogsumm [\-\-config <file>] [\-\-bounce\-detail <cnt>] [\-\-colwidth <n>] [\-d|\-\-date\-range <date [range]>] [\-\-deferral\-detail <cnt>] [\-\-detail <cnt>] [\-\-dow0mon] [\-e|\-\-extended\-detail] [\-\-expired\-detail <cnt>] [\-h|\-\-host\-cnt <cnt>] [\-i|\-\-ignore\-case] [\-\-iso\-date\-time] [\-m|\-\-uucp\-mung] [\-\-mailq] [\-\-no\-no\-msg\-size] [\-\-problems\-first] [\-\-pscrn\-detail <cnt>] [\-\-pscrn\-stats] [\-q|\-\-quiet] [\-\-rej\-add\-from] [\-\-rej\-add\-to] [\-\-reject\-detail <cnt>] [\-\-smtpd\-stats] [\-\-srs\-mung] [\-\-ssl\-tls\-stats] [\-\-syslog\-name <string>] [\-u|\-\-user\-cnt <cnt>] [\-\-unprocd\-file <filename>] [\-\-use\-orig\-to] [\-\-verbose\-msg\-detail] [\-\-verp\-mung [n]] [\-\-warning\-detail <cnt>] [\-x|\-\-debug <file>] [\-\-zero\-fill] [file1 [filen]]"
 .IX Header "SYNOPSIS pflogsumm [--config <file>] [--bounce-detail <cnt>] [--colwidth <n>] [-d|--date-range <date [range]>] [--deferral-detail <cnt>] [--detail <cnt>] [--dow0mon] [-e|--extended-detail] [--expired-detail <cnt>] [-h|--host-cnt <cnt>] [-i|--ignore-case] [--iso-date-time] [-m|--uucp-mung] [--mailq] [--no-no-msg-size] [--problems-first] [--pscrn-detail <cnt>] [--pscrn-stats] [-q|--quiet] [--rej-add-from] [--rej-add-to] [--reject-detail <cnt>] [--smtpd-stats] [--srs-mung] [--ssl-tls-stats] [--syslog-name <string>] [-u|--user-cnt <cnt>] [--unprocd-file <filename>] [--use-orig-to] [--verbose-msg-detail] [--verp-mung [n]] [--warning-detail <cnt>] [-x|--debug <file>] [--zero-fill] [file1 [filen]]"
 .Vb 1

diff --git a/pftobyfrom.1 b/pftobyfrom.1
index e26668a9c1a7618a1e257a3367cb185698ce5e52..46ea7b026d1c7ccdc6cbef144ee4080ff5c34ca1 100644 (file)
--- a/pftobyfrom.1
+++ b/pftobyfrom.1
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PFTOBYFROM 1"
-.TH PFTOBYFROM 1 2025-05-22 1.1.15 "User Contributed Perl Documentation"
+.TH PFTOBYFROM 1 2025-05-22 1.2.1 "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l