diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-03-30 15:08:57 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-03-30 15:08:57 +0000 |
| commit | f26a33c17b76c5be48ff2ff0738588cac4e31f8d (patch) | |
| tree | 4db58ec706182a37adbcc5bd45b3f01b42f807fc /lang | |
| parent | bcc8f40f6200ef0b0ede9c8f92054f649fd0384e (diff) | |
| download | pkgsrc-f26a33c17b76c5be48ff2ff0738588cac4e31f8d.tar.gz | |
go116: Find pkgsrc SSL certificates on SunOS.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go116/Makefile | 7 | ||||
| -rw-r--r-- | lang/go116/distinfo | 3 | ||||
| -rw-r--r-- | lang/go116/patches/patch-src_crypto_x509_root__solaris.go | 21 |
3 files changed, 29 insertions, 2 deletions
diff --git a/lang/go116/Makefile b/lang/go116/Makefile index 064b7e44536..be9cc6c45b3 100644 --- a/lang/go116/Makefile +++ b/lang/go116/Makefile @@ -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${GOVERSSUFFIX}/src/clean.rc 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 diff --git a/lang/go116/distinfo b/lang/go116/distinfo index 74a4b245e0c..3e94f156b79 100644 --- a/lang/go116/distinfo +++ b/lang/go116/distinfo @@ -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 bytes 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 diff --git a/lang/go116/patches/patch-src_crypto_x509_root__solaris.go b/lang/go116/patches/patch-src_crypto_x509_root__solaris.go new file mode 100644 index 00000000000..004800a9751 --- /dev/null +++ b/lang/go116/patches/patch-src_crypto_x509_root__solaris.go @@ -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", + } |