import podman-3.0.1-6.module+el8.4.0+10607+f4da7515

2021-05-18 02:46:37 -04:00 · 2021-05-18 02:46:37 -04:00 · c90348260e
parent 3f40dfc125
commit c90348260e
3 changed files with 283 additions and 93 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.1.1.tar.gz
-SOURCES/v2.2.1-rhel-82e4e66.tar.gz
+SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
--- a/.podman.metadata
+++ b/.podman.metadata
@ -1,3 +1,3 @@
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
-a6a7a79166bf4f95d9c5843035882324c10cc277 SOURCES/v2.2.1-rhel-82e4e66.tar.gz
+51614e209e85f259aaec4528377c5e2d8e269c87 SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@ -1,15 +1,7 @@
-%global with_debug 1
 %global with_check 0

-%bcond_without varlink
-%global gogenerate go generate
-
-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package   %{nil}
-%endif

 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
@ -21,15 +13,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif

 %global import_path github.com/containers/podman
-%global branch v2.2.1-rhel
-%global commit0 82e4e6605390ac761b9a57fb8361e9612089ad1c
+%global branch v3.0.1-rhel
+%global commit0 ad1aaba8df96cb25e12fe28ec96f3c131e572e3e
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.1.1

 Name: podman
-Version: 2.2.1
-Release: 7%{?dist}
+Version: 3.0.1
+Release: 6%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@ -40,8 +32,8 @@ 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
-# Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
-ExcludeArch: i686
+# 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
@ -77,9 +69,6 @@ Requires: (container-selinux if selinux-policy)
 Requires: slirp4netns >= 0.4.0-1
 Requires: runc >= 1.0.0-57
 Requires: fuse-overlayfs
-%if %{with varlink}
-Requires: libvarlink
-%endif
 Requires: %{name}-catatonit >= %{version}-%{release}
 Requires: oci-runtime

@ -109,20 +98,17 @@ This package installs a script named docker that emulates the Docker CLI by
 executes %{name} commands, it also creates links between all Docker CLI man
 pages and %{name}.

-%if %{with varlink}
 %package remote
-Summary: (Experimental) Remote client for managing %{name} containers
+Summary: A remote CLI for Podman: A Simple management tool for pods, containers and images

 %description remote
-Remote client for managing %{name} containers.
+%{name}-remote provides a local client interacting with a Podman backend
+node through a RESTful API tunneled through a ssh connection. In this context,
+a %{name} node is a Linux system with Podman installed on it and the API
+service activated.

-This experimental remote client is under heavy development. Please do not
-run %{name}-remote in production.
-
-%{name}-remote uses the varlink connection to connect to a %{name} client to
-manage pods, containers and container images. %{name}-remote supports ssh
-connections as well.
-%endif
+Credentials for this session can be passed in using flags, environment
+variables, or in containers.conf.

 %package catatonit
 Summary: A signal-forwarding process manager for containers
@ -157,6 +143,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: nmap-ncat
 Requires: httpd-tools
 Requires: jq
+Requires: socat

 %description tests
 %{summary}
@ -190,15 +177,8 @@ popd
 ln -s vendor src

 rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go
-%if %{with varlink}
-%gogenerate ./pkg/varlink/...
-%endif

-# build %%{name}
 export BUILDTAGS="systemd selinux seccomp btrfs_noversion exclude_graphdriver_devicemapper $(hack/libdm_tag.sh)"
-%if %{with varlink}
-export BUILDTAGS+=" varlink"
-%endif
 # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
 LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
@ -243,9 +223,6 @@ install -dp %{buildroot}%{_userunitdir}
 install -dp %{buildroot}%{_tmpfilesdir}
 PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
        ETCDIR=%{buildroot}%{_sysconfdir} \
-%if %{with varlink}
-        BUILDTAGS="varlink" \
-%endif
        install.bin-nobuild \
        install.remote-nobuild \
        install.man-nobuild \
