import CS podman-5.4.0-1.el9

2025-03-11 08:00:04 +00:00 · 2025-03-11 08:00:04 +00:00 · 0e2e3e8096
commit 0e2e3e8096
parent 72d67ded2b
3 changed files with 144 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 SOURCES/dnsname-bdc4ab8.tar.gz
+SOURCES/podman-5.4.0-f9f7d48.tar.gz
 SOURCES/v0.1.7.tar.gz
-SOURCES/v4.9-4c14019.tar.gz
--- a/.podman.metadata
+++ b/.podman.metadata
@ -1,3 +1,3 @@
 69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz
+3efdca2402c3a17a4515b117076d6c1f9f75b964 SOURCES/podman-5.4.0-f9f7d48.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
-dcc2c86ccb8ed60236971aa56c61d34b5c07844d SOURCES/v4.9-4c14019.tar.gz
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@ -4,16 +4,16 @@
 GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};

 %global import_path github.com/containers/podman
-%global branch v4.9
-%global commit0 4c140196f1233e5a48a088a41fe63eb2ad5e6b78
+#%%global branch v5.4-rhel
+%global commit0 f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2
 %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})

-Epoch: 2
+Epoch: 5
 Name: podman
-Version: 4.9.2
+Version: 5.4.0
 Release: 1%{?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
@ -65,6 +65,7 @@ Requires: libseccomp >= 2.5
 Requires: conmon >= 2.0.25
 Requires: (container-selinux if selinux-policy)
 Requires: slirp4netns >= 0.4.0-1
+Requires: passt
 Recommends: crun
 Requires: fuse-overlayfs
 Requires: oci-runtime
@ -156,6 +157,11 @@ sed -i '$d' configure.ac
 popd
 tar fx %{SOURCE2}

+# cgroups-v1 is supported on rhel9
+%if 0%{?rhel} == 9
+sed -i '/DELETE ON RHEL9/,/DELETE ON RHEL9/d' libpod/runtime.go
+%endif
+
 # this is shipped by skopeo: containers-common subpackage
 rm -rf docs/source/markdown/containers-mounts.conf.5.md

@ -203,9 +209,12 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
 # build rootlessport
 %gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport

-export BUILDTAGS="seccomp btrfs_noversion exclude_graphdriver_devicemapper exclude_graphdriver_btrfs $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
+export BUILDTAGS="cni seccomp btrfs_noversion exclude_graphdriver_devicemapper exclude_graphdriver_btrfs $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}

+# build %%{name}-testing
+%gobuild -o bin/podman-testing %{import_path}/cmd/podman-testing
+
 # build %%{name}-remote
 export BUILDTAGS="remote $BUILDTAGS"
 %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
@ -237,7 +246,8 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build
        install.systemd \
        install.completions \
        install.docker \
-        install.docker-docs
+        install.docker-docs \
+        install.testing

 sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker

@ -251,7 +261,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 rm -f               %{buildroot}/%{_datadir}/%{name}/test/system/*.t

 # do not include docker and podman-remote man pages in main package
-for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
+for file in `find %{buildroot}%{_mandir}/man[157] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
    echo "$file*" >> podman.file-list
 done

@ -333,6 +343,7 @@ fi
 %files docker
 %{_bindir}/docker
 %{_mandir}/man1/docker*.1*
+%{_sysconfdir}/profile.d/%{name}-docker.*
 %{_tmpfilesdir}/%{name}-docker.conf
 %{_user_tmpfilesdir}/%{name}-docker.conf

@ -355,9 +366,133 @@ fi

 %files tests
 %license LICENSE
+%{_bindir}/%{name}-testing
 %{_datadir}/%{name}/test

 %changelog
+* Wed Feb 12 2025 Jindrich Novy <jnovy@redhat.com> - 5:5.4.0-1
+- update to https://github.com/containers/podman/releases/tag/v5.4.0
+- Related: RHEL-60277
+
+* Tue Feb 04 2025 Jindrich Novy <jnovy@redhat.com> - 5:5.3.2-2
+- Add cni to BUILDTAGS
+- Related: RHEL-60277
+
+* Wed Jan 22 2025 Jindrich Novy <jnovy@redhat.com> - 5:5.3.2-1
+- update to https://github.com/containers/podman/releases/tag/v5.3.2
+- Related: RHEL-60277
+
+* Wed Nov 27 2024 Jindrich Novy <jnovy@redhat.com> - 5:5.3.1-1
+- update to https://github.com/containers/podman/releases/tag/v5.3.1
+- Related: RHEL-60277
+
+* Mon Nov 11 2024 Jindrich Novy <jnovy@redhat.com> - 5:5.2.2-2
+- update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel
+  (https://github.com/containers/podman/commit/e40738b)
+- Resolves: RHEL-61858
+
+* Wed Oct 09 2024 Jindrich Novy <jnovy@redhat.com> - 5:5.2.2-1
+- stick with the v5.2-rhel branch for RHEL
+- update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel
+  (https://github.com/containers/podman/commit/458f9b4)
+- Resolves: RHEL-60965
+
+* Tue Oct 08 2024 Jindrich Novy <jnovy@redhat.com> - 4:5.2.3-6
+- properly package podman-testing
+- Resolves: RHEL-60927
+
+* Mon Oct 07 2024 Jindrich Novy <jnovy@redhat.com> - 4:5.2.3-5
+- podman gating: test CNI, thanks to Ed Santiago
+- Resolves: RHEL-60277
+
+* Fri Oct 04 2024 Jindrich Novy <jnovy@redhat.com> - 4:5.2.3-4
+- bump Epoch to 4 to preserve upgrade path
+- Related: RHEL-60277
+
+* Wed Oct 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.3-3
+- Enable EPEL for tests for tmt+provision-container
+- Related: RHEL-16374
+
+* Wed Oct 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.3-2
+- require tmt+provision-container instead of tmt-provision-container
+- Resolves: RHEL-16374
+
+* Thu Sep 26 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.3-1
+- update to https://github.com/containers/podman/releases/tag/v5.2.3
+- Related: RHEL-59620
+
+* Thu Aug 22 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.2-1
+- update to https://github.com/containers/podman/releases/tag/v5.2.2
+- Related: RHEL-27608
+
+* Thu Aug 15 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.1-1
+- update to https://github.com/containers/podman/releases/tag/v5.2.1
+- Related: RHEL-27608
+
+* Wed Aug 07 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.0-2
+- Add PODMAN_TESTING definition
+- Related: RHEL-27608
+
+* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.2.0-1
+- update to https://github.com/containers/podman/releases/tag/v5.2.0
+- Related: RHEL-27608
+
+* Wed Jul 10 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.1.2-1
+- update to https://github.com/containers/podman/releases/tag/v5.1.2
+- Related: RHEL-27608
+
+* Tue Jun 11 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.1.1-1
+- update to https://github.com/containers/podman/releases/tag/v5.1.1
+- Related: RHEL-27608
+
+* Mon Jun 03 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.1.0-1
+- update to https://github.com/containers/podman/releases/tag/v5.1.0
+- Related: RHEL-27608
+
+* Wed May 29 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.3-1
+- update to https://github.com/containers/podman/releases/tag/v5.0.3
+- Related: RHEL-27608
+
+* Tue May 07 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.2-1
+- update to https://github.com/containers/podman/releases/tag/v5.0.2
+- Related: RHEL-27608
+
+* Mon Apr 15 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.1-2
+- Add requires to passt
+- Related: RHEL-27608
+
+* Sat Apr 13 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.1-1
+- update to https://github.com/containers/podman/releases/tag/v5.0.1
+- Related: RHEL-27608
+
+* Fri Mar 22 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.0-3
+- Add missing scripts
+- Related: RHEL-27608
+
+* Fri Mar 22 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.0-2
+- update to latest content of https://github.com/containers/podman/releases/tag/5.0.0
+  (https://github.com/containers/podman/commit/e71ec6f1d94d2d97fb3afe08aae0d8adaf8bddf0)
+- Related: RHEL-27608
+
+* Wed Mar 20 2024 Jindrich Novy <jnovy@redhat.com> - 2:5.0.0-1
+- update to https://github.com/containers/podman/releases/tag/v5.0.0
+- Related: RHEL-27608
+
+* Tue Mar 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:4.9.4-0.2
+- update to the latest content of https://github.com/containers/podman/tree/v4.9
+  (https://github.com/containers/podman/commit/3ae0197)
+- Related: RHEL-27608
+
+* Tue Feb 20 2024 Jindrich Novy <jnovy@redhat.com> - 2:4.9.4-0.1
+- update to the latest content of https://github.com/containers/podman/tree/v4.9
+  (https://github.com/containers/podman/commit/4b69d93)
+- Related: RHEL-2112
+
+* Fri Feb 09 2024 Jindrich Novy <jnovy@redhat.com> - 2:4.9.3-0.1
+- update to the latest content of https://github.com/containers/podman/tree/v4.9
+  (https://github.com/containers/podman/commit/b8a887c)
+- Related: RHEL-2112
+
 * Tue Feb 06 2024 Jindrich Novy <jnovy@redhat.com> - 2:4.9.2-1
 - update to the latest content of https://github.com/containers/podman/tree/v4.9
  (https://github.com/containers/podman/commit/4c14019)