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 deleted file mode 100644 index c0f214b13f53bcf679c0fecd538b666ef2cb362b..0000000000000000000000000000000000000000 --- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f3d446b60a082308ec5aaa2fdc36e31f566081bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20=C4=8Cajka?= -Date: Thu, 22 Mar 2018 11:49:09 +0100 -Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the - internal test suite - ---- - src/time/internal_test.go | 7 +++++-- - src/time/zoneinfo_test.go | 3 ++- - src/time/zoneinfo_unix.go | 2 -- - 3 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/time/internal_test.go b/src/time/internal_test.go -index 35ce69b228..1cea04ed7e 100644 ---- a/src/time/internal_test.go -+++ b/src/time/internal_test.go -@@ -4,13 +4,15 @@ - - package time - -+import "runtime" -+ - func init() { - // force US/Pacific for time zone tests - ForceUSPacificForTesting() - } - - func initTestingZone() { -- 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() + "; you may want to use -tags=timetzdata") - } -@@ -21,8 +23,9 @@ func initTestingZone() { - var OrigZoneSources = zoneSources - - func forceZipFileForTesting(zipOnly bool) { -- zoneSources = make([]string, len(OrigZoneSources)) -+ zoneSources = make([]string, len(OrigZoneSources)+1) - copy(zoneSources, OrigZoneSources) -+ zoneSources = append(zoneSources, runtime.GOROOT()+"/lib/time/zoneinfo.zip") - if zipOnly { - zoneSources = zoneSources[len(zoneSources)-1:] - } -diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go -index 277b68f798..be2aa6c687 100644 ---- a/src/time/zoneinfo_test.go -+++ b/src/time/zoneinfo_test.go -@@ -9,6 +9,7 @@ import ( - "fmt" - "os" - "reflect" -+ "runtime" - "testing" - "time" - ) -@@ -139,7 +140,7 @@ func TestLoadLocationFromTZData(t *testing.T) { - t.Fatal(err) - } - -- tzinfo, err := time.LoadTzinfo(locationName, time.OrigZoneSources[len(time.OrigZoneSources)-1]) -+ tzinfo, err := time.LoadTzinfo(locationName, runtime.GOROOT()+"/lib/time/zoneinfo.zip") - if err != nil { - t.Fatal(err) - } -diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go -index d2465eef65..b8c934c9a9 100644 ---- a/src/time/zoneinfo_unix.go -+++ b/src/time/zoneinfo_unix.go -@@ -12,7 +12,6 @@ - package time - - import ( -- "runtime" - "syscall" - ) - -@@ -22,7 +21,6 @@ var zoneSources = []string{ - "/usr/share/zoneinfo/", - "/usr/share/lib/zoneinfo/", - "/usr/lib/locale/TZ/", -- runtime.GOROOT() + "/lib/time/zoneinfo.zip", - } - - func initLocal() { --- -2.26.2 - diff --git a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/0001-cmd-go-disable-Google-s-proxy-and-sumdb.patch similarity index 100% rename from 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch rename to 0001-cmd-go-disable-Google-s-proxy-and-sumdb.patch diff --git a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch b/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch deleted file mode 100644 index 5d0970c9a4d984154f4b53dfbcab5c326f405047..0000000000000000000000000000000000000000 --- a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 67a4711d09c6595c17f32470c15bf471c287777d Mon Sep 17 00:00:00 2001 -From: Michael Munday -Date: Tue, 17 Jan 2017 11:33:38 -0500 -Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x - -Exposing this field on s390x improves compatibility with the other -linux architectures, all of which already expose it. - -Fixes #18628 and updates #18632. - -Change-Id: I08e8e1eb705f898cd8822f8bee0d61ce11d514b5 ---- - src/syscall/ztypes_linux_s390x.go | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/syscall/ztypes_linux_s390x.go b/src/syscall/ztypes_linux_s390x.go -index 91f5ceff20..59a8b1fccd 100644 ---- a/src/syscall/ztypes_linux_s390x.go -+++ b/src/syscall/ztypes_linux_s390x.go -@@ -449,12 +449,12 @@ type RtAttr struct { - } - - type IfInfomsg struct { -- Family uint8 -- _ uint8 -- Type uint16 -- Index int32 -- Flags uint32 -- Change uint32 -+ Family uint8 -+ X__ifi_pad uint8 -+ Type uint16 -+ Index int32 -+ Flags uint32 -+ Change uint32 - } - - type IfAddrmsg struct { --- -2.26.2 - diff --git a/go1.18.3.src.tar.gz b/go1.19.4.src.tar.gz similarity index 65% rename from go1.18.3.src.tar.gz rename to go1.19.4.src.tar.gz index 669e038068336ccca5d091d80f5bc3d090d42beb..2a2e59ad1bfbb74899a287646577eabc395ad68f 100644 Binary files a/go1.18.3.src.tar.gz and b/go1.19.4.src.tar.gz differ diff --git a/golang.spec b/golang.spec index c439d0892e770e21b73df4b2ec1dc67577b23b96..077566dac2261985d045c73b1a55ae38b2c5e850 100644 --- a/golang.spec +++ b/golang.spec @@ -69,13 +69,12 @@ %global gohostarch arm64 %endif -# Comment out go_prerelease and go_patch as needed -%global go_api 1.18 -#global go_prerelease rc1 -%global go_patch 3 +# Comment out go_patch as needed +%global go_api 1.19 +%global go_patch 4 -%global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} -%global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} +%global go_version %{go_api}%{?go_patch:.%{go_patch}} +%global go_source %{go_api}%{?go_patch:.%{go_patch}} Name: golang Version: %{go_version} @@ -99,28 +98,24 @@ BuildRequires: pcre-devel, glibc-static, perl-interpreter, procps-ng Provides: go = %{version}-%{release} -# Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data +# Bundled/Vendored provides can be found in `find . -name modules.txt` on the in tree module data # - in version filed substituted with . per versioning guidelines -Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20211104044539.f987b9c94b31 -Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20210905161508.09a460cdf81d -Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210923205945.b76863e36670 -Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20211215153901.e495a2d5b3d3 -Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20211102181907.3a5865c02020 -Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209124913.491a49abca63 -Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20210220032951.036812b2e83c -Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20211205182925.97ca703d548d -Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210927222741.03fcf44c2211 -Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20211105212822.18b340fc7af2 -Provides: bundled(golang(golang.org/x/tools)) = 0.1.9.0.20220329150752.294080fd2f5a -Provides: bundled(golang(golang.org/x/xerrors)) = 0.0.0.20200804184101.5ec99f83aff1 +Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20220729232143.a41b82acbcb1 +Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20220319035150.800ac71e25c2 +Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20220412001346.fc48f9fe4c15 +Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20220516162934.403b01795ae8 +Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20220419223038.86c51ed26bb4 +Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20220907013720.d52c520e3766 +Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20220513210516.0976fa681c29 +Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20220614162138.6c1b26c55098 +Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20220411215600.e5f449aeb171 +Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20220509174342.b4bca84b0361 +Provides: bundled(golang(golang.org/x/tools)) = 0.1.11.0.20220516163903.1e55371df567 Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} -Requires: go-srpm-macros -Patch1: 0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch -Patch2: 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch -Patch3: 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch +Patch3: 0001-cmd-go-disable-Google-s-proxy-and-sumdb.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1 @@ -136,12 +131,13 @@ Source100: golang-gdbinit %description %{summary}. +Go is an open source programming language that makes it easy to build simple, reliable, and efficient software. %package docs Summary: Golang compiler docs Requires: %{name} = %{version}-%{release} BuildArch: noarch -Obsoletes: %{name}-docs < 1.1-4 +Obsoletes: %{name}-docs < 1.1 %description docs %{summary}. @@ -211,7 +207,7 @@ Requires: gcc Recommends: git, subversion, mercurial %description bin -%{summary} +%{summary}. # Workaround old RPM bug of symlink-replaced-with-dir failure %pretrans -p @@ -238,7 +234,7 @@ Summary: Golang std library with -race enabled Requires: %{name} = %{version}-%{release} %description race -%{summary} +%{summary}. %endif %prep @@ -441,10 +437,10 @@ if [ $1 = 0 ]; then %{_sbindir}/update-alternatives --remove go %{goroot}/bin/go fi +%generate_compatibility_deps %files %license LICENSE PATENTS -%doc AUTHORS CONTRIBUTORS # VERSION has to be present in the GOROOT, for `go install std` to work %doc %{goroot}/VERSION %dir %{goroot}/doc @@ -491,5 +487,8 @@ fi %endif %changelog +* Tue Jan 3 2023 Kun(llfl) - 1.19.4-1 +- update version to 1.19.4 + * Tue Jun 14 2022 happy_orange - 1.18.3-1 - init from upstream