summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz>2016-02-06 19:50:15 +0000
committerspz <spz>2016-02-06 19:50:15 +0000
commite45a3f24c2c71094567b6aae177f77725b42a9a6 (patch)
tree2002f1f3deabe74c30c71f30363b95cae979ec63
parent061eca326c151f408f28100dcf95ac4d20812c12 (diff)
downloadpkgsrc-e45a3f24c2c71094567b6aae177f77725b42a9a6.tar.gz
Pullup ticket #4908 - requested by bsiegert
lang/go: bugfix Revisions pulled up: - lang/go/Makefile 1.38 - lang/go/distinfo 1.32 - lang/go/patches/patch-src_crypto_x509_root__bsd.go 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: bsiegert Date: Sun Jan 31 10:17:27 UTC 2016 Modified Files: pkgsrc/lang/go: Makefile distinfo Added Files: pkgsrc/lang/go/patches: patch-src_crypto_x509_root__bsd.go Log Message: Add the correct path for SSL certificates that mozilla-rootcerts uses. PR pkg/50690. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/go/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/go/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/go/patches/patch-src_crypto_x509_root__bsd.go
-rw-r--r--lang/go/Makefile4
-rw-r--r--lang/go/distinfo3
-rw-r--r--lang/go/patches/patch-src_crypto_x509_root__bsd.go10
3 files changed, 14 insertions, 3 deletions
diff --git a/lang/go/Makefile b/lang/go/Makefile
index aa4939d55a7..d8c45107af9 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2015/12/22 20:44:40 bsiegert Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2016/02/06 19:50:15 spz Exp $
.include "version.mk"
DISTNAME= go${GO_VERSION}.src
PKGNAME= go-${GO_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= https://storage.googleapis.com/golang/
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 81bf66abaaf..4e2df4052e1 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2015/12/22 20:44:40 bsiegert Exp $
+$NetBSD: distinfo,v 1.30.2.1 2016/02/06 19:50:15 spz Exp $
SHA1 (go1.5.2.src.tar.gz) = c7d78ba4df574b5f9a9bb5d17505f40c4d89b81c
RMD160 (go1.5.2.src.tar.gz) = 38aec8e0f7f93c4616db58ccfc6152b3b35bbd08
@@ -9,4 +9,5 @@ SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
SHA1 (patch-src_cmd_go_pkg.go) = ccc470577951bd00741c39229599c0c06be52d0a
SHA1 (patch-src_math_big_nat.go) = 3043a3883c6dbb5d4b75a07cb18effea5069ea74
SHA1 (patch-src_math_big_nat_test.go) = c64bdd6b7ec1d28c0af4f7cf92a40d6f8262d346
+SHA1 (patch-src_crypto_x509_root__bsd.go) = 0eca1eafa967268ae9b224be4aeda347ebc91901
SHA1 (patch-src_syscall_syscall__solaris.go) = 436371947897dcba574a6dfecc6bbcd04f6e25b2
diff --git a/lang/go/patches/patch-src_crypto_x509_root__bsd.go b/lang/go/patches/patch-src_crypto_x509_root__bsd.go
new file mode 100644
index 00000000000..298e48c56af
--- /dev/null
+++ b/lang/go/patches/patch-src_crypto_x509_root__bsd.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_crypto_x509_root__bsd.go,v 1.1.2.2 2016/02/06 19:50:15 spz Exp $
+
+--- src/crypto/x509/root_bsd.go.orig 2016-01-13 19:47:00.000000000 +0000
++++ src/crypto/x509/root_bsd.go
+@@ -11,4 +11,5 @@ var certFiles = []string{
+ "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
+ "/etc/ssl/cert.pem", // OpenBSD
+ "/etc/openssl/certs/ca-certificates.crt", // NetBSD
++ "/etc/ssl/certs/ca-certificates.crt", // NetBSD
+ }