On 8/16/24 8:19 AM, Rupert Gallagher wrote:
This is the new code:https://github.com/fastmail/authentication_milter Please pinch Giovanni Bechis.
WIP update to latest version and drop maintainership since I no longer use this. Tests are not working yet since we lack Lock::File (at least). Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-Milter-Authentication/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile 8 Nov 2022 11:14:50 -0000 1.8
+++ Makefile 23 Aug 2024 14:27:28 -0000
@@ -1,12 +1,8 @@
COMMENT = perl implementation of email authentication standards
-V = 1.1.0
-DISTNAME = Mail-Milter-Authentication-v${V}
-PKGNAME = p5-Mail-Milter-Authentication-${V}
+V = 3.20240701
+DISTNAME = Mail-Milter-Authentication-${V}
CATEGORIES = mail
-REVISION = 3
-
-MAINTAINER = Giovanni Bechis <giova...@openbsd.org>
# Perl
PERMIT_PACKAGE = Yes
@@ -16,6 +12,7 @@ MODULES = cpan
SUBST_VARS = VARBASE
pre-configure:
${SUBST_CMD} ${WRKSRC}/bin/authentication_milter
+ find ${WRKBUILD} -type f -name '*${PATCHORIG}' -delete
CONFIGURE_STYLE = modinst
@@ -27,10 +24,15 @@ RUN_DEPENDS = devel/p5-List-MoreUtils \
mail/p5-Mail-SPF \
sysutils/p5-Proc-ProcessTable
-TEST_DEPENDS = devel/p5-Test-CheckManifest \
+TEST_DEPENDS = converters/p5-JSON-XS \
+ devel/p5-App-Cmd \
+ devel/p5-File-Slurp \
+ devel/p5-Import-Into \
+ devel/p5-Test-CheckManifest \
devel/p5-Test-File-Contents \
devel/p5-Test-Perl-Critic \
devel/p5-Test-Pod \
- devel/p5-Test-Pod-Coverage
+ devel/p5-Test-Pod-Coverage \
+ devel/p5-TOML
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-Milter-Authentication/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 2 Sep 2016 12:25:36 -0000 1.2
+++ distinfo 23 Aug 2024 14:27:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (Mail-Milter-Authentication-v1.1.0.tar.gz) = 6yVd+pgHndVkSonEtEhYHJjly4exxQktSFtXnkfTcmU=
-SIZE (Mail-Milter-Authentication-v1.1.0.tar.gz) = 84104
+SHA256 (Mail-Milter-Authentication-3.20240701.tar.gz) = ZGWZcA02pRKGzMDHITMIUx0O2k6+DaZgldWvrGAvsJc=
+SIZE (Mail-Milter-Authentication-3.20240701.tar.gz) = 251471
Index: patches/patch-bin_authentication_milter
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-Milter-Authentication/patches/patch-bin_authentication_milter,v
diff -u -p -r1.3 patch-bin_authentication_milter
--- patches/patch-bin_authentication_milter 11 Mar 2022 19:34:49 -0000 1.3
+++ patches/patch-bin_authentication_milter 23 Aug 2024 14:27:28 -0000
@@ -1,7 +1,8 @@
---- bin/authentication_milter.orig Thu Sep 10 05:37:11 2015
-+++ bin/authentication_milter Wed Apr 27 15:57:09 2016
-@@ -14,7 +14,7 @@ use Module::Load;
- use Pod::Usage;
+Index: bin/authentication_milter
+--- bin/authentication_milter.orig
++++ bin/authentication_milter
+@@ -15,7 +15,7 @@ use Mail::Milter::Authentication::Protocol::Milter;
+ use Mail::Milter::Authentication::Protocol::SMTP;
# CONFIG
-my $pid_file = '/run/authentication_milter.pid';
@@ -9,8 +10,8 @@
my $daemon = 0;
my $help = 0;
my $prefix;
-@@ -145,7 +145,7 @@ __END__
- =item -p|--pidfile <file>
+@@ -195,7 +195,7 @@ version 3.20240701
+ =item --pidfile <file>
Write the process PID to the given file.
- defaults to /run/authentication_milter.pid
Index: patches/patch-share_authentication_milter_json
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-Milter-Authentication/patches/patch-share_authentication_milter_json,v
diff -u -p -r1.2 patch-share_authentication_milter_json
--- patches/patch-share_authentication_milter_json 11 Mar 2022 19:34:49 -0000 1.2
+++ patches/patch-share_authentication_milter_json 23 Aug 2024 14:27:28 -0000
@@ -1,5 +1,6 @@
---- share/authentication_milter.json.orig Fri Jan 16 06:33:40 2015
-+++ share/authentication_milter.json Wed Oct 14 19:37:15 2015
+Index: share/authentication_milter.json
+--- share/authentication_milter.json.orig
++++ share/authentication_milter.json
@@ -6,8 +6,8 @@
"connection" : "inet:12345@localhost",
@@ -11,12 +12,3 @@
"chroot" : "",
"listen_backlog" : 20,
-@@ -65,7 +65,7 @@
- "100.200.100.2",
- "2001:44c2:3881:aa00::/56",
- "2001:44b8:3021:123:dead:beef:abcd:1234"
-- ],
-+ ]
- },
-
- "!AddID" : {},
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-Milter-Authentication/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST 8 Nov 2022 11:14:50 -0000 1.4
+++ pkg/PLIST 23 Aug 2024 14:27:28 -0000
@@ -1,32 +1,97 @@
@newgroup _milter-auth:770
-@newuser _milter-auth:770:_milter-auth::Milter Authentication Daemon:/var/empty:/sbin/nologin
+@newuser _milter-auth:770:_milter-auth::Milter Authentication Daemon:${VARBASE}/empty:/sbin/nologin
+@rcscript ${RCDIR}/mail_milter_authentication
bin/authentication_milter
+bin/authentication_milter_blocker
bin/authentication_milter_client
+bin/authentication_milter_log
${P5SITE}/Mail/Milter/
${P5SITE}/Mail/Milter/Authentication/
${P5SITE}/Mail/Milter/Authentication.pm
+${P5SITE}/Mail/Milter/Authentication/App/
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App/
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App.pm
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App/Command/
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App/Command/add.pm
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App/Command/delete.pm
+${P5SITE}/Mail/Milter/Authentication/App/Blocker/App/Command/list.pm
+${P5SITE}/Mail/Milter/Authentication/App/ProcessLog/
+${P5SITE}/Mail/Milter/Authentication/App/ProcessLog/App/
+${P5SITE}/Mail/Milter/Authentication/App/ProcessLog/App.pm
+${P5SITE}/Mail/Milter/Authentication/App/ProcessLog/App/Command/
+${P5SITE}/Mail/Milter/Authentication/App/ProcessLog/App/Command/arex.pm
${P5SITE}/Mail/Milter/Authentication/Client.pm
${P5SITE}/Mail/Milter/Authentication/Config.pm
${P5SITE}/Mail/Milter/Authentication/Constants.pm
+${P5SITE}/Mail/Milter/Authentication/Exception.pm
+${P5SITE}/Mail/Milter/Authentication/HTDocs.pm
${P5SITE}/Mail/Milter/Authentication/Handler/
${P5SITE}/Mail/Milter/Authentication/Handler.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/ARC.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/ARC_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/AbusixDataFeed.pm
${P5SITE}/Mail/Milter/Authentication/Handler/AddID.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/AlignedFrom.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/AlignedFrom_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/Auth.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/Auth_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/BIMI.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/Blocker.pm
${P5SITE}/Mail/Milter/Authentication/Handler/DKIM.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/DKIM_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/DMARC.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/DMARC_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/IPRev.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/IPRev_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/LocalIP.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/LocalIP_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/Logger.pm
${P5SITE}/Mail/Milter/Authentication/Handler/PTR.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/PTR_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/RBLDNS.pm
${P5SITE}/Mail/Milter/Authentication/Handler/ReturnOK.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/ReturnOK_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/SPF.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/SPF_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/Sanitize.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/Sanitize_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/SenderID.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/SenderID_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/Size.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/Size_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/TLS.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/TLS_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Handler/TestTimeout.pm
${P5SITE}/Mail/Milter/Authentication/Handler/TrustedIP.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/TrustedIP_metrics.json
${P5SITE}/Mail/Milter/Authentication/Handler/XGoogleDKIM.pm
+${P5SITE}/Mail/Milter/Authentication/Handler/XGoogleDKIM_metrics.json
+${P5SITE}/Mail/Milter/Authentication/Metric/
+${P5SITE}/Mail/Milter/Authentication/Metric.pm
+${P5SITE}/Mail/Milter/Authentication/Metric/Base.json
+${P5SITE}/Mail/Milter/Authentication/Metric/Grafana.pm
+${P5SITE}/Mail/Milter/Authentication/Metric/RowErrors.json
+${P5SITE}/Mail/Milter/Authentication/Metric/RowProcesses.json
+${P5SITE}/Mail/Milter/Authentication/Metric/RowProcessingTime.json
+${P5SITE}/Mail/Milter/Authentication/Metric/RowThroughput.json
+${P5SITE}/Mail/Milter/Authentication/Metric/RowUptime.json
+${P5SITE}/Mail/Milter/Authentication/Net/
+${P5SITE}/Mail/Milter/Authentication/Net/Milter.pm
+${P5SITE}/Mail/Milter/Authentication/Net/ServerPatches.pm
+${P5SITE}/Mail/Milter/Authentication/Pragmas.pm
${P5SITE}/Mail/Milter/Authentication/Protocol/
${P5SITE}/Mail/Milter/Authentication/Protocol/Milter.pm
${P5SITE}/Mail/Milter/Authentication/Protocol/SMTP.pm
+${P5SITE}/Mail/Milter/Authentication/Resolver.pm
+${P5SITE}/Mail/Milter/Authentication/Tester/
+${P5SITE}/Mail/Milter/Authentication/Tester.pm
+${P5SITE}/Mail/Milter/Authentication/Tester/HandlerTester.pm
+${P5SITE}/Mail/Milter/Authentication/htdocs/
+${P5SITE}/Mail/Milter/Authentication/htdocs/css/
+${P5SITE}/Mail/Milter/Authentication/htdocs/css/authmilter.css
+${P5SITE}/Mail/Milter/Authentication/htdocs/css/normalize.css
+${P5SITE}/Mail/Milter/Authentication/htdocs/css/skeleton.css
${P5SITE}/auto/share/dist/Mail-Milter-Authentication/
@comment ${P5SITE}/auto/share/dist/Mail-Milter-Authentication/authentication_milter.init
${P5SITE}/auto/share/dist/Mail-Milter-Authentication/authentication_milter.json
@@ -34,26 +99,52 @@ ${P5SITE}/auto/share/dist/Mail-Milter-Au
${P5SITE}/auto/share/dist/Mail-Milter-Authentication/mail-dmarc.ini
@sample ${SYSCONFDIR}/mail-dmarc.ini
@man man/man1/authentication_milter.1
+@man man/man1/authentication_milter_blocker.1
@man man/man1/authentication_milter_client.1
+@man man/man1/authentication_milter_log.1
@man man/man3p/Mail::Milter::Authentication.3p
+@man man/man3p/Mail::Milter::Authentication::App::Blocker::App.3p
+@man man/man3p/Mail::Milter::Authentication::App::Blocker::App::Command::add.3p
+@man man/man3p/Mail::Milter::Authentication::App::Blocker::App::Command::delete.3p
+@man man/man3p/Mail::Milter::Authentication::App::Blocker::App::Command::list.3p
+@man man/man3p/Mail::Milter::Authentication::App::ProcessLog::App.3p
+@man man/man3p/Mail::Milter::Authentication::App::ProcessLog::App::Command::arex.3p
@man man/man3p/Mail::Milter::Authentication::Client.3p
@man man/man3p/Mail::Milter::Authentication::Config.3p
@man man/man3p/Mail::Milter::Authentication::Constants.3p
+@man man/man3p/Mail::Milter::Authentication::Exception.3p
+@man man/man3p/Mail::Milter::Authentication::HTDocs.3p
@man man/man3p/Mail::Milter::Authentication::Handler.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::ARC.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::AbusixDataFeed.3p
@man man/man3p/Mail::Milter::Authentication::Handler::AddID.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::AlignedFrom.3p
@man man/man3p/Mail::Milter::Authentication::Handler::Auth.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::BIMI.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::Blocker.3p
@man man/man3p/Mail::Milter::Authentication::Handler::DKIM.3p
@man man/man3p/Mail::Milter::Authentication::Handler::DMARC.3p
@man man/man3p/Mail::Milter::Authentication::Handler::IPRev.3p
@man man/man3p/Mail::Milter::Authentication::Handler::LocalIP.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::Logger.3p
@man man/man3p/Mail::Milter::Authentication::Handler::PTR.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::RBLDNS.3p
@man man/man3p/Mail::Milter::Authentication::Handler::ReturnOK.3p
@man man/man3p/Mail::Milter::Authentication::Handler::SPF.3p
@man man/man3p/Mail::Milter::Authentication::Handler::Sanitize.3p
@man man/man3p/Mail::Milter::Authentication::Handler::SenderID.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::Size.3p
@man man/man3p/Mail::Milter::Authentication::Handler::TLS.3p
+@man man/man3p/Mail::Milter::Authentication::Handler::TestTimeout.3p
@man man/man3p/Mail::Milter::Authentication::Handler::TrustedIP.3p
@man man/man3p/Mail::Milter::Authentication::Handler::XGoogleDKIM.3p
+@man man/man3p/Mail::Milter::Authentication::Metric.3p
+@man man/man3p/Mail::Milter::Authentication::Metric::Grafana.3p
+@man man/man3p/Mail::Milter::Authentication::Net::Milter.3p
+@man man/man3p/Mail::Milter::Authentication::Net::ServerPatches.3p
+@man man/man3p/Mail::Milter::Authentication::Pragmas.3p
@man man/man3p/Mail::Milter::Authentication::Protocol::Milter.3p
@man man/man3p/Mail::Milter::Authentication::Protocol::SMTP.3p
-@rcscript ${RCDIR}/mail_milter_authentication
+@man man/man3p/Mail::Milter::Authentication::Resolver.3p
+@man man/man3p/Mail::Milter::Authentication::Tester.3p
+@man man/man3p/Mail::Milter::Authentication::Tester::HandlerTester.3p
OpenPGP_signature.asc
Description: OpenPGP digital signature