@ -324,13 +301,7 @@ exit 0
 %{_userunitdir}/%{name}.socket
 %{_userunitdir}/%{name}-auto-update.service
 %{_userunitdir}/%{name}-auto-update.timer
-%if %{with varlink}
-%{_unitdir}/io.%{name}.service
-%{_unitdir}/io.%{name}.socket
-%{_userunitdir}/io.%{name}.service
-%{_userunitdir}/io.%{name}.socket
-%{_tmpfilesdir}/%{name}.conf
-%endif
+%{_usr}/lib/tmpfiles.d/%{name}.conf

 %files docker
 %{_bindir}/docker
@ -367,71 +338,290 @@ exit 0
 %{_datadir}/%{name}/test

 %changelog
-* Mon Feb 08 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2.2.1-7
- Resolves: #1925928 - Fix varlink GetVersion()
- Upstream PR: https://github.com/containers/podman/pull/9274
+* Thu Mar 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-6
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/ad1aaba)
+- Resolves: #1921128
+- Resolves: #1936927
+- Resolves: #1938234

-* Thu Feb 04 2021 Jindrich Novy <jnovy@redhat.com> - 2.2.1-6
- update to the latest content of https://github.com/containers/podman/tree/v2.2.1-rhel
-  (https://github.com/containers/podman/commit/1741f15)
- Related: #1888571
+* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-5
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/fcca86d)
+- Resolves: #1936927

-* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 2.2.1-5
- update to the latest content of https://github.com/containers/podman/tree/v2.2.1-rhel
-  (https://github.com/containers/podman/commit/b5bc6a7)
- Related: #1877188
+* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-4
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/c67172a)
+- Resolves: #1935376

-* Tue Feb 02 2021 Jindrich Novy <jnovy@redhat.com> - 2.2.1-4
+* Tue Mar 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-3
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/7a71903)
+- Resolves: #1931545
+
+* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/9a2fc37)
+- Related: #1883490
+
+* Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/7e286bc)
+- Related: #1883490
+
+* Mon Feb 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/797f1ea)
+- Related: #1883490
+
+* Fri Feb 12 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/ddd8a17)
+- Related: #1883490
+
+* Wed Feb 10 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.41rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/2b89fe7)
+- Related: #1883490
+
+* Tue Feb 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.40rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/a5ab59e)
+- Related: #1883490
+
+* Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.39rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/288fb68)
+- Resolves: #1883490
+
+* Thu Feb 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.38rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/82081e8)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.37rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/c2a298e)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.36rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/013770e)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.35rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/978c005)
+- Related: #1883490
+
+* Tue Feb 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.34rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/67d48c5)
 - add Requires: oci-runtime
- Related: #1888571
+- Related: #1883490

-* Wed Jan 06 2021 Jindrich Novy <jnovy@redhat.com> - 2.2.1-3
- update to the latest content of https://github.com/containers/podman/tree/v2.2.1-rhel
-  (https://github.com/containers/podman/commit/14c35f6)
- Related: #1888571
+* Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.33rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/745fa4a)
+- Related: #1883490

-* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.1-2
+* Wed Jan 27 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.32rc1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/4dbb58d)
+- Related: #1883490
+
+* Tue Jan 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.31rc1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/dc2f4c6)
+- Related: #1883490
+
+* Fri Jan 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.30rc1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/469c203)
+- Related: #1883490
+
+* Thu Jan 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.29rc1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/4ecd2be)
+- Related: #1883490
+
+* Tue Jan 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.28rc1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/ade8a92)
+- Related: #1883490
+
+* Mon Jan 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.27rc1
+- switch from master to release candidate (3.0.0-rc1)
+- Related: #1883490
+
+* Mon Jan 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.26
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5b3c7a5)
+- Related: #1883490
+
+* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.25
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/83ed464)
+- Related: #1883490
+
+* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.24
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5a166b2)
+- Related: #1883490
+
+* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.23
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/3fcf346)
+- Related: #1883490
+
+* Thu Jan 14 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.22
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/b2ac2a3)
+- Related: #1883490
+
+* Wed Jan 13 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.21
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/f52a9ee)
+- require socat for gating tests
+- Related: #1914884
+
+* Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.20
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5681907)
+- Related: #1883490
+
+* Fri Jan 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.19
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/78cda71)
+- Related: #1883490
+
+* Thu Jan 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.18
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/355e387)
+- Related: #1883490
+
+* Wed Jan 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.17
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ffe2b1e)
+- Related: #1883490
+
+* Tue Jan 05 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.16
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/618c355)
+- Related: #1883490
+
+* Mon Jan 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.15
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/142b4ac)
+- Related: #1883490
+
+* Sat Jan 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.14
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/39b1cb4)
+- Related: #1883490
+
+* Sat Dec 26 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.13
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/9c9f02a)
+- Related: #1883490
+
+* Mon Dec 21 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.12
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5c6b5ef)
+- Related: #1883490
+
+* Tue Dec 15 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.11
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/999d40d)
+- Related: #1883490
+
+* Mon Dec 14 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/a226e6e)
+- Related: #1883490
+
+* Fri Dec 11 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.9
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/6823a5d)
+- Related: #1883490
+
+* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.8
 - update to https://github.com/containers/dnsname/releases/tag/v1.1.1
+- Related: #1883490

-* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.1-1
- update to the latest content of https://github.com/containers/podman/tree/v2.2.1-rhel
-  (https://github.com/containers/podman/commit/a0d478e)
- Related: #1888571
+* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.7
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/9216be2)
+- Related: #1883490

-* Thu Dec 03 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.0-2
- attempt to fix gatng tests
- Related: #1888571
+* Wed Dec 09 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.6
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/dd295f2)
+- Related: #1883490

-* Wed Dec 02 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.0-1
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e2f9120)
+- Related: #1883490
+
+* Mon Dec 07 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/035d289)
+- Related: #1883490
+
+* Sat Dec 05 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/8e83799)
+- Related: #1883490
+
+* Fri Dec 04 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/70284b1)
+- Related: #1883490
+
+* Thu Dec 03 2020 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.1
+- attempt to fix gating tests with patch from Matt Heon
+- Related: #1883490
+
+* Tue Dec 01 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.0-1
 - update to https://github.com/containers/podman/releases/tag/v2.2.0
- Related: #1888571
+- Related: #1883490

-* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-3
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-8
+- fix branch name setup
+- Related: #1883490
+
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-7
 - attempt to fix linker error with golang-1.15
 - add Requires: httpd-tools to tests, needed to work around
  missing htpasswd in docker registry image, thanks to Ed Santiago
- Related: #1888571
+- Related: #1883490

-* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-2
- update to the latest content of https://github.com/containers/podman/tree/v2.1.1-rhel
-  (https://github.com/containers/podman/commit/450615a)
- Resolves: #1873204
- Resolves: #1884668
+* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-6
+- add tests/roles subdirectory
+- Related: #1883490

-* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-1
- update podman to 2.1.1-rhel
- Resolves: #1743687
- Resolves: #1811570
- Resolves: #1869322
- Resolves: #1678546
- Resolves: #1853455
- Resolves: #1874271
+* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-5
+- use shortcommit ID in branch tarball name
+- Related: #1883490

-* Wed Sep 23 2020 Jindrich Novy <jnovy@redhat.com> - 2.0.5-5
- fix "[FJ8.3 Bug]: [REG] "--group-add" option of "podman create" doesn't work with "--user" option"
- Resolves: #1877177
- fix "`podman images --all` fails on images with digest"
- Resolves: #1879622
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-4
+- use the correct upstream tarball
+- Related: #1883490
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-3
+- do not lock down to upstream branch for 8.4.0 yet and consume
+  new upstream releases
+- Related: #1883490
+
+* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-2
+- fix the tarball reference for consumption directly from upstream branch
+- Related: #1883490
+
+* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-1
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490

 * Fri Sep 11 2020 Jindrich Novy <jnovy@redhat.com> - 2.0.5-4
 - consume content directly from the dedicated upstream branch