Update to 1.1.2. Fixes rhbz#2069648.

Mitigate CVE-2022-29162 / GHSA-f3fp-gc8g-vw66.
Don't pull in git unnecessarily
This commit is contained in:
Maxwell G 2022-05-22 17:50:02 -05:00
parent 3ee1d9a817
commit 79a4ab51a6
3 changed files with 9 additions and 4 deletions

1
.gitignore vendored
View File

@ -357,3 +357,4 @@
/v1.1.0-rc.1.tar.gz /v1.1.0-rc.1.tar.gz
/v1.1.0.tar.gz /v1.1.0.tar.gz
/v1.1.1.tar.gz /v1.1.1.tar.gz
/v1.1.2.tar.gz

View File

@ -24,7 +24,7 @@
%global import_path %{provider_prefix} %global import_path %{provider_prefix}
%global git0 https://github.com/opencontainers/runc %global git0 https://github.com/opencontainers/runc
%global built_tag v1.1.1 %global built_tag v1.1.2
%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
@ -49,7 +49,6 @@ BuildRequires: golang
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
BuildRequires: go-md2man BuildRequires: go-md2man
BuildRequires: make BuildRequires: make
BuildRequires: git
Provides: oci-runtime Provides: oci-runtime
# vendored libraries # vendored libraries
# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
@ -89,7 +88,7 @@ in accordance with the Open Container Initiative's specifications,
and to manage containers running under runc. and to manage containers running under runc.
%prep %prep
%autosetup -Sgit -n %{name}-%{built_tag_strip} %autosetup -p1 -n %{name}-%{built_tag_strip}
sed -i 's/ -trimpath//g' Makefile sed -i 's/ -trimpath//g' Makefile
%build %build
@ -142,6 +141,11 @@ install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
%changelog %changelog
* Mon Jun 27 2022 Maxwell G <gotmax@e.email> - 2:1.1.2-1
- Update to 1.1.2. Fixes rhbz#2069648.
- Mitigate CVE-2022-29162 / GHSA-f3fp-gc8g-vw66.
- Don't pull in git unnecessarily
* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2:1.1.1-2 * Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2:1.1.1-2
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
CVE-2022-29526, CVE-2022-30629 CVE-2022-29526, CVE-2022-30629

View File

@ -1 +1 @@
SHA512 (v1.1.1.tar.gz) = baf622e7edae9b68d2fa255f02359d770489c7578be3c6379a5d939b4f1dfa697ec9eb4ef7dce252e64ee5225f76c06e45182a9b92b68a952e21e3f5f91450d0 SHA512 (v1.1.2.tar.gz) = 61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049