commit 389b0270b3ccf3b44894208b4df716cce576c191
Author: Jan Palus <[email protected]>
Date: Sun Mar 20 16:23:42 2022 +0100
up to 1.18
0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch | 2 +-
ca-certs.patch | 4 ++--
golang.spec | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 650fd3b..bc310a3 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.17.7
+Version: 1.18
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: 063999612df20d2f9b5777fb60eb2f82
+# Source0-md5: da8a439a13865ad0d298a703e70e7ee5
Patch0: ca-certs.patch
Patch1:
0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
URL: https://golang.org/
diff --git a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
index 422ca2b..0447995 100644
--- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
+++ b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
@@ -29,7 +29,7 @@ index 76d5524124..e81ace5f64 100644
- z, err := loadLocation("America/Los_Angeles",
zoneSources[len(zoneSources)-1:])
+ z, err := loadLocation("America/Los_Angeles", zoneSources)
if err != nil {
- panic("cannot load America/Los_Angeles for testing: " +
err.Error())
+ panic("cannot load America/Los_Angeles for testing: " +
err.Error() + "; you may want to use -tags=timetzdata")
}
@@ -21,8 +23,9 @@ func initTestingZone() {
var OrigZoneSources = zoneSources
diff --git a/ca-certs.patch b/ca-certs.patch
index 6a723ba..84a54f8 100644
--- a/ca-certs.patch
+++ b/ca-certs.patch
@@ -1,8 +1,8 @@
--- 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.
+
+ // Possible directories with certificate files; all will be read.
var certDirectories = []string{
+ "/etc/openssl/certs", // PLD Linux
"/etc/ssl/certs", // SLES10/SLES11,
https://golang.org/issue/12139
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/389b0270b3ccf3b44894208b4df716cce576c191
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
