CVS commit: pkgsrc/mail

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Oct 14 03:34:56 UTC 2026

Modified Files:
        pkgsrc/mail: Makefile
Added Files:
        pkgsrc/mail/dkim-rotate: DESCR Makefile Makefile.common distinfo
        pkgsrc/mail/dkim-rotate-base: DESCR Makefile PLIST
        pkgsrc/mail/dkim-rotate-doc: DESCR Makefile PLIST

Log Message:
Import dkim-rotate-1.1 as mail/dkim-rotate.

dkim-rotate is a tool that rotates DKIM keys and publishes them in
order to invalidate them so that they do not become an incentive for
authenticating leaked private email over time.

The dkim-rotate program is just a Perl script that can be invoked
from a cron job to update an MTA's DKIM configuration and a
corresponding zone file.  The documentation is built with pandoc,
which is a much heavier build dependency, so I've split it into three
packages:

- dkim-rotate-base having the main program and an example config,
- dkim-rotate-doc having the man pages and other documentation, and
- a meta-package dkim-rotate depending on both of those.


To generate a diff of this commit:
cvs rdiff -u -r1.698 -r1.699 pkgsrc/mail/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dkim-rotate/DESCR \
    pkgsrc/mail/dkim-rotate/Makefile pkgsrc/mail/dkim-rotate/Makefile.common \
    pkgsrc/mail/dkim-rotate/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dkim-rotate-base/DESCR \
    pkgsrc/mail/dkim-rotate-base/Makefile pkgsrc/mail/dkim-rotate-base/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dkim-rotate-doc/DESCR \
    pkgsrc/mail/dkim-rotate-doc/Makefile pkgsrc/mail/dkim-rotate-doc/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/Makefile
diff -u pkgsrc/mail/Makefile:1.698 pkgsrc/mail/Makefile:1.699
--- pkgsrc/mail/Makefile:1.698  Sat Oct  3 15:24:32 2026
+++ pkgsrc/mail/Makefile        Wed Oct 14 03:34:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.698 2026/10/03 15:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.699 2026/10/14 03:34:55 riastradh Exp $
 #
 
 COMMENT=       Electronic mail utilities
@@ -68,6 +68,9 @@ SUBDIR+=      deliver
 SUBDIR+=       demime
 SUBDIR+=       distribute
 SUBDIR+=       dk-milter
+SUBDIR+=       dkim-rotate
+SUBDIR+=       dkim-rotate-base
+SUBDIR+=       dkim-rotate-doc
 SUBDIR+=       dkimproxy
 SUBDIR+=       dmarc-report-viewer
 SUBDIR+=       dnsbl-milter

Added files:

