CVS commit: pkgsrc/security/go-mkcert

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu May 15 19:29:16 UTC 2025

Modified Files:
        pkgsrc/security/go-mkcert: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/go-mkcert/patches: patch-truststore__linux.go

Log Message:
go-mkcert: grok pkgsrc-determined trust store on at least NetBSD.

NFCI on Darwin and Linux where `mkcert -install` already knows where
to write to.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/security/go-mkcert/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/go-mkcert/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/go-mkcert/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/go-mkcert/patches/patch-truststore__linux.go

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

Modified files:

Index: pkgsrc/security/go-mkcert/Makefile
diff -u pkgsrc/security/go-mkcert/Makefile:1.69 pkgsrc/security/go-mkcert/Makefile:1.70
--- pkgsrc/security/go-mkcert/Makefile:1.69     Sat Apr  5 18:51:25 2025
+++ pkgsrc/security/go-mkcert/Makefile  Thu May 15 19:29:16 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2025/04/05 18:51:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.70 2025/05/15 19:29:16 schmonz Exp $
 
 DISTNAME=              mkcert-1.4.4
 PKGNAME=               ${DISTNAME:S/^/go-/}
-PKGREVISION=           20
+PKGREVISION=           21
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=FiloSottile/}
 GITHUB_PROJECT=                mkcert
@@ -15,9 +15,34 @@ LICENSE=             modified-bsd
 
 DEPENDS+=              nss-[0-9]*:../../devel/nss
 
-post-patch:
-       cd ${WRKSRC} && cp truststore_linux.go truststore_netbsd.go
+SUBST_CLASSES+=                certsdir
+SUBST_STAGE.certsdir=  pre-configure
+SUBST_FILES.certsdir=  truststore_*.go
+SUBST_VARS.certsdir=   PREFIX SH SSLCERTS
 
 .include "go-modules.mk"
 .include "../../lang/go/go-module.mk"
+
+# Defining these way down here because if they're earlier,
+# ERROR: bin/mkcert: is not a Position Independent Executable
+
+# Buildlink just enough OpenSSL to get SSLCERTS defined
+BUILDLINK_INCDIRS.openssl=     /nonexistent
+BUILDLINK_LIBDIRS.openssl=     /nonexistent
+BUILDLINK_DEPMETHOD.openssl=   build
+.include "../../security/openssl/buildlink3.mk"
+
+PLIST_VARS=            rehash
+.if ${OPSYS} != "Darwin" && ${OPSYS} != "Linux"
+PLIST.rehash=          yes
+DEPENDS+=              mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
+INSTALLATION_DIRS+=    libexec
+post-patch:
+       cd ${WRKSRC} && cp truststore_linux.go truststore_unix.go
+post-install:
+       ${ECHO} '#!${SH} -e' > ${DESTDIR}${PREFIX}/libexec/rehash-mozilla-rootcerts
+       ${ECHO} 'cd "$$1" && ${PREFIX}/sbin/mozilla-rootcerts rehash' >> ${DESTDIR}${PREFIX}/libexec/rehash-mozilla-rootcerts
+       chmod +x ${DESTDIR}${PREFIX}/libexec/rehash-mozilla-rootcerts
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/go-mkcert/PLIST
diff -u pkgsrc/security/go-mkcert/PLIST:1.1 pkgsrc/security/go-mkcert/PLIST:1.2
--- pkgsrc/security/go-mkcert/PLIST:1.1 Sun Jan 13 04:23:54 2019
+++ pkgsrc/security/go-mkcert/PLIST     Thu May 15 19:29:16 2025
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2019/01/13 04:23:54 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/05/15 19:29:16 schmonz Exp $
 bin/mkcert
+${PLIST.rehash}libexec/rehash-mozilla-rootcerts

Index: pkgsrc/security/go-mkcert/distinfo
diff -u pkgsrc/security/go-mkcert/distinfo:1.5 pkgsrc/security/go-mkcert/distinfo:1.6
--- pkgsrc/security/go-mkcert/distinfo:1.5      Wed Mar 15 18:20:51 2023
+++ pkgsrc/security/go-mkcert/distinfo  Thu May 15 19:29:16 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/03/15 18:20:51 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2025/05/15 19:29:16 schmonz Exp $
 
 BLAKE2s (github.com_jessevdk_go-flags_@v_v1.4.0.mod) = d0fd3bc9afc8ecdc658c6f85b995efee97fce9f6c594fc55f6340dc8a76119dc
 SHA512 (github.com_jessevdk_go-flags_@v_v1.4.0.mod) = 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
@@ -63,3 +63,4 @@ Size (software.sslmate.com_src_go-pkcs12
 BLAKE2s (software.sslmate.com_src_go-pkcs12_@v_v0.2.0.zip) = fb5062e7f881c739308b5f38e4de286f6ba55bee2d27291f827a61876a6e6766
 SHA512 (software.sslmate.com_src_go-pkcs12_@v_v0.2.0.zip) = dbeaed719249c3a8a394da7670a3bbfa79733b454b76e7605646f4b9032c7fe60da9b75080d22bb670988c059628d1214f6c2668eeddd4bccc5824c1391c8e9e
 Size (software.sslmate.com_src_go-pkcs12_@v_v0.2.0.zip) = 36374 bytes
+SHA1 (patch-truststore__linux.go) = 365617050260f0362201ac783e8e4148a9011ea9

Added files:

Index: pkgsrc/security/go-mkcert/patches/patch-truststore__linux.go
diff -u /dev/null pkgsrc/security/go-mkcert/patches/patch-truststore__linux.go:1.1
--- /dev/null   Thu May 15 19:29:16 2025
+++ pkgsrc/security/go-mkcert/patches/patch-truststore__linux.go        Thu May 15 19:29:16 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-truststore__linux.go,v 1.1 2025/05/15 19:29:16 schmonz Exp $
+
+Support pkgsrc OpenSSL certsdir.
+
+--- truststore_linux.go.orig   2022-04-26 17:37:25.000000000 +0000
++++ truststore_linux.go
+@@ -45,6 +45,9 @@ func init() {
+       } else if pathExists("/usr/share/pki/trust/anchors") {
+               SystemTrustFilename = "/usr/share/pki/trust/anchors/%s.pem"
+               SystemTrustCommand = []string{"update-ca-certificates"}
++      } else if pathExists("@SSLCERTS@") {
++              SystemTrustFilename = "@SSLCERTS@/%s.pem"
++              SystemTrustCommand = []string{"@PREFIX@/libexec/rehash-mozilla-rootcerts", "@SSLCERTS@"}
+       }
+ }
+