[packages/golang] fix path to ssl certificates

glen glen at pld-linux.org
Wed Aug 21 19:58:31 CEST 2013


commit c6ce79b1fbb2f90c514f9da31221fa8415a50520
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Aug 21 20:57:48 2013 +0300

    fix path to ssl certificates
    
    so net resources work now:
    $ go get code.google.com/p/go-tour/gotour

 ca-certs.patch | 10 ++++++++++
 golang.spec    |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 39bf4fe..4126aa0 100644
--- a/golang.spec
+++ b/golang.spec
@@ -13,12 +13,13 @@ Summary:	Go compiler and tools
 Summary(pl.UTF-8):	Kompilator języka Go i narzędzia
 Name:		golang
 Version:	1.1.2
-Release:	0.1
+Release:	0.2
 License:	BSD
 Group:		Development/Languages
 #Source0Download: https://code.google.com/p/go/downloads/list
 Source0:	https://go.googlecode.com/files/go%{version}.src.tar.gz
 # Source0-md5:	705feb2246c8ddaf820d7e171f1430c5
+Patch0:		ca-certs.patch
 URL:		http://golang.org/
 BuildRequires:	bison
 BuildRequires:	ed
@@ -27,6 +28,7 @@ BuildRequires:	rpm-pythonprov
 %if %{with tests}
 BuildRequires:	hostname
 %endif
+Requires:	ca-certificates
 ExclusiveArch:	%{ix86} %{x8664} %{arm}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,7 +85,9 @@ Go mode for Emacs.
 Tryb Go dla Emacsa.
 
 %prep
-%setup -q -n go
+%setup -qc
+mv go/* .
+%patch0 -p1
 
 # broken tests
 %{__rm} src/pkg/net/multicast_test.go
diff --git a/ca-certs.patch b/ca-certs.patch
new file mode 100644
index 0000000..36ad410
--- /dev/null
+++ b/ca-certs.patch
@@ -0,0 +1,10 @@
+--- go-1.1.2/src/pkg/crypto/x509/root_unix.go~	2013-08-13 08:45:24.000000000 +0300
++++ go-1.1.2/src/pkg/crypto/x509/root_unix.go	2013-08-21 20:45:30.044974438 +0300
+@@ -10,6 +10,7 @@
+ 
+ // Possible certificate files; stop after finding one.
+ var certFiles = []string{
++	"/etc/certs/ca-certificates.crt",         // PLD Linux
+ 	"/etc/ssl/certs/ca-certificates.crt",     // Linux etc
+ 	"/etc/pki/tls/certs/ca-bundle.crt",       // Fedora/RHEL
+ 	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/c6ce79b1fbb2f90c514f9da31221fa8415a50520



More information about the pld-cvs-commit mailing list