diff --git a/0001-add-loong64-support-for-etcd.patch b/0001-add-loong64-support-for-etcd.patch deleted file mode 100644 index bb6f9f50b862df350558afae5d565e0cc96143c6..0000000000000000000000000000000000000000 --- a/0001-add-loong64-support-for-etcd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e6fea3042b3b9f9986ce9e19c730b2bd3d3eaa05 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 30 Dec 2022 06:22:44 +0000 -Subject: [PATCH] add loong64 support for etcd - ---- - vendor/go.etcd.io/bbolt/bolt_loong64.go | 10 ++++++++++ - 1 file changed, 10 insertions(+) - create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go - -diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go -new file mode 100644 -index 0000000..d02d59e ---- /dev/null -+++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go -@@ -0,0 +1,10 @@ -+// +build loong64 -+ -+package bbolt -+ -+// maxMapSize represents the largest mmap size supported by Bolt. -+const maxMapSize = 0x8000000000 // 512GB -+ -+// maxAllocSize is the size used when creating array pointers. -+const maxAllocSize = 0x7FFFFFFF -+ --- -2.27.0 - diff --git a/download b/download index ef565dff87747d426ed68a7b00a9f751a7d7c480..38eed102a54468a71d6c3f5607ab0e2639067c09 100644 --- a/download +++ b/download @@ -1 +1 @@ -eb3bec6d86707bffa79fb44c1b098d11 release-1.11-3f98753.tar.gz +523b1a91a86aec6e19261708d14a82a7 skopeo-1.13.3-9e29e4c.tar.gz diff --git a/skopeo.spec b/skopeo.spec index f0b987f608b98980998392a14dfe73deb9eba801..a853c5b67093dc222c436736b3d212ef7b92b79c 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -15,14 +15,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/%{name} -%global branch release-1.11 -%global commit0 3f98753bfdaa2c9e0465328b279f48bbdaa2ddaa +#%%global branch release-1.11 +%global commit0 9e29e4cede9bdaa4a54aa5b0af86efedb823bde4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.11.2 -Release: 0.2%{anolis_release}%{?dist} +Version: 1.13.3 +Release: 1%{anolis_release}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -34,7 +34,6 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif -Patch001: 0001-add-loong64-support-for-etcd.patch BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -130,41 +129,56 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Thu Jun 08 2023 Wenlong Zhang - 2:1.11.2-0.2.0.1 +* Wed Dec 13 2023 Wenlong Zhang - 2:1.13.3-1.0.1 - add loong64 support for skopeo -* Wed Feb 22 2023 Jindrich Novy - 2:1.11.2-0.2 -- fix build -- Related: #2123641 +* Fri Aug 25 2023 Jindrich Novy - 2:1.13.3-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.13.3 +- Related: #2176055 -* Tue Feb 21 2023 Jindrich Novy - 2:1.11.2-0.1 -- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11 - (https://github.com/containers/skopeo/commit/3f98753) -- Related: #2123641 +* Fri Aug 11 2023 Jindrich Novy - 2:1.13.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.13.2 +- Related: #2176055 -* Fri Feb 17 2023 Jindrich Novy - 2:1.11.1-1 -- update to https://github.com/containers/skopeo/releases/tag/v1.11.1 -- Related: #2123641 +* Fri Jul 21 2023 Jindrich Novy - 2:1.13.1-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.13.1 +- Related: #2176055 -* Fri Jan 27 2023 Jindrich Novy - 2:1.11.0-1 -- update to https://github.com/containers/skopeo/releases/tag/v1.11.0 - (https://github.com/containers/skopeo/commit/968670116c56023d37e9e98b48346478599c6801) -- Related: #2123641 +* Fri Jul 07 2023 Jindrich Novy - 2:1.13.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.13.0 +- Related: #2176055 -* Tue Jan 24 2023 Jindrich Novy - 2:1.11.0-0.3 -- update to the latest content of https://github.com/containers/skopeo/tree/main - (https://github.com/containers/skopeo/commit/fe15a36) -- Related: #2123641 +* Wed Jun 14 2023 Jindrich Novy - 2:1.12.0-2 +- rebuild for following CVEs: +CVE-2022-41724 CVE-2022-41725 CVE-2023-24537 CVE-2023-24538 CVE-2023-24534 CVE-2023-24536 CVE-2022-41723 CVE-2023-24539 CVE-2023-24540 CVE-2023-29400 +- Resolves: #2179951 +- Resolves: #2187319 +- Resolves: #2187367 +- Resolves: #2203682 +- Resolves: #2207513 -* Tue Jan 17 2023 Jindrich Novy - 2:1.11.0-0.2 -- update to the latest content of https://github.com/containers/skopeo/tree/main - (https://github.com/containers/skopeo/commit/8e09e64) -- Related: #2123641 +* Tue Jun 06 2023 Jindrich Novy - 2:1.12.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.12.0 +- Related: #2176055 -* Fri Jan 13 2023 Jindrich Novy - 2:1.11.0-0.1 -- update to the latest content of https://github.com/containers/skopeo/tree/main - (https://github.com/containers/skopeo/commit/2817510) -- Related: #2123641 +* Fri May 12 2023 Jindrich Novy - 2:1.11.3-0.2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11 + (https://github.com/containers/skopeo/commit/7e11ab4) +- Related: #2176055 + +* Wed Apr 12 2023 Jindrich Novy - 2:1.11.3-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11 + (https://github.com/containers/skopeo/commit/d79588e) +- Related: #2176055 + +* Sun Mar 26 2023 Jindrich Novy - 2:1.11.2-0.4 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.11 + (https://github.com/containers/skopeo/commit/8191ef3) +- Related: #2176055 + +* Wed Mar 08 2023 Jindrich Novy - 2:1.11.2-0.3 +- fix build +- Related: #2176055 * Thu Oct 06 2022 Jindrich Novy - 2:1.10.0-1 - update to https://github.com/containers/skopeo/releases/tag/v1.10.0