From d4036d8254a32af298b3b55ae919a4adbfdaeea7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 10 2020 01:16:32 +0000 Subject: import podman-2.0.0-0.9.rc7.module+el8.3.0+7084+c16098dd --- diff --git a/.gitignore b/.gitignore index 4a0b1ed..c628a30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.9.2.tar.gz +SOURCES/v2.0.0-rc7.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 84d1eb3..d44e675 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1 +1 @@ -4c8b007a6fe37cde3689318f72260c998973b069 SOURCES/v1.9.2.tar.gz +b32c0bf490e773df61cc23d43ca1dbdfca7b0026 SOURCES/v2.0.0-rc7.tar.gz diff --git a/SOURCES/podman-1784950.patch b/SOURCES/podman-1784950.patch deleted file mode 100644 index 3588b8d..0000000 --- a/SOURCES/podman-1784950.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 35829854a24133f5f6900f6ee252d154dd742a15 Mon Sep 17 00:00:00 2001 -From: Daniel J Walsh -Date: Tue, 19 May 2020 16:32:42 -0400 -Subject: [PATCH] Fix mountpont in SecretMountsWithUIDGID - -In FIPS Mode we expect to work off of the Mountpath not the Rundir path. -This is causing FIPS Mode checks to fail. - -Signed-off-by: Daniel J Walsh ---- - libpod/container_internal_linux.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go -index 8ee0fb456d..2bd6099f06 100644 ---- libpod-1.9.2/libpod/container_internal_linux.go -+++ libpod-1.9.2/libpod/container_internal_linux.go -@@ -1236,7 +1236,7 @@ func (c *Container) makeBindMounts() error { - } - - // Add Secret Mounts -- secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.Containers.DefaultMountsFile, c.state.RunDir, c.RootUID(), c.RootGID(), rootless.IsRootless(), false) -+ secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.Containers.DefaultMountsFile, c.state.Mountpoint, c.RootUID(), c.RootGID(), rootless.IsRootless(), false) - for _, mount := range secretMounts { - if _, ok := c.state.BindMounts[mount.Destination]; !ok { - c.state.BindMounts[mount.Destination] = mount.Source diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 447f2ff..08b432e 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -26,15 +26,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} Name: podman -Version: 1.9.2 -Release: 3%{?dist} +Version: 2.0.0 +Release: 0.9.rc7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/v%{version}.tar.gz -# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1784950 -# patch: https://github.com/containers/libpod/pull/6281.patch -Patch0: podman-1784950.patch +Source0: %{git0}/archive/v%{version}-rc7.tar.gz +# Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686 +ExcludeArch: i686 Provides: %{name}-manpages = %{version}-%{release} Obsoletes: %{name}-manpages < %{version}-%{release} BuildRequires: golang >= 1.12.12-4 @@ -113,6 +112,7 @@ connections as well. Summary: Tests for %{name} Requires: %{name} = %{version}-%{release} #Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this) +Requires: nmap-ncat Requires: jq %description tests @@ -121,7 +121,7 @@ Requires: jq This package contains system tests for %{name} %prep -%autosetup -Sgit -n %{repo}-%{version} +%autosetup -Sgit -n %{repo}-%{version}-rc7 sed -i 's/install.bin: podman/install.bin:/' Makefile sed -i 's/install.man: docs/install.man:/' Makefile @@ -158,19 +158,18 @@ export BUILDTAGS="remoteclient $BUILDTAGS" %install install -dp %{buildroot}%{_unitdir} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ - install.bin \ +install -dp %{buildroot}%{_userunitdir} +install -dp %{buildroot}%{_tmpfilesdir} +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ + ETCDIR=%{buildroot}%{_sysconfdir} BUILDTAGS="varlink" \ + install.bin-nobuild \ install.remote \ - install.man \ + install.man-nobuild \ install.cni \ install.systemd \ install.completions \ install.docker -# install libpod.conf -install -dp %{buildroot}%{_datadir}/containers -install -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers - # install docker-docs install -dp %{buildroot}%{_mandir}/man1 install -m 644 docs/build/man/docker*.1 -t %{buildroot}%{_mandir}/man1 @@ -224,16 +223,16 @@ exit 0 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist -%{_datadir}/containers/%{repo}.conf -%{_unitdir}/io.%{name}.service -%{_unitdir}/io.%{name}.socket -%{_userunitdir}/io.%{name}.service -%{_userunitdir}/io.%{name}.socket -%{_usr}/lib/tmpfiles.d/%{name}.conf %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket +%{_tmpfilesdir}/%{name}.conf + %files docker %{_bindir}/docker @@ -250,6 +249,54 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Thu Jun 18 2020 Jindrich Novy - 2.0.0-0.9.rc7 +- update to https://github.com/containers/libpod/releases/tag/v2.0.0-rc7 +- Related: #1821193 + +* Tue Jun 16 2020 Jindrich Novy - 2.0.0-0.8.rc6 +- attempt to fix test user for gating tests (Ed Santiago) +- Related: #1821193 + +* Tue Jun 16 2020 Jindrich Novy - 2.0.0-0.7.rc6 +- fix "Socket-activated Varlink (io.podman.socket) fails after first call" +- Related: #1821193 + +* Tue Jun 16 2020 Jindrich Novy - 2.0.0-0.6.rc6 +- fix build: add relevant socket/service/conf files and re-enable varlink +- Related: #1821193 + +* Mon Jun 15 2020 Jindrich Novy - 2.0.0-0.5.rc6 +- update to https://github.com/containers/libpod/releases/tag/v2.0.0-rc6 +- Related: #1821193 + +* Wed Jun 10 2020 Jindrich Novy - 2.0.0-0.4.rc5 +- update to https://github.com/containers/libpod/releases/tag/v2.0.0-rc5 +- Related: #1821193 + +* Thu Jun 04 2020 Jindrich Novy - 2.0.0-0.3.rc4 +- update to https://github.com/containers/libpod/releases/tag/v2.0.0-rc4 +- Related: #1821193 + +* Thu Jun 04 2020 Jindrich Novy - 2.0.0-0.2.rc3 +- podman-tests requires nmap-ncat now +- Related: #1821193 + +* Tue Jun 02 2020 Jindrich Novy - 2.0.0-0.1.rc3 +- update to https://github.com/containers/libpod/releases/tag/v2.0.0-rc3 +- Related: #1821193 + +* Mon Jun 01 2020 Jindrich Novy - 1.9.3-3 +- fix "Signature verification incorrectly uses mirror’s references" +- Related: #1821193 + +* Wed May 27 2020 Jindrich Novy - 1.9.3-2 +- exclude i686 arch due to "No matching package to install: 'golang >= 1.12.12-4'" on i686 +- Related: #1821193 + +* Mon May 25 2020 Jindrich Novy - 1.9.3-1 +- update to https://github.com/containers/libpod/releases/tag/v1.9.3 +- Related: #1821193 + * Wed May 20 2020 Jindrich Novy - 1.9.2-3 - fix "Podman support for FIPS Mode requires a bind mount inside the container" - version the oci-systemd-hook obsolete