commit 59cf9949234a39313d3719b0c3a7d78d83c5b571
Author: Jan Palus <[email protected]>
Date: Mon Apr 5 18:54:23 2021 +0200
up to 1.16.3
ca-certs.patch | 6 +++---
golang.spec | 10 +++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 23c9055..0b56800 100644
--- a/golang.spec
+++ b/golang.spec
@@ -26,14 +26,14 @@
Summary: Go compiler and tools
Summary(pl.UTF-8): Kompilator języka Go i narzędzia
Name: golang
-Version: 1.14.9
+Version: 1.16.3
Release: 1
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under
Public Domain
License: BSD and Public Domain
Group: Development/Languages
# Source0Download: https://golang.org/dl/
Source0: https://storage.googleapis.com/golang/go%{version}.src.tar.gz
-# Source0-md5: 6f6dd1377421d27ca4bb607283b31738
+# Source0-md5: 48183a40d6522f1ea59b7d63377b7072
Patch0: ca-certs.patch
Patch1:
0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
URL: https://golang.org/
@@ -163,6 +163,10 @@ export CC="${CC#ccache }"
export CC_FOR_TARGET="$CC"
EOF
+grep -rl '#!.*env bash' . | xargs %{__sed} -i -e '1{
+ s,^#!.*bin/env bash,#!%{__bash},
+}'
+
%if 0
# optflags for go tools build
nflags="\"$(echo '%{rpmcflags}' | sed -e 's/^[ ]*//;s/[
]*$//;s/[ ]\+/ /g' -e 's/ /\",\"/g')\""
@@ -207,7 +211,7 @@ ln -sf %{_libdir}/%{name}/pkg/tool/linux_%{GOARCH}/cgo
$RPM_BUILD_ROOT%{_bindir}
# FIXME: do we need whole sources, including build scripts?
# for now, remove only non-Linux stuff
%{__rm} \
-
$RPM_BUILD_ROOT%{_libdir}/%{name}/src/syscall/{mksyscall,mksysctl_openbsd,mksysnum_{darwin,dragonfly,freebsd,netbsd,openbsd}}.pl
+
$RPM_BUILD_ROOT%{_libdir}/%{name}/src/syscall/{mksyscall,mksysctl_openbsd,mksysnum_{dragonfly,freebsd,netbsd,openbsd}}.pl
# ...and tests
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/src/internal/trace \
$RPM_BUILD_ROOT%{_libdir}/%{name}/misc/cgo/{errors,fortran,test*}
diff --git a/ca-certs.patch b/ca-certs.patch
index 78ddd54..6a723ba 100644
--- a/ca-certs.patch
+++ b/ca-certs.patch
@@ -1,10 +1,10 @@
---- golang-1.6/src/crypto/x509/root_unix.go~ 2016-02-17 22:35:21.000000000
+0200
-+++ golang-1.6/src/crypto/x509/root_unix.go 2016-04-05 13:04:44.231441583
+0300
+--- golang-1.6/src/crypto/x509/root_linux.go~ 2016-02-17 22:35:21.000000000
+0200
++++ golang-1.6/src/crypto/x509/root_linux.go 2016-04-05 13:04:44.231441583
+0300
@@ -11,6 +11,7 @@
// Possible directories with certificate files; stop after successfully
// reading at least one file from a directory.
var certDirectories = []string{
+ "/etc/openssl/certs", // PLD Linux
"/etc/ssl/certs", // SLES10/SLES11,
https://golang.org/issue/12139
+ "/etc/pki/tls/certs", // Fedora/RHEL
"/system/etc/security/cacerts", // Android
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/59cf9949234a39313d3719b0c3a7d78d83c5b571
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
