From 598d5dc47bda8ed82898adb4805b92eae9d5b60c Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 27 May 2024 14:24:25 +0800 Subject: [PATCH 1/2] update to skopeo-1.14.3-2.src.rpm Signed-off-by: Zhao Hang --- download | 2 +- skopeo.spec | 62 ++++++++++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/download b/download index 38eed10..b1abfa7 100644 --- a/download +++ b/download @@ -1 +1 @@ -523b1a91a86aec6e19261708d14a82a7 skopeo-1.13.3-9e29e4c.tar.gz +16db48d7c12708ab9b504f282766e164 release-1.14-5f2b9af.tar.gz diff --git a/skopeo.spec b/skopeo.spec index 8529d63..88e0c78 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,28 +1,22 @@ %global debug_package %{nil} %global with_check 0 -%global anolis_release .0.1 %if 0%{?rhel} > 7 && ! 0%{?fedora} -%ifarch loongarch64 -%define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; -%else %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 %{?**}; -%endif %else %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 import_path github.com/containers/%{name} -#%%global branch release-1.11 -%global commit0 9e29e4cede9bdaa4a54aa5b0af86efedb823bde4 +%global branch release-1.14 +%global commit0 5f2b9afebe813012e936cd5b3f4bae1caae8bd6f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.13.3 -Release: 3%{anolis_release}%{?dist} +Version: 1.14.3 +Release: 2%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -33,9 +27,8 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif - BuildRequires: git-core -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel @@ -129,16 +122,41 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Mon Mar 04 2024 Wenlong Zhang - 2:1.13.3-3.0.1 -- add loong64 support for skopeo - -* Tue Jan 23 2024 Jindrich Novy - 2:1.13.3-3 -- Make the module buildable again -- Resolves: RHEL-16299 - -* Mon Dec 04 2023 Lokesh Mandvekar - 2:1.13.3-2 -- Rebuild with golang 1.20.10 for CVE-2023-39321 -- Related: Jira:RHEL-4517 +* Fri Apr 19 2024 Jindrich Novy - 2:1.14.3-2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/5f2b9af) +- Resolves: RHEL-28728 + +* Mon Apr 01 2024 Lokesh Mandvekar - 2:1.14.3-1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/4a2bc3a) +- Resolves: RHEL-28226 + +* Mon Mar 18 2024 Jindrich Novy - 2:1.14.3-0.2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/d0a0f1a) +- Resolves: RHEL-28226 + +* Fri Feb 02 2024 Jindrich Novy - 2:1.14.3-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/1c2ab99) +- Related: Jira:RHEL-2110 + +* Wed Jan 31 2024 Jindrich Novy - 2:1.14.1-2 +- Switch to the maint branch +- Related: Jira:RHEL-2110 + +* Fri Jan 19 2024 Jindrich Novy - 2:1.14.1-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.14.1 +- Related: Jira:RHEL-2110 + +* Tue Jan 02 2024 Jindrich Novy - 2:1.14.0-2 +- update to latest content of https://github.com/containers/skopeo/releases/tag/1.14.0 + (https://github.com/containers/skopeo/commit/6abf96bb82666fbb3d4ad9faf1812e5ae2d31a74) + +* Thu Dec 07 2023 Lokesh Mandvekar - 2:1.14.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.14.0 +- Related: Jira:RHEL-2110 * Fri Aug 25 2023 Jindrich Novy - 2:1.13.3-1 - update to https://github.com/containers/skopeo/releases/tag/v1.13.3 -- Gitee From 691f0a593e95fbe22d5e75b4e9c4b3ae38e033fb Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 30 Dec 2022 15:41:15 +0800 Subject: [PATCH 2/2] add loong64 support for skopeo Signed-off-by: Wenlong Zhang --- skopeo.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/skopeo.spec b/skopeo.spec index 88e0c78..be9ade1 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,9 +1,15 @@ %global debug_package %{nil} %global with_check 0 +%global anolis_release .0.1 %if 0%{?rhel} > 7 && ! 0%{?fedora} +%ifarch loongarch64 +%define gobuild(o:) \ +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +%else %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 %{?**}; +%endif %else %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 @@ -16,7 +22,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 2 Name: skopeo Version: 1.14.3 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -27,6 +33,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif + BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -122,6 +129,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon May 27 2024 Wenlong Zhang - 2:1.14.3-2.0.1 +- add loong64 support for skopeo + * Fri Apr 19 2024 Jindrich Novy - 2:1.14.3-2 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 (https://github.com/containers/skopeo/commit/5f2b9af) -- Gitee