CVS commit: pkgsrc/mail

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Nov  2 12:08:31 UTC 2026

Modified Files:
        pkgsrc/mail/dkim-rotate: distinfo
        pkgsrc/mail/dkim-rotate-base: Makefile
Added Files:
        pkgsrc/mail/dkim-rotate/patches: patch-dkim-rotate

Log Message:
mail/dkim-rotate: Work around GNUisms.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/dkim-rotate/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/dkim-rotate-base/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dkim-rotate/patches/patch-dkim-rotate

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

Modified files:

Index: pkgsrc/mail/dkim-rotate/distinfo
diff -u pkgsrc/mail/dkim-rotate/distinfo:1.1 pkgsrc/mail/dkim-rotate/distinfo:1.2
--- pkgsrc/mail/dkim-rotate/distinfo:1.1        Wed Oct 14 03:34:55 2026
+++ pkgsrc/mail/dkim-rotate/distinfo    Mon Nov  2 12:08:31 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2026/11/02 12:08:31 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
+SHA1 (patch-dkim-rotate) = 0e909eeffdd0fd639b801e18dd03e01aeba560fc

Index: pkgsrc/mail/dkim-rotate-base/Makefile
diff -u pkgsrc/mail/dkim-rotate-base/Makefile:1.1 pkgsrc/mail/dkim-rotate-base/Makefile:1.2
--- pkgsrc/mail/dkim-rotate-base/Makefile:1.1   Wed Oct 14 03:34:55 2026
+++ pkgsrc/mail/dkim-rotate-base/Makefile       Mon Nov  2 12:08:31 2026
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2026/10/14 03:34:55 riastradh Exp $
+#      $NetBSD: Makefile,v 1.2 2026/11/02 12:08:31 riastradh Exp $
 #
 
 .include "../../mail/dkim-rotate/Makefile.common"
 
 PKGNAME=       ${DISTNAME:C/^dkim-rotate-dkim-rotate-/dkim-rotate-base-/}
+PKGREVISION=   1
 
 COMMENT=       Tool for rotation and revocation of DKIM keys
 
@@ -33,12 +34,6 @@ TOOL_DEPENDS+=               coreutils>=0:../../sysut
 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/*
 

Added files:

Index: pkgsrc/mail/dkim-rotate/patches/patch-dkim-rotate
diff -u /dev/null pkgsrc/mail/dkim-rotate/patches/patch-dkim-rotate:1.1
--- /dev/null   Mon Nov  2 12:08:31 2026
+++ pkgsrc/mail/dkim-rotate/patches/patch-dkim-rotate   Mon Nov  2 12:08:31 2026
@@ -0,0 +1,31 @@
+$NetBSD: patch-dkim-rotate,v 1.1 2026/11/02 12:08:31 riastradh Exp $
+
+Nix runtime and user-visible dependencies on GNU coreutils:
+
+- Use `openssl dgst -md5 -r' instead of `md5sum'.
+
+- Suggest `openssl base64 -d' instead of `base64 -d' for users to
+  generate the URLs.  (Also works around NetBSD's quirky base64(1).)
+
+- Suggest sed instead of Perl for users to generate the URLs.
+
+--- dkim-rotate.orig   2026-10-14 03:26:28.933524660 +0000
++++ dkim-rotate
+@@ -246,7 +246,7 @@ procedure.  Starting (say) with the DKIM
+ 
+ Calculating the end of the URL can be done with a rune like this:
+ 
+- echo 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ycQ99x3kKz6aUKj' | base64 -d | md5sum | perl -pe 's/ .*//; s#^..#$&/$&#; s/$/.pem/'
++ echo 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ycQ99x3kKz6aUKj' | openssl base64 -d | openssl dgst -md5 -r | sed -e 's/ .*//; s#^..#&/&#; s/$/.pem/'
+ 
+ supposing MIIBIjAN... came from the DKIM selector.
+ 
+@@ -662,7 +662,7 @@ sub generate_key () {
+       chmod 644 new.priv.pem # directory permissions protect (checked)
+       openssl rsa -in new.priv.pem -out new.pub.pem -pubout -outform PEM
+       openssl base64 -a -d -in new.pub.pem -out new.pub.bin
+-      md5sum <new.pub.bin >new.pub.hash
++      openssl dgst -md5 -r <new.pub.bin >new.pub.hash
+       read <new.pub.hash keyname
+       keyname=${keyname%% *}
+       echo $keyname