import podman-4.2.0-3.el9

.gitignore

@@ -1,5 +1,5 @@
 SOURCES/dnsname-18822f9.tar.gz
+SOURCES/podman-4.2.0-7fe5a41.tar.gz
 SOURCES/podman-machine-cni-0749884.tar.gz
-SOURCES/v0.1.0.tar.gz
 SOURCES/v0.1.7.tar.gz
-SOURCES/v4.0-rhel-bb1e6e6.tar.gz
+SOURCES/v0.2.0.tar.gz

.podman.metadata

@@ -1,5 +1,5 @@
 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
+3407e210353afdd5fcaffe91c6eeabb5d41c3c75 SOURCES/podman-4.2.0-7fe5a41.tar.gz
 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
-d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
-188ffd5d89ff6b21fa45425a7cb183554a3bba9e SOURCES/v4.0-rhel-bb1e6e6.tar.gz
+64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz

SPECS/podman.spec

@@ -1,31 +1,25 @@
 %global with_check 0
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
-%global _lto_cflags %{nil}
-
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-
 %define gobuild(o:) \
 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.0-rhel
+#%%global branch v4.1.1-rhel
-%global commit0 bb1e6e6b7bebed89a5a2e9653e1447aa5a3c79e0
+%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
 %global gvproxyrepo gvisor-tap-vsock
-%global gvproxyver 0.1.0
+%global gvproxyver 0.2.0
 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
 
 Epoch: 2
 Name: podman
-Version: 4.0.2
+Version: 4.2.0
-Release: 4%{?dist}
+Release: 3%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -43,7 +37,7 @@ Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar
 ExclusiveArch: %{go_arches}
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
-BuildRequires: golang >= 1.17.7
+BuildRequires: golang >= 1.17.5
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
@@ -60,25 +54,21 @@ BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-devel
 BuildRequires: shadow-utils-subid-devel
-# for catatonit
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: file
-BuildRequires: gcc
-BuildRequires: libtool
 Requires: containers-common >= 2:1-27
-Requires: containernetworking-plugins >= 0.9.1-1
+Suggests: containernetworking-plugins >= 0.9.1-1
+Requires: netavark
 Requires: iptables
 Requires: nftables
 Obsoletes: oci-systemd-hook < 1
-Requires: libseccomp >= 2.4.1
+Requires: libseccomp >= 2.5
 Requires: conmon >= 2.0.25
 Requires: (container-selinux if selinux-policy)
 Requires: slirp4netns >= 0.4.0-1
-Requires: runc >= 1.0.0-57
+Recommends: crun
 Requires: fuse-overlayfs
 Requires: %{name}-catatonit >= %{epoch}:%{version}-%{release}
 Requires: oci-runtime
+Conflicts: catatonit
 
 %description
 %{name} (Pod Manager) is a fully featured container engine that is a simple
@@ -121,6 +111,11 @@ variables, or in containers.conf.
 %package catatonit
 Summary: A signal-forwarding process manager for containers
 Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: file
+BuildRequires: gcc
+BuildRequires: libtool
 
 %description catatonit
 Catatonit is a /sbin/init program for use within containers. It
@@ -158,6 +153,7 @@ Requires: openssl
 Requires: buildah
 Requires: gnupg
 Requires: git-daemon
+Requires: podman-catatonit
 
 %description tests
 %{summary}
@@ -180,6 +176,7 @@ dynamic port forwarding.
 %autosetup -Sgit -n %{name}-%{commit0}
 %endif
 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
+sed -i 's,-Werror,,' pkg/rootless/rootless_linux.go
 tar fx %{SOURCE1}
 pushd catatonit-%{cataver}
 sed -i '$d' configure.ac
@@ -188,8 +185,6 @@ tar fx %{SOURCE2}
 tar fx %{SOURCE3}
 tar fx %{SOURCE4}
 
-mv pkg/hooks/README.md pkg/hooks/README-hooks.md
-
 # this is shipped by skopeo: containers-common subpackage
 rm -rf docs/source/markdown/containers-mounts.conf.5.md
 
@@ -349,12 +344,21 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_bindir}/%{name} system renumber
 exit 0
 
+%preun
+if [ $1 == 0 ]; then
+  systemctl stop podman.service > /dev/null 2>&1
+  systemctl stop podman.socket > /dev/null 2>&1
+  systemctl disable podman.service > /dev/null 2>&1
+  systemctl disable podman.socket > /dev/null 2>&1
+fi
+:
+
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
 %files -f podman.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
+%doc README.md CONTRIBUTING.md install.md transfer.md
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/rootlessport
 %{_datadir}/bash-completion/completions/%{name}
@@ -414,20 +418,88 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
-* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-4
+* Mon Aug 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-3
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
+- fix dependency in test subpackage
-  (https://github.com/containers/podman/commit/bb1e6e6)
+- Related: #2061316
-- Resolves: #2066501
 
-* Mon Mar 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
+* Mon Aug 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-2
-- rebuild with golang >= 1.17.5 (CVE-2021-44716, CVE-2021-44717)
+- readd catatonit
-- rebuild with golang >= 1.17.7 to fix FIPS issues
+- Related: #2061316
-- Related: #1975396
 
-* Tue Mar 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
+* Thu Aug 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-1
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
+- update to latest content of https://github.com/containers/podman/releases/tag/4.2.0
-  (https://github.com/containers/podman/commit/9237d75)
+  (https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4)
-- Related: #2062835
+- Related: #2061316
+
+* Wed Aug 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-0.3rc3
+- require catatonit for gating tests
+- Related: #2061316
+
+* Fri Aug 05 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.2.0-0.2rc3
+- update to 4.2.0-rc3
+- Related: #2061316
+
+* Mon Aug 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-0.1rc2
+- update to 4.2.0-rc2
+- Related: #2061316
+
+* Thu Jul 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-6
+- convert catatonit dependency to soft dep as catatonit is
+  no longer in Appstream but in CRB
+- Related: #2061316
+
+* Fri Jul 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.1.1-5
+- rebuild for combined gating with catatonit
+- Related: #2097694
+
+* Tue Jul 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.1.1-4
+- catatonit is now a standalone package
+- Related: #2097694
+
+* Fri Jul 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-3
+- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel
+  (https://github.com/containers/podman/commit/fa692a6)
+- Related: #2097694
+
+* Fri Jul 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-2
+- be sure podman services/sockets are stopped upon package removal
+- Related: #2061316
+
+* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-1
+- update to https://github.com/containers/podman/releases/tag/v4.1.1
+- Related: #2061316
+
+* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-4
+- don't require runc and Recommends: crun
+- Related: #2061316
+
+* Fri May 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-3
+- Re-enable LTO and debuginfo
+- Related: #2061316
+
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-2
+- update gvisor-tap-vsock to 0.2.0 to fix compilation with golang 1.18
+- Related: #2061316
+
+* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-1
+- update to https://github.com/containers/podman/releases/tag/v4.1.0
+- Related: #2061316
+
+* Tue May 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-2
+- require netavark and move CNI to soft dependencies
+- Related: #2061316
+
+* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-1
+- update to https://github.com/containers/podman/releases/tag/v4.0.3
+- Related: #2061316
+
+* Fri Mar 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
+- bump minimal libseccomp version requirement
+- Related: #2061316
+
+* Mon Mar 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
+- rebuilt with golang >= 1.17.5 (CVE-2021-44716, CVE-2021-44717)
+- Related: #2061316
 
 * Wed Mar 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-1
 - update to https://github.com/containers/podman/releases/tag/v4.0.2