From a6109823f24a8a5155fe266bfcd43c94d4d93090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 3 Apr 2018 15:42:14 +0200 Subject: [PATCH] Rebase to 1.9.5 --- .gitignore | 1 + golang.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cc45de7..0218b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /go1.9.2.src.tar.gz /go1.9.3.src.tar.gz /go1.9.4.src.tar.gz +/go1.9.5.src.tar.gz diff --git a/golang.spec b/golang.spec index 4e6be96..f930b52 100644 --- a/golang.spec +++ b/golang.spec @@ -96,11 +96,11 @@ %endif %global go_api 1.9 -%global go_version 1.9.4 +%global go_version 1.9.5 Name: golang -Version: 1.9.4 -Release: 2%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -183,8 +183,6 @@ Patch221: use-buildmode-pie-for-pie-testing.patch # https://github.com/hyangah/go/commit/3502496d03bcd842fd7aac95ec0d7096d581cd26 Patch222: use-no-pie-where-needed.patch -Patch223: CVE-2018-7187.patch - # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -321,8 +319,6 @@ Requires: %{name} = %{version}-%{release} %patch221 -p1 -b pie %patch222 -p1 -%patch223 -p1 - cp %{SOURCE1} ./src/runtime/ %build @@ -558,6 +554,9 @@ fi %endif %changelog +* Tue Apr 03 2018 Jakub Čajka - 1.9.5-1 +- Rebase to 1.9.5 + * Sat Mar 03 2018 Jakub Čajka - 1.9.4-2 - Fix CVE-2018-7187 - Resolves: BZ#1546386, BZ#1546388 diff --git a/sources b/sources index 06e4a51..9c6b46c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.9.4.src.tar.gz) = 1a7c830e07507ff7b89025adfb5c713444d97301f8ad47ef2564722c1e28186e946350f07e22777fbdd6f2f589c334eb01dfd589e97cb8a86f73669547badb0b +SHA512 (go1.9.5.src.tar.gz) = 5cde6a3c6e6040ddbcafa75dae551500d0bb15096a523ee29f788cbf3fa11d083d4e4a1b56a094ad2234f967c0d1be280ae00479d5f7c01174dc6da2a5a25924