From nobody Fri Nov 21 23:03:13 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCrNd5RDbz6HvSL for ; Fri, 21 Nov 2025 23:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCrNd2NQJz4DZ3 for ; Fri, 21 Nov 2025 23:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763766193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6GzoLtgetUkVMo7DVHs+i1fU94AL+WmFvzpk9uIX1s=; b=x78s8cdOjPfoVcVQcmnTW189r/GVrJ3sxWvZZ3fO21ot3e4o+oxST//hYcpcG2fHUTEju/ XtEhjCnpVs0zClWXg8YvtM9IhhFoAxq+HdjF8EYtzfKt2U63TYMMj0var5uQ9Iec74ff8l Tswpp9T8wm6mfjoKimPn85jdwBKkYowBm1Lyzp2H7V/+owg1jzfN3X/ZsEpojkBCLy0PSR 3k/bJxf9er9PuFLbnrNe4g+eY9t+gIVaOlcS8OpY5/klIZLNdiRuYem2D7bYu0f0izKRqV 6hLdJbczQZ9+/wQ7AAT7+rwHhxLIxHWIT6hYbE+DWCr+mcZ9Ts/JNGhK+8xZcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763766193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6GzoLtgetUkVMo7DVHs+i1fU94AL+WmFvzpk9uIX1s=; b=mSjpvDKRCrvBqRWf6KDb2hbq9cSlRitpqANYBQB+cG1zxnn044zX5mpyoy6aCibZNQV2ea b03b1kE8YGrh/kGYLDUUkKIJ9yc6n1RsT0nqiXSzHxfD5g97nV2Z3WxeSetM3ZxRMB738M 8O3myurhSddEyr7IH+ED8nUFuC8D9ewcGfclhhdAR37G6arck1IzgMcR4VNbZ4WT4gquT5 CH5XqaUYBiW801ezIFGKQVNhGoQ61B4UJ+4Blqn7uYsb/QzI5uIY55d7lAZ4vmCzIgxaBo Of8Prmo1rLys5kJVW7fDnhmuFFjWTSsEeotdT9LtbE8M5D94oEz+qKPpsMdUBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763766193; a=rsa-sha256; cv=none; b=r3CRl7fTjhmHrKedfADX82ZWoSmoJO/0qn6IjuoWjVb2SnpaX0GLKKbK0BTuQoak+Kl+G3 Ng/INA1x5CtdowPPbXLOhZ9huEa6o6wWja/yVPdI0Ss+8z7ka6R7pqiiIZGzb2Tw0PAeOx JLE4plcqURrDrISy1X3HKshsWRh3SLBGLHII2THG8qmmJZlEcyrWkKgEXhGxjIXjVQlQ8r NL/5bKr9LtsSLwveDls18AUvUjr6RzWtqGdKSZEUAVgew4/25geV4h4flcyt8SKNyJ/Fsu usmKQTuthGAowh0mLgZG5T5WM8lzpLAxMX0QocTDXVSrEo504lt89QryHnh9qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCrNd1rD5zYgD for ; Fri, 21 Nov 2025 23:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 94b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 23:03:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Michael Grimm From: Vladimir Druzenko Subject: git: a82b06f2fce1 - main - sysutils/logwatch: Add support of the upcoming postfix 3.11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a82b06f2fce175f9377c7008895a5a453c4c8626 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 23:03:13 +0000 Message-Id: <6920efb1.94b6.1748b27@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a82b06f2fce175f9377c7008895a5a453c4c8626 commit a82b06f2fce175f9377c7008895a5a453c4c8626 Author: Michael Grimm AuthorDate: 2025-11-21 22:59:08 +0000 Commit: Vladimir Druzenko CommitDate: 2025-11-21 23:03:09 +0000 sysutils/logwatch: Add support of the upcoming postfix 3.11 - The upcoming postfix 3.11 stable and next postfix-current version will break the postfix service script: https://www.postfix.org/postconf.5.html#smtp_log_tls_feature_status - A patched postfix service script will deal with old and new status report lines. - This patch has been reported upstream: https://sourceforge.net/p/logwatch/patches/95/ - Patch has been tested with a logfiles from past 360 days. - files/pkg-message.in has been updated accordingly. PR: 291130 --- sysutils/logwatch/Makefile | 1 + .../logwatch/files/patch-scripts_services_postfix | 43 ++++++++++++++++++++++ sysutils/logwatch/files/pkg-message.in | 4 ++ 3 files changed, 48 insertions(+) diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile index c9f09d893f6e..5600ae6ac26f 100644 --- a/sysutils/logwatch/Makefile +++ b/sysutils/logwatch/Makefile @@ -1,5 +1,6 @@ PORTNAME= logwatch DISTVERSION= 7.13 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${DISTVERSION} diff --git a/sysutils/logwatch/files/patch-scripts_services_postfix b/sysutils/logwatch/files/patch-scripts_services_postfix new file mode 100644 index 000000000000..969b829560cb --- /dev/null +++ b/sysutils/logwatch/files/patch-scripts_services_postfix @@ -0,0 +1,43 @@ +--- 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=, 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=, 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=, orig_to=, relay=mail.example.net[2001:dead:beef::1], delay=2, status=sent (250 Ok: queued as 5221227246) ++ # ++ # postfix >= 3.11: ++ # ++ #TD4d9bVw113Wz1SwX: to=, 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=, 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 index c885cea0b304..f790792b32b1 100644 --- a/sysutils/logwatch/files/pkg-message.in +++ b/sysutils/logwatch/files/pkg-message.in @@ -15,6 +15,10 @@ Important changes in logwatch-7.13: - 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 } ]