diff --git a/0001-add-loong64-support-for-uio.patch b/0001-add-loong64-support-for-uio.patch deleted file mode 100644 index 39d5c7e03074fc7a2c32b336dfd8ffa4ab4a3b2b..0000000000000000000000000000000000000000 --- a/0001-add-loong64-support-for-uio.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 30a8c133d3293d8850161dad9a3b720bb00c3963 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 31 May 2024 14:20:29 +0800 -Subject: [PATCH 1/2] add loong64 support for uio - ---- - .../vendor/github.com/u-root/uio/ubinary/little_endian.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804/vendor/github.com/u-root/uio/ubinary/little_endian.go b/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804/vendor/github.com/u-root/uio/ubinary/little_endian.go -index 317bb91..c0779ef 100644 ---- a/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804/vendor/github.com/u-root/uio/ubinary/little_endian.go -+++ b/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804/vendor/github.com/u-root/uio/ubinary/little_endian.go -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style - // license that can be found in the LICENSE file. - --// +build 386 amd64 arm arm64 mipsle mips64le ppc64le riscv riscv64 -+// +build 386 amd64 arm arm64 mipsle mips64le ppc64le riscv riscv64 loong64 - - package ubinary - --- -2.39.3 - diff --git a/0002-add-loong64-support-for-ebpf.patch b/1000-add-loong64-support-for-podman.patch similarity index 39% rename from 0002-add-loong64-support-for-ebpf.patch rename to 1000-add-loong64-support-for-podman.patch index ca216edd641cb63efe8c930b31a73e03c02afdd1..6550e70fe64b07ea13c9913c041a89c047d45a05 100644 --- a/0002-add-loong64-support-for-ebpf.patch +++ b/1000-add-loong64-support-for-podman.patch @@ -1,12 +1,27 @@ -From 365da3fbabe738cacd2615682c853c1617b9b8fc Mon Sep 17 00:00:00 2001 +From 7e279d30758acb332d4cd8d23457c7b360569421 Mon Sep 17 00:00:00 2001 From: rpm-build -Date: Fri, 31 May 2024 14:20:52 +0800 -Subject: [PATCH 2/2] add loong64 support for ebpf +Date: Wed, 14 Aug 2024 13:35:59 +0800 +Subject: [PATCH] add loong64 support for podman +Signed-off-by: rpm-build --- - vendor/github.com/cilium/ebpf/internal/endian_le.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../vendor/github.com/u-root/uio/ubinary/little_endian.go | 2 +- + vendor/github.com/cilium/ebpf/internal/endian_le.go | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/gvisor-tap-vsock-c62637db4d1417408b84340cbe993843a4984b92/vendor/github.com/u-root/uio/ubinary/little_endian.go b/gvisor-tap-vsock-c62637db4d1417408b84340cbe993843a4984b92/vendor/github.com/u-root/uio/ubinary/little_endian.go +index 317bb91..c0779ef 100644 +--- a/gvisor-tap-vsock-c62637db4d1417408b84340cbe993843a4984b92/vendor/github.com/u-root/uio/ubinary/little_endian.go ++++ b/gvisor-tap-vsock-c62637db4d1417408b84340cbe993843a4984b92/vendor/github.com/u-root/uio/ubinary/little_endian.go +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build 386 amd64 arm arm64 mipsle mips64le ppc64le riscv riscv64 ++// +build 386 amd64 arm arm64 mipsle mips64le ppc64le riscv riscv64 loong64 + + package ubinary + diff --git a/vendor/github.com/cilium/ebpf/internal/endian_le.go b/vendor/github.com/cilium/ebpf/internal/endian_le.go index 41a6822..62480fb 100644 --- a/vendor/github.com/cilium/ebpf/internal/endian_le.go @@ -20,5 +35,5 @@ index 41a6822..62480fb 100644 package internal -- -2.39.3 +2.43.0 diff --git a/download b/download index a8f7e099d0e38ecf4f49d5804bc2535ec9aa0a81..8d3bc29434c97f7284c5a74a022378751de4d9d1 100644 --- a/download +++ b/download @@ -1,4 +1,4 @@ 38ec1fc4dd55a482cc197d58f315104e dnsname-bdc4ab8.tar.gz -4ceb372fc42fc35de5f92b55330d4d08 gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804.tar.gz +369f4f472bdd335722c9aa1e6090b160 gvisor-tap-vsock-c62637db4d1417408b84340cbe993843a4984b92.tar.gz 4e88a5a12a13ec1787eb6b301e839d65 v0.1.7.tar.gz -b42f77fef0ec0d51178a19f6c906fafe v4.9-rhel-1a6dca2.tar.gz +73c79ad557d451b4faadb10b969e2bf5 v4.9-rhel-6b45bb1.tar.gz diff --git a/podman.spec b/podman.spec index 5bafea862af505cc34a13f443223bb5d7d3720fb..05218f2dd710e41aab71863030b585cf16c9f997 100644 --- a/podman.spec +++ b/podman.spec @@ -1,5 +1,5 @@ +%define anolis_release .0.1 %global with_check 0 -%global anolis_release .0.1 %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -9,19 +9,19 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global import_path github.com/containers/podman %global branch v4.9-rhel -%global commit0 1a6dca22bed80d4abcedd6d1cb4f8f636c7a42ff +%global commit0 6b45bb172a71e5af9d3da83dec9ed518538499a4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global commit_dnsname bdc4ab85266ade865a7c398336e98721e62ef6b2 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global gvproxyrepo gvisor-tap-vsock -%global gvproxyver 0.7.1 -%global commit_gvproxy 97028a6a6d6af2f26680f4fdf9dd15323de07804 +%global gvproxyver 0.7.3 +%global commit_gvproxy c62637db4d1417408b84340cbe993843a4984b92 Epoch: 4 Name: podman Version: 4.9.4 -Release: 4%{anolis_release}%{?dist} +Release: 12%{anolis_release}%{?dist} Summary: Manage Pods, Containers and Container Images License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 URL: https://%{name}.io/ @@ -34,8 +34,7 @@ Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz #Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz -Source5: 0001-add-loong64-support-for-uio.patch -Source6: 0002-add-loong64-support-for-ebpf.patch +Source1000: 1000-add-loong64-support-for-podman.patch # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -191,8 +190,7 @@ sed -i '$d' configure.ac popd tar fx %{SOURCE2} tar fx %{SOURCE4} -patch -p1 < %{SOURCE5} -patch -p1 < %{SOURCE6} +patch -p1 < %{SOURCE1000} # this is shipped by skopeo: containers-common subpackage rm -rf docs/source/markdown/containers-mounts.conf.5.md @@ -428,9 +426,45 @@ fi %{_libexecdir}/%{name}/gvproxy %changelog -* Thu Jun 20 2024 Wenlong Zhang - 4:4.9.4-4.0.1 +* Wed Aug 14 2024 Wenlong Zhang - 4:4.9.4-12.0.1 - add loong64 support for podman +* Thu Aug 08 2024 Jindrich Novy - 4:4.9.4-12 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/6b45bb1) +- Resolves: RHEL-53249 + +* Mon Aug 05 2024 Jindrich Novy - 4:4.9.4-11 +- rebuild for golang fixes +- Related: RHEL-28452 + +* Thu Aug 01 2024 Jindrich Novy - 4:4.9.4-10 +- rebuild for golang fixes +- Related: RHEL-28452 + +* Tue Jul 23 2024 Jindrich Novy - 4:4.9.4-9 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/1a2d8e3) +- Resolves: RHEL-32589 + +* Mon Jul 22 2024 Jindrich Novy - 4:4.9.4-8 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/affa589) +- Resolves: RHEL-47169 + +* Thu Jul 18 2024 Jindrich Novy - 4:4.9.4-7 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/8fa0c76) +- Resolves: RHEL-40800 + +* Wed Jul 17 2024 Jindrich Novy - 4:4.9.4-6 +- update gvisor-tap-vsock to mekr it compilable with new golang +- Related: RHEL-24295 + +* Fri Jun 21 2024 Jindrich Novy - 4:4.9.4-5 +- rebuild for CVE-2024-1394 +- Resolves: RHEL-24295 + * Thu Jun 13 2024 Jindrich Novy - 4:4.9.4-4 - update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel (https://github.com/containers/podman/commit/1a6dca2)