podman-3.3.1-1.el9

- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel
  (https://github.com/containers/podman/commit/405507a)
- Related: #2000051
- mark ghost dir correctly

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

podman.spec

@@ -16,15 +16,20 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/podman
-%global branch v3.3
+%global branch v3.3.1-rhel
-%global commit0 57422d2093e2f03c8bf5101ac2eb8eb7f281c4de
+%global commit0 405507a0bb83b2881e0c0dc9d3d5bf9aa3693b7f
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
-%global dnsnamever 1.1.1
+%global dnsnamever 1.3.0
+%global gvproxyrepo gvisor-tap-vsock
+%global gvproxyver 0.1.0
+%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396
+%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
+
 
 Name: podman
-Version: 3.3.0
+Version: 3.3.1
-Release: 4%{?dist}
+Release: 1%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -35,11 +40,13 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
 %endif
 Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
 Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz
+Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz
+Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
 Provides: %{name}-manpages = %{version}-%{release}
 Obsoletes: %{name}-manpages < %{version}-%{release}
-BuildRequires: golang >= 1.12.12-4
+BuildRequires: golang >= 1.16.6
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
@@ -61,7 +68,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: libtool
-Requires: containers-common >= 0.1.29-3
+Requires: containers-common >= 2:1-2
 Requires: containernetworking-plugins >= 0.9.1-1
 Requires: iptables
 Requires: nftables
@@ -130,6 +137,7 @@ signalfd(2)) and has no additional features.
 %package plugins
 Summary: Plugins for %{name}
 Requires: dnsmasq
+Recommends: %{name}-gvproxy = %{version}-%{release}
 
 %description plugins
 This plugin sets up the use of dnsmasq on a given CNI network so
@@ -156,6 +164,15 @@ Requires: buildah
 
 This package contains system tests for %{name}
 
+%package gvproxy
+Summary: Go replacement for libslirp and VPNKit
+
+%description gvproxy
+A replacement for libslirp and VPNKit, written in pure Go.
+It is based on the network stack of gVisor. Compared to libslirp,
+gvisor-tap-vsock brings a configurable DNS server and
+dynamic port forwarding.
+
 %prep
 %if 0%{?branch:1}
 %autosetup -Sgit -n containers-%{name}-%{shortcommit0}
@@ -164,6 +181,8 @@ This package contains system tests for %{name}
 %endif
 tar fx %{SOURCE1}
 tar fx %{SOURCE2}
+tar fx %{SOURCE3}
+tar fx %{SOURCE4}
 
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md
 
@@ -223,10 +242,31 @@ export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname
 popd
 
+pushd %{name}-machine-cni-%{commit_mcni}
+unset LDFLAGS
+mkdir _build
+pushd _build
+mkdir -p src/github.com/containers
+ln -s ../../../../ src/github.com/containers/%{name}-machine-cni
+popd
+ln -s vendor src
+export GOPATH=$(pwd)/_build:$(pwd)
+%gobuild -o bin/%{name}-machine github.com/containers/%{name}-machine-cni/plugins/meta/%{name}-machine
+popd
+
+pushd %{gvproxyrepo}-%{gvproxyver}
+unset LDFLAGS
+mkdir _build
+pushd _build
+mkdir -p src/github.com/containers
+ln -s ../../../../ src/github.com/containers/%{gvproxyrepo}
+popd
+ln -s vendor src
+export GOPATH=$(pwd)/_build:$(pwd)
+%gobuild -o bin/gvproxy github.com/containers/%{gvproxyrepo}/cmd/gvproxy
+popd
+
 %install
-install -dp %{buildroot}%{_unitdir}
-install -dp %{buildroot}%{_userunitdir}
-install -dp %{buildroot}%{_tmpfilesdir}
 PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
         ETCDIR=%{buildroot}%{_sysconfdir} \
         install.bin-nobuild \
@@ -260,9 +300,16 @@ pushd dnsname-%{dnsnamever}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 popd
 
-# install CNI
+# install machine-cni plugin
-install -dp %{buildroot}%{_sysconfdir}/cni/net.d
+pushd %{name}-machine-cni-%{commit_mcni}
-install -p cni/87-podman-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
+%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
+popd
+
+# install gvproxy
+pushd %{gvproxyrepo}-%{gvproxyver}
+install -dp %{buildroot}%{_libexecdir}/%{name}
+install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
+popd
 
 %check
 %if 0%{?with_check}
@@ -301,7 +348,8 @@ exit 0
 %{_datadir}/zsh/site-functions/_%{name}
 %dir %{_datadir}/fish/vendor_completions.d
 %{_datadir}/fish/vendor_completions.d/%{name}.fish
-%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
+%ghost %dir %{_sysconfdir}/cni/net.d
+%ghost %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
 %{_unitdir}/*.service
 %{_unitdir}/*.socket
 %{_unitdir}/*.timer
@@ -338,12 +386,25 @@ exit 0
 %license dnsname-%{dnsnamever}/LICENSE
 %doc dnsname-%{dnsnamever}/{README.md,README_PODMAN.md}
 %{_libexecdir}/cni/dnsname
+%{_libexecdir}/cni/%{name}-machine
 
 %files tests
 %license LICENSE
 %{_datadir}/%{name}/test
 
+%files gvproxy
+%license %{gvproxyrepo}-%{gvproxyver}/LICENSE
+%doc %{gvproxyrepo}-%{gvproxyver}/README.md
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/gvproxy
+
 %changelog
+* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.1-1
+- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel
+  (https://github.com/containers/podman/commit/405507a)
+- Related: #2000051
+- mark ghost dir correctly
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.0-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

sources

@@ -1,3 +1,5 @@
+SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91
+SHA512 (v0.1.0.tar.gz) = 72d27e2a7c20f956a177bcda96508c1ec7b8ac0a512f9ab1a045bcf2450c8c13e6b37033053dc68af986194c9381d1be9d065fbdfbbffe8634ea525924a35ebc
 SHA512 (v0.1.5.tar.gz) = 75387cf9c611222ef0afc9f688cefb3e4a4ec388cfa9d2329ee7860cb2ad83afa9311f53c1047f92f7adde27b7eb07f5501ee602334e610a3227104d8894486b
-SHA512 (v1.1.1.tar.gz) = 4ffaf73f41d96a3d36a15cfefdad989579bf3e187c0da9df35b16b43f77f8694c01a7f006b89b97070ea9c0d924778a416c30a96b18fa125b74186beb800c54f
+SHA512 (v1.3.0.tar.gz) = df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2
-SHA512 (v3.3-57422d2.tar.gz) = 91fc7c6d5dfbe6fbfd20c8064ca877fffc3b673c1dcebaedc7cef5264e5a8c5354477086cb5f23d4ca8f07842e624156024bcfcf6654442ad6a997e047891604
+SHA512 (v3.3.1-rhel-405507a.tar.gz) = a166a705605907085591b362afde37188b7a814df28708514ed8b238ceb0c5ebf153c8756454ce9497c4032e515368b998d3b26ab80bea223bb9868d144403bb