From 9b2d87f3d26fca5308f42c9a9b5eeca56f8875f8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 08 Jan 2019 13:21:52 +0000
Subject: [PATCH] import source-to-image-1.1.13-1.el7

---
 .source-to-image.metadata  |    2 
 SPECS/source-to-image.spec |  100 ++++++++++++++++++++++++++++++++++++++++---------
 .gitignore                 |    2 
 3 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6cce1a1..3180cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.0.9.tar.gz
+SOURCES/source-to-image-1.1.13.tar.gz
diff --git a/.source-to-image.metadata b/.source-to-image.metadata
index 782eb5f..8210ce2 100644
--- a/.source-to-image.metadata
+++ b/.source-to-image.metadata
@@ -1 +1 @@
-8ddb6cf4e6862d1c1339b5680770b9a41599a992 SOURCES/v1.0.9.tar.gz
+73d2b2e26f43478a9ff9377b1e1a223230bb487a SOURCES/source-to-image-1.1.13.tar.gz
diff --git a/SPECS/source-to-image.spec b/SPECS/source-to-image.spec
index c2b7261..b77daf5 100644
--- a/SPECS/source-to-image.spec
+++ b/SPECS/source-to-image.spec
@@ -1,7 +1,7 @@
 %if 0%{?fedora} || 0%{?rhel} == 6
 %global with_devel 1
 %global with_bundled 1
-%global with_debug 1
+%global with_debug 0
 %global with_check 1
 %global with_unit_test 1
 %else
@@ -29,30 +29,32 @@
 # https://github.com/openshift/source-to-image
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          f9ff77d66250d5b904183fb9af0b1cb98b5aab98
+%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.0.9
+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/v%{version}.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}}
+# there is no docker on ppc64, only on ppc64le
+# https://bugzilla.redhat.com/show_bug.cgi?id=1465159
+ExcludeArch: ppc64
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 
 %if ! 0%{?with_bundled}
-BuildRequires: golang(github.com/docker/docker/builder/parser)
 BuildRequires: golang(github.com/fsouza/go-dockerclient)
 BuildRequires: golang(github.com/golang/glog)
 BuildRequires: golang(github.com/spf13/cobra)
@@ -63,6 +65,8 @@
 Requires:      git
 Requires:      tar
 
+Provides:      s2i = %{version}-%{release}
+
 %description
 %{summary}
 
@@ -72,14 +76,12 @@
 BuildArch:     noarch
 
 %if 0%{?with_check}
-BuildRequires: golang(github.com/docker/docker/builder/parser)
 BuildRequires: golang(github.com/fsouza/go-dockerclient)
 BuildRequires: golang(github.com/golang/glog)
 BuildRequires: golang(github.com/spf13/cobra)
 BuildRequires: golang(github.com/spf13/pflag)
 %endif
 
-Requires:      golang(github.com/docker/docker/builder/parser)
 Requires:      golang(github.com/fsouza/go-dockerclient)
 Requires:      golang(github.com/golang/glog)
 Requires:      golang(github.com/spf13/cobra)
@@ -95,15 +97,19 @@
 Provides:      golang(%{import_path}/pkg/build/strategies/layered) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/build/strategies/onbuild) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/build/strategies/sti) = %{version}-%{release}
+Provides:      golang(%{import_path}/pkg/cmd) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/config) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/create) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/create/templates) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/docker) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/docker/test) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/errors) = %{version}-%{release}
-Provides:      golang(%{import_path}/pkg/git) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/ignore) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/run) = %{version}-%{release}
+Provides:      golang(%{import_path}/pkg/scm) = %{version}-%{release}
+Provides:      golang(%{import_path}/pkg/scm/empty) = %{version}-%{release}
+Provides:      golang(%{import_path}/pkg/scm/file) = %{version}-%{release}
+Provides:      golang(%{import_path}/pkg/scm/git) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/scripts) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/tar) = %{version}-%{release}
 Provides:      golang(%{import_path}/pkg/test) = %{version}-%{release}
@@ -124,6 +130,7 @@
 %package unit-test
 Summary:         Unit tests for %{name} package
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 
 %if 0%{?with_check}
@@ -142,7 +149,7 @@
 %endif
 
 %prep
-%setup -q -n source-to-image-%{version}
+%setup -q -n %{repo}-%{version}
 
 %build
 mkdir -p src/github.com/openshift
@@ -158,8 +165,12 @@
 export STI_GIT_MINOR=2
 export STI_GIT_VERSION=%{commit}
 
-export LDFLAGS="-X majorFromGit=%{majorFromGit} -X minorFromGit=%{minorFromGit} -X versionFromGit=%{versionFromGit} -X commitFromGit=%{commitFromGit}"
-go build -a -v -x -o bin/s2i %{import_path}/cmd/s2i
+export LDFLAGS="\
+	-X %{import_path}/pkg/version.majorFromGit=%{majorFromGit} \
+	-X %{import_path}/pkg/version.minorFromGit=%{minorFromGit} \
+	-X %{import_path}/pkg/version.versionFromGit=%{versionFromGit} \
+	-X %{import_path}/pkg/version.commitFromGit=%{commitFromGit}"
+%gobuild -o bin/s2i %{import_path}/cmd/s2i
 
 %install
 install -d -p %{buildroot}%{_bindir}
@@ -170,7 +181,7 @@
 install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
 echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
 # find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./Godeps") ; do
+for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
     echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
     install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
     cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
@@ -182,7 +193,7 @@
 %if 0%{?with_unit_test} && 0%{?with_devel}
 install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
 # find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go" | grep -v "./Godeps"); do
+for file in $(find . -iname "*_test.go"); do
     echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
     install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
     cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
@@ -206,13 +217,15 @@
 %global gotest go test
 %endif
 
-%gotest %{import_path}/pkg/build/strategies
+%gotest %{import_path}/pkg/api
+%gotest %{import_path}/pkg/api/validation
 %gotest %{import_path}/pkg/build/strategies/layered
 %gotest %{import_path}/pkg/build/strategies/onbuild
 %gotest %{import_path}/pkg/build/strategies/sti
 %gotest %{import_path}/pkg/docker
-%gotest %{import_path}/pkg/git
 %gotest %{import_path}/pkg/ignore
+#%%gotest %%{import_path}/pkg/scm
+#%gotest %{import_path}/pkg/scm/git
 %gotest %{import_path}/pkg/scripts
 %gotest %{import_path}/pkg/tar
 %gotest %{import_path}/pkg/util
@@ -242,8 +255,57 @@
 %endif
 
 %changelog
-* Wed May 11 2016 Tomas Hrcka - 1.0.9-1
-- Rebase to latest upstream release
+* Wed Dec 12 2018 Honza Horak <hhorak@redhat.com> - 1.1.13-1
+- Update to 1.1.13
+  Also fixes CVE-2018-1102
+  Resolves: #1654243
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 07 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.1.7-1
+- Update to v1.1.7
+  resolves: #1510476
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Till Maas <opensource@till.name> - 1.0.9-5
+- Do not build on ppc64 (does not contain docker)
+
+* Mon May 15 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.0.9-4
+- Fix go-1.8 -X importpath/name=value syntax
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jul 21 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-2
+- https://fedoraproject.org/wiki/Changes/golang1.7
+
+* Sat May 21 2016 jchaloup <jchaloup@redhat.com> - 1.0.9-1
+- Update to v1.0.9
+  resolves: #1273677
+
+* Mon Feb 22 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-3
+- https://fedoraproject.org/wiki/Changes/golang1.6
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Dec 10 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.4-1
+- New upstream release
+- https://github.com/openshift/source-to-image/releases/tag/v1.0.4
+
+* Thu Oct 22 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.3-2
+- Rebase to new upstream version
+- Package now provides s2i
+- Disable tests removed by upstream
 
 * Thu Sep 17 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.2-4
 - Fix dependencies

--
Gitblit v1.8.0