From 48aaf5f781e136e2bc52a85b3a3436e5278919b2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 08 2022 06:35:49 +0000 Subject: import podman-4.2.0-1.module+el8.7.0+16772+33343656 --- diff --git a/.gitignore b/.gitignore index 87d7f31..d696edc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ SOURCES/dnsname-18822f9.tar.gz SOURCES/podman-machine-cni-0749884.tar.gz SOURCES/v0.1.7.tar.gz SOURCES/v0.2.0.tar.gz -SOURCES/v4.1.1-rhel-7f5e2fd.tar.gz +SOURCES/v4.2.0-rhel-7154106.tar.gz diff --git a/.podman.metadata b/.podman.metadata index fc2b53a..4027aa3 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -2,4 +2,4 @@ 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz 64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz -0830b39e60d005a5f3e364b7cf1038ff4ac32105 SOURCES/v4.1.1-rhel-7f5e2fd.tar.gz +7914f890fcbffdfb3096fdb6896348a483753774 SOURCES/v4.2.0-rhel-7154106.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 52f5877..bc9e7d9 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -7,8 +7,8 @@ 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.1.1-rhel -%global commit0 7f5e2fd58bdc312ba67e7b912c89e03fa27f814a +%global branch v4.2.0-rhel +%global commit0 7154106256fb4cde08e04fd4078cda4d2539299b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 @@ -19,10 +19,10 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) -Epoch: 2 +Epoch: 3 Name: podman -Version: 4.1.1 -Release: 7%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -188,8 +188,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 +347,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,65 +421,201 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog -* Tue Oct 11 2022 Jindrich Novy - 2:4.1.1-7 -- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/7f5e2fd) -- Resolves: #2130912 +* Thu Sep 29 2022 Jindrich Novy - 2:4.2.0-1 +- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel + (https://github.com/containers/podman/commit/7154106) +- Related: #2130911 + +* Thu Sep 29 2022 Jindrich Novy - 2:4.2.1-1 +- update to https://github.com/containers/podman/releases/tag/v4.2.1 +- Related: #2062697 + +* Thu Aug 11 2022 Jindrich Novy - 2:4.2.0-1 +- update to https://github.com/containers/podman/releases/tag/v4.2.0 + (https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4) +- Related: #2061390 -* Tue Oct 11 2022 Jindrich Novy - 2:4.1.1-6 -- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/2e917df) -- Resolves: #2132413 +* Fri Aug 05 2022 Lokesh Mandvekar - 2:4.2.0-0.2rc3 +- update to 4.2.0-rc3 +- Related: #2061390 -* Tue Oct 11 2022 Jindrich Novy - 2:4.1.1-5 -- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/46e1da6) -- Resolves: #2132993 +* Mon Aug 01 2022 Jindrich Novy - 2:4.2.0-0.1rc2 +- update to 4.2.0-rc2 +- Related: #2061390 -* Mon Oct 10 2022 Jindrich Novy - 2:4.1.1-4 +* Fri Jul 08 2022 Jindrich Novy - 2:4.1.1-6 - update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/735c155) -- Resolves: #2126243 + (https://github.com/containers/podman/commit/fa692a6) +- Related: #2061390 -* Thu Sep 29 2022 Jindrich Novy - 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/75e92a2) -- Resolves: #2130912 +* Fri Jul 01 2022 Jindrich Novy - 2:4.1.1-5 +- don't allow systemd commands to fail the transaction +- Related: #2061390 -* Fri Jul 08 2022 Jindrich Novy - 2:4.1.1-2 -- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/fa692a6) +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-4 +- stopping service/socket might execute podman command too - move to preun +- Related: #2061390 -* Thu Jun 23 2022 Lokesh Mandvekar - 2:4.1.1-2 -- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel - (https://github.com/containers/podman/commit/edcbcfd) -- fixes a gating test -- Related: #2097049 +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-3 +- be sure podman socket is stopped only in case of package removal +- Related: #2061390 + +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-2 +- be sure podman socket is closed after podman package is removed +- Related: #2061390 * Wed Jun 15 2022 Jindrich Novy - 2:4.1.1-1 - update to https://github.com/containers/podman/releases/tag/v4.1.1 - Related: #2061390 -* Wed May 18 2022 Jindrich Novy - 2:4.1.0-2 +* Wed May 18 2022 Jindrich Novy - 2:4.1.0-3 - Require CNI and make netavark optional - Related: #2061390 +* Wed May 11 2022 Jindrich Novy - 2:4.1.0-2 +- update gvisor-tap-vsock to 0.2.0 to fix compilation with golang 1.18 +- Related: #2061390 + * Mon May 09 2022 Jindrich Novy - 2:4.1.0-1 - update to https://github.com/containers/podman/releases/tag/v4.1.0 - Related: #2061390 -* Wed Apr 20 2022 Jindrich Novy - 2:4.0.3-2 +* Fri Apr 08 2022 Jindrich Novy - 2:4.0.3-2 - Related: #2061390 * Fri Apr 01 2022 Jindrich Novy - 2:4.0.3-1 - update to https://github.com/containers/podman/releases/tag/v4.0.3 +- Related: #2061390 -* Thu Mar 24 2022 Jindrich Novy - 2:4.0.2-0.8 +* Fri Mar 18 2022 Jindrich Novy - 2:4.0.2-2 - bump minimal libseccomp version requirement - Related: #2061390 -* Mon Mar 07 2022 Jindrich Novy - 2:4.0.2-0.7 +* Mon Mar 07 2022 Jindrich Novy - 2:4.0.2-1 - update to https://github.com/containers/podman/releases/tag/v4.0.2 +- Related: #2061390 + +* Mon Feb 28 2022 Jindrich Novy - 2:4.0.1-1 +- update to https://github.com/containers/podman/releases/tag/v4.0.1 +- Related: #2001445 + +* Mon Feb 21 2022 Lokesh Mandvekar - 2:4.0.0-3 +- use correct commit 49f8da72 for podman, previous commit said 4.0.1-dev +- Related: #2001445 + +* Mon Feb 21 2022 Lokesh Mandvekar - 2:4.0.0-2 +- install podman-plugins for gating tests +- Related: #2001445 + +* Fri Feb 18 2022 Jindrich Novy - 2:4.0.0-1 +- update to podman-4.0.0 final +- Related: #2001445 + +* Thu Feb 17 2022 Jindrich Novy - 2:4.0.0-0.31 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/a34f279) +- Related: #2001445 + +* Wed Feb 16 2022 Jindrich Novy - 2:4.0.0-0.30 +- fix linker flags to assure -D_FORTIFY_SOURCE=2 is present at the command line +- Related: #2001445 + +* Tue Feb 15 2022 Jindrich Novy - 2:4.0.0-0.29 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/ab3e566) +- Related: #2001445 + +* Mon Feb 14 2022 Jindrich Novy - 2:4.0.0-0.28 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/b0a445e) +- Related: #2001445 + +* Fri Feb 11 2022 Jindrich Novy - 2:4.0.0-0.27 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/c4a9aa7) +- Related: #2001445 + +* Thu Feb 10 2022 Jindrich Novy - 2:4.0.0-0.26 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/5b2d96f) +- Related: #2001445 + +* Wed Feb 09 2022 Jindrich Novy - 2:4.0.0-0.25 +- set CGO_CFLAGS explicitly +- Related: #2001445 + +* Mon Feb 07 2022 Jindrich Novy - 2:4.0.0-0.24 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/2dca7b2) +- Related: #2001445 + +* Fri Feb 04 2022 Jindrich Novy - 2:4.0.0-0.23 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/4ad9e00) +- Related: #2001445 + +* Fri Feb 04 2022 Jindrich Novy - 2:4.0.0-0.22 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/337f706) +- Related: #2001445 + +* Thu Jan 27 2022 Jindrich Novy - 1:3.4.5-0.7 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/a54320a) +- Related: #2001445 + +* Thu Jan 20 2022 Jindrich Novy - 2:3.4.5-0.6 +- update gating tests +- Related: #2001445 + +* Mon Jan 17 2022 Jindrich Novy - 1:3.4.5-0.5 +- add git-daemon to test subpackage + (https://github.com/containers/podman/issues/12851) +- Related: #2001445 + +* Fri Jan 14 2022 Jindrich Novy - 1:3.4.5-0.4 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/63134a1) +- Related: #2001445 + +* Tue Jan 11 2022 Jindrich Novy - 1:3.4.5-0.3 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/3f57b6e) +- Related: #2001445 + +* Fri Dec 17 2021 Jindrich Novy - 1:3.4.5-0.2 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/17788ed) +- Related: #2001445 + +* Thu Dec 09 2021 Jindrich Novy - 1:3.4.5-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/b8fde5c) +- Related: #2001445 + +* Wed Dec 08 2021 Jindrich Novy - 1:3.4.4-0.2 +- drop patch applied upstream +- Related: #2001445 + +* Wed Dec 08 2021 Jindrich Novy - 1:3.4.4-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/49f589d) +- Related: #2001445 + +* Mon Dec 06 2021 Jindrich Novy - 1:3.4.3-0.9 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/fe44757) +- Related: #2001445 + +* Thu Dec 02 2021 Jindrich Novy - 1:3.4.3-0.8 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/815f36a) +- Related: #2001445 + +* Wed Dec 01 2021 Jindrich Novy - 1:3.4.3-0.7 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/31bc358) +- Related: #2001445 * Tue Nov 23 2021 Jindrich Novy - 1:3.4.3-0.6 - update to the latest content of https://github.com/containers/podman/tree/v3.4