diff --git a/0001-add-loong64-support-for-etcd.patch b/0001-add-loong64-support-for-etcd.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3caf523f5c96b6aac43bcac255f194c5126020d --- /dev/null +++ b/0001-add-loong64-support-for-etcd.patch @@ -0,0 +1,31 @@ +From ede7f7ed58d034507643a98aeca453dba0f497fb Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Thu, 5 Jan 2023 12:37:27 +0000 +Subject: [PATCH] add loong64 support for etcd + +--- + vendor/go.etcd.io/bbolt/bolt_loong64.go | 13 +++++++++++++ + 1 file changed, 13 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..bb402fb +--- /dev/null ++++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go +@@ -0,0 +1,13 @@ ++// +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 ++ ++// Are unaligned load/stores broken on this arch? ++var brokenUnaligned = false ++ +-- +2.33.0 diff --git a/0001-fix-CVE-2022-41723.patch b/0002-fix-CVE-2022-41723.patch similarity index 100% rename from 0001-fix-CVE-2022-41723.patch rename to 0002-fix-CVE-2022-41723.patch diff --git a/registries.conf b/registries.conf index 7984db106eef5c77cdc4bf34fd884774e89b9a1d..496c6aa7ab1f356ce7ae01ee11a79c288100b88c 100644 --- a/registries.conf +++ b/registries.conf @@ -1,2 +1,2 @@ # # An array of host[:port] registries to try when pulling an unqualified image, in order. -unqualified-search-registries = ["docker.io"] \ No newline at end of file +unqualified-search-registries = ["docker.io"] diff --git a/skopeo.spec b/skopeo.spec index 0cdd86def1bbc2699fe0c0ed04d0ce04c23457a6..5aadd33ec2455a39809966d018e198ef47c14685 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,15 +30,16 @@ ExcludeArch: ppc64 Name: %{repo} Epoch: 1 Version: 1.5.2 -Release: 4 +Release: 5 Summary: Work with remote images registries - retrieving information, images, signing content License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/%{build_version}.tar.gz Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz Source2: registries.conf - -Patch0001: 0001-fix-CVE-2022-41723.patch +Source3: sys-unix.tar.gz +Patch0: 0001-add-loong64-support-for-etcd.patch +Patch0002: 0002-fix-CVE-2022-41723.patch BuildRequires: go-srpm-macros git-core pkgconfig(devmapper) make BuildRequires: golang >= 1.16.6 @@ -229,6 +230,10 @@ policy under `/etc/containers/`. %prep %autosetup -Sgit -n %{name}-%{version} -p1 tar -xf %SOURCE1 +%ifarch loongarch64 +rm -rf vendor/golang.org/x/sys/unix +tar -xf %{SOURCE3} -C vendor/golang.org/x/sys/ +%endif %build pushd go-md2man-* @@ -349,32 +354,29 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_prefix}/share/bash-completion/completions/%{name} %changelog -* Thu Apr 18 2024 zhangbowei -1:1.5.2-4 +* Thu Apr 18 2024 zhangbowei -1:1.5.2-5 - Type:bugfix - CVE:NA - SUG:NA - DESC: fix CVE-2022-41723 -* Wed Feb 21 2024 liukuo - 1:1.5.2-3 +* Wed Feb 21 2024 liukuo - 1:1.5.2-4 - Type:bugfix - ID:NA - SUG:NA -- DESC:rebuild for golang cvefix: CVE-2023-29406,CVE-2023-39326 +- DESC:rebuild for golang cvefix: CVE-2022-32190,CVE-2022-41723,CVE-2022-32148,CVE-2023-29406,CVE-2023-39326 -* Thu Sep 14 2023 lijian - 1:1.5.2-2 +* Tue Sep 5 2023 lijian - 1:1.5.2-3 - Type:bugfix - ID:NA - SUG:NA -- DESC:rebuild for golang cvefix: CVE-2023-24534,CVE-2023-24537 +- DESC:rebuild for golang CVE-2023-24534,CVE-2023-24536,CVE-2023-24537,CVE-2023-24538 -* Thu Jun 15 2023 Jiachen Fan - 1:1.5.2-1 -- Type:revert +* Sat Jan 7 2023 huajingyun - 1.1.0-8.dev.git63085f5 +- Type:bugfix - ID:NA - SUG:NA -- DESC:revert commit ab1fb58b56ef0913e64b71a7bac60ba129e460ff, to fix skopeo install bug in standard iso - -* Fri Jun 09 2023 duyiwei - 1:1.5.2-2 -- remove subpackage containers-common +- DESC: add loong64 support * Mon Nov 29 2021 haozi007 - 1.1.0-7.dev.git63085f5 - Type:bugfix diff --git a/sys-unix.tar.gz b/sys-unix.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..78a439025a383b57df74773fbdfa655554e5a8e9 Binary files /dev/null and b/sys-unix.tar.gz differ