diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-03-30 14:53:35 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-03-30 14:53:35 +0000 |
| commit | bcc8f40f6200ef0b0ede9c8f92054f649fd0384e (patch) | |
| tree | 05dfacaf91e509eb9f1b8db67b7b1c0b8a03a065 /lang | |
| parent | 193118d687006fa2bb3185baa9201697282ae02e (diff) | |
| download | pkgsrc-bcc8f40f6200ef0b0ede9c8f92054f649fd0384e.tar.gz | |
go115: Find pkgsrc SSL certificates on SunOS.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go115/Makefile | 7 | ||||
| -rw-r--r-- | lang/go115/distinfo | 3 | ||||
| -rw-r--r-- | lang/go115/patches/patch-src_crypto_x509_root__solaris.go | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lang/go115/Makefile b/lang/go115/Makefile index a781fb913de..0b76ee064d5 100644 --- a/lang/go115/Makefile +++ b/lang/go115/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2021/02/18 11:05:42 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2021/03/30 14:53:35 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/go115/distinfo b/lang/go115/distinfo index 68b811484e0..d5a87cdf5c4 100644 --- a/lang/go115/distinfo +++ b/lang/go115/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2021/03/19 17:22:55 bsiegert Exp $ +$NetBSD: distinfo,v 1.8 2021/03/30 14:53:35 jperkin Exp $ SHA1 (go1.15.10.src.tar.gz) = 4c9ecfbe1e1aace59de5d8a5e9945a3c6e6b4bc1 RMD160 (go1.15.10.src.tar.gz) = 55bb5bdfdd80f075ca2777fccc3288ed40269b8f @@ -8,6 +8,7 @@ SHA1 (patch-misc_io_clangwrap.sh) = df5911c430ff6251abab12e5cc233e32fc3cd953 SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 3dfcb5c824d4201fadda0cfb6b48e5938899baf0 SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d +SHA1 (patch-src_crypto_x509_root__solaris.go) = ee75e00992d04967c690d716be89b9ecbc356866 SHA1 (patch-src_runtime_cgo_gcc__netbsd__arm64.c) = d2fc1cebc104ad2e35f488e5edebcecd6f0323be SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577 SHA1 (patch-src_runtime_sys__netbsd__arm64.s) = c8d3dfddd7930794a6ff9b2919c42632aa9358cd diff --git a/lang/go115/patches/patch-src_crypto_x509_root__solaris.go b/lang/go115/patches/patch-src_crypto_x509_root__solaris.go new file mode 100644 index 00000000000..dd73d589e74 --- /dev/null +++ b/lang/go115/patches/patch-src_crypto_x509_root__solaris.go @@ -0,0 +1,14 @@ +$NetBSD: patch-src_crypto_x509_root__solaris.go,v 1.1 2021/03/30 14:53:35 jperkin Exp $ + +Use pkgsrc certificates by default. + +--- src/crypto/x509/root_solaris.go.orig 2021-01-19 20:01:09.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 |