CVS commit: pkgsrc/lang/go116

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Mar 30 15:08:57 UTC 2021

Modified Files:
        pkgsrc/lang/go116: Makefile distinfo
Added Files:
        pkgsrc/lang/go116/patches: patch-src_crypto_x509_root__solaris.go

Log Message:
go116: Find pkgsrc SSL certificates on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go116/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/go116/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/go116/patches/patch-src_crypto_x509_root__solaris.go

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

Modified files:

Index: pkgsrc/lang/go116/Makefile
diff -u pkgsrc/lang/go116/Makefile:1.2 pkgsrc/lang/go116/Makefile:1.3
--- pkgsrc/lang/go116/Makefile:1.2      Thu Feb 18 11:05:42 2021
+++ pkgsrc/lang/go116/Makefile  Tue Mar 30 15:08:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/02/18 11:05:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/03/30 15:08:57 jperkin Exp $
 
 .include "../../lang/go/version.mk"
 .include "../../lang/go/bootstrap.mk"
@@ -67,6 +67,11 @@ CHECK_INTERPRETER_SKIP+=     go${GOVERSSUFFI
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/run.rc
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     src/crypto/x509/root_solaris.go
+SUBST_VARS.paths=      PKG_SYSCONFDIR
+
 PLIST_SUBST+=  GOVERSSUFFIX=${GOVERSSUFFIX}
 
 PLIST_VARS+=   pty route

Index: pkgsrc/lang/go116/distinfo
diff -u pkgsrc/lang/go116/distinfo:1.5 pkgsrc/lang/go116/distinfo:1.6
--- pkgsrc/lang/go116/distinfo:1.5      Sun Mar 14 18:15:16 2021
+++ pkgsrc/lang/go116/distinfo  Tue Mar 30 15:08:57 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/03/14 18:15:16 bsiegert Exp $
+$NetBSD: distinfo,v 1.6 2021/03/30 15:08:57 jperkin Exp $
 
 SHA1 (go1.16.2.src.tar.gz) = 78812c9ee656d3f54b8c9b4f3f78e00e81ba81ad
 RMD160 (go1.16.2.src.tar.gz) = 0f667e1fd0691890eb282d921ac46c442df62c69
@@ -7,4 +7,5 @@ Size (go1.16.2.src.tar.gz) = 20905135 by
 SHA1 (patch-misc_ios_clangwrap.sh) = 0a06403609cb7bce2e6f65444fd322f486761afe
 SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
 SHA1 (patch-src_crypto_x509_root__bsd.go) = 27636e0d8c121ccec6c46a3a82cd0e0469473a6e
+SHA1 (patch-src_crypto_x509_root__solaris.go) = cce8d78a5a3712a0e7a620ead232a779e4a4b21e
 SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b

Added files:

Index: pkgsrc/lang/go116/patches/patch-src_crypto_x509_root__solaris.go
diff -u /dev/null pkgsrc/lang/go116/patches/patch-src_crypto_x509_root__solaris.go:1.1
--- /dev/null   Tue Mar 30 15:08:57 2021
+++ pkgsrc/lang/go116/patches/patch-src_crypto_x509_root__solaris.go    Tue Mar 30 15:08:57 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_crypto_x509_root__solaris.go,v 1.1 2021/03/30 15:08:57 jperkin Exp $
+
+Use pkgsrc certificates by default.
+
+--- src/crypto/x509/root_solaris.go.orig       2021-03-11 17:14:31.000000000 +0000
++++ src/crypto/x509/root_solaris.go
+@@ -6,6 +6,7 @@ package x509
+ 
+ // Possible certificate files; stop after finding one.
+ var certFiles = []string{
++      "@PKG_SYSCONFDIR@/openssl/certs/ca-certificates.crt",
+       "/etc/certs/ca-certificates.crt",     // Solaris 11.2+
+       "/etc/ssl/certs/ca-certificates.crt", // Joyent SmartOS
+       "/etc/ssl/cacert.pem",                // OmniOS
+@@ -14,5 +15,6 @@ var certFiles = []string{
+ // Possible directories with certificate files; stop after successfully
+ // reading at least one file from a directory.
+ var certDirectories = []string{
++      "@PKG_SYSCONFDIR@/openssl/certs",
+       "/etc/certs/CA",
+ }