Index: pkgsrc/mail/dkim-rotate/DESCR
diff -u /dev/null pkgsrc/mail/dkim-rotate/DESCR:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate/DESCR       Wed Oct 14 03:34:55 2026
@@ -0,0 +1,5 @@
+dkim-rotate is a tool for managing DKIM (RFC 6376 email antispoofing)
+keys in a manner that avoids unnecessarily making emails nonrepudiable.
+
+This meta-package provides the dkim-rotate(1) program, an example
+crontab and zone file to configure it, and the documentation.
Index: pkgsrc/mail/dkim-rotate/Makefile
diff -u /dev/null pkgsrc/mail/dkim-rotate/Makefile:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate/Makefile    Wed Oct 14 03:34:55 2026
@@ -0,0 +1,15 @@
+#      $NetBSD: Makefile,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+#
+
+.include "Makefile.common"
+
+PKGNAME=       ${DISTNAME:C/^dkim-rotate-dkim-rotate-/dkim-rotate-/}
+
+COMMENT=       Tool and documentation for rotation and revocation of DKIM keys
+
+DEPENDS+=      dkim-rotate-base>=${PKGVERSION}:../../mail/dkim-rotate-base
+DEPENDS+=      dkim-rotate-doc>=${PKGVERSION}:../../mail/dkim-rotate-doc
+
+META_PACKAGE=  yes
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/dkim-rotate/Makefile.common
diff -u /dev/null pkgsrc/mail/dkim-rotate/Makefile.common:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate/Makefile.common     Wed Oct 14 03:34:55 2026
@@ -0,0 +1,26 @@
+#      $NetBSD: Makefile.common,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+#
+
+# used by mail/dkim-rotate-base/Makefile
+# used by mail/dkim-rotate-doc/Makefile
+
+DISTNAME=      dkim-rotate-dkim-rotate-1.1
+CATEGORIES=    mail
+MASTER_SITES=  https://salsa.debian.org/iwj/dkim-rotate/-/archive/dkim-rotate/v${PKGVERSION_NOREV}/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://salsa.debian.org/iwj/dkim-rotate
+LICENSE=       gnu-gpl-v3
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths+=    dkim-rotate
+SUBST_FILES.paths+=    dkim-rotate.*.md
+SUBST_SED.paths+=      -e 's,/etc,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=      -e 's,/var/lib,${VARBASE}/db,g'
+SUBST_SED.paths+=      -e 's,/usr/local,${PREFIX},g'
+
+BUILD_DEFS+=   VARBASE
+
+DISTINFO_FILE= ../../mail/dkim-rotate/distinfo
+PATCHDIR=      ../../mail/dkim-rotate/patches
Index: pkgsrc/mail/dkim-rotate/distinfo
diff -u /dev/null pkgsrc/mail/dkim-rotate/distinfo:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate/distinfo    Wed Oct 14 03:34:55 2026
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+
+BLAKE2s (dkim-rotate-dkim-rotate-1.1.tar.gz) = 3af941af30cd331c83d67e4261747ea1982b23f8e4565c7810fc30d93907aff1
+SHA512 (dkim-rotate-dkim-rotate-1.1.tar.gz) = 1e2b553f4e69fbdd2c361fdd8cb11ae8ef5467cc53ec2248cd80086246111be996ccbbce2dc6f162469d4653e94c49af11726eca6ff1f3941cf25ea122d67fce
+Size (dkim-rotate-dkim-rotate-1.1.tar.gz) = 28102 bytes

Index: pkgsrc/mail/dkim-rotate-base/DESCR
diff -u /dev/null pkgsrc/mail/dkim-rotate-base/DESCR:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-base/DESCR  Wed Oct 14 03:34:55 2026
@@ -0,0 +1,5 @@
+dkim-rotate is a tool for managing DKIM (RFC 6376 email antispoofing)
+keys in a manner that avoids unnecessarily making emails nonrepudiable.
+
+This package provides the dkim-rotate(1) program and an example crontab
+and zone file to configure it.
Index: pkgsrc/mail/dkim-rotate-base/Makefile
diff -u /dev/null pkgsrc/mail/dkim-rotate-base/Makefile:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-base/Makefile       Wed Oct 14 03:34:55 2026
@@ -0,0 +1,48 @@
+#      $NetBSD: Makefile,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+#
+
+.include "../../mail/dkim-rotate/Makefile.common"
+
+PKGNAME=       ${DISTNAME:C/^dkim-rotate-dkim-rotate-/dkim-rotate-base-/}
+
+COMMENT=       Tool for rotation and revocation of DKIM keys
+
+USE_LANGUAGES= # none
+
+USE_TOOLS+=    perl:run
+
+DEPENDS+=      p5-Getopt-Long-Descriptive>=0:../../devel/p5-Getopt-Long-Descriptive
+
+REPLACE_PERL+= dkim-rotate
+
+EGDIR=                 ${PREFIX}/share/examples/dkim-rotate
+INSTALLATION_DIRS+=    bin
+INSTALLATION_DIRS+=    ${EGDIR}
+
+NO_BUILD=      yes
+
+do-install:
+       ${INSTALL_SCRIPT} ${WRKSRC:Q}/dkim-rotate ${DESTDIR:Q}${PREFIX:Q}/bin/
+       ${INSTALL_DATA} ${WRKSRC:Q}/example.zone ${WRKSRC:Q}/crontab \
+           ${DESTDIR:Q}${EGDIR:Q}/
+
+USE_TOOLS+=            bash:test date:test ggrep:test gmake:test realpath:test
+
+TOOL_DEPENDS+=         coreutils>=0:../../sysutils/coreutils
+
+TOOLS_PATH.date=       ${TOOLBASE}/gnu/bin/date
+TOOLS_PATH.grep=       ${TOOLBASE}/gnu/bin/grep
+
+TOOLS_CREATE+=         md5sum
+TOOLS_PATH.md5sum=     ${TOOLBASE}/gnu/bin/md5sum
+
+TOOLS_CREATE+=         base64
+TOOLS_SCRIPT.base64=   exec openssl base64 "$$@"
+
+REPLACE_BASH+=         debian/tests/*
+REPLACE_BASH+=         tests/*
+
+TEST_TARGET+=          check
+TEST_MAKE_FLAGS+=      SHELL=${SHELL:Q}
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/dkim-rotate-base/PLIST
diff -u /dev/null pkgsrc/mail/dkim-rotate-base/PLIST:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-base/PLIST  Wed Oct 14 03:34:55 2026
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+bin/dkim-rotate
+share/examples/dkim-rotate/crontab
+share/examples/dkim-rotate/example.zone

Index: pkgsrc/mail/dkim-rotate-doc/DESCR
diff -u /dev/null pkgsrc/mail/dkim-rotate-doc/DESCR:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-doc/DESCR   Wed Oct 14 03:34:55 2026
@@ -0,0 +1,5 @@
+dkim-rotate is a tool for managing DKIM (RFC 6376 email antispoofing)
+keys in a manner that avoids unnecessarily making emails nonrepudiable.
+
+This package provides the man pages and other documentation for
+dkim-rotate.
Index: pkgsrc/mail/dkim-rotate-doc/Makefile
diff -u /dev/null pkgsrc/mail/dkim-rotate-doc/Makefile:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-doc/Makefile        Wed Oct 14 03:34:55 2026
@@ -0,0 +1,35 @@
+#      $NetBSD: Makefile,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+#
+
+.include "../../mail/dkim-rotate/Makefile.common"
+
+PKGNAME=       ${DISTNAME:C/^dkim-rotate-dkim-rotate-/dkim-rotate-doc-/}
+
+COMMENT=       Documentation for dkim-rotate
+
+USE_LANGUAGES= # none
+
+USE_TOOLS+=    gmake
+
+TOOL_DEPENDS+=         pandoc-cli>=0:../../converters/pandoc-cli
+TOOLS_CREATE+=         pandoc
+TOOLS_PATH.pandoc=     ${TOOLDIR}/bin/pandoc
+
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man5
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man7
+INSTALLATION_DIRS+=    share/doc/dkim-rotate
+
+MAKE_FLAGS+=   SHELL=${SHELL:Q}
+
+do-install:
+       ${RUN}${INSTALL_MAN} ${WRKSRC:Q}/dkim-rotate.1 \
+           ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1
+       ${RUN}${INSTALL_MAN} ${WRKSRC:Q}/dkim-rotate.5 \
+           ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man5
+       ${RUN}${INSTALL_MAN} ${WRKSRC:Q}/dkim-rotate.7 \
+           ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man7
+       ${RUN}${INSTALL_DATA} ${WRKSRC:Q}/*.html \
+           ${DESTDIR:Q}${PREFIX:Q}/share/doc/dkim-rotate/
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/dkim-rotate-doc/PLIST
diff -u /dev/null pkgsrc/mail/dkim-rotate-doc/PLIST:1.1
--- /dev/null   Wed Oct 14 03:34:56 2026
+++ pkgsrc/mail/dkim-rotate-doc/PLIST   Wed Oct 14 03:34:55 2026
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+man/man1/dkim-rotate.1
+man/man5/dkim-rotate.5
+man/man7/dkim-rotate.7
+share/doc/dkim-rotate/INTERNALS.html
+share/doc/dkim-rotate/README.html
+share/doc/dkim-rotate/dkim-rotate.1.html
+share/doc/dkim-rotate/dkim-rotate.5.html
+share/doc/dkim-rotate/dkim-rotate.7.html