From 0659caf3aaa35796ec2aacc8726031fb36851c10 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Dec 13 2018 07:46:06 +0000 Subject: Update to 1.1.13 Also fixes CVE-2018-1102 Resolves: #1590175 --- diff --git a/.gitignore b/.gitignore index 1584993..c918f79 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /source-to-image-226afa1.tar.gz +/source-to-image-1.1.13.tar.gz diff --git a/source-to-image.spec b/source-to-image.spec index 8ebd094..38b7527 100644 --- a/source-to-image.spec +++ b/source-to-image.spec @@ -29,22 +29,22 @@ # https://github.com/openshift/source-to-image %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 226afa1319c3498f47b974ec8ceb36526341a19c +%global commit b54d75d3de92d123e68a79c6ee09c2c5fe44e720 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global majorFromGit 1 -%global minorFromGit 0+ -%global versionFromGit v1.0.9 +%global minorFromGit 1+ +%global versionFromGit v1.1.13 %global commitFromGit %{commit} Name: %{repo} -Version: 1.1.7 -Release: 3%{?dist} +Version: 1.1.13 +Release: 1%{?dist} Summary: A tool for building artifacts from source and injecting into docker images License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{version}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} @@ -149,7 +149,7 @@ providing packages with %{import_path} prefix. %endif %prep -%setup -q -n %{repo}-%{commit} +%setup -q -n %{repo}-%{version} %build mkdir -p src/github.com/openshift @@ -255,6 +255,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Thu Dec 13 2018 Honza Horak - 1.1.13-1 +- Update to 1.1.13 + Also fixes CVE-2018-1102 + Resolves: #1590175 + * Sat Jul 14 2018 Fedora Release Engineering - 1.1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index db21619..53b2ee1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (source-to-image-226afa1.tar.gz) = b1e7d05af5992cfcdd7886304c8d9f14b051d97e4721cda69279ce7508b958299231f0e0de30f6ecc84c0ea32592125c327dbbb5bbb85412aefb40588e6d021b +SHA512 (source-to-image-1.1.13.tar.gz) = d885f3e8ecb2d2e671461704ffde2b47d2ada9fb07f7cd0259242f1030768df4d7cd5d6a2963805938a139178f51ca5ed0875ac068e1873e6b648952de46dc0a