diff --git a/.gitignore b/.gitignore index ac15d58..882d68a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.0.0-rc92.tar.gz +SOURCES/v1.0.2.tar.gz diff --git a/.runc.metadata b/.runc.metadata index 85883d8..ed58c0a 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -b5571f41bcc85be33a56122a30cb1a241476a8d1 SOURCES/v1.0.0-rc92.tar.gz +3a0bb2a9506981b5a2204fb1591afc827ecaeb45 SOURCES/v1.0.2.tar.gz diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 6e5f001..95eaeba 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -19,11 +19,10 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl # https://github.com/opencontainers/runc %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global release_candidate rc92 Name: %{repo} -Version: 1.0.0 -Release: 70.%{release_candidate}%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: CLI for running Open Containers # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures #ExclusiveArch: %%{go_arches} @@ -32,9 +31,8 @@ Summary: CLI for running Open Containers ExcludeArch: %{ix86} License: ASL 2.0 URL: %{git0} -Source0: %{git0}/archive/v1.0.0-%{release_candidate}.tar.gz -#Patch0: 1807.patch -Provides: oci-runtime = 1 +Source0: %{git0}/archive/v%{version}.tar.gz +Provides: oci-runtime BuildRequires: golang >= 1.12.12-4 BuildRequires: git BuildRequires: go-md2man @@ -47,7 +45,7 @@ in accordance with the Open Container Initiative's specifications, and to manage containers running under runc. %prep -%autosetup -Sgit -n %{repo}-%{version}-%{release_candidate} +%autosetup -Sgit sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name} %build @@ -58,9 +56,11 @@ pushd GOPATH popd pushd GOPATH/src/%{import_path} +export GO111MODULE=off export GOPATH=%{gopath}:$(pwd)/GOPATH export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" export BUILDTAGS="selinux seccomp" +export LDFLAGS="-X main.gitCommit= -X main.version=%{version}" %gobuild -o %{name} %{import_path} pushd man @@ -68,15 +68,7 @@ pushd man popd %install -install -d -p %{buildroot}%{_bindir} -install -p -m 755 %{name} %{buildroot}%{_bindir} - -# install man pages -install -d -p %{buildroot}%{_mandir}/man8 -install -p -m 644 man/man8/* %{buildroot}%{_mandir}/man8 -# install bash completion -install -d -p %{buildroot}%{_datadir}/bash-completion/completions -install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions +make install install-man install-bash DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir} BINDIR=%{_bindir} %check @@ -91,6 +83,54 @@ install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash %{_datadir}/bash-completion/completions/%{name} %changelog +* Wed Aug 25 2021 Jindrich Novy - 1.0.2-1 +- update to https://github.com/opencontainers/runc/releases/tag/v1.0.2 +- Related: #1934415 + +* Fri Aug 06 2021 Jindrich Novy - 1.0.1-5 +- do not use versioned provide +- Related: #1934415 + +* Thu Jul 29 2021 Jindrich Novy - 1.0.1-4 +- fix "unknown version" displayed by runc -v +- Related: #1934415 + +* Mon Jul 26 2021 Jindrich Novy - 1.0.1-3 +- be sure to compile runc binaries the right way +- Related: #1934415 + +* Mon Jul 26 2021 Jindrich Novy - 1.0.1-2 +- use Makefile +- Related: #1934415 + +* Wed Jul 21 2021 Jindrich Novy - 1.0.1-1 +- update to https://github.com/opencontainers/runc/releases/tag/v1.0.1 +- Related: #1934415 + +* Thu May 20 2021 Jindrich Novy - 1.0.0-76.rc95 +- updated to rc95 to fix CVE-2021-30465 +- Related: #1934415 + +* Tue May 18 2021 Jindrich Novy - 1.0.0-75.rc94 +- set GO111MODULE=off to fix build +- Related: #1934415 + +* Fri May 14 2021 Jindrich Novy - 1.0.0-74.rc94 +- update to https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc94 +- Related: #1934415 + +* Tue May 11 2021 Jindrich Novy - 1.0.0-73.rc93 +- fix CVE-2021-30465 +- Related: #1934415 + +* Tue Mar 30 2021 Jindrich Novy - 1.0.0-72.rc93 +- upload rc93 tarball +- Related: #1934415 + +* Tue Mar 30 2021 Jindrich Novy - 1.0.0-71.rc93 +- update to rc93 +- Related: #1934415 + * Fri Jan 29 2021 Jindrich Novy - 1.0.0-70.rc92 - add missing Provides: oci-runtime = 1 - Related: #1883490