Date: Thu, 22 Jan 2026 18:32:23 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Michael Grimm <trashcan@ellael.org> Subject: git: 01c5d9fe39a1 - main - sysutils/logwatch: Update 7.13 => 7.14 Message-ID: <69726d37.3f071.664e355c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=01c5d9fe39a1fb74e7f2de2ead7daf4beeefe906 commit 01c5d9fe39a1fb74e7f2de2ead7daf4beeefe906 Author: Michael Grimm <trashcan@ellael.org> AuthorDate: 2026-01-22 18:25:57 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-01-22 18:25:57 +0000 sysutils/logwatch: Update 7.13 => 7.14 Commit log: https://sourceforge.net/p/logwatch/git/ci/93cb38bb54f0ca12f4e792d9167993c9213e2c66/log/ - Remove no longer needed files/pkg-message.in and files/patch-scripts_services_postfix. - Optimize post-install-DOCS-on. PR: 292655 --- sysutils/logwatch/Makefile | 8 +--- sysutils/logwatch/distinfo | 6 +-- sysutils/logwatch/files/Makefile | 2 + .../logwatch/files/patch-scripts_services_postfix | 43 ---------------------- sysutils/logwatch/files/pkg-message.in | 24 ------------ sysutils/logwatch/pkg-plist | 4 ++ 6 files changed, 11 insertions(+), 76 deletions(-) diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile index 5600ae6ac26f..795b71ef70f1 100644 --- a/sysutils/logwatch/Makefile +++ b/sysutils/logwatch/Makefile @@ -1,6 +1,5 @@ PORTNAME= logwatch -DISTVERSION= 7.13 -PORTREVISION= 1 +DISTVERSION= 7.14 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${DISTVERSION} @@ -21,8 +20,6 @@ MAKE_ENV+= SITE_PERL_REL=${SITE_PERL_REL} NO_ARCH= yes NO_BUILD= yes -SUB_FILES= pkg-message - PORTDOCS= HOWTO-Customize-LogWatch README OPTIONS_DEFINE= DATEMANIP DOCS @@ -41,7 +38,6 @@ pre-configure: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/HOWTO-Customize-LogWatch ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/sysutils/logwatch/distinfo b/sysutils/logwatch/distinfo index ad7668fb216c..d50557116031 100644 --- a/sysutils/logwatch/distinfo +++ b/sysutils/logwatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753253303 -SHA256 (logwatch-7.13.tar.gz) = 0c9a10c2d8e5bc0cb10e16dc86c83be60d71d8a52b97bca785c64a30ed642839 -SIZE (logwatch-7.13.tar.gz) = 514042 +TIMESTAMP = 1769092363 +SHA256 (logwatch-7.14.tar.gz) = 2fc66eca83419053991484b7d6e778f46b03704ce778893473d7a9cb7dd915f9 +SIZE (logwatch-7.14.tar.gz) = 518727 diff --git a/sysutils/logwatch/files/Makefile b/sysutils/logwatch/files/Makefile index 319d76411983..cb2b538427b1 100644 --- a/sysutils/logwatch/files/Makefile +++ b/sysutils/logwatch/files/Makefile @@ -110,6 +110,7 @@ install: autorpm \ barracuda \ bfd \ + chronyd \ cisco \ citadel \ clam-update \ @@ -120,6 +121,7 @@ install: denyhosts \ dhcpd \ dirsrv \ + dnf5 \ dnf-automatic \ dnf-rpm \ dnssec \ diff --git a/sysutils/logwatch/files/patch-scripts_services_postfix b/sysutils/logwatch/files/patch-scripts_services_postfix deleted file mode 100644 index 969b829560cb..000000000000 --- a/sysutils/logwatch/files/patch-scripts_services_postfix +++ /dev/null @@ -1,43 +0,0 @@ ---- scripts/services/postfix.orig 2025-03-02 22:05:02 UTC -+++ scripts/services/postfix -@@ -61,7 +61,8 @@ our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d+)?)/ - our $re_QID; - - our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d+)?)/; --our $re_DDD = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, delays=[\d\/.]+)?(?:, dsn=[\d.]+)?)/; -+# postfix >= 3.11 will log TLS feature information in delivery status logging by default (tls=) -+our $re_DDD = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, delays=[\d\/.]+)?(?:, tls=[^,]*)?(?:, dsn=[\d.]+)?)/; - - #MODULE: ../Logreporters/Utils.pm - package Logreporters::Utils; -@@ -3287,14 +3288,30 @@ sys 0m3.005s - } - - ### sent, forwarded, bounced, softbounce, deferred, (un)deliverable -+ # -+ # postfix >= 3.11 will log TLS feature information in delivery status logging by default (tls=) -+ # modified $re_DDD detects the corresponding tls= part, now -+ # - elsif ($p1 =~ s/^to=<(.*?)>,(?: orig_to=<(.*?)>,)? relay=([^,]*).*, ($re_DDD), status=(\S+) //o) { - ($relay,$status) = ($3,$5); - - my ($to,$origto,$localpart,$domainpart,$dsn,$p1) = process_delivery_attempt ($1,$2,$4,$p1); - -+ my ($tlsfeatures) = $4 =~ /tls=([^,]+)/; -+ if ($tlsfeatures ne '') { -+ $domainpart = $domainpart . " (tls=" . $tlsfeatures . ")"; -+ } -+ -+ # postfix <= 3.10: -+ # - #TD 552B6C20E: to=<to@sample.com>, relay=mail.example.net[10.0.0.1]:25, delay=1021, delays=1020/0.04/0.56/0.78, dsn=2.0.0, status=sent (250 Ok: queued as 6EAC4719EB) - #TD 552B6C20E: to=<to@sample.com>, relay=mail.example.net[10.0.0.1]:25, conn_use=2 delay=1021, delays=1020/0.04/0.56/0.78, dsn=2.0.0, status=sent (250 Ok: queued as 6EAC4719EB) - #TD DD925BBE2: to=<to@example.net>, orig_to=<to-ext@example.net>, relay=mail.example.net[2001:dead:beef::1], delay=2, status=sent (250 Ok: queued as 5221227246) -+ # -+ # postfix >= 3.11: -+ # -+ #TD4d9bVw113Wz1SwX: to=<to@example.net>, relay=mail.example.org[10.0.01]:25, delay=3.2, delays=0.09/0.05/1.8/1.2, tls=dane, dsn=2.0.0, status=sent (250 OK id=1vLFwP-00000008xhU-3ZkI) -+ #TD4d9bVw113Wz1SwX: to=<to@example.net>, relay=mail.example.org[10.0.01]:25, delay=3.2, delays=0.09/0.05/1.8/1.2, tls=may, dsn=2.0.0, status=sent (250 OK id=1vLFwP-00000008xhU-3ZkI) - - ### sent - if ($status eq 'sent') { diff --git a/sysutils/logwatch/files/pkg-message.in b/sysutils/logwatch/files/pkg-message.in deleted file mode 100644 index f790792b32b1..000000000000 --- a/sysutils/logwatch/files/pkg-message.in +++ /dev/null @@ -1,24 +0,0 @@ -[ -{ - type: upgrade - message: <<EOM - -Important changes in logwatch-7.13: - - - temporary data is now stored in /var/cache/logwatch - (you can remove /usr/local/var/logwatch, now) - - - ability to deal with FBSD's <facility.severity> patterns in logfiles, if activated - - - improvement of the dovecot script and conf files - (allow granular detail options like the ones for postfix script) - - - postfix script detects modified 3.10+ log entries, now - -Important changes in logwatch-7.13_1: - - - postfix script detects 3.11+ TLS feature information in delivery status logging (tls=), now - -EOM -} -] diff --git a/sysutils/logwatch/pkg-plist b/sysutils/logwatch/pkg-plist index 8118f2dc6f91..0ed821abf1c6 100644 --- a/sysutils/logwatch/pkg-plist +++ b/sysutils/logwatch/pkg-plist @@ -71,6 +71,7 @@ %%ETCDIR%%/defaults/services/autorpm.conf %%ETCDIR%%/defaults/services/barracuda.conf %%ETCDIR%%/defaults/services/bfd.conf +%%ETCDIR%%/defaults/services/chronyd.conf %%ETCDIR%%/defaults/services/cisco.conf %%ETCDIR%%/defaults/services/citadel.conf %%ETCDIR%%/defaults/services/clam-update.conf @@ -83,6 +84,7 @@ %%ETCDIR%%/defaults/services/dirsrv.conf %%ETCDIR%%/defaults/services/dnf-automatic.conf %%ETCDIR%%/defaults/services/dnf-rpm.conf +%%ETCDIR%%/defaults/services/dnf5.conf %%ETCDIR%%/defaults/services/dnssec.conf %%ETCDIR%%/defaults/services/dovecot.conf %%ETCDIR%%/defaults/services/dpkg.conf @@ -204,6 +206,7 @@ libexec/logwatch/defaults/services/automount libexec/logwatch/defaults/services/autorpm libexec/logwatch/defaults/services/barracuda libexec/logwatch/defaults/services/bfd +libexec/logwatch/defaults/services/chronyd libexec/logwatch/defaults/services/cisco libexec/logwatch/defaults/services/citadel libexec/logwatch/defaults/services/clam-update @@ -216,6 +219,7 @@ libexec/logwatch/defaults/services/dhcpd libexec/logwatch/defaults/services/dirsrv libexec/logwatch/defaults/services/dnf-automatic libexec/logwatch/defaults/services/dnf-rpm +libexec/logwatch/defaults/services/dnf5 libexec/logwatch/defaults/services/dnssec libexec/logwatch/defaults/services/dovecot libexec/logwatch/defaults/services/dpkghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69726d37.3f071.664e355c>