From 183c6dd14b874ccd78464cc9d7a74324ad04cdf3 Mon Sep 17 00:00:00 2001 From: Renbo Date: Thu, 2 Mar 2023 15:48:43 +0800 Subject: [PATCH] update to skopeo-1.9.4-0.1.module+el8.7.0+17824+66a0202b Signed-off-by: Renbo --- download | 2 +- skopeo.spec | 57 ++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/download b/download index d311592..96edfd7 100644 --- a/download +++ b/download @@ -1 +1 @@ -f2d559e81db55fee4681b4e05c650deb release-1.6-1186cc6.tar.gz +92fbb68275179666699976f64afc12d1 release-1.9-04d99f7.tar.gz diff --git a/skopeo.spec b/skopeo.spec index f12fc57..0b8b573 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,8 +1,5 @@ %global with_check 0 -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 - %if 0%{?rhel} > 7 && ! 0%{?fedora} %define gobuild(o:) \ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; @@ -10,15 +7,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %endif -%global branch release-1.6 %global import_path github.com/containers/%{name} -%global commit0 1186cc6bce235addb7345115c43aacea3cf6893a +%global branch release-1.9 +%global commit0 04d99f7eb2de0abdb04ea6b7b9f3fff77dfe4c9f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.9.4 +Release: 0.1%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -30,8 +27,8 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif BuildRequires: git-core -BuildRequires: golang >= 1.16.6 -BuildRequires: go-md2man +BuildRequires: golang >= 1.17.7 +BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: pkgconfig(devmapper) @@ -66,6 +63,7 @@ This package contains system tests for %{name} %autosetup -Sgit -n %{name}-%{commit0} %endif sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile +sed -i 's/completions: bin\/%{name}/completions:/' Makefile sed -i 's/install-docs: docs/install-docs:/' Makefile %build @@ -113,15 +111,50 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}.fish +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name} %files tests %license LICENSE %{_datadir}/%{name}/test %changelog -* Fri Apr 01 2022 Jindrich Novy - 2:1.6.1-2 -- fix CVE-2022-21698 -- Related: #2059296 +* Fri Jan 13 2023 Jindrich Novy - 2:1.9.4-0.1 +- consume skopeo from release-1.9 upstream branch +- Resolves: #2160713 + +* Thu Oct 20 2022 Jindrich Novy - 2:1.9.3-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.9.3 +- Related: #2135973 + +* Wed Aug 03 2022 Jindrich Novy - 2:1.9.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.9.2 +- Related: #2061390 + +* Tue Jul 26 2022 Jindrich Novy - 2:1.9.1-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.9.1 +- Related: #2061390 + +* Mon Jul 18 2022 Jindrich Novy - 2:1.9.0-2 +- update to skopeo-1.9.0 - thanks to Lokesh Mandvekar for fixing build issues +- Related: #2061390 + +* Wed May 11 2022 Jindrich Novy - 2:1.8.0-2 +- BuildRequires: /usr/bin/go-md2man +- Related: #2061390 + +* Mon May 09 2022 Jindrich Novy - 2:1.8.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.8.0 +- Related: #2061390 + +* Fri Apr 08 2022 Jindrich Novy - 2:1.7.0-2 +- Related: #2061390 + +* Fri Mar 25 2022 Jindrich Novy - 2:1.7.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.7.0 +- Related: #2061390 * Thu Feb 17 2022 Jindrich Novy - 2:1.6.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.6.1 -- Gitee