Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2015-06-23 11:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go" Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2015-06-12 20:31:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2015-06-23 11:57:06.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 11 12:38:51 UTC 2015 - [email protected] + +- Remove fix_certificates_lookup_on_sles11.patch: this is superseded + by fix_certificates.patch +- Add fix_certificates_lookup.patch: force Go to look for certificates only + in the locations available on openSUSE and SLE. Also ensure certificates + are found on SLE11 (previous fix_certificates_lookup_on_sles11.patch) + +------------------------------------------------------------------- Old: ---- fix_certificates_lookup_on_sles11.patch New: ---- fix_certificates_lookup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.GZbg4w/_old 2015-06-23 11:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GZbg4w/_new 2015-06-23 11:57:07.000000000 +0200 @@ -50,9 +50,9 @@ # armv6l needs this patch for our build system # see https://groups.google.com/forum/#!topic/golang-nuts/MqKTX_XIOKE Patch6: armv6l.patch -# PATCH-FIX_SLE11 handle certificates on SLE11 -# see https://github.com/golang/go/issues/6391 -Patch7: fix_certificates_lookup_on_sles11.patch +# PATCH-FIX-OPENSUSE fix_certificates_lookup.patch [email protected] -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 +# PATCH-FIX-SUSE fix_certificates_lookup.patch [email protected] -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 +Patch7: fix_certificates_lookup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rpm %if 0%{?suse_version} >= 1210 @@ -101,9 +101,7 @@ %ifarch armv6hl %patch6 -p1 %endif -%if 0%{?suse_version} < 1200 %patch7 -p1 -%endif cp %{SOURCE5} . # setup go_arch (BSD-like scheme) ++++++ fix_certificates_lookup_on_sles11.patch -> fix_certificates_lookup.patch ++++++ --- /work/SRC/openSUSE:Factory/go/fix_certificates_lookup_on_sles11.patch 2015-06-12 20:31:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/fix_certificates_lookup.patch 2015-06-23 11:57:06.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- go.orig/src/crypto/x509/root_unix.go +++ go/src/crypto/x509/root_unix.go -@@ -6,7 +6,10 @@ +@@ -6,24 +6,20 @@ package x509 @@ -14,16 +14,26 @@ // Possible certificate files; stop after finding one. var certFiles = []string{ -@@ -23,7 +26,7 @@ var certFiles = []string{ +- "/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc. +- "/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL +- "/etc/ssl/ca-bundle.pem", // OpenSUSE +- "/etc/ssl/cert.pem", // OpenBSD +- "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly +- "/etc/pki/tls/cacert.pem", // OpenELEC +- "/etc/certs/ca-certificates.crt", // Solaris 11.2+ ++ "/etc/ssl/ca-bundle.pem", // openSUSE and SLE12+ + } + + // Possible directories with certificate files; stop after successfully // reading at least one file from a directory. var certDirectories = []string{ - "/system/etc/security/cacerts", // Android +- "/system/etc/security/cacerts", // Android - -+ "/etc/ssl/certs", // SLE11 ++ "/etc/ssl/certs", // SLE11 } func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { -@@ -41,22 +44,25 @@ func initSystemRoots() { +@@ -41,22 +37,24 @@ func initSystemRoots() { } } @@ -48,7 +58,6 @@ - return - } + } -+ + if rootsAdded { + systemRoots = roots }
