diff --git a/0001-fix-CVE-2024-28180.patch b/0005-fix-CVE-2024-28180.patch similarity index 100% rename from 0001-fix-CVE-2024-28180.patch rename to 0005-fix-CVE-2024-28180.patch diff --git a/podman.spec b/podman.spec index 833ce1ce707c3839207f78edd7909db50af7e1c2..85088f7e1ac86f7055f7d1dd5d758bfe9ab10362 100644 --- a/podman.spec +++ b/podman.spec @@ -2,7 +2,7 @@ Name: podman Version: 4.9.4 -Release: 9 +Release: 10 Summary: A tool for managing OCI containers and pods. Epoch: 1 License: Apache-2.0 and MIT @@ -11,12 +11,12 @@ Source0: https://github.com/containers/podman/archive/refs/tags/v%{version Source1: https://github.com/containers/dnsname/archive/18822f9a4fb35d1349eb256f4cd2bfd372474d84/dnsname-18822f9.tar.gz Source2: https://github.com/containers/gvisor-tap-vsock/archive/refs/tags/v0.7.1.tar.gz Source3: https://github.com/cpuguy83/go-md2man/archive/refs/tags/v2.0.3.tar.gz -Patch0: 0001-podman-4.9.4-add-support-for-loongarch64.patch -Patch0001: 0001-fix-CVE-2024-28180.patch +Patch0001: 0001-podman-4.9.4-add-support-for-loongarch64.patch Patch0002: 0002-fix-CVE-2023-3978.patch Patch0003: 0003-fix-CVE-2023-48795.patch Patch0004: 0004-fix-CVE-2022-3064.patch +Patch0005: 0005-fix-CVE-2024-28180.patch BuildRequires: gcc golang btrfs-progs-devel glib2-devel glibc-devel glibc-static BuildRequires: gpgme-devel libassuan-devel libgpg-error-devel libseccomp-devel libselinux-devel @@ -117,16 +117,22 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %prep %setup -n %{name}-%{version} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile -%patch0001 -p1 + # untar dnsname tar zxf %{SOURCE1} -%patch0002 -p1 -%patch0004 -p1 + # untar %%{name}-gvproxy tar zxf %{SOURCE2} -%patch0003 -p1 + # untar go-md2man tar zxf %{SOURCE3} + +# apply patch +%patch0002 -p1 +%patch0003 -p1 +%patch0004 -p1 +%patch0005 -p1 + %ifarch loongarch64 cd dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84 export GOSUMDB="sum.golang.org" @@ -136,7 +142,7 @@ go mod tidy go mod download go mod vendor cd - -%patch0 -p1 +%patch0001 -p1 %endif @@ -300,6 +306,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name}sh %changelog +* Thu Jan 09 2025 duyiwei - 1:4.9.4-10 +- Type:bugfix +- CVE:CVE-2024-9355、CVE-2019-9514、CVE-2024-24791、CVE-2022-32189、CVE-2022-41715、CVE-2022-2880、CVE-2022-1962、CVE-2023-45290、CVE-2024-24783、CVE-2024-24785 +- SUG:NA +- DESC: Optimize spec files and fix CVE in batches through rebuild + * Tue Aug 20 2024 Xuebing Li - 1:4.9.4-9 - Add 'Buildarch: noarch' to the help subpackage diff --git a/podman.yaml b/podman.yaml index 9f95c1c79ea55ce152981eb9a856c04b0359a95c..33bcc56584bff90ac19102c2f10d838d7772c08a 100644 --- a/podman.yaml +++ b/podman.yaml @@ -1,4 +1,4 @@ version_control: github -src_repo: containers/libpod +src_repo: containers/podman tag_prefix: ^v seperator: .