From 88f0849d222ddb30a6b6c9d258e820edcd24192f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 19 Aug 2020 06:44:16 -0600 Subject: [PATCH 001/110] Define 'buildInfo', to get timestamp in podman version Weirdness that will probably haunt us one day: in the project source tree Makefile there's a "/v2" that doesn't work when we specify it in the specfile. Signed-off-by: Ed Santiago --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 3499e44..4da038f 100644 --- a/podman.spec +++ b/podman.spec @@ -464,6 +464,10 @@ export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_ %if 0%{?centos} export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %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} # build %%{name}-remote From 8ef7475a9416be829efd112ea14aa627d7c44378 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 25 Aug 2020 08:45:30 -0400 Subject: [PATCH 002/110] no timestamp Signed-off-by: Lokesh Mandvekar --- podman.spec | 195 ++++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 96 deletions(-) diff --git a/podman.spec b/podman.spec index 4da038f..e0dbd2c 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.178.dev.git%{shortcommit0}%{?dist} +Release: 0.179.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -651,295 +651,298 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Tue Aug 11 19:10:50 GMT 2020 RH Container Bot - 2:2.1.0-0.178.dev.git43f2771 +* Tue Aug 25 2020 Lokesh Mandvekar - 2:2.1.0-0.179.dev.git43f2771 +- buildinfo in LDFLAGS + +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.178.dev.git43f2771 - autobuilt 43f2771 -* Tue Aug 11 18:11:25 GMT 2020 RH Container Bot - 2:2.1.0-0.177.dev.gitaa66c06 +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.177.dev.gitaa66c06 - autobuilt aa66c06 -* Tue Aug 11 12:10:46 GMT 2020 RH Container Bot - 2:2.1.0-0.176.dev.git6d3075a +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.176.dev.git6d3075a - autobuilt 6d3075a -* Tue Aug 11 11:11:02 GMT 2020 RH Container Bot - 2:2.1.0-0.175.dev.git68c67d2 +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.175.dev.git68c67d2 - autobuilt 68c67d2 -* Tue Aug 11 08:41:21 GMT 2020 RH Container Bot - 2:2.1.0-0.174.dev.gita90ae00 +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.174.dev.gita90ae00 - autobuilt a90ae00 -* Tue Aug 11 08:16:07 GMT 2020 RH Container Bot - 2:2.1.0-0.173.dev.git92b088b +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.173.dev.git92b088b - autobuilt 92b088b -* Tue Aug 11 00:10:40 GMT 2020 RH Container Bot - 2:2.1.0-0.172.dev.gitdf0ad51 +* Tue Aug 11 2020 RH Container Bot - 2:2.1.0-0.172.dev.gitdf0ad51 - autobuilt df0ad51 -* Mon Aug 10 21:11:03 GMT 2020 RH Container Bot - 2:2.1.0-0.171.dev.git75d2fe6 +* Mon Aug 10 2020 RH Container Bot - 2:2.1.0-0.171.dev.git75d2fe6 - autobuilt 75d2fe6 -* Mon Aug 10 17:10:44 GMT 2020 RH Container Bot - 2:2.1.0-0.170.dev.git68fd9aa +* Mon Aug 10 2020 RH Container Bot - 2:2.1.0-0.170.dev.git68fd9aa - autobuilt 68fd9aa -* Mon Aug 10 16:11:01 GMT 2020 RH Container Bot - 2:2.1.0-0.169.dev.git162625f +* Mon Aug 10 2020 RH Container Bot - 2:2.1.0-0.169.dev.git162625f - autobuilt 162625f -* Mon Aug 10 15:11:11 GMT 2020 RH Container Bot - 2:2.1.0-0.168.dev.gitda00482 +* Mon Aug 10 2020 RH Container Bot - 2:2.1.0-0.168.dev.gitda00482 - autobuilt da00482 -* Sun Aug 09 12:10:18 GMT 2020 RH Container Bot - 2:2.1.0-0.167.dev.git95e2e15 +* Sun Aug 09 2020 RH Container Bot - 2:2.1.0-0.167.dev.git95e2e15 - autobuilt 95e2e15 -* Sat Aug 08 12:10:35 GMT 2020 RH Container Bot - 2:2.1.0-0.166.dev.git3173a18 +* Sat Aug 08 2020 RH Container Bot - 2:2.1.0-0.166.dev.git3173a18 - autobuilt 3173a18 -* Sat Aug 08 11:10:34 GMT 2020 RH Container Bot - 2:2.1.0-0.165.dev.git1298161 +* Sat Aug 08 2020 RH Container Bot - 2:2.1.0-0.165.dev.git1298161 - autobuilt 1298161 -* Fri Aug 07 13:10:45 GMT 2020 RH Container Bot - 2:2.1.0-0.164.dev.git51159e7 +* Fri Aug 07 2020 RH Container Bot - 2:2.1.0-0.164.dev.git51159e7 - autobuilt 51159e7 -* Wed Aug 05 22:10:25 GMT 2020 RH Container Bot - 2:2.1.0-0.163.dev.git0d4a269 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.163.dev.git0d4a269 - autobuilt 0d4a269 -* Wed Aug 05 21:10:21 GMT 2020 RH Container Bot - 2:2.1.0-0.162.dev.gita948635 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.162.dev.gita948635 - autobuilt a948635 -* Wed Aug 05 20:10:17 GMT 2020 RH Container Bot - 2:2.1.0-0.161.dev.gitbae6d5d +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.161.dev.gitbae6d5d - autobuilt bae6d5d -* Wed Aug 05 13:10:50 GMT 2020 RH Container Bot - 2:2.1.0-0.160.dev.gitd1aaf33 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.160.dev.gitd1aaf33 - autobuilt d1aaf33 * Wed Aug 05 2020 Eduardo Santiago - 2:2.1.0-0.159.dev.git7a7c8e9 - add openssl, httpd-tools requirements to podman-tests -* Wed Aug 05 09:10:26 GMT 2020 RH Container Bot - 2:2.1.0-0.158.dev.git7a7c8e9 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.158.dev.git7a7c8e9 - autobuilt 7a7c8e9 -* Wed Aug 05 08:11:08 GMT 2020 RH Container Bot - 2:2.1.0-0.157.dev.git4797190 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.157.dev.git4797190 - autobuilt 4797190 -* Wed Aug 05 03:10:10 GMT 2020 RH Container Bot - 2:2.1.0-0.156.dev.git6260677 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.156.dev.git6260677 - autobuilt 6260677 -* Wed Aug 05 01:10:24 GMT 2020 RH Container Bot - 2:2.1.0-0.155.dev.git0a3f3c9 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.155.dev.git0a3f3c9 - autobuilt 0a3f3c9 -* Wed Aug 05 00:10:27 GMT 2020 RH Container Bot - 2:2.1.0-0.154.dev.git807efd6 +* Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.154.dev.git807efd6 - autobuilt 807efd6 * Mon Aug 3 2020 Peter Oliver - 2:2.1.0-0.153.dev.git1709335 - Include podman-auto-update systemd service and timer. -* Tue Aug 04 14:10:21 GMT 2020 RH Container Bot - 2:2.1.0-0.152.dev.gitd4cf3c5 +* Tue Aug 04 2020 RH Container Bot - 2:2.1.0-0.152.dev.gitd4cf3c5 - autobuilt d4cf3c5 -* Tue Aug 04 13:10:43 GMT 2020 RH Container Bot - 2:2.1.0-0.151.dev.git93d6320 +* Tue Aug 04 2020 RH Container Bot - 2:2.1.0-0.151.dev.git93d6320 - autobuilt 93d6320 -* Tue Aug 04 11:10:25 GMT 2020 RH Container Bot - 2:2.1.0-0.150.dev.gitf7440ff +* Tue Aug 04 2020 RH Container Bot - 2:2.1.0-0.150.dev.gitf7440ff - autobuilt f7440ff -* Tue Aug 04 09:11:02 GMT 2020 RH Container Bot - 2:2.1.0-0.149.dev.git1ed1e58 +* Tue Aug 04 2020 RH Container Bot - 2:2.1.0-0.149.dev.git1ed1e58 - autobuilt 1ed1e58 -* Mon Aug 03 16:09:48 GMT 2020 RH Container Bot - 2:2.1.0-0.148.dev.git1709335 +* Mon Aug 03 2020 RH Container Bot - 2:2.1.0-0.148.dev.git1709335 - autobuilt 1709335 -* Mon Aug 03 14:11:09 GMT 2020 RH Container Bot - 2:2.1.0-0.147.dev.git2e3928e +* Mon Aug 03 2020 RH Container Bot - 2:2.1.0-0.147.dev.git2e3928e - autobuilt 2e3928e -* Mon Aug 03 13:11:31 GMT 2020 RH Container Bot - 2:2.1.0-0.146.dev.git41358f5 +* Mon Aug 03 2020 RH Container Bot - 2:2.1.0-0.146.dev.git41358f5 - autobuilt 41358f5 -* Mon Aug 03 07:11:14 GMT 2020 RH Container Bot - 2:2.1.0-0.145.dev.gitbfd3454 +* Mon Aug 03 2020 RH Container Bot - 2:2.1.0-0.145.dev.gitbfd3454 - autobuilt bfd3454 -* Sun Aug 02 12:10:13 GMT 2020 RH Container Bot - 2:2.1.0-0.144.dev.gitf4d4bd2 +* Sun Aug 02 2020 RH Container Bot - 2:2.1.0-0.144.dev.gitf4d4bd2 - autobuilt f4d4bd2 -* Sat Aug 01 14:10:17 GMT 2020 RH Container Bot - 2:2.1.0-0.143.dev.gitb425a4f +* Sat Aug 01 2020 RH Container Bot - 2:2.1.0-0.143.dev.gitb425a4f - autobuilt b425a4f -* Sat Aug 01 13:10:40 GMT 2020 RH Container Bot - 2:2.1.0-0.142.dev.git0d064a0 +* Sat Aug 01 2020 RH Container Bot - 2:2.1.0-0.142.dev.git0d064a0 - autobuilt 0d064a0 -* Fri Jul 31 23:09:44 GMT 2020 RH Container Bot - 2:2.1.0-0.141.dev.git4c75fe3 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.141.dev.git4c75fe3 - autobuilt 4c75fe3 -* Fri Jul 31 16:09:52 GMT 2020 RH Container Bot - 2:2.1.0-0.140.dev.git7a15be5 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.140.dev.git7a15be5 - autobuilt 7a15be5 -* Fri Jul 31 13:09:54 GMT 2020 RH Container Bot - 2:2.1.0-0.139.dev.git3cf8237 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.139.dev.git3cf8237 - autobuilt 3cf8237 -* Fri Jul 31 12:09:54 GMT 2020 RH Container Bot - 2:2.1.0-0.138.dev.gitbb96c89 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.138.dev.gitbb96c89 - autobuilt bb96c89 -* Fri Jul 31 11:09:50 GMT 2020 RH Container Bot - 2:2.1.0-0.137.dev.gite911875 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.137.dev.gite911875 - autobuilt e911875 -* Fri Jul 31 08:09:58 GMT 2020 RH Container Bot - 2:2.1.0-0.136.dev.git0e009d5 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.136.dev.git0e009d5 - autobuilt 0e009d5 -* Fri Jul 31 02:09:50 GMT 2020 RH Container Bot - 2:2.1.0-0.135.dev.git1b784b4 +* Fri Jul 31 2020 RH Container Bot - 2:2.1.0-0.135.dev.git1b784b4 - autobuilt 1b784b4 -* Thu Jul 30 20:10:01 GMT 2020 RH Container Bot - 2:2.1.0-0.134.dev.git4132b71 +* Thu Jul 30 2020 RH Container Bot - 2:2.1.0-0.134.dev.git4132b71 - autobuilt 4132b71 -* Thu Jul 30 19:10:35 GMT 2020 RH Container Bot - 2:2.1.0-0.133.dev.gitca2bda6 +* Thu Jul 30 2020 RH Container Bot - 2:2.1.0-0.133.dev.gitca2bda6 - autobuilt ca2bda6 -* Thu Jul 30 15:10:32 GMT 2020 RH Container Bot - 2:2.1.0-0.132.dev.git05b3e0e +* Thu Jul 30 2020 RH Container Bot - 2:2.1.0-0.132.dev.git05b3e0e - autobuilt 05b3e0e -* Thu Jul 30 11:09:55 GMT 2020 RH Container Bot - 2:2.1.0-0.131.dev.git1170430 +* Thu Jul 30 2020 RH Container Bot - 2:2.1.0-0.131.dev.git1170430 - autobuilt 1170430 -* Wed Jul 29 21:09:39 GMT 2020 RH Container Bot - 2:2.1.0-0.130.dev.gitc66ce8d +* Wed Jul 29 2020 RH Container Bot - 2:2.1.0-0.130.dev.gitc66ce8d - autobuilt c66ce8d -* Wed Jul 29 20:10:05 GMT 2020 RH Container Bot - 2:2.1.0-0.129.dev.giteaa2f52 +* Wed Jul 29 2020 RH Container Bot - 2:2.1.0-0.129.dev.giteaa2f52 - autobuilt eaa2f52 -* Wed Jul 29 19:10:08 GMT 2020 RH Container Bot - 2:2.1.0-0.128.dev.git044a7cb +* Wed Jul 29 2020 RH Container Bot - 2:2.1.0-0.128.dev.git044a7cb - autobuilt 044a7cb -* Wed Jul 29 12:10:30 GMT 2020 RH Container Bot - 2:2.1.0-0.127.dev.git7f38774 +* Wed Jul 29 2020 RH Container Bot - 2:2.1.0-0.127.dev.git7f38774 - autobuilt 7f38774 -* Wed Jul 29 09:09:58 GMT 2020 RH Container Bot - 2:2.1.0-0.126.dev.git83166a9 +* Wed Jul 29 2020 RH Container Bot - 2:2.1.0-0.126.dev.git83166a9 - autobuilt 83166a9 -* Tue Jul 28 23:09:57 GMT 2020 RH Container Bot - 2:2.1.0-0.125.dev.git539bb4c +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.125.dev.git539bb4c - autobuilt 539bb4c -* Tue Jul 28 22:09:57 GMT 2020 RH Container Bot - 2:2.1.0-0.124.dev.gitb0777ad +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.124.dev.gitb0777ad - autobuilt b0777ad -* Tue Jul 28 14:26:41 GMT 2020 RH Container Bot - 2:2.1.0-0.123.dev.git288ebec +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.123.dev.git288ebec - autobuilt 288ebec -* Tue Jul 28 14:10:01 GMT 2020 RH Container Bot - 2:2.1.0-0.122.dev.git6ed9868 +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.122.dev.git6ed9868 - autobuilt 6ed9868 -* Tue Jul 28 13:09:42 GMT 2020 RH Container Bot - 2:2.1.0-0.121.dev.gitec69497 +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.121.dev.gitec69497 - autobuilt ec69497 -* Tue Jul 28 12:10:00 GMT 2020 RH Container Bot - 2:2.1.0-0.120.dev.git91c92d1 +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.120.dev.git91c92d1 - autobuilt 91c92d1 -* Tue Jul 28 08:10:34 GMT 2020 RH Container Bot - 2:2.1.0-0.119.dev.gitd463715 +* Tue Jul 28 2020 RH Container Bot - 2:2.1.0-0.119.dev.gitd463715 - autobuilt d463715 -* Mon Jul 27 20:09:57 GMT 2020 RH Container Bot - 2:2.1.0-0.118.dev.git2b7bc9b +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.118.dev.git2b7bc9b - autobuilt 2b7bc9b -* Mon Jul 27 19:09:49 GMT 2020 RH Container Bot - 2:2.1.0-0.117.dev.git956caf3 +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.117.dev.git956caf3 - autobuilt 956caf3 -* Mon Jul 27 18:10:00 GMT 2020 RH Container Bot - 2:2.1.0-0.116.dev.gitbf92ec5 +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.116.dev.gitbf92ec5 - autobuilt bf92ec5 -* Mon Jul 27 15:09:31 GMT 2020 RH Container Bot - 2:2.1.0-0.115.dev.git5e9b54f +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.115.dev.git5e9b54f - autobuilt 5e9b54f -* Mon Jul 27 14:09:53 GMT 2020 RH Container Bot - 2:2.1.0-0.114.dev.git55a7faf +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.114.dev.git55a7faf - autobuilt 55a7faf -* Mon Jul 27 11:10:29 GMT 2020 RH Container Bot - 2:2.1.0-0.113.dev.git71f7150 +* Mon Jul 27 2020 RH Container Bot - 2:2.1.0-0.113.dev.git71f7150 - autobuilt 71f7150 -* Sun Jul 26 12:09:47 GMT 2020 RH Container Bot - 2:2.1.0-0.112.dev.git11e8e65 +* Sun Jul 26 2020 RH Container Bot - 2:2.1.0-0.112.dev.git11e8e65 - autobuilt 11e8e65 -* Fri Jul 24 15:10:04 GMT 2020 RH Container Bot - 2:2.1.0-0.111.dev.gitc2deeff +* Fri Jul 24 2020 RH Container Bot - 2:2.1.0-0.111.dev.gitc2deeff - autobuilt c2deeff -* Fri Jul 24 09:09:52 GMT 2020 RH Container Bot - 2:2.1.0-0.110.dev.gitd924476 +* Fri Jul 24 2020 RH Container Bot - 2:2.1.0-0.110.dev.gitd924476 - autobuilt d924476 -* Thu Jul 23 20:09:53 GMT 2020 RH Container Bot - 2:2.1.0-0.109.dev.git197825d +* Thu Jul 23 2020 RH Container Bot - 2:2.1.0-0.109.dev.git197825d - autobuilt 197825d -* Thu Jul 23 18:09:59 GMT 2020 RH Container Bot - 2:2.1.0-0.108.dev.git961fa6a +* Thu Jul 23 2020 RH Container Bot - 2:2.1.0-0.108.dev.git961fa6a - autobuilt 961fa6a -* Wed Jul 22 22:09:36 GMT 2020 RH Container Bot - 2:2.1.0-0.107.dev.git1aac197 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.107.dev.git1aac197 - autobuilt 1aac197 -* Wed Jul 22 21:10:06 GMT 2020 RH Container Bot - 2:2.1.0-0.106.dev.git9223b72 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.106.dev.git9223b72 - autobuilt 9223b72 -* Wed Jul 22 19:09:56 GMT 2020 RH Container Bot - 2:2.1.0-0.105.dev.gitd493374 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.105.dev.gitd493374 - autobuilt d493374 -* Wed Jul 22 14:09:59 GMT 2020 RH Container Bot - 2:2.1.0-0.104.dev.git80add29 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.104.dev.git80add29 - autobuilt 80add29 -* Wed Jul 22 13:09:55 GMT 2020 RH Container Bot - 2:2.1.0-0.103.dev.git9f5d146 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.103.dev.git9f5d146 - autobuilt 9f5d146 -* Wed Jul 22 12:10:07 GMT 2020 RH Container Bot - 2:2.1.0-0.102.dev.gitef03815 +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.102.dev.gitef03815 - autobuilt ef03815 -* Wed Jul 22 10:09:59 GMT 2020 RH Container Bot - 2:2.1.0-0.101.dev.git59bad8b +* Wed Jul 22 2020 RH Container Bot - 2:2.1.0-0.101.dev.git59bad8b - autobuilt 59bad8b -* Tue Jul 21 21:10:01 GMT 2020 RH Container Bot - 2:2.1.0-0.100.dev.git344a791 +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.100.dev.git344a791 - autobuilt 344a791 -* Tue Jul 21 18:09:44 GMT 2020 RH Container Bot - 2:2.1.0-0.99.dev.gite5b3563 +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.99.dev.gite5b3563 - autobuilt e5b3563 -* Tue Jul 21 16:09:47 GMT 2020 RH Container Bot - 2:2.1.0-0.98.dev.gitbe5219a +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.98.dev.gitbe5219a - autobuilt be5219a -* Tue Jul 21 15:10:42 GMT 2020 RH Container Bot - 2:2.1.0-0.97.dev.gitf8e2a35 +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.97.dev.gitf8e2a35 - autobuilt f8e2a35 -* Tue Jul 21 14:09:54 GMT 2020 RH Container Bot - 2:2.1.0-0.96.dev.git644b5bc +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.96.dev.git644b5bc - autobuilt 644b5bc -* Tue Jul 21 10:09:33 GMT 2020 RH Container Bot - 2:2.1.0-0.95.dev.gitdf6920a +* Tue Jul 21 2020 RH Container Bot - 2:2.1.0-0.95.dev.gitdf6920a - autobuilt df6920a -* Mon Jul 20 19:09:35 GMT 2020 RH Container Bot - 2:2.1.0-0.94.dev.git0d26a57 +* Mon Jul 20 2020 RH Container Bot - 2:2.1.0-0.94.dev.git0d26a57 - autobuilt 0d26a57 -* Mon Jul 20 18:09:30 GMT 2020 RH Container Bot - 2:2.1.0-0.93.dev.gite8de509 +* Mon Jul 20 2020 RH Container Bot - 2:2.1.0-0.93.dev.gite8de509 - autobuilt e8de509 -* Mon Jul 20 13:09:49 GMT 2020 RH Container Bot - 2:2.1.0-0.92.dev.git17f9b80 +* Mon Jul 20 2020 RH Container Bot - 2:2.1.0-0.92.dev.git17f9b80 - autobuilt 17f9b80 -* Sun Jul 19 13:09:17 GMT 2020 RH Container Bot - 2:2.1.0-0.91.dev.gitb7b8fce +* Sun Jul 19 2020 RH Container Bot - 2:2.1.0-0.91.dev.gitb7b8fce - autobuilt b7b8fce -* Sat Jul 18 13:09:24 GMT 2020 RH Container Bot - 2:2.1.0-0.90.dev.gitd087ade +* Sat Jul 18 2020 RH Container Bot - 2:2.1.0-0.90.dev.gitd087ade - autobuilt d087ade -* Sat Jul 18 11:10:10 GMT 2020 RH Container Bot - 2:2.1.0-0.89.dev.gitdeff289 +* Sat Jul 18 2020 RH Container Bot - 2:2.1.0-0.89.dev.gitdeff289 - autobuilt deff289 -* Fri Jul 17 21:09:43 GMT 2020 RH Container Bot - 2:2.1.0-0.88.dev.git10c5f24 +* Fri Jul 17 2020 RH Container Bot - 2:2.1.0-0.88.dev.git10c5f24 - autobuilt 10c5f24 -* Fri Jul 17 10:10:05 GMT 2020 RH Container Bot - 2:2.1.0-0.87.dev.gitdfca83d +* Fri Jul 17 2020 RH Container Bot - 2:2.1.0-0.87.dev.gitdfca83d - autobuilt dfca83d -* Fri Jul 17 09:10:08 GMT 2020 RH Container Bot - 2:2.1.0-0.86.dev.gitd86bae2 +* Fri Jul 17 2020 RH Container Bot - 2:2.1.0-0.86.dev.gitd86bae2 - autobuilt d86bae2 -* Thu Jul 16 22:09:46 GMT 2020 RH Container Bot - 2:2.1.0-0.85.dev.git0bd5181 +* Thu Jul 16 2020 RH Container Bot - 2:2.1.0-0.85.dev.git0bd5181 - autobuilt 0bd5181 -* Thu Jul 16 16:09:55 GMT 2020 RH Container Bot - 2:2.1.0-0.84.dev.gitf4766e0 +* Thu Jul 16 2020 RH Container Bot - 2:2.1.0-0.84.dev.gitf4766e0 - autobuilt f4766e0 -* Thu Jul 16 14:10:14 GMT 2020 RH Container Bot - 2:2.1.0-0.83.dev.git984fffc +* Thu Jul 16 2020 RH Container Bot - 2:2.1.0-0.83.dev.git984fffc - autobuilt 984fffc -* Thu Jul 16 12:10:30 GMT 2020 RH Container Bot - 2:2.1.0-0.82.dev.git11fe857 +* Thu Jul 16 2020 RH Container Bot - 2:2.1.0-0.82.dev.git11fe857 - autobuilt 11fe857 * Wed Jul 15 2020 RH Container Bot - 2:2.1.0-0.81.dev.git9efeb1c From 7725f93a7c4fc1d65448e6c3f57f79d1165db9a8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 14 Sep 2020 14:00:49 +0000 Subject: [PATCH 003/110] podman-2:2.1.0-0.180.dev.git43f2771 autobuilt v2.1.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index e0dbd2c..42fdcac 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.4 +%define built_tag v2.1.0-rc1 Name: podman %if 0%{?fedora} @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.179.dev.git%{shortcommit0}%{?dist} +Release: 0.180.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -651,6 +651,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Sep 14 2020 RH Container Bot - 2:2.1.0-0.180.dev.git43f2771 +- autobuilt v2.1.0-rc1 + * Tue Aug 25 2020 Lokesh Mandvekar - 2:2.1.0-0.179.dev.git43f2771 - buildinfo in LDFLAGS From 3fc7afcf88641573f54e856a89fa6288102ddf14 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 10:22:01 -0400 Subject: [PATCH 004/110] podman-2:2.1.0-0.181.rc1 - bump to v2.1.0-rc1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 76f69a9..e909b70 100644 --- a/.gitignore +++ b/.gitignore @@ -1252,3 +1252,4 @@ /podman-6d3075a.tar.gz /podman-aa66c06.tar.gz /podman-43f2771.tar.gz +/v2.1.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 42fdcac..e04b7b8 100644 --- a/podman.spec +++ b/podman.spec @@ -32,8 +32,6 @@ # To build a random user's fork/commit, comment out above line, # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO -%global commit0 43f277156c52141c89025ed6a3854f870db38033 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname # https://github.com/containers/libpod @@ -45,6 +43,8 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %define built_tag v2.1.0-rc1 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -57,11 +57,15 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.180.dev.git%{shortcommit0}%{?dist} +Release: 0.181.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source0: %{download_url} +# To build a random user's fork/commit, comment out above line, +# uncomment below Source0, and replace the placeholders with the right info +# Also, adjust %%prep section as necessary. +#Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} @@ -443,7 +447,7 @@ is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit -n %{name}-%{built_tag_strip} # untar dnsname tar zxf %{SOURCE1} @@ -651,6 +655,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.181.rc1 +- bump to v2.1.0-rc1 + * Mon Sep 14 2020 RH Container Bot - 2:2.1.0-0.180.dev.git43f2771 - autobuilt v2.1.0-rc1 diff --git a/sources b/sources index 3524186..5384cc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (podman-43f2771.tar.gz) = 324533adc8ba30a0694619a320d7419699fcc83ff82def6f186825b52d80f330da827c264a80ec859cae7e639a075588b09565b1269d8368027f9b17b06fa48b +SHA512 (v2.1.0-rc1.tar.gz) = 17f9d73a63f0d54c0ce80f830c0e2829bb54e1d1f69d3bdac70a0d5be5e20a604ec0f3e3f8978b2b13c2481a301475ff1e529115e94a0c87995af1a74f0d21b4 From 28c1db868c4b167b1313a748e05193e691e0a64a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 14:55:36 -0400 Subject: [PATCH 005/110] podman-2:2.1.0-0.182.rc1 - use correct remote buildtag Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index e04b7b8..f7476de 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.181.rc1%{?dist} +Release: 0.182.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -475,7 +475,7 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build %%{name}-remote -export BUILDTAGS+=" remoteclient" +export BUILDTAGS+=" remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} pushd dnsname-%{commit_plugins} @@ -655,6 +655,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.182.rc1 +- use correct remote buildtag + * Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.181.rc1 - bump to v2.1.0-rc1 From 90e9b67f584792eb211f6837e05c3028edc81ae0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 15:10:18 -0400 Subject: [PATCH 006/110] podman-2:2.1.0-0.183.rc1 - build without btrfs for podman-remote - correct a changelog chronlogical order issue Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index f7476de..54884ed 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.182.rc1%{?dist} +Release: 0.183.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -475,7 +475,7 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build %%{name}-remote -export BUILDTAGS+=" remote" +export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} pushd dnsname-%{commit_plugins} @@ -655,6 +655,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.183.rc1 +- build without btrfs for podman-remote + * Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.182.rc1 - use correct remote buildtag @@ -742,7 +745,7 @@ exit 0 * Wed Aug 05 2020 RH Container Bot - 2:2.1.0-0.154.dev.git807efd6 - autobuilt 807efd6 -* Mon Aug 3 2020 Peter Oliver - 2:2.1.0-0.153.dev.git1709335 +* Tue Aug 04 2020 Peter Oliver - 2:2.1.0-0.153.dev.git1709335 - Include podman-auto-update systemd service and timer. * Tue Aug 04 2020 RH Container Bot - 2:2.1.0-0.152.dev.gitd4cf3c5 From 642cfecd515f779898a001f660b6b28f788af8fe Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 16:08:24 -0400 Subject: [PATCH 007/110] add space for buildtag separation in centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 54884ed..78e35e3 100644 --- a/podman.spec +++ b/podman.spec @@ -466,7 +466,7 @@ ln -s vendor src # build %%{name} export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" %if 0%{?centos} -export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" %endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? From 3e97e3d78058869284def21af74928b3b18a6c1e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Sep 2020 10:47:22 -0400 Subject: [PATCH 008/110] podman- 2:2.1.0-0.184.rc1 - podman-plugins depends on dnsmasq Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 78e35e3..1d7521e 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.183.rc1%{?dist} +Release: 0.184.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -368,7 +368,7 @@ Provides: golang(%{import_path}/pkg/registrar) = %{epoch}:%{version}-%{release} Provides: golang(%{import_path}/pkg/storage) = %{epoch}:%{version}-%{release} Provides: golang(%{import_path}/utils) = %{epoch}:%{version}-%{release} -%description -n libpod-devel +%description devel %{summary} This package contains library source intended for @@ -415,6 +415,7 @@ Requires: skopeo Requires: nmap-ncat Requires: httpd-tools Requires: openssl +Requires: dnsmasq %description tests %{summary} @@ -655,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 16 10:47:14 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.184.rc1 +- podman-plugins depends on dnsmasq + * Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.183.rc1 - build without btrfs for podman-remote From db2601380feca6a0f5ddfd1342f5473e6a8906b8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Sep 2020 11:08:42 -0400 Subject: [PATCH 009/110] podman-2:2.1.0-0.185.rc1 - fix deps for podman-plugins Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 1d7521e..f23a062 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.184.rc1%{?dist} +Release: 0.185.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -415,7 +415,6 @@ Requires: skopeo Requires: nmap-ncat Requires: httpd-tools Requires: openssl -Requires: dnsmasq %description tests %{summary} @@ -438,6 +437,7 @@ connections as well. %package plugins Summary: Plugins for %{name} +Requires: dnsmasq %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -656,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 16 11:08:33 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.185.rc1 +- fix deps for podman-plugins + * Wed Sep 16 10:47:14 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.184.rc1 - podman-plugins depends on dnsmasq From fbdf0ef8f71fcb600487652017de9d66092c5b38 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Sep 2020 21:13:31 +0000 Subject: [PATCH 010/110] podman-2:2.1.0-0.186.rc1 autobuilt v2.1.0-rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e909b70..bbbd24f 100644 --- a/.gitignore +++ b/.gitignore @@ -1253,3 +1253,4 @@ /podman-aa66c06.tar.gz /podman-43f2771.tar.gz /v2.1.0-rc1.tar.gz +/v2.1.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index f23a062..e519728 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0-rc1 +%define built_tag v2.1.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.185.rc1%{?dist} +Release: 0.186.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -656,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.186.rc1 +- autobuilt v2.1.0-rc2 + * Wed Sep 16 11:08:33 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.185.rc1 - fix deps for podman-plugins diff --git a/sources b/sources index 5384cc3..ebbbbfc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0-rc1.tar.gz) = 17f9d73a63f0d54c0ce80f830c0e2829bb54e1d1f69d3bdac70a0d5be5e20a604ec0f3e3f8978b2b13c2481a301475ff1e529115e94a0c87995af1a74f0d21b4 +SHA512 (v2.1.0-rc2.tar.gz) = 9ec5ccfe0f82f19a16fd89cbd5e20311ae90a30d570da0ffa66746e8393da34840d08c9e0ce8c094558736f3e465e64ac6848a2accae56123f0d1079fce7d43b From 18ce769aae32cab3953b7b043f6ac63270355eae Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Sep 2020 08:26:04 -0400 Subject: [PATCH 011/110] podman-2:2.1.0-0.187.rc2 - fix release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e519728..dc6a728 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.186.rc1%{?dist} +Release: 0.187.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -656,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.187.rc2 +- fix release tag + * Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.186.rc1 - autobuilt v2.1.0-rc2 From da31c95b5ac7a9c259bf5b4195fafa3af2a5e3df Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 22 Sep 2020 17:53:28 +0000 Subject: [PATCH 012/110] podman-2:2.1.0-1 autobuilt v2.1.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bbbd24f..cd61c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1254,3 +1254,4 @@ /podman-43f2771.tar.gz /v2.1.0-rc1.tar.gz /v2.1.0-rc2.tar.gz +/v2.1.0.tar.gz diff --git a/podman.spec b/podman.spec index dc6a728..c839804 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0-rc2 +%define built_tag v2.1.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.187.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -656,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 +- autobuilt v2.1.0 + * Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.187.rc2 - fix release tag diff --git a/sources b/sources index ebbbbfc..fd09024 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0-rc2.tar.gz) = 9ec5ccfe0f82f19a16fd89cbd5e20311ae90a30d570da0ffa66746e8393da34840d08c9e0ce8c094558736f3e465e64ac6848a2accae56123f0d1079fce7d43b +SHA512 (v2.1.0.tar.gz) = eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e From db67a073f4a624d29d77678124f33da073eb9a89 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 19:08:41 -0400 Subject: [PATCH 013/110] podman-2:2.1.0-1 - autobuilt v2.1.0 - Resolves: #1874268, #1881345 - CVE-2020-14370 Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index c839804..98690b5 100644 --- a/podman.spec +++ b/podman.spec @@ -66,7 +66,7 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -658,6 +658,7 @@ exit 0 %changelog * Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 - autobuilt v2.1.0 +- Resolves: #1874268, #1881345 - CVE-2020-14370 * Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.187.rc2 - fix release tag From d3fdc023f4093c6bfadef87824813e9eba3742bc Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 18 Sep 2020 11:56:41 -0400 Subject: [PATCH 014/110] spec: make podman-plugins a weak dep That way someone who wants just podman doesn't also get dnsmasq. This is a point of contention in FCOS currently: https://github.com/coreos/fedora-coreos-tracker/issues/519 (cherry picked from commit 217f4344ec796dd1134a5ba54a8ce2fb5a32a5b6) Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 98690b5..82a2d1b 100644 --- a/podman.spec +++ b/podman.spec @@ -91,7 +91,7 @@ Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 Requires: oci-runtime -Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel From c1d4bd28f07ae1f4a2255cba984ae963de675f26 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 23 Sep 2020 16:43:31 -0400 Subject: [PATCH 015/110] podman-2:2.1.0-2 - podman-plugins is a weak dep for podman Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 82a2d1b..2f2a4c3 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -656,6 +656,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.0-2 +- podman-plugins is a weak dep for podman + * Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 - autobuilt v2.1.0 - Resolves: #1874268, #1881345 - CVE-2020-14370 From 5ca1f1946aced00df26e73cdd8ac20a43e0080dc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 27 Sep 2020 09:39:39 -0400 Subject: [PATCH 016/110] podman-2:2.1.1-1 - bump to v2.1.1 - depend on containers-common >= 1.1.1-9 for f33 gating tests Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cd61c0e..bbfdae3 100644 --- a/.gitignore +++ b/.gitignore @@ -1255,3 +1255,4 @@ /v2.1.0-rc1.tar.gz /v2.1.0-rc2.tar.gz /v2.1.0.tar.gz +/v2.1.1.tar.gz diff --git a/podman.spec b/podman.spec index 2f2a4c3..6ae60c6 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0 +%define built_tag v2.1.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -52,7 +52,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.1.0 +Version: 2.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -85,7 +85,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common +Requires: containers-common >= 1.1.1-9 Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables @@ -656,6 +656,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.1-1 +- bump to v2.1.1 +- depend on containers-common >= 1.1.1-9 for f33 gating tests + * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.0-2 - podman-plugins is a weak dep for podman diff --git a/sources b/sources index fd09024..7bf9ccb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0.tar.gz) = eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e +SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 From 851325f1b654cdbc521d9f696ad0d37d670eb33c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 14:53:10 -0400 Subject: [PATCH 017/110] podman-2:2.1.1-6 - fix crun gating test issue - bump release tag to preserve upgrade path Signed-off-by: Lokesh Mandvekar --- gating-test-crun.patch | 33 +++++++++++++++++++++++++++++++++ podman.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gating-test-crun.patch diff --git a/gating-test-crun.patch b/gating-test-crun.patch new file mode 100644 index 0000000..18f7930 --- /dev/null +++ b/gating-test-crun.patch @@ -0,0 +1,33 @@ +From f732e2edcb5a1b925aa2bea65bfe1162edec032e Mon Sep 17 00:00:00 2001 +From: Ed Santiago +Date: Tue, 29 Sep 2020 06:20:21 -0600 +Subject: [PATCH] Gating-test fix: deal with new crun error msg + +crun changed an error message: + + https://github.com/containers/crun/pull/439 + +It's a good change, absolutely the right thing to do, but +it broke gating tests. Fix tests so they handle both old +and new format. + +Fixes: #7814 + +Signed-off-by: Ed Santiago +--- + test/system/030-run.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/system/030-run.bats b/test/system/030-run.bats +index 4a286d3ae1..b3599cc173 100644 +--- a/test/system/030-run.bats ++++ b/test/system/030-run.bats +@@ -14,7 +14,7 @@ load helpers + # ...but check the configured runtime engine, and switch to crun as needed + run_podman info --format '{{ .Host.OCIRuntime.Path }}' + if expr "$output" : ".*/crun"; then +- err_no_such_cmd="Error: executable file not found in \$PATH: No such file or directory: OCI runtime command not found error" ++ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error" + err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error" + fi + diff --git a/podman.spec b/podman.spec index 6ae60c6..8630639 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 6%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -67,6 +67,7 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz +Patch0: gating-test-crun.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -656,6 +657,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-6 +- fix crun gating test issue +- bump release tag to preserve upgrade path + * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.1-1 - bump to v2.1.1 - depend on containers-common >= 1.1.1-9 for f33 gating tests From 7382ef29b6912c34caf11ca71b4105f9d61be7d7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 15:12:07 -0400 Subject: [PATCH 018/110] podman-2:2.1.1-7 - bump release tag for upgrade path Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8630639..bf5fe18 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 6%{?dist} +Release: 7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -657,6 +657,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-7 +- bump release tag for upgrade path + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-6 - fix crun gating test issue - bump release tag to preserve upgrade path From a64ff5004bf35006c53673a3d0d71ce220d16957 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 24 Sep 2020 12:38:01 +0000 Subject: [PATCH 019/110] Require container-selinux when selinux-policy is installed (#1881218) (cherry picked from commit 5620973b1af4f2b5ca491eae27b6e25bf460781e) Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index bf5fe18..4284871 100644 --- a/podman.spec +++ b/podman.spec @@ -102,7 +102,7 @@ Recommends: crun >= 0.14-2 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit -Recommends: container-selinux +Requires: (container-selinux if selinux-policy) Recommends: runc Recommends: slirp4netns >= 0.3.0-2 %else From 176a630bfb546abfbda3e7a90770dde537e8b3e6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 10:43:51 -0400 Subject: [PATCH 020/110] podman-2:2.1.1-8 - Requires: (container-selinux if selinux-policy) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 4284871..e4e447e 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 7%{?dist} +Release: 8%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -657,6 +657,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 +- Requires: (container-selinux if selinux-policy) + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-7 - bump release tag for upgrade path From 0a3af289296fe26eb367857918fe132bd6dd2dc3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 15:24:58 -0400 Subject: [PATCH 021/110] podman-2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) Signed-off-by: Lokesh Mandvekar --- fix-capset-issue.patch | 102 +++++++++++++++++++++++++++++++++++++++++ podman.spec | 6 ++- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 fix-capset-issue.patch diff --git a/fix-capset-issue.patch b/fix-capset-issue.patch new file mode 100644 index 0000000..044705e --- /dev/null +++ b/fix-capset-issue.patch @@ -0,0 +1,102 @@ +From 445b6cc2e776e5c0417acfe119772bcdb7fbd9f2 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 29 Sep 2020 10:06:48 +0200 +Subject: [PATCH] capabilities: always set ambient and inheritable + +change capabilities handling to reflect what docker does. + +Bounding: set to caplist +Inheritable: set to caplist +Effective: if uid != 0 then clear; else set to caplist +Permitted: if uid != 0 then clear; else set to caplist +Ambient: clear + +Signed-off-by: Giuseppe Scrivano +(cherry picked from commit 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5) +--- + pkg/specgen/generate/security.go | 3 ++- + test/e2e/cp_test.go | 4 ++-- + test/system/030-run.bats | 4 ++-- + test/system/075-exec.bats | 4 ++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go +index 87e8029a75..d5e8cd4ff4 100644 +--- a/pkg/specgen/generate/security.go ++++ b/pkg/specgen/generate/security.go +@@ -130,12 +130,13 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, + } + + configSpec := g.Config ++ configSpec.Process.Capabilities.Ambient = []string{} + configSpec.Process.Capabilities.Bounding = caplist ++ configSpec.Process.Capabilities.Inheritable = caplist + + if s.User == "" || s.User == "root" || s.User == "0" { + configSpec.Process.Capabilities.Effective = caplist + configSpec.Process.Capabilities.Permitted = caplist +- configSpec.Process.Capabilities.Inheritable = caplist + } else { + userCaps, err := capabilities.NormalizeCapabilities(s.CapAdd) + if err != nil { +diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go +index a53485fa46..0a9fa990c5 100644 +--- a/test/e2e/cp_test.go ++++ b/test/e2e/cp_test.go +@@ -269,11 +269,11 @@ var _ = Describe("Podman cp", func() { + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +- session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "testfile"}) ++ session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "/tmp/testfile"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +- session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"}) ++ session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:/tmp/testfile", "testfile1"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +diff --git a/test/system/030-run.bats b/test/system/030-run.bats +index 518d902a7b..59983fef01 100644 +--- a/test/system/030-run.bats ++++ b/test/system/030-run.bats +@@ -312,7 +312,7 @@ echo $rand | 0 | $rand + @test "podman run : --userns=keep-id: passwd file is modifiable" { + skip_if_remote "FIXME: pending #7195" + +- run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done' ++ run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done' + cid="$output" + + # Assign a UID that is (a) not in our image /etc/passwd and (b) not +@@ -333,7 +333,7 @@ echo $rand | 0 | $rand + is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \ + "newuser3 added to /etc/passwd in container" + +- run_podman exec $cid touch /stop ++ run_podman exec $cid touch /tmp/stop + run_podman wait $cid + } + +diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats +index e9db8c27eb..edd7dedc43 100644 +--- a/test/system/075-exec.bats ++++ b/test/system/075-exec.bats +@@ -92,14 +92,14 @@ load helpers + # #6829 : add username to /etc/passwd inside container if --userns=keep-id + @test "podman exec - with keep-id" { + run_podman run -d --userns=keep-id $IMAGE sh -c \ +- "echo READY;while [ ! -f /stop ]; do sleep 1; done" ++ "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" + cid="$output" + wait_for_ready $cid + + run_podman exec $cid id -un + is "$output" "$(id -un)" "container is running as current user" + +- run_podman exec --user=$(id -un) $cid touch /stop ++ run_podman exec --user=$(id -un) $cid touch /tmp/stop + run_podman wait $cid + run_podman rm $cid + } diff --git a/podman.spec b/podman.spec index e4e447e..1ebd03c 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 8%{?dist} +Release: 9%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -68,6 +68,7 @@ Source0: %{download_url} #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Patch0: gating-test-crun.patch +Patch1: fix-capset-issue.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -657,6 +658,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 +- fix capset issue on podman run (upstream PR#7898) + * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 - Requires: (container-selinux if selinux-policy) From 8daa8e6f6b5e30a24be2405d7e9edf99ead0f290 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 16:11:14 -0400 Subject: [PATCH 022/110] correct containers-common dependency Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 1ebd03c..47c63d6 100644 --- a/podman.spec +++ b/podman.spec @@ -87,7 +87,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 1.1.1-9 Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables @@ -98,8 +97,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel +Requires: containers-common >= 1:1.2.0-2 Recommends: fuse-overlayfs >= 0.3-8 -Recommends: crun >= 0.14-2 +Recommends: crun >= 0.15-5 +%else +Requires: containers-common >= 2:1.2.0-2 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit @@ -660,6 +662,7 @@ exit 0 %changelog * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) +- Requires containers-common >= %%epoch:1.2.0-2 * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 - Requires: (container-selinux if selinux-policy) From 5f498229e275dbd84b6ef311ef52a79912ed317a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 4 Oct 2020 19:20:35 -0400 Subject: [PATCH 023/110] podman-2:2.1.1-10 - fix permission denied issue when using --net=host Signed-off-by: Lokesh Mandvekar --- net-host.patch | 133 +++++++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 6 ++- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 net-host.patch diff --git a/net-host.patch b/net-host.patch new file mode 100644 index 0000000..8164da8 --- /dev/null +++ b/net-host.patch @@ -0,0 +1,133 @@ +From e896ca924f214404be48de116fb18cb21404cbca Mon Sep 17 00:00:00 2001 +From: Daniel J Walsh +Date: Mon, 28 Sep 2020 15:55:06 -0400 +Subject: [PATCH] Ignore containers.conf sysctl when namespaces set to host + +If user sets namespace to host, then default sysctls need to be ignored +that are specific to that namespace. + +--net=host ignore sysctls that begin with net. +--ipc=host ignore fs.mqueue +--uts=host ignore kernel.domainname and kernel.hostname + +Signed-off-by: Daniel J Walsh +(cherry picked from commit 0d70df119539d818224b0d014602aaad2bd1b95e) +Signed-off-by: Lokesh Mandvekar +--- + cmd/podman/common/create.go | 2 +- + pkg/specgen/generate/security.go | 46 ++++++++++++++++++++++++++++++++ + test/e2e/containers_conf_test.go | 6 +++++ + test/e2e/run_test.go | 5 ++++ + 4 files changed, 58 insertions(+), 1 deletion(-) + +diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go +index 7e3dc7fb4e..d5cad675d5 100644 +--- a/cmd/podman/common/create.go ++++ b/cmd/podman/common/create.go +@@ -448,7 +448,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { + + createFlags.StringSliceVar( + &cf.Sysctl, +- "sysctl", containerConfig.Sysctls(), ++ "sysctl", []string{}, + "Sysctl options", + ) + createFlags.StringVar( +diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go +index d5e8cd4ff4..d17cd4a9a2 100644 +--- a/pkg/specgen/generate/security.go ++++ b/pkg/specgen/generate/security.go +@@ -7,6 +7,7 @@ import ( + "github.com/containers/common/pkg/capabilities" + "github.com/containers/common/pkg/config" + "github.com/containers/podman/v2/libpod" ++ "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" +@@ -168,7 +169,52 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, + } + + g.SetRootReadonly(s.ReadOnlyFilesystem) ++ ++ // Add default sysctls ++ defaultSysctls, err := util.ValidateSysctls(rtc.Sysctls()) ++ if err != nil { ++ return err ++ } ++ for sysctlKey, sysctlVal := range defaultSysctls { ++ ++ // Ignore mqueue sysctls if --ipc=host ++ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since IPC Namespace set to host", sysctlKey, sysctlVal) ++ ++ continue ++ } ++ ++ // Ignore net sysctls if --net=host ++ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since Network Namespace set to host", sysctlKey, sysctlVal) ++ continue ++ } ++ ++ // Ignore uts sysctls if --uts=host ++ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since UTS Namespace set to host", sysctlKey, sysctlVal) ++ continue ++ } ++ ++ g.AddLinuxSysctl(sysctlKey, sysctlVal) ++ } ++ + for sysctlKey, sysctlVal := range s.Sysctl { ++ ++ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since IPC Namespace set to host", sysctlKey, sysctlVal) ++ } ++ ++ // Ignore net sysctls if --net=host ++ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since Host Namespace set to host", sysctlKey, sysctlVal) ++ } ++ ++ // Ignore uts sysctls if --uts=host ++ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since UTS Namespace set to host", sysctlKey, sysctlVal) ++ } ++ + g.AddLinuxSysctl(sysctlKey, sysctlVal) + } + +diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go +index 8339b77321..981b9638db 100644 +--- a/test/e2e/containers_conf_test.go ++++ b/test/e2e/containers_conf_test.go +@@ -182,6 +182,12 @@ var _ = Describe("Podman run", func() { + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).To(ContainSubstring("1000")) ++ ++ // Ignore containers.conf setting if --net=host ++ session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) ++ session.WaitWithDefaultTimeout() ++ Expect(session.ExitCode()).To(Equal(0)) ++ Expect(session.OutputToString()).ToNot((ContainSubstring("1000"))) + }) + + It("podman run containers.conf search domain", func() { +diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go +index c8655dcad0..359c6a41c2 100644 +--- a/test/e2e/run_test.go ++++ b/test/e2e/run_test.go +@@ -375,6 +375,11 @@ USER bin` + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).To(ContainSubstring("net.core.somaxconn = 65535")) ++ ++ // network sysctls should fail if --net=host is set ++ session = podmanTest.Podman([]string{"run", "--net", "host", "--rm", "--sysctl", "net.core.somaxconn=65535", ALPINE, "sysctl", "net.core.somaxconn"}) ++ session.WaitWithDefaultTimeout() ++ Expect(session.ExitCode()).To(Equal(125)) + }) + + It("podman run blkio-weight test", func() { diff --git a/podman.spec b/podman.spec index 47c63d6..fd73e10 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 9%{?dist} +Release: 10%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -69,6 +69,7 @@ Source0: %{download_url} Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Patch0: gating-test-crun.patch Patch1: fix-capset-issue.patch +Patch2: net-host.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -660,6 +661,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 +- fix permission denied issue when using --net=host + * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) - Requires containers-common >= %%epoch:1.2.0-2 From cf458007c252f5df70caaabac7d927a6faef6eb4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 7 Oct 2020 09:17:08 -0400 Subject: [PATCH 024/110] podman-2:2.1.1-11 - bring back varlink for f33 Signed-off-by: Lokesh Mandvekar --- podman.spec | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index fd73e10..76e8e5c 100644 --- a/podman.spec +++ b/podman.spec @@ -3,6 +3,13 @@ %global with_check 0 %global with_unit_test 0 +%if 0%{?fedora} || 0%{?centos} >= 8 +#### DO NOT REMOVE - NEEDED FOR CENTOS +%bcond_without varlink +%else +%bcond_with varlink +%endif + %if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %global with_debug 1 @@ -57,7 +64,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 10%{?dist} +Release: 11%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -109,6 +116,7 @@ Recommends: catatonit Requires: (container-selinux if selinux-policy) Recommends: runc Recommends: slirp4netns >= 0.3.0-2 +Recommends: libvarlink-util %else Requires: catatonit Requires: container-selinux @@ -469,8 +477,17 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src +%if %{with varlink} +%gogenerate ./pkg/varlink/... +%endif + # build %%{name} export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" + +%if %{with varlink} +export BUILDTAGS+=" varlink" +%endif + %if 0%{?centos} export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" %endif @@ -502,6 +519,9 @@ rm -rf docs/containers-mounts.conf.5.md install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +%if %{with varlink} + BUILDTAGS="varlink" \ +%endif install.bin-nobuild \ install.man-nobuild \ install.cni \ @@ -622,6 +642,13 @@ exit 0 %{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%if %{with varlink} +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket +%{_tmpfilesdir}/%{name}.conf +%endif %files docker %{_bindir}/docker @@ -661,6 +688,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Oct 7 2020 Lokesh Mandvekar - 2:2.1.1-11 +- bring back varlink for f33 + * Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 - fix permission denied issue when using --net=host From 1430631f3dae39c00b476e7c7c1501851c4becf0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 7 Oct 2020 12:03:40 -0400 Subject: [PATCH 025/110] Revert "podman-2:2.1.1-11" no varlink for f33 This reverts commit cf458007c252f5df70caaabac7d927a6faef6eb4. --- podman.spec | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/podman.spec b/podman.spec index 76e8e5c..fd73e10 100644 --- a/podman.spec +++ b/podman.spec @@ -3,13 +3,6 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} || 0%{?centos} >= 8 -#### DO NOT REMOVE - NEEDED FOR CENTOS -%bcond_without varlink -%else -%bcond_with varlink -%endif - %if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %global with_debug 1 @@ -64,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 11%{?dist} +Release: 10%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -116,7 +109,6 @@ Recommends: catatonit Requires: (container-selinux if selinux-policy) Recommends: runc Recommends: slirp4netns >= 0.3.0-2 -Recommends: libvarlink-util %else Requires: catatonit Requires: container-selinux @@ -477,17 +469,8 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src -%if %{with varlink} -%gogenerate ./pkg/varlink/... -%endif - # build %%{name} export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" - -%if %{with varlink} -export BUILDTAGS+=" varlink" -%endif - %if 0%{?centos} export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" %endif @@ -519,9 +502,6 @@ rm -rf docs/containers-mounts.conf.5.md install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ -%if %{with varlink} - BUILDTAGS="varlink" \ -%endif install.bin-nobuild \ install.man-nobuild \ install.cni \ @@ -642,13 +622,6 @@ exit 0 %{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket -%if %{with varlink} -%{_unitdir}/io.%{name}.service -%{_unitdir}/io.%{name}.socket -%{_userunitdir}/io.%{name}.service -%{_userunitdir}/io.%{name}.socket -%{_tmpfilesdir}/%{name}.conf -%endif %files docker %{_bindir}/docker @@ -688,9 +661,6 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Wed Oct 7 2020 Lokesh Mandvekar - 2:2.1.1-11 -- bring back varlink for f33 - * Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 - fix permission denied issue when using --net=host From 97a642820fbc96edd4af70f7078adb40f2790b8d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 7 Oct 2020 12:18:51 -0400 Subject: [PATCH 026/110] podman-2:2.1.1-12 - -11 was a bad build - no varlink for fedora 33 and newer - rebuild Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index fd73e10..1c2aa37 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 10%{?dist} +Release: 12%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -661,6 +661,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Oct 7 2020 Lokesh Mandvekar - 2:2.1.1-12 +- -11 was a bad build - no varlink for fedora 33 and newer +- rebuild + * Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 - fix permission denied issue when using --net=host From bf92bc5d6ce199c0488f9ce6e8c1eaa44b1eef5e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 19 Oct 2020 06:27:01 -0600 Subject: [PATCH 027/110] Podman tests now require buildah PR #7891 introduced a way for podman-rm to remove external containers; to test it, we need buildah. Signed-off-by: Ed Santiago (cherry picked from commit fee6ccac125f77013703c2ad6f2b14a765d35dde) Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index 1c2aa37..46dc077 100644 --- a/podman.spec +++ b/podman.spec @@ -420,6 +420,8 @@ Requires: skopeo Requires: nmap-ncat Requires: httpd-tools Requires: openssl +Requires: socat +Requires: buildah %description tests %{summary} From 51f25b80fae899d90ac8ba02289e13e3306b958a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 12:43:28 -0500 Subject: [PATCH 028/110] podman-2:2.1.1-13 - bump dnsname to v1.1.0, commit a9c2a10 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bbfdae3..fe84292 100644 --- a/.gitignore +++ b/.gitignore @@ -1256,3 +1256,5 @@ /v2.1.0-rc2.tar.gz /v2.1.0.tar.gz /v2.1.1.tar.gz +/dnsname-a9c2a10.tar.gz +/podman-286d356.tar.gz diff --git a/podman.spec b/podman.spec index 46dc077..637e043 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # https://github.com/containers/libpod %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -57,7 +57,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 12%{?dist} +Release: 13%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -66,7 +66,7 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz +Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz Patch0: gating-test-crun.patch Patch1: fix-capset-issue.patch Patch2: net-host.patch @@ -663,6 +663,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.1.1-13 +- bump dnsname to v1.1.0, commit a9c2a10 + * Wed Oct 7 2020 Lokesh Mandvekar - 2:2.1.1-12 - -11 was a bad build - no varlink for fedora 33 and newer - rebuild diff --git a/sources b/sources index 7bf9ccb..d4e60b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc +SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 From 7c17c76fa5269cc5bf3caab87e6df46c6c0484a3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 13:13:05 -0500 Subject: [PATCH 029/110] Remove containers-mounts.conf.5.md Present in containers-common From: Ed Santiago Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 637e043..408ecd4 100644 --- a/podman.spec +++ b/podman.spec @@ -456,6 +456,7 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} +rm -f docs/source/markdown/containers-mounts.conf.5.md # untar dnsname tar zxf %{SOURCE1} @@ -500,8 +501,6 @@ popd %{__make} docs %install -rm -rf docs/containers-mounts.conf.5.md - install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin-nobuild \ From 4bbf1704bc7b0c39c5b86edb6e30787988d98a72 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 13:20:00 -0500 Subject: [PATCH 030/110] remove patches merged upstream for v2.2 Signed-off-by: Lokesh Mandvekar --- fix-capset-issue.patch | 102 ------------------------------- gating-test-crun.patch | 33 ---------- net-host.patch | 133 ----------------------------------------- podman.spec | 3 - 4 files changed, 271 deletions(-) delete mode 100644 fix-capset-issue.patch delete mode 100644 gating-test-crun.patch delete mode 100644 net-host.patch diff --git a/fix-capset-issue.patch b/fix-capset-issue.patch deleted file mode 100644 index 044705e..0000000 --- a/fix-capset-issue.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 445b6cc2e776e5c0417acfe119772bcdb7fbd9f2 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Tue, 29 Sep 2020 10:06:48 +0200 -Subject: [PATCH] capabilities: always set ambient and inheritable - -change capabilities handling to reflect what docker does. - -Bounding: set to caplist -Inheritable: set to caplist -Effective: if uid != 0 then clear; else set to caplist -Permitted: if uid != 0 then clear; else set to caplist -Ambient: clear - -Signed-off-by: Giuseppe Scrivano -(cherry picked from commit 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5) ---- - pkg/specgen/generate/security.go | 3 ++- - test/e2e/cp_test.go | 4 ++-- - test/system/030-run.bats | 4 ++-- - test/system/075-exec.bats | 4 ++-- - 4 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go -index 87e8029a75..d5e8cd4ff4 100644 ---- a/pkg/specgen/generate/security.go -+++ b/pkg/specgen/generate/security.go -@@ -130,12 +130,13 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, - } - - configSpec := g.Config -+ configSpec.Process.Capabilities.Ambient = []string{} - configSpec.Process.Capabilities.Bounding = caplist -+ configSpec.Process.Capabilities.Inheritable = caplist - - if s.User == "" || s.User == "root" || s.User == "0" { - configSpec.Process.Capabilities.Effective = caplist - configSpec.Process.Capabilities.Permitted = caplist -- configSpec.Process.Capabilities.Inheritable = caplist - } else { - userCaps, err := capabilities.NormalizeCapabilities(s.CapAdd) - if err != nil { -diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go -index a53485fa46..0a9fa990c5 100644 ---- a/test/e2e/cp_test.go -+++ b/test/e2e/cp_test.go -@@ -269,11 +269,11 @@ var _ = Describe("Podman cp", func() { - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -- session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "testfile"}) -+ session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "/tmp/testfile"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -- session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"}) -+ session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:/tmp/testfile", "testfile1"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -diff --git a/test/system/030-run.bats b/test/system/030-run.bats -index 518d902a7b..59983fef01 100644 ---- a/test/system/030-run.bats -+++ b/test/system/030-run.bats -@@ -312,7 +312,7 @@ echo $rand | 0 | $rand - @test "podman run : --userns=keep-id: passwd file is modifiable" { - skip_if_remote "FIXME: pending #7195" - -- run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done' -+ run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done' - cid="$output" - - # Assign a UID that is (a) not in our image /etc/passwd and (b) not -@@ -333,7 +333,7 @@ echo $rand | 0 | $rand - is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \ - "newuser3 added to /etc/passwd in container" - -- run_podman exec $cid touch /stop -+ run_podman exec $cid touch /tmp/stop - run_podman wait $cid - } - -diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats -index e9db8c27eb..edd7dedc43 100644 ---- a/test/system/075-exec.bats -+++ b/test/system/075-exec.bats -@@ -92,14 +92,14 @@ load helpers - # #6829 : add username to /etc/passwd inside container if --userns=keep-id - @test "podman exec - with keep-id" { - run_podman run -d --userns=keep-id $IMAGE sh -c \ -- "echo READY;while [ ! -f /stop ]; do sleep 1; done" -+ "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" - cid="$output" - wait_for_ready $cid - - run_podman exec $cid id -un - is "$output" "$(id -un)" "container is running as current user" - -- run_podman exec --user=$(id -un) $cid touch /stop -+ run_podman exec --user=$(id -un) $cid touch /tmp/stop - run_podman wait $cid - run_podman rm $cid - } diff --git a/gating-test-crun.patch b/gating-test-crun.patch deleted file mode 100644 index 18f7930..0000000 --- a/gating-test-crun.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f732e2edcb5a1b925aa2bea65bfe1162edec032e Mon Sep 17 00:00:00 2001 -From: Ed Santiago -Date: Tue, 29 Sep 2020 06:20:21 -0600 -Subject: [PATCH] Gating-test fix: deal with new crun error msg - -crun changed an error message: - - https://github.com/containers/crun/pull/439 - -It's a good change, absolutely the right thing to do, but -it broke gating tests. Fix tests so they handle both old -and new format. - -Fixes: #7814 - -Signed-off-by: Ed Santiago ---- - test/system/030-run.bats | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/system/030-run.bats b/test/system/030-run.bats -index 4a286d3ae1..b3599cc173 100644 ---- a/test/system/030-run.bats -+++ b/test/system/030-run.bats -@@ -14,7 +14,7 @@ load helpers - # ...but check the configured runtime engine, and switch to crun as needed - run_podman info --format '{{ .Host.OCIRuntime.Path }}' - if expr "$output" : ".*/crun"; then -- err_no_such_cmd="Error: executable file not found in \$PATH: No such file or directory: OCI runtime command not found error" -+ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error" - err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error" - fi - diff --git a/net-host.patch b/net-host.patch deleted file mode 100644 index 8164da8..0000000 --- a/net-host.patch +++ /dev/null @@ -1,133 +0,0 @@ -From e896ca924f214404be48de116fb18cb21404cbca Mon Sep 17 00:00:00 2001 -From: Daniel J Walsh -Date: Mon, 28 Sep 2020 15:55:06 -0400 -Subject: [PATCH] Ignore containers.conf sysctl when namespaces set to host - -If user sets namespace to host, then default sysctls need to be ignored -that are specific to that namespace. - ---net=host ignore sysctls that begin with net. ---ipc=host ignore fs.mqueue ---uts=host ignore kernel.domainname and kernel.hostname - -Signed-off-by: Daniel J Walsh -(cherry picked from commit 0d70df119539d818224b0d014602aaad2bd1b95e) -Signed-off-by: Lokesh Mandvekar ---- - cmd/podman/common/create.go | 2 +- - pkg/specgen/generate/security.go | 46 ++++++++++++++++++++++++++++++++ - test/e2e/containers_conf_test.go | 6 +++++ - test/e2e/run_test.go | 5 ++++ - 4 files changed, 58 insertions(+), 1 deletion(-) - -diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go -index 7e3dc7fb4e..d5cad675d5 100644 ---- a/cmd/podman/common/create.go -+++ b/cmd/podman/common/create.go -@@ -448,7 +448,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { - - createFlags.StringSliceVar( - &cf.Sysctl, -- "sysctl", containerConfig.Sysctls(), -+ "sysctl", []string{}, - "Sysctl options", - ) - createFlags.StringVar( -diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go -index d5e8cd4ff4..d17cd4a9a2 100644 ---- a/pkg/specgen/generate/security.go -+++ b/pkg/specgen/generate/security.go -@@ -7,6 +7,7 @@ import ( - "github.com/containers/common/pkg/capabilities" - "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/libpod" -+ "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/libpod/image" - "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" -@@ -168,7 +169,52 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, - } - - g.SetRootReadonly(s.ReadOnlyFilesystem) -+ -+ // Add default sysctls -+ defaultSysctls, err := util.ValidateSysctls(rtc.Sysctls()) -+ if err != nil { -+ return err -+ } -+ for sysctlKey, sysctlVal := range defaultSysctls { -+ -+ // Ignore mqueue sysctls if --ipc=host -+ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since IPC Namespace set to host", sysctlKey, sysctlVal) -+ -+ continue -+ } -+ -+ // Ignore net sysctls if --net=host -+ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since Network Namespace set to host", sysctlKey, sysctlVal) -+ continue -+ } -+ -+ // Ignore uts sysctls if --uts=host -+ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since UTS Namespace set to host", sysctlKey, sysctlVal) -+ continue -+ } -+ -+ g.AddLinuxSysctl(sysctlKey, sysctlVal) -+ } -+ - for sysctlKey, sysctlVal := range s.Sysctl { -+ -+ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since IPC Namespace set to host", sysctlKey, sysctlVal) -+ } -+ -+ // Ignore net sysctls if --net=host -+ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since Host Namespace set to host", sysctlKey, sysctlVal) -+ } -+ -+ // Ignore uts sysctls if --uts=host -+ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since UTS Namespace set to host", sysctlKey, sysctlVal) -+ } -+ - g.AddLinuxSysctl(sysctlKey, sysctlVal) - } - -diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go -index 8339b77321..981b9638db 100644 ---- a/test/e2e/containers_conf_test.go -+++ b/test/e2e/containers_conf_test.go -@@ -182,6 +182,12 @@ var _ = Describe("Podman run", func() { - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("1000")) -+ -+ // Ignore containers.conf setting if --net=host -+ session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) -+ session.WaitWithDefaultTimeout() -+ Expect(session.ExitCode()).To(Equal(0)) -+ Expect(session.OutputToString()).ToNot((ContainSubstring("1000"))) - }) - - It("podman run containers.conf search domain", func() { -diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go -index c8655dcad0..359c6a41c2 100644 ---- a/test/e2e/run_test.go -+++ b/test/e2e/run_test.go -@@ -375,6 +375,11 @@ USER bin` - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("net.core.somaxconn = 65535")) -+ -+ // network sysctls should fail if --net=host is set -+ session = podmanTest.Podman([]string{"run", "--net", "host", "--rm", "--sysctl", "net.core.somaxconn=65535", ALPINE, "sysctl", "net.core.somaxconn"}) -+ session.WaitWithDefaultTimeout() -+ Expect(session.ExitCode()).To(Equal(125)) - }) - - It("podman run blkio-weight test", func() { diff --git a/podman.spec b/podman.spec index 408ecd4..1432605 100644 --- a/podman.spec +++ b/podman.spec @@ -67,9 +67,6 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz -Patch0: gating-test-crun.patch -Patch1: fix-capset-issue.patch -Patch2: net-host.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From 6706f68bd1c5010e0df80eecff02eb85fe4e5d6d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 18 Nov 2020 19:32:37 +0000 Subject: [PATCH 031/110] podman-2:2.2.0-0.1.rc1 autobuilt v2.2.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fe84292..25c3f83 100644 --- a/.gitignore +++ b/.gitignore @@ -1258,3 +1258,4 @@ /v2.1.1.tar.gz /dnsname-a9c2a10.tar.gz /podman-286d356.tar.gz +/v2.2.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 1432605..d0e667b 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.1 +%define built_tag v2.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -52,12 +52,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.1.1 +Version: 2.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 13%{?dist} +Release: 0.1.rc1 Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -659,6 +659,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 RH Container Bot - 2:2.2.0-0.1.rc1 +- autobuilt v2.2.0-rc1 + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.1.1-13 - bump dnsname to v1.1.0, commit a9c2a10 diff --git a/sources b/sources index d4e60b0..8e19127 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 +SHA512 (v2.2.0-rc1.tar.gz) = e0145fc38b46da0adb385e514df1de3a759512a2434176c850b1b8820136bf479a8eea0c014513d5b03a2589b2c6084c707d96177ece2c79322558197ace8e56 From 3272f460dbee669201a462f37f480613b84552aa Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 18 Nov 2020 13:15:20 -0700 Subject: [PATCH 032/110] 2.2.0-rc1 : fix broken build - add back %{?dist}, accidentally removed in last commit; without this we don't get the '.f33' - package new fish/zsh completion files - package less-new tmpfiles.d/podman.conf Signed-off-by: Ed Santiago --- podman.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index d0e667b..62d18d7 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1 +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -607,10 +607,12 @@ exit 0 %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %{_bindir}/%{name} -%{_datadir}/bash-completion/completions/* +%{_datadir}/bash-completion/completions/%{name} # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions %{_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 %{_unitdir}/%{name}-auto-update.service %{_unitdir}/%{name}-auto-update.timer @@ -620,6 +622,7 @@ exit 0 %{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_usr}/lib/tmpfiles.d/%{name}.conf %files docker %{_bindir}/docker @@ -645,6 +648,11 @@ exit 0 %license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.* +%{_datadir}/bash-completion/completions/%{name}-remote +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name}-remote #%%{_datadir}/man/man5/%%{name}-remote*.* %files tests From 08e51493989a9a786ef3b1456e89136a920e04c7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 15:45:56 -0500 Subject: [PATCH 033/110] podman-2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 62d18d7..a767d12 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -95,11 +95,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Requires: containers-common >= 1:1.2.0-2 +Requires: containers-common >= 1:1.2.0-8 Recommends: fuse-overlayfs >= 0.3-8 Recommends: crun >= 0.15-5 %else -Requires: containers-common >= 2:1.2.0-2 +Requires: containers-common >= 2:1.2.0-8 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit @@ -667,6 +667,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 +- require containers-common 1:1.2.0-8 for shortnames + * Wed Nov 18 2020 RH Container Bot - 2:2.2.0-0.1.rc1 - autobuilt v2.2.0-rc1 From fe0c24ca600abcefba7af022900698ab125039ed Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 16:17:11 -0500 Subject: [PATCH 034/110] podman-2:2.2.0-0.3.rc1 - podman-plugins should require podman Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index a767d12..ba68b8d 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -442,6 +442,7 @@ connections as well. %package plugins Summary: Plugins for %{name} Requires: dnsmasq +Requires: %{name} = %{epoch}:%{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -667,6 +668,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 +- podman-plugins should require podman + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames From 23052b8b75b52a416a4e703b6ab858a5651d1972 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 16:18:55 -0500 Subject: [PATCH 035/110] better changelog message for latest entry Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ba68b8d..ec1037d 100644 --- a/podman.spec +++ b/podman.spec @@ -669,7 +669,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 -- podman-plugins should require podman +- podman-plugins should require podman otherwise it can cause funny upgrade +scenarios, where if "podman" upgrade fails, "podman-plugins" could still +succeed * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames From 66e1e265bfdbdc55a83009149d14451e67507fc8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 09:04:59 -0500 Subject: [PATCH 036/110] podman-2:2.2.0-0.4.rc1 - use latest containers-common 1.2.0-9 Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index ec1037d..07041e9 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -95,11 +95,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Requires: containers-common >= 1:1.2.0-8 +Requires: containers-common >= 1:1.2.0-9 Recommends: fuse-overlayfs >= 0.3-8 Recommends: crun >= 0.15-5 %else -Requires: containers-common >= 2:1.2.0-8 +Requires: containers-common >= 2:1.2.0-9 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit @@ -668,6 +668,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Nov 20 2020 Lokesh Mandvekar - 2:2.2.0-0.4.rc1 +- use latest containers-common 1.2.0-9 + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 - podman-plugins should require podman otherwise it can cause funny upgrade scenarios, where if "podman" upgrade fails, "podman-plugins" could still From 65405cc222d6f97c1f0f507c816c20437d46658c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 13:45:57 -0500 Subject: [PATCH 037/110] handle centos7 Signed-off-by: Lokesh Mandvekar (cherry picked from commit b8c95c5e84feea49ec31753bbf58f96b918e8fd8) Signed-off-by: Lokesh Mandvekar --- podman.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index 07041e9..3875363 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -524,10 +524,14 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, done # do not install remote manpages on centos7 -%if 0%{?centos} && 0%{?centos} < 8 -rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1 -rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1 -rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 +%if ! 0%{?fedora} && 0%{?centos} < 8 +rm -f %{buildroot}%{_mandir}/man1/docker-remote.1 +rm -f %{buildroot}%{_mandir}/man1/%{name}-remote.1 +rm -f %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 +rm -f %{buildroot}%{_datadir}/bash-completion/completions/%{name}-remote +rm -f %{buildroot}%{_datadir}/zsh/site-functions/_%{name}-remote +rm -f %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +rm -f %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif # source codes for building projects @@ -650,16 +654,18 @@ exit 0 %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.* %{_datadir}/bash-completion/completions/%{name}-remote +%dir %{_datadir}/fish %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +%dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}-remote -#%%{_datadir}/man/man5/%%{name}-remote*.* +%endif %files tests %license LICENSE %{_datadir}/%{name}/test -%endif +%dir %{_datadir}/%{name}/test/system %files plugins %license dnsname-%{commit_plugins}/LICENSE @@ -668,6 +674,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Nov 23 2020 Lokesh Mandvekar - 2:2.2.0-0.5.rc1 +- handle centos7 + * Fri Nov 20 2020 Lokesh Mandvekar - 2:2.2.0-0.4.rc1 - use latest containers-common 1.2.0-9 From 93bd9a6dfb9fa576b27486a936f826bc975016b6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 24 Nov 2020 12:33:40 +0000 Subject: [PATCH 038/110] podman-2:2.2.0-0.6.rc2 autobuilt v2.2.0-rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25c3f83..60eee97 100644 --- a/.gitignore +++ b/.gitignore @@ -1259,3 +1259,4 @@ /dnsname-a9c2a10.tar.gz /podman-286d356.tar.gz /v2.2.0-rc1.tar.gz +/v2.2.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 3875363..4bc1bcc 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.2.0-rc1 +%define built_tag v2.2.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.5.rc1%{?dist} +Release: 0.6.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Nov 24 2020 RH Container Bot - 2:2.2.0-0.6.rc2 +- autobuilt v2.2.0-rc2 + * Mon Nov 23 2020 Lokesh Mandvekar - 2:2.2.0-0.5.rc1 - handle centos7 diff --git a/sources b/sources index 8e19127..6c9d34b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.2.0-rc1.tar.gz) = e0145fc38b46da0adb385e514df1de3a759512a2434176c850b1b8820136bf479a8eea0c014513d5b03a2589b2c6084c707d96177ece2c79322558197ace8e56 +SHA512 (v2.2.0-rc2.tar.gz) = 2478fcb41226690e61bc47643773c3027133ab44865a395df811e7b0977bcb33704f4aa41bfe2aba0636fb63fa0900aa15e3b946b85b542715c121a829220484 From b7b4528ad64ac328444f08fb1c02ca5139707a67 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Dec 2020 02:33:14 +0000 Subject: [PATCH 039/110] podman-2:2.2.0-1 autobuilt v2.2.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60eee97..16f14d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1260,3 +1260,4 @@ /podman-286d356.tar.gz /v2.2.0-rc1.tar.gz /v2.2.0-rc2.tar.gz +/v2.2.0.tar.gz diff --git a/podman.spec b/podman.spec index 4bc1bcc..cf53606 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.2.0-rc2 +%define built_tag v2.2.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 1 2020 RH Container Bot - 2:2.2.0-1 +- autobuilt v2.2.0 + * Tue Nov 24 2020 RH Container Bot - 2:2.2.0-0.6.rc2 - autobuilt v2.2.0-rc2 diff --git a/sources b/sources index 6c9d34b..ecc85f0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.2.0-rc2.tar.gz) = 2478fcb41226690e61bc47643773c3027133ab44865a395df811e7b0977bcb33704f4aa41bfe2aba0636fb63fa0900aa15e3b946b85b542715c121a829220484 +SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d From c2468de56be461b43dcb76088bbb275269ec5b60 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Dec 2020 11:58:19 -0500 Subject: [PATCH 040/110] podman- 2:2.2.0-2 - use podman-plugins / dnsname upstream v1.1.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 7 +++++-- sources | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 16f14d2..2c36beb 100644 --- a/.gitignore +++ b/.gitignore @@ -1261,3 +1261,5 @@ /v2.2.0-rc1.tar.gz /v2.2.0-rc2.tar.gz /v2.2.0.tar.gz +/dnsname-c654c95.tar.gz +/podman-429d949.tar.gz diff --git a/podman.spec b/podman.spec index cf53606..9c6ad37 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # https://github.com/containers/libpod %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 +%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -57,7 +57,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 1 2020 Lokesh Mandvekar - 2:2.2.0-2 +- use podman-plugins / dnsname upstream v1.1.1 + * Tue Dec 1 2020 RH Container Bot - 2:2.2.0-1 - autobuilt v2.2.0 diff --git a/sources b/sources index ecc85f0..2df7a76 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d +SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 From ad557c765f431b7ee41571b457c190d7b1e22de2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Dec 2020 12:01:43 -0500 Subject: [PATCH 041/110] ensure sources uploaded correctly Signed-off-by: Lokesh Mandvekar --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 2df7a76..2da6b4a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 +SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d From 9f65dc104148c4d54c1246e887586b634e3089f5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Dec 2020 11:12:40 -0500 Subject: [PATCH 042/110] Harden cgo based golang binaries - adjust CGO_CFLAGS to make both koji and checksec happy Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9c6ad37..911192a 100644 --- a/podman.spec +++ b/podman.spec @@ -20,7 +20,6 @@ %if ! 0%{?gobuild:1} %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif -%define gogenerate go generate %global provider github %global provider_tld com @@ -70,6 +69,7 @@ Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: gcc BuildRequires: golang BuildRequires: glib2-devel BuildRequires: glibc-devel @@ -462,6 +462,12 @@ tar zxf %{SOURCE1} %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) +export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +%ifarch x86_64 +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection" +%endif +# These extra flags present in %%{optflags} have been skipped for now as they break the build +#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" mkdir _build pushd _build From 5f556ba7908ae9d6137f9590c083861fc6c65d44 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 09:45:04 -0500 Subject: [PATCH 043/110] podman-2:2.2.0-3 - harden cgo based golang binaries Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 911192a..40d0ef1 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -680,6 +680,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-3 +- harden cgo based golang binaries +- Reported-by: Wade Mealing + * Tue Dec 1 2020 Lokesh Mandvekar - 2:2.2.0-2 - use podman-plugins / dnsname upstream v1.1.1 From 3bb55e27eae563d87d6c86270ac3064975970b92 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:31:29 -0500 Subject: [PATCH 044/110] -fcf-protection cflag NOT for centos <= 7 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 7a29eeae7ce0ee139eb01315cb1a3da22cad5fa9) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 40d0ef1..7b1177e 100644 --- a/podman.spec +++ b/podman.spec @@ -464,7 +464,10 @@ export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" %ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection" +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +%endif %endif # These extra flags present in %%{optflags} have been skipped for now as they break the build #export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" From 173c957e5bcb1e1c2e5820632bc5ce823eb192b1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:32:33 -0500 Subject: [PATCH 045/110] podman-2:2.2.0-4 - bump release tag to make centos OBS happy Signed-off-by: Lokesh Mandvekar (cherry picked from commit d909aed18cd11798a2d3aa6f75ab1b25a7047757) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7b1177e..73e6f47 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-4 +- bump release tag to make centos OBS happy + * Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-3 - harden cgo based golang binaries - Reported-by: Wade Mealing From 06cca6d76867c809050784f789a6b190e450dce3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 8 Dec 2020 14:33:08 +0000 Subject: [PATCH 046/110] podman-2:2.2.1-1 autobuilt v2.2.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c36beb..b888fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1263,3 +1263,4 @@ /v2.2.0.tar.gz /dnsname-c654c95.tar.gz /podman-429d949.tar.gz +/v2.2.1.tar.gz diff --git a/podman.spec b/podman.spec index 73e6f47..433c543 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.2.0 +%define built_tag v2.2.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.2.0 +Version: 2.2.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 +- autobuilt v2.2.1 + * Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-4 - bump release tag to make centos OBS happy diff --git a/sources b/sources index 2da6b4a..01ae7d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d +SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 From 26aac056c534b26f45c121aec5105472b723f925 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 11 Jan 2021 14:37:44 -0500 Subject: [PATCH 047/110] BR: git-core instead of git Signed-off-by: Lokesh Mandvekar (cherry picked from commit fb46e70f3556f2b7999f881ed6fa8610c0e96ce8) --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 433c543..c513a7e 100644 --- a/podman.spec +++ b/podman.spec @@ -74,7 +74,7 @@ BuildRequires: golang BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static -BuildRequires: git +BuildRequires: git-core BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel From a1d7bfee45b1fc40c733007ee1cfc571c0cd73c5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 18 Jan 2021 16:03:34 +0000 Subject: [PATCH 048/110] podman-2:3.0.0-0.1.rc1 autobuilt v3.0.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b888fd3..405c0a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1264,3 +1264,4 @@ /dnsname-c654c95.tar.gz /podman-429d949.tar.gz /v2.2.1.tar.gz +/v3.0.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index c513a7e..8decb7f 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.2.1 +%define built_tag v3.0.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.2.1 +Version: 3.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jan 18 2021 RH Container Bot - 2:3.0.0-0.1.rc1 +- autobuilt v3.0.0-rc1 + * Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 - autobuilt v2.2.1 diff --git a/sources b/sources index 01ae7d3..dccb33c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 +SHA512 (v3.0.0-rc1.tar.gz) = 118c7b9fd3ca05d32cfbc5e6a1ba9e62a62d4c55201eec580380b7f4e19162c09fdefc9950fd5d04090e16c0393507c261d7c83a3e89e9ffafc72bcf234f0c28 From ccedf26e30e670078174be29885e86bb4316249d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 29 Jan 2021 23:03:05 +0000 Subject: [PATCH 049/110] podman-2:3.0.0-0.2.rc2 autobuilt v3.0.0-rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 405c0a7..4f16c11 100644 --- a/.gitignore +++ b/.gitignore @@ -1265,3 +1265,4 @@ /podman-429d949.tar.gz /v2.2.1.tar.gz /v3.0.0-rc1.tar.gz +/v3.0.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 8decb7f..a9d0cc6 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0-rc1 +%define built_tag v3.0.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jan 29 2021 RH Container Bot - 2:3.0.0-0.2.rc2 +- autobuilt v3.0.0-rc2 + * Mon Jan 18 2021 RH Container Bot - 2:3.0.0-0.1.rc1 - autobuilt v3.0.0-rc1 diff --git a/sources b/sources index dccb33c..a8af963 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0-rc1.tar.gz) = 118c7b9fd3ca05d32cfbc5e6a1ba9e62a62d4c55201eec580380b7f4e19162c09fdefc9950fd5d04090e16c0393507c261d7c83a3e89e9ffafc72bcf234f0c28 +SHA512 (v3.0.0-rc2.tar.gz) = e623c54a446af919dda4f0fc7529d499e1fbf0b2e5036edde06c4fb14f3dd43b52b26c299e663ebf7b10d4f5d4873aa54b51b5be8445d8c562614a78d158b1cc From 4696df64476b5be6c703ad4a4e1743521c66a878 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 19 Jan 2021 14:07:19 -0500 Subject: [PATCH 050/110] fix build for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/podman.spec b/podman.spec index a9d0cc6..0c884cc 100644 --- a/podman.spec +++ b/podman.spec @@ -3,7 +3,7 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} || 0%{?centos} >= 8 +%if 0%{?fedora} && ! 0%{?centos} #### DO NOT REMOVE - NEEDED FOR CENTOS %global with_debug 1 %else @@ -65,7 +65,7 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/c654c95366ac5f309ca3e5727c9b858864247328/dnsname-c654c95.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -90,7 +90,6 @@ Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 Requires: oci-runtime -Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel @@ -103,6 +102,7 @@ Requires: containers-common >= 2:1.2.0-9 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) Recommends: runc Recommends: slirp4netns >= 0.3.0-2 @@ -111,6 +111,7 @@ Requires: catatonit Requires: container-selinux Requires: runc Requires: slirp4netns >= 0.3.0-2 +Requires: %{name}-plugins = %{epoch}:%{version}-%{release} %endif # vendored libraries @@ -406,7 +407,7 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} +%if 0%{?fedora} && ! 0%{?centos} %package tests Summary: Tests for %{name} @@ -424,6 +425,7 @@ Requires: buildah %{summary} This package contains system tests for %{name} +%endif %package remote Summary: (Experimental) Remote client for managing %{name} containers @@ -437,7 +439,6 @@ run %{name}-remote in production. %{name}-remote uses the version 2 API to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. -%endif %package plugins Summary: Plugins for %{name} @@ -516,9 +517,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.systemd \ install.completions \ install.docker \ -%if 0%{?fedora} install.remote-nobuild \ -%endif mv pkg/hooks/README.md pkg/hooks/README-hooks.md @@ -532,17 +531,6 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, echo "$file*" >> podman.file-list done -# do not install remote manpages on centos7 -%if ! 0%{?fedora} && 0%{?centos} < 8 -rm -f %{buildroot}%{_mandir}/man1/docker-remote.1 -rm -f %{buildroot}%{_mandir}/man1/%{name}-remote.1 -rm -f %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 -rm -f %{buildroot}%{_datadir}/bash-completion/completions/%{name}-remote -rm -f %{buildroot}%{_datadir}/zsh/site-functions/_%{name}-remote -rm -f %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish -rm -f %{buildroot}%{_tmpfilesdir}/%{name}.conf -%endif - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -607,8 +595,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +%if 0%{?fedora} && ! 0%{?centos} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%endif %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -656,8 +646,6 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %endif -#### DO NOT REMOVE - NEEDED FOR CENTOS -%if 0%{?fedora} %files remote %license LICENSE %{_bindir}/%{name}-remote @@ -669,12 +657,14 @@ exit 0 %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}-remote -%endif +#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} && ! 0%{?centos} %files tests %license LICENSE %{_datadir}/%{name}/test %dir %{_datadir}/%{name}/test/system +%endif %files plugins %license dnsname-%{commit_plugins}/LICENSE @@ -766,10 +756,10 @@ succeed * Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.186.rc1 - autobuilt v2.1.0-rc2 -* Wed Sep 16 11:08:33 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.185.rc1 +* Wed Sep 16 2020 Lokesh Mandvekar - 2:2.1.0-0.185.rc1 - fix deps for podman-plugins -* Wed Sep 16 10:47:14 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.184.rc1 +* Wed Sep 16 2020 Lokesh Mandvekar - 2:2.1.0-0.184.rc1 - podman-plugins depends on dnsmasq * Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.183.rc1 From 92bb4cffb4a95253fb31285b9b031acbf091167c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 8 Feb 2021 16:11:15 -0500 Subject: [PATCH 051/110] podman-2:3.0.0-0.5.rc3 - built v3.0.0-rc3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 32 +++++++++++++++++++------------- sources | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4f16c11..cfff042 100644 --- a/.gitignore +++ b/.gitignore @@ -1266,3 +1266,4 @@ /v2.2.1.tar.gz /v3.0.0-rc1.tar.gz /v3.0.0-rc2.tar.gz +/v3.0.0-rc3.tar.gz diff --git a/podman.spec b/podman.spec index 0c884cc..621a211 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0-rc2 +%define built_tag v3.0.0-rc3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc2%{?dist} +Release: 0.5.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -85,27 +85,24 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containernetworking-plugins >= 0.8.6-1 +Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 -Requires: oci-runtime +Requires: containers-common >= 4:1-4 Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Requires: containers-common >= 1:1.2.0-9 Recommends: fuse-overlayfs >= 0.3-8 -Recommends: crun >= 0.15-5 -%else -Requires: containers-common >= 2:1.2.0-9 %endif %if 0%{?fedora} || 0%{?centos} >= 8 +Requires: oci-runtime >= 2 +Recommends: crun >= 0.17-3 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) -Recommends: runc -Recommends: slirp4netns >= 0.3.0-2 +Recommends: slirp4netns >= 1.1.8-1 %else Requires: catatonit Requires: container-selinux @@ -455,7 +452,7 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} -rm -f docs/source/markdown/containers-mounts.conf.5.md +#rm -f docs/source/markdown/containers-mounts.conf.5.md # untar dnsname tar zxf %{SOURCE1} @@ -481,9 +478,9 @@ popd ln -s vendor src # build %%{name} -export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS="$(hack/systemd_tag.sh) seccomp exclude_graphdriver_devicemapper $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" %if 0%{?centos} -export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" +export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion containers_image_ostree_stub" %endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? @@ -673,6 +670,15 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Feb 08 2021 Lokesh Mandvekar - 2:3.0.0-0.5.rc3 +- built v3.0.0-rc3 + +* Thu Feb 04 2021 Lokesh Mandvekar - 2:3.0.0-0.4.rc2 +- bump for centos + +* Thu Feb 04 2021 Lokesh Mandvekar - 2:3.0.0-0.3.rc2 +- update dependencies + * Fri Jan 29 2021 RH Container Bot - 2:3.0.0-0.2.rc2 - autobuilt v3.0.0-rc2 diff --git a/sources b/sources index a8af963..a6903a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0-rc2.tar.gz) = e623c54a446af919dda4f0fc7529d499e1fbf0b2e5036edde06c4fb14f3dd43b52b26c299e663ebf7b10d4f5d4873aa54b51b5be8445d8c562614a78d158b1cc +SHA512 (v3.0.0-rc3.tar.gz) = 7ec1d7c1ab4f1ca8996d81d6718ea45f9447094363156ed2e96f1742e1550f2e8d36c7d01f9059d1deb7d5f9e83ca48f43aa7c0947dfc51aa0bd42f7342602a7 From 41b507d9df82c2a5158a7dbf3836532704b83e58 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Feb 2021 13:36:24 -0500 Subject: [PATCH 052/110] fix flags for i686 Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 621a211..3a079f7 100644 --- a/podman.spec +++ b/podman.spec @@ -460,11 +460,14 @@ tar zxf %{SOURCE1} %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) -export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" +%ifnarch %{ix86} +export CGO_CFLAGS+=" -D_FILE_OFFSET_BITS=64" +%endif %ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +export CGO_CFLAGS+=" -m64 -mtune=generic" %if 0%{?fedora} || 0%{?centos} >= 8 -export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +export CGO_CFLAGS+=" -fcf-protection" %endif %endif # These extra flags present in %%{optflags} have been skipped for now as they break the build From 57247c0fd611e9b1d21b2ef0da9f835cba57f236 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 11 Feb 2021 11:05:45 -0500 Subject: [PATCH 053/110] podman-2:3.0.0-0.6.rc3 - set %gobuild for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 3a079f7..deaf7d8 100644 --- a/podman.spec +++ b/podman.spec @@ -17,7 +17,7 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} +%if ! 0%{?gobuild:1} || 0%{?centos} %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.5.rc3%{?dist} +Release: 0.6.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Feb 11 2021 Lokesh Mandvekar - 2:3.0.0-0.6.rc3 +- set %gobuild for centos + * Mon Feb 08 2021 Lokesh Mandvekar - 2:3.0.0-0.5.rc3 - built v3.0.0-rc3 From 57ff5ce1f15c8f6a27dd580f2eca3c42a073700c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 11 Feb 2021 18:09:19 -0500 Subject: [PATCH 054/110] podman-2:3.0.0-1 - bump to v3.0.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cfff042..a15dc43 100644 --- a/.gitignore +++ b/.gitignore @@ -1267,3 +1267,4 @@ /v3.0.0-rc1.tar.gz /v3.0.0-rc2.tar.gz /v3.0.0-rc3.tar.gz +/v3.0.0.tar.gz diff --git a/podman.spec b/podman.spec index deaf7d8..1b8c884 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0-rc3 +%define built_tag v3.0.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Feb 11 2021 Lokesh Mandvekar - 2:3.0.0-1 +- bump to v3.0.0 + * Thu Feb 11 2021 Lokesh Mandvekar - 2:3.0.0-0.6.rc3 - set %gobuild for centos diff --git a/sources b/sources index a6903a7..605c6c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0-rc3.tar.gz) = 7ec1d7c1ab4f1ca8996d81d6718ea45f9447094363156ed2e96f1742e1550f2e8d36c7d01f9059d1deb7d5f9e83ca48f43aa7c0947dfc51aa0bd42f7342602a7 +SHA512 (v3.0.0.tar.gz) = 2dca54b6836a612c71d1d6dfa67b93909852df42c2d15f8000f1ac02e218cf80a966f6a5b350d44fbdfb7606ebb6af0e12183313ff7f94e574d02faf2e9d93f3 From f2abfc9e296fc90de1fe45ce7a59f3688001ad07 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 14 Feb 2021 12:44:58 -0500 Subject: [PATCH 055/110] podman-2:3.0.0-2 - bump release to hopefully hide centos7 build Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 1b8c884..7a27a49 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sun Feb 14 2021 Lokesh Mandvekar - 2:3.0.0-2 +- bump release to hopefully hide centos7 build + * Thu Feb 11 2021 Lokesh Mandvekar - 2:3.0.0-1 - bump to v3.0.0 From 6f52baf167f9f8d98e3886ac52f536d380e46774 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Feb 2021 08:37:27 -0500 Subject: [PATCH 056/110] handle centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 7a27a49..f6e734d 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -106,7 +106,7 @@ Recommends: slirp4netns >= 1.1.8-1 %else Requires: catatonit Requires: container-selinux -Requires: runc +Requires: runc >= 2:1.0.0-148.rc93 Requires: slirp4netns >= 0.3.0-2 Requires: %{name}-plugins = %{epoch}:%{version}-%{release} %endif @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Feb 15 2021 Lokesh Mandvekar - 2:3.0.0-3 +- requires runc v1.0.0-rc93 for centos7 + * Sun Feb 14 2021 Lokesh Mandvekar - 2:3.0.0-2 - bump release to hopefully hide centos7 build From 894150af40d787d9fb3ab53d2e879ff9ef53797a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Feb 2021 11:49:33 -0500 Subject: [PATCH 057/110] podman-2:3.0.1-1 - bump to v3.0.1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index f6e734d..233aa4f 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0 +%define built_tag v3.0.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.0.0 +Version: 3.0.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Feb 19 2021 Lokesh Mandvekar - 2:3.0.1-1 +- bump to v3.0.1 + * Mon Feb 15 2021 Lokesh Mandvekar - 2:3.0.0-3 - requires runc v1.0.0-rc93 for centos7 From ddb5abcd24523b4c90bfa86c9a4b03317a05bed4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Feb 2021 11:53:10 -0500 Subject: [PATCH 058/110] upload src tarball to lookaside cache Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a15dc43..9f8b1c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1268,3 +1268,4 @@ /v3.0.0-rc2.tar.gz /v3.0.0-rc3.tar.gz /v3.0.0.tar.gz +/v3.0.1.tar.gz diff --git a/sources b/sources index 605c6c0..577481e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0.tar.gz) = 2dca54b6836a612c71d1d6dfa67b93909852df42c2d15f8000f1ac02e218cf80a966f6a5b350d44fbdfb7606ebb6af0e12183313ff7f94e574d02faf2e9d93f3 +SHA512 (v3.0.1.tar.gz) = 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754 From 1e95324c44d08450ff189044bcac5e3049153538 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Feb 2021 10:00:42 -0500 Subject: [PATCH 059/110] podman-2:3.0.1-2 - bump for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 233aa4f..b4d836b 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.0.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Feb 25 2021 Lokesh Mandvekar - 2:3.0.1-2 +- bump for centos + * Fri Feb 19 2021 Lokesh Mandvekar - 2:3.0.1-1 - bump to v3.0.1 From dfd6a4f9daac26c6cc6cae496e04c74e6895e081 Mon Sep 17 00:00:00 2001 From: James Cassell Date: Tue, 2 Mar 2021 07:20:39 -0500 Subject: [PATCH 060/110] macros in changelog need escaping --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index b4d836b..c3933b4 100644 --- a/podman.spec +++ b/podman.spec @@ -689,7 +689,7 @@ exit 0 - bump to v3.0.0 * Thu Feb 11 2021 Lokesh Mandvekar - 2:3.0.0-0.6.rc3 -- set %gobuild for centos +- set %%gobuild for centos * Mon Feb 08 2021 Lokesh Mandvekar - 2:3.0.0-0.5.rc3 - built v3.0.0-rc3 From cdcf16b08931459b6e8513913cd3aae167264580 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 8 Mar 2021 22:02:17 +0000 Subject: [PATCH 061/110] podman-2:3.1.0-0.1.rc1 autobuilt v3.1.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9f8b1c5..459cc22 100644 --- a/.gitignore +++ b/.gitignore @@ -1269,3 +1269,4 @@ /v3.0.0-rc3.tar.gz /v3.0.0.tar.gz /v3.0.1.tar.gz +/v3.1.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index c3933b4..7f717b5 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.1 +%define built_tag v3.1.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.0.1 +Version: 3.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -673,6 +673,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Mar 08 2021 RH Container Bot - 2:3.1.0-0.1.rc1 +- autobuilt v3.1.0-rc1 + * Thu Feb 25 2021 Lokesh Mandvekar - 2:3.0.1-2 - bump for centos diff --git a/sources b/sources index 577481e..2168a7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.1.tar.gz) = 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754 +SHA512 (v3.1.0-rc1.tar.gz) = 549d4999bf687eb8e48a8e3bf6c7bb094432816f05f54e29427d54308051824641e75f608996dc130f9f096544d5383d5d22fe3c1557e37f25e77d7faa240378 From 691138cf81eba0122af3db9a8c0da33189a38b63 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Mar 2021 11:57:14 -0500 Subject: [PATCH 062/110] fix build issues (cherry picked from commit 5be5a47b5967995583c25734a9e084337096b188) Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7f717b5..9f1aed6 100644 --- a/podman.spec +++ b/podman.spec @@ -506,7 +506,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd -%{__make} docs +%{__make} docs docker-docs %install install -dp %{buildroot}%{_unitdir} @@ -517,6 +517,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.systemd \ install.completions \ install.docker \ + install.docker-docs-nobuild \ install.remote-nobuild \ mv pkg/hooks/README.md pkg/hooks/README-hooks.md From efe110a62b37d25c221b9f6ecc4bf77996713815 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 23 Mar 2021 22:25:55 +0000 Subject: [PATCH 063/110] podman-2:3.1.0-0.2.rc2 autobuilt v3.1.0-rc2 Signed-off-by: RH Container Bot --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 9f1aed6..8fb4538 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.1.0-rc1 +%define built_tag v3.1.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Mar 23 2021 RH Container Bot - 2:3.1.0-0.2.rc2 +- autobuilt v3.1.0-rc2 + * Mon Mar 08 2021 RH Container Bot - 2:3.1.0-0.1.rc1 - autobuilt v3.1.0-rc1 From 50dba361f2efe48b6a3481d2b80aa611a20e42ee Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Mar 2021 18:45:37 -0400 Subject: [PATCH 064/110] upload sources to lookaside cache Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 459cc22..5cd3a68 100644 --- a/.gitignore +++ b/.gitignore @@ -1270,3 +1270,4 @@ /v3.0.0.tar.gz /v3.0.1.tar.gz /v3.1.0-rc1.tar.gz +/v3.1.0-rc2.tar.gz diff --git a/sources b/sources index 2168a7b..65ed12d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.1.0-rc1.tar.gz) = 549d4999bf687eb8e48a8e3bf6c7bb094432816f05f54e29427d54308051824641e75f608996dc130f9f096544d5383d5d22fe3c1557e37f25e77d7faa240378 +SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad From 6a4295016f004564e5fb41389871449d0143a109 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Mar 2021 21:41:07 -0400 Subject: [PATCH 065/110] fix build issues on 32-bit (cherry picked from commit 1e1651a3ef847ee58221162ea79ce8c45a397fd2) Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8fb4538..1d4d8dd 100644 --- a/podman.spec +++ b/podman.spec @@ -452,7 +452,9 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} -#rm -f docs/source/markdown/containers-mounts.conf.5.md +%ifarch %{ix86} armv7hl +sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go +%endif # untar dnsname tar zxf %{SOURCE1} From e746c8980bbe4c5cfb1de539693d99f75acd717e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Mar 2021 13:26:55 -0400 Subject: [PATCH 066/110] podman-2:3.1.0-0.3.rc2 - bump crun and dnsname deps Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 23 ++++++++--------------- sources | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 5cd3a68..b60291c 100644 --- a/.gitignore +++ b/.gitignore @@ -1270,4 +1270,5 @@ /v3.0.0.tar.gz /v3.0.1.tar.gz /v3.1.0-rc1.tar.gz +/dnsname-3b29247.tar.gz /v3.1.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 1d4d8dd..1b4d343 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ # https://github.com/containers/libpod %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328 +%global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -65,7 +65,7 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: https://github.com/containers/dnsname/archive/c654c95366ac5f309ca3e5727c9b858864247328/dnsname-c654c95.tar.gz +Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -96,20 +96,12 @@ BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 %endif -%if 0%{?fedora} || 0%{?centos} >= 8 Requires: oci-runtime >= 2 -Recommends: crun >= 0.17-3 +Recommends: crun >= 0.18-4 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) Recommends: slirp4netns >= 1.1.8-1 -%else -Requires: catatonit -Requires: container-selinux -Requires: runc >= 2:1.0.0-148.rc93 -Requires: slirp4netns >= 0.3.0-2 -Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -%endif # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -452,9 +444,7 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} -%ifarch %{ix86} armv7hl -sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go -%endif +sed -i 's/id128StringMax := C.ulong/id128StringMax := C.size_t/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go # untar dnsname tar zxf %{SOURCE1} @@ -676,6 +666,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Mar 25 2021 Lokesh Mandvekar - 2:3.1.0-0.3.rc2 +- bump crun and dnsname deps + * Tue Mar 23 2021 RH Container Bot - 2:3.1.0-0.2.rc2 - autobuilt v3.1.0-rc2 diff --git a/sources b/sources index 65ed12d..35378bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 +SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad From 40641f5e70d21db09e6f69669ff8419156365058 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 30 Mar 2021 13:25:34 +0000 Subject: [PATCH 067/110] podman-2:3.1.0-1 autobuilt v3.1.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b60291c..2235f89 100644 --- a/.gitignore +++ b/.gitignore @@ -1272,3 +1272,4 @@ /v3.1.0-rc1.tar.gz /dnsname-3b29247.tar.gz /v3.1.0-rc2.tar.gz +/v3.1.0.tar.gz diff --git a/podman.spec b/podman.spec index 1b4d343..bdfb3d2 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.1.0-rc2 +%define built_tag v3.1.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -666,6 +666,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Mar 30 2021 RH Container Bot - 2:3.1.0-1 +- autobuilt v3.1.0 + * Thu Mar 25 2021 Lokesh Mandvekar - 2:3.1.0-0.3.rc2 - bump crun and dnsname deps diff --git a/sources b/sources index 35378bb..8347d73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad +SHA512 (v3.1.0.tar.gz) = 534a16acbfc75c515c1abaf603ecb6af636039cd8208ce415979f577895174404bcf5e75c8fe6646f0f9f3032e4a3da9b0927d36f0e7fb525e19800cf8bc610e From 5bbd56f16f35a1c08e071f4994358bfcebf95306 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 5 Apr 2021 10:18:00 -0400 Subject: [PATCH 068/110] podman-2:3.1.0-2 - requires crun instead of recommends Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index bdfb3d2..e16ea43 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -96,8 +96,7 @@ BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 %endif -Requires: oci-runtime >= 2 -Recommends: crun >= 0.18-4 +Requires: crun >= 0.18-4 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) @@ -666,6 +665,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 05 2021 Lokesh Mandvekar - 2:3.1.0-2 +- requires crun instead of recommends + * Tue Mar 30 2021 RH Container Bot - 2:3.1.0-1 - autobuilt v3.1.0 From 1b8618d0e468f2c896cc2bd9a5bdf3c339257de9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 12 Apr 2021 10:32:18 -0400 Subject: [PATCH 069/110] podman-2:3.1.0-3 - update crun and container-selinux dependencies Signed-off-by: Lokesh Mandvekar --- podman.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index e16ea43..2397967 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -88,18 +88,20 @@ BuildRequires: systemd-devel Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.16-1 -Requires: containers-common >= 4:1-4 +Requires: conmon >= 2:2.0.27-1 +Requires: containers-common >= 4:1-10 Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 %endif -Requires: crun >= 0.18-4 +Requires: oci-runtime >= 2 +Recommends: crun >= 0.19-1 +Conflicts: crun < 0.19-1 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: (container-selinux if selinux-policy) +Requires: (container-selinux >= 2:2.160.0-1 if selinux-policy) Recommends: slirp4netns >= 1.1.8-1 # vendored libraries @@ -665,6 +667,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 12 2021 Lokesh Mandvekar - 2:3.1.0-3 +- update crun and container-selinux dependencies + * Mon Apr 05 2021 Lokesh Mandvekar - 2:3.1.0-2 - requires crun instead of recommends From 358155cda95316e20618b7cb4d5c4d68745b6011 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 19 Apr 2021 13:24:49 +0000 Subject: [PATCH 070/110] podman-2:3.1.1-1 autobuilt v3.1.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2235f89..2341492 100644 --- a/.gitignore +++ b/.gitignore @@ -1273,3 +1273,4 @@ /dnsname-3b29247.tar.gz /v3.1.0-rc2.tar.gz /v3.1.0.tar.gz +/v3.1.1.tar.gz diff --git a/podman.spec b/podman.spec index 2397967..0c1e5e3 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.1.0 +%define built_tag v3.1.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.0 +Version: 3.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -667,6 +667,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 19 2021 RH Container Bot - 2:3.1.1-1 +- autobuilt v3.1.1 + * Mon Apr 12 2021 Lokesh Mandvekar - 2:3.1.0-3 - update crun and container-selinux dependencies diff --git a/sources b/sources index 8347d73..b2e7baa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.0.tar.gz) = 534a16acbfc75c515c1abaf603ecb6af636039cd8208ce415979f577895174404bcf5e75c8fe6646f0f9f3032e4a3da9b0927d36f0e7fb525e19800cf8bc610e +SHA512 (v3.1.1.tar.gz) = 2348b06c81352a86f51ac9c5ab7fe21e1ce577dfd0164c043baa2fb8a89928e3fdcc13fa75dd731572175ba4232fa27a2e31a3715a2b1596a38a64de919da1b7 From cdc29bb4aea7777bff41a1d5bdf60e5ef8ea7725 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 14 Apr 2021 15:44:04 -0400 Subject: [PATCH 071/110] podman-2:3.1.1-2 - update dependencies Signed-off-by: Lokesh Mandvekar --- podman.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/podman.spec b/podman.spec index 0c1e5e3..8e88808 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -89,20 +89,14 @@ Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-1 -Requires: containers-common >= 4:1-10 +Requires: containers-common >= 4:1-11 +Recommends: catatonit +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Recommends: fuse-overlayfs >= 0.3-8 %endif -Requires: oci-runtime >= 2 -Recommends: crun >= 0.19-1 -Conflicts: crun < 0.19-1 -Recommends: catatonit -Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: (container-selinux >= 2:2.160.0-1 if selinux-policy) -Recommends: slirp4netns >= 1.1.8-1 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -445,7 +439,6 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} -sed -i 's/id128StringMax := C.ulong/id128StringMax := C.size_t/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go # untar dnsname tar zxf %{SOURCE1} @@ -667,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 19 2021 Lokesh Mandvekar - 2:3.1.1-2 +- update dependencies + * Mon Apr 19 2021 RH Container Bot - 2:3.1.1-1 - autobuilt v3.1.1 From 6deb4549d0a1b7d40d3552810e54c5fa7452acf7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 20 Apr 2021 14:16:52 -0400 Subject: [PATCH 072/110] fix centos8 build with go-systemd.patch Signed-off-by: Lokesh Mandvekar --- go-systemd.patch | 1182 ++++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 3 + 2 files changed, 1185 insertions(+) create mode 100644 go-systemd.patch diff --git a/go-systemd.patch b/go-systemd.patch new file mode 100644 index 0000000..eccf006 --- /dev/null +++ b/go-systemd.patch @@ -0,0 +1,1182 @@ +From bdd93829d13780db3dd41548740a6b8cd5d4f31e Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Tue, 20 Apr 2021 11:54:44 -0400 +Subject: [PATCH] Bump github.com/coreos/go-systemd from 22.2.0 to 22.3.1 + +podman fails to build on CentOS 8 otherwise. + +Essentially the same as commit 5a7a1a1 but cherry-picking it gave a lot +of conflicts, so I manually vendored it in. + +Signed-off-by: Lokesh Mandvekar +--- + go.mod | 4 +- + go.sum | 6 +- + .../coreos/go-systemd/v22/dbus/methods.go | 21 ++- + .../go-systemd/v22/sdjournal/journal.go | 5 +- + vendor/github.com/godbus/dbus/v5/.travis.yml | 50 ------ + .../github.com/godbus/dbus/v5/README.markdown | 4 +- + vendor/github.com/godbus/dbus/v5/auth.go | 2 +- + vendor/github.com/godbus/dbus/v5/call.go | 9 + + vendor/github.com/godbus/dbus/v5/conn.go | 159 ++++++++++++------ + vendor/github.com/godbus/dbus/v5/dbus.go | 4 + + .../godbus/dbus/v5/default_handler.go | 22 ++- + vendor/github.com/godbus/dbus/v5/export.go | 61 +++++-- + vendor/github.com/godbus/dbus/v5/match.go | 27 +++ + vendor/github.com/godbus/dbus/v5/object.go | 65 ++----- + vendor/github.com/godbus/dbus/v5/sequence.go | 24 +++ + .../godbus/dbus/v5/sequential_handler.go | 125 ++++++++++++++ + vendor/github.com/godbus/dbus/v5/sig.go | 2 +- + .../dbus/v5/transport_unixcred_freebsd.go | 1 + + vendor/github.com/godbus/dbus/v5/variant.go | 6 + + vendor/modules.txt | 4 +- + 20 files changed, 411 insertions(+), 190 deletions(-) + delete mode 100644 vendor/github.com/godbus/dbus/v5/.travis.yml + create mode 100644 vendor/github.com/godbus/dbus/v5/sequence.go + create mode 100644 vendor/github.com/godbus/dbus/v5/sequential_handler.go + +diff --git a/go.mod b/go.mod +index d940dfbba8b..e4f2e373638 100644 +--- a/go.mod ++++ b/go.mod +@@ -17,7 +17,7 @@ require ( + github.com/containers/ocicrypt v1.1.0 + github.com/containers/psgo v1.5.2 + github.com/containers/storage v1.29.0 +- github.com/coreos/go-systemd/v22 v22.2.0 ++ github.com/coreos/go-systemd/v22 v22.3.1 + github.com/cri-o/ocicni v0.2.1-0.20210301205850-541cf7c703cf + github.com/cyphar/filepath-securejoin v0.2.2 + github.com/davecgh/go-spew v1.1.1 +@@ -28,7 +28,7 @@ require ( + github.com/docker/go-units v0.4.0 + github.com/fsnotify/fsnotify v1.4.9 + github.com/ghodss/yaml v1.0.0 +- github.com/godbus/dbus/v5 v5.0.3 ++ github.com/godbus/dbus/v5 v5.0.4 + github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf + github.com/google/uuid v1.2.0 + github.com/gorilla/mux v1.8.0 +diff --git a/go.sum b/go.sum +index c14591e9dfb..29e11eee2ac 100644 +--- a/go.sum ++++ b/go.sum +@@ -235,8 +235,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9 + github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= + github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= + github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +-github.com/coreos/go-systemd/v22 v22.2.0 h1:BBmbNtSc5PuUM3Byxs7yE5rLdxQO4/FMoEXY5Rle4GA= +-github.com/coreos/go-systemd/v22 v22.2.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= ++github.com/coreos/go-systemd/v22 v22.3.1 h1:7OO2CXWMYNDdaAzP51t4lCCZWwpQHmvPbm9sxWjm3So= ++github.com/coreos/go-systemd/v22 v22.3.1/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= + github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= + github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +@@ -339,6 +339,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68Fp + github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= + github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= + github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= ++github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= ++github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= + github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= + github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= + github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +diff --git a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go +index 679f244e8f1..01879ba1580 100644 +--- a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go ++++ b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go +@@ -24,6 +24,18 @@ import ( + "github.com/godbus/dbus/v5" + ) + ++// Who can be used to specify which process to kill in the unit via the KillUnitWithTarget API ++type Who string ++ ++const ( ++ // All sends the signal to all processes in the unit ++ All Who = "all" ++ // Main sends the signal to the main process of the unit ++ Main Who = "main" ++ // Control sends the signal to the control process of the unit ++ Control Who = "control" ++) ++ + func (c *Conn) jobComplete(signal *dbus.Signal) { + var id uint32 + var job dbus.ObjectPath +@@ -196,7 +208,12 @@ func (c *Conn) KillUnit(name string, signal int32) { + + // KillUnitContext same as KillUnit with context + func (c *Conn) KillUnitContext(ctx context.Context, name string, signal int32) { +- c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store() ++ c.KillUnitWithTarget(ctx, name, All, signal) ++} ++ ++// KillUnitWithTarget is like KillUnitContext, but allows you to specify which process in the unit to send the signal to ++func (c *Conn) KillUnitWithTarget(ctx context.Context, name string, target Who, signal int32) error { ++ return c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, string(target), signal).Store() + } + + // ResetFailedUnit resets the "failed" state of a specific unit. +@@ -360,7 +377,7 @@ func (c *Conn) SetUnitPropertiesContext(ctx context.Context, name string, runtim + + // Deprecated: use GetUnitTypePropertyContext instead + func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) { +- return c.GetUnitTypePropertyContext(context.Background(), unitType, unitType, propertyName) ++ return c.GetUnitTypePropertyContext(context.Background(), unit, unitType, propertyName) + } + + // GetUnitTypePropertyContext same as GetUnitTypeProperty with context +diff --git a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go +index c61a2025ff9..fb11b1179c8 100644 +--- a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go ++++ b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go +@@ -310,7 +310,7 @@ package sdjournal + // } + // + // char * +-// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[_SD_ARRAY_STATIC SD_ID128_STRING_MAX]) ++// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[SD_ID128_STRING_MAX]) + // { + // char *(*sd_id128_to_string)(sd_id128_t, char *); + // +@@ -1155,7 +1155,8 @@ func (j *Journal) GetBootID() (string, error) { + return "", err + } + +- c := (*C.char)(C.malloc(33)) ++ id128StringMax := C.size_t(C.SD_ID128_STRING_MAX) ++ c := (*C.char)(C.malloc(id128StringMax)) + defer C.free(unsafe.Pointer(c)) + C.my_sd_id128_to_string(sd_id128_to_string, boot_id, c) + +diff --git a/vendor/github.com/godbus/dbus/v5/.travis.yml b/vendor/github.com/godbus/dbus/v5/.travis.yml +deleted file mode 100644 +index dd67672048b..00000000000 +--- a/vendor/github.com/godbus/dbus/v5/.travis.yml ++++ /dev/null +@@ -1,50 +0,0 @@ +-dist: bionic +-language: go +-go_import_path: github.com/godbus/dbus +- +-go: +- - 1.11.x +- - 1.12.x +- - 1.13.x +- - tip +- +-matrix: +- fast_finish: true +- allow_failures: +- - go: tip +- +-addons: +- apt: +- packages: +- - dbus +- - dbus-x11 +- +-before_install: +- - export GO111MODULE=on +- +-script: +- - go test -v -race -mod=readonly ./... # Run all the tests with the race detector enabled +- - go vet ./... # go vet is the official Go static analyzer +- +-jobs: +- include: +- # The build matrix doesn't cover build stages, so manually expand +- # the jobs with anchors +- - &multiarch +- stage: "Multiarch Test" +- go: 1.11.x +- env: TARGETS="386 arm arm64 ppc64le" +- before_install: +- - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes +- script: +- - | +- set -e +- for target in $TARGETS; do +- printf "\e[1mRunning test suite under ${target}.\e[0m\n" +- GOARCH="$target" go test -v ./... +- printf "\n\n" +- done +- - <<: *multiarch +- go: 1.12.x +- - <<: *multiarch +- go: 1.13.x +diff --git a/vendor/github.com/godbus/dbus/v5/README.markdown b/vendor/github.com/godbus/dbus/v5/README.markdown +index fd29648752d..1fb2eacaa15 100644 +--- a/vendor/github.com/godbus/dbus/v5/README.markdown ++++ b/vendor/github.com/godbus/dbus/v5/README.markdown +@@ -1,4 +1,4 @@ +-[![Build Status](https://travis-ci.org/godbus/dbus.svg?branch=master)](https://travis-ci.org/godbus/dbus) ++![Build Status](https://github.com/godbus/dbus/workflows/Go/badge.svg) + + dbus + ---- +@@ -32,6 +32,8 @@ gives a short overview over the basic usage. + #### Projects using godbus + - [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library. + - [go-bluetooth](https://github.com/muka/go-bluetooth) provides a bluetooth client over bluez dbus API. ++- [playerbm](https://github.com/altdesktop/playerbm) a bookmark utility for media players. ++- [iwd](https://github.com/shibumi/iwd) go bindings for the internet wireless daemon "iwd". + + Please note that the API is considered unstable for now and may change without + further notice. +diff --git a/vendor/github.com/godbus/dbus/v5/auth.go b/vendor/github.com/godbus/dbus/v5/auth.go +index 31abac629d7..283487a0e31 100644 +--- a/vendor/github.com/godbus/dbus/v5/auth.go ++++ b/vendor/github.com/godbus/dbus/v5/auth.go +@@ -37,7 +37,7 @@ const ( + + // Auth defines the behaviour of an authentication mechanism. + type Auth interface { +- // Return the name of the mechnism, the argument to the first AUTH command ++ // Return the name of the mechanism, the argument to the first AUTH command + // and the next status. + FirstData() (name, resp []byte, status AuthStatus) + +diff --git a/vendor/github.com/godbus/dbus/v5/call.go b/vendor/github.com/godbus/dbus/v5/call.go +index 2cb189012e7..b06b063580f 100644 +--- a/vendor/github.com/godbus/dbus/v5/call.go ++++ b/vendor/github.com/godbus/dbus/v5/call.go +@@ -24,6 +24,15 @@ type Call struct { + // Holds the response once the call is done. + Body []interface{} + ++ // ResponseSequence stores the sequence number of the DBus message containing ++ // the call response (or error). This can be compared to the sequence number ++ // of other call responses and signals on this connection to determine their ++ // relative ordering on the underlying DBus connection. ++ // For errors, ResponseSequence is populated only if the error came from a ++ // DBusMessage that was received or if there was an error receiving. In case of ++ // failure to make the call, ResponseSequence will be NoSequence. ++ ResponseSequence Sequence ++ + // tracks context and canceler + ctx context.Context + ctxCanceler context.CancelFunc +diff --git a/vendor/github.com/godbus/dbus/v5/conn.go b/vendor/github.com/godbus/dbus/v5/conn.go +index b55bc99c854..29fe018ad82 100644 +--- a/vendor/github.com/godbus/dbus/v5/conn.go ++++ b/vendor/github.com/godbus/dbus/v5/conn.go +@@ -45,6 +45,7 @@ type Conn struct { + serialGen SerialGenerator + inInt Interceptor + outInt Interceptor ++ auth []Auth + + names *nameTracker + calls *callTracker +@@ -59,7 +60,8 @@ type Conn struct { + func SessionBus() (conn *Conn, err error) { + sessionBusLck.Lock() + defer sessionBusLck.Unlock() +- if sessionBus != nil { ++ if sessionBus != nil && ++ sessionBus.Connected() { + return sessionBus, nil + } + defer func() { +@@ -67,19 +69,7 @@ func SessionBus() (conn *Conn, err error) { + sessionBus = conn + } + }() +- conn, err = SessionBusPrivate() +- if err != nil { +- return +- } +- if err = conn.Auth(nil); err != nil { +- conn.Close() +- conn = nil +- return +- } +- if err = conn.Hello(); err != nil { +- conn.Close() +- conn = nil +- } ++ conn, err = ConnectSessionBus() + return + } + +@@ -116,7 +106,8 @@ func SessionBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Co + func SystemBus() (conn *Conn, err error) { + systemBusLck.Lock() + defer systemBusLck.Unlock() +- if systemBus != nil { ++ if systemBus != nil && ++ systemBus.Connected() { + return systemBus, nil + } + defer func() { +@@ -124,20 +115,42 @@ func SystemBus() (conn *Conn, err error) { + systemBus = conn + } + }() +- conn, err = SystemBusPrivate() ++ conn, err = ConnectSystemBus() ++ return ++} ++ ++// ConnectSessionBus connects to the session bus. ++func ConnectSessionBus(opts ...ConnOption) (*Conn, error) { ++ address, err := getSessionBusAddress() + if err != nil { +- return ++ return nil, err + } +- if err = conn.Auth(nil); err != nil { +- conn.Close() +- conn = nil +- return ++ return Connect(address, opts...) ++} ++ ++// ConnectSystemBus connects to the system bus. ++func ConnectSystemBus(opts ...ConnOption) (*Conn, error) { ++ return Connect(getSystemBusPlatformAddress(), opts...) ++} ++ ++// Connect connects to the given address. ++// ++// Returned connection is ready to use and doesn't require calling ++// Auth and Hello methods to make it usable. ++func Connect(address string, opts ...ConnOption) (*Conn, error) { ++ conn, err := Dial(address, opts...) ++ if err != nil { ++ return nil, err ++ } ++ if err = conn.Auth(conn.auth); err != nil { ++ _ = conn.Close() ++ return nil, err + } + if err = conn.Hello(); err != nil { +- conn.Close() +- conn = nil ++ _ = conn.Close() ++ return nil, err + } +- return ++ return conn, nil + } + + // SystemBusPrivate returns a new private connection to the system bus. +@@ -197,6 +210,14 @@ func WithSerialGenerator(gen SerialGenerator) ConnOption { + } + } + ++// WithAuth sets authentication methods for the auth conversation. ++func WithAuth(methods ...Auth) ConnOption { ++ return func(conn *Conn) error { ++ conn.auth = methods ++ return nil ++ } ++} ++ + // Interceptor intercepts incoming and outgoing messages. + type Interceptor func(msg *Message) + +@@ -309,6 +330,11 @@ func (conn *Conn) Context() context.Context { + return conn.ctx + } + ++// Connected returns whether conn is connected ++func (conn *Conn) Connected() bool { ++ return conn.ctx.Err() == nil ++} ++ + // Eavesdrop causes conn to send all incoming messages to the given channel + // without further processing. Method replies, errors and signals will not be + // sent to the appropriate channels and method calls will not be handled. If nil +@@ -342,8 +368,9 @@ func (conn *Conn) Hello() error { + } + + // inWorker runs in an own goroutine, reading incoming messages from the +-// transport and dispatching them appropiately. ++// transport and dispatching them appropriately. + func (conn *Conn) inWorker() { ++ sequenceGen := newSequenceGenerator() + for { + msg, err := conn.ReadMessage() + if err != nil { +@@ -352,7 +379,7 @@ func (conn *Conn) inWorker() { + // anything but to shut down all stuff and returns errors to all + // pending replies. + conn.Close() +- conn.calls.finalizeAllWithError(err) ++ conn.calls.finalizeAllWithError(sequenceGen, err) + return + } + // invalid messages are ignored +@@ -381,13 +408,14 @@ func (conn *Conn) inWorker() { + if conn.inInt != nil { + conn.inInt(msg) + } ++ sequence := sequenceGen.next() + switch msg.Type { + case TypeError: +- conn.serialGen.RetireSerial(conn.calls.handleDBusError(msg)) ++ conn.serialGen.RetireSerial(conn.calls.handleDBusError(sequence, msg)) + case TypeMethodReply: +- conn.serialGen.RetireSerial(conn.calls.handleReply(msg)) ++ conn.serialGen.RetireSerial(conn.calls.handleReply(sequence, msg)) + case TypeSignal: +- conn.handleSignal(msg) ++ conn.handleSignal(sequence, msg) + case TypeMethodCall: + go conn.handleCall(msg) + } +@@ -395,7 +423,7 @@ func (conn *Conn) inWorker() { + } + } + +-func (conn *Conn) handleSignal(msg *Message) { ++func (conn *Conn) handleSignal(sequence Sequence, msg *Message) { + iface := msg.Headers[FieldInterface].value.(string) + member := msg.Headers[FieldMember].value.(string) + // as per http://dbus.freedesktop.org/doc/dbus-specification.html , +@@ -421,10 +449,11 @@ func (conn *Conn) handleSignal(msg *Message) { + } + } + signal := &Signal{ +- Sender: sender, +- Path: msg.Headers[FieldPath].value.(ObjectPath), +- Name: iface + "." + member, +- Body: msg.Body, ++ Sender: sender, ++ Path: msg.Headers[FieldPath].value.(ObjectPath), ++ Name: iface + "." + member, ++ Body: msg.Body, ++ Sequence: sequence, + } + conn.signalHandler.DeliverSignal(iface, member, signal) + } +@@ -442,6 +471,9 @@ func (conn *Conn) Object(dest string, path ObjectPath) BusObject { + } + + func (conn *Conn) sendMessageAndIfClosed(msg *Message, ifClosed func()) { ++ if msg.serial == 0 { ++ msg.serial = conn.getSerial() ++ } + if conn.outInt != nil { + conn.outInt(msg) + } +@@ -473,16 +505,16 @@ func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call { + if ctx == nil { + panic("nil context") + } ++ if ch == nil { ++ ch = make(chan *Call, 1) ++ } else if cap(ch) == 0 { ++ panic("dbus: unbuffered channel passed to (*Conn).Send") ++ } + + var call *Call + ctx, canceler := context.WithCancel(ctx) + msg.serial = conn.getSerial() + if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 { +- if ch == nil { +- ch = make(chan *Call, 5) +- } else if cap(ch) == 0 { +- panic("dbus: unbuffered channel passed to (*Conn).Send") +- } + call = new(Call) + call.Destination, _ = msg.Headers[FieldDestination].value.(string) + call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath) +@@ -504,7 +536,8 @@ func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call { + }) + } else { + canceler() +- call = &Call{Err: nil} ++ call = &Call{Err: nil, Done: ch} ++ ch <- call + conn.sendMessageAndIfClosed(msg, func() { + call = &Call{Err: ErrClosed} + }) +@@ -529,7 +562,6 @@ func (conn *Conn) sendError(err error, dest string, serial uint32) { + } + msg := new(Message) + msg.Type = TypeError +- msg.serial = conn.getSerial() + msg.Headers = make(map[HeaderField]Variant) + if dest != "" { + msg.Headers[FieldDestination] = MakeVariant(dest) +@@ -548,7 +580,6 @@ func (conn *Conn) sendError(err error, dest string, serial uint32) { + func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) { + msg := new(Message) + msg.Type = TypeMethodReply +- msg.serial = conn.getSerial() + msg.Headers = make(map[HeaderField]Variant) + if dest != "" { + msg.Headers[FieldDestination] = MakeVariant(dest) +@@ -564,8 +595,14 @@ func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) { + // AddMatchSignal registers the given match rule to receive broadcast + // signals based on their contents. + func (conn *Conn) AddMatchSignal(options ...MatchOption) error { ++ return conn.AddMatchSignalContext(context.Background(), options...) ++} ++ ++// AddMatchSignalContext acts like AddMatchSignal but takes a context. ++func (conn *Conn) AddMatchSignalContext(ctx context.Context, options ...MatchOption) error { + options = append([]MatchOption{withMatchType("signal")}, options...) +- return conn.busObj.Call( ++ return conn.busObj.CallWithContext( ++ ctx, + "org.freedesktop.DBus.AddMatch", 0, + formatMatchOptions(options), + ).Store() +@@ -573,8 +610,14 @@ func (conn *Conn) AddMatchSignal(options ...MatchOption) error { + + // RemoveMatchSignal removes the first rule that matches previously registered with AddMatchSignal. + func (conn *Conn) RemoveMatchSignal(options ...MatchOption) error { ++ return conn.RemoveMatchSignalContext(context.Background(), options...) ++} ++ ++// RemoveMatchSignalContext acts like RemoveMatchSignal but takes a context. ++func (conn *Conn) RemoveMatchSignalContext(ctx context.Context, options ...MatchOption) error { + options = append([]MatchOption{withMatchType("signal")}, options...) +- return conn.busObj.Call( ++ return conn.busObj.CallWithContext( ++ ctx, + "org.freedesktop.DBus.RemoveMatch", 0, + formatMatchOptions(options), + ).Store() +@@ -639,10 +682,11 @@ func (e Error) Error() string { + // Signal represents a D-Bus message of type Signal. The name member is given in + // "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost. + type Signal struct { +- Sender string +- Path ObjectPath +- Name string +- Body []interface{} ++ Sender string ++ Path ObjectPath ++ Name string ++ Body []interface{} ++ Sequence Sequence + } + + // transport is a D-Bus transport. +@@ -825,25 +869,25 @@ func (tracker *callTracker) track(sn uint32, call *Call) { + tracker.lck.Unlock() + } + +-func (tracker *callTracker) handleReply(msg *Message) uint32 { ++func (tracker *callTracker) handleReply(sequence Sequence, msg *Message) uint32 { + serial := msg.Headers[FieldReplySerial].value.(uint32) + tracker.lck.RLock() + _, ok := tracker.calls[serial] + tracker.lck.RUnlock() + if ok { +- tracker.finalizeWithBody(serial, msg.Body) ++ tracker.finalizeWithBody(serial, sequence, msg.Body) + } + return serial + } + +-func (tracker *callTracker) handleDBusError(msg *Message) uint32 { ++func (tracker *callTracker) handleDBusError(sequence Sequence, msg *Message) uint32 { + serial := msg.Headers[FieldReplySerial].value.(uint32) + tracker.lck.RLock() + _, ok := tracker.calls[serial] + tracker.lck.RUnlock() + if ok { + name, _ := msg.Headers[FieldErrorName].value.(string) +- tracker.finalizeWithError(serial, Error{name, msg.Body}) ++ tracker.finalizeWithError(serial, sequence, Error{name, msg.Body}) + } + return serial + } +@@ -856,7 +900,7 @@ func (tracker *callTracker) handleSendError(msg *Message, err error) { + _, ok := tracker.calls[msg.serial] + tracker.lck.RUnlock() + if ok { +- tracker.finalizeWithError(msg.serial, err) ++ tracker.finalizeWithError(msg.serial, NoSequence, err) + } + } + +@@ -871,7 +915,7 @@ func (tracker *callTracker) finalize(sn uint32) { + } + } + +-func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) { ++func (tracker *callTracker) finalizeWithBody(sn uint32, sequence Sequence, body []interface{}) { + tracker.lck.Lock() + c, ok := tracker.calls[sn] + if ok { +@@ -880,11 +924,12 @@ func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) { + tracker.lck.Unlock() + if ok { + c.Body = body ++ c.ResponseSequence = sequence + c.done() + } + } + +-func (tracker *callTracker) finalizeWithError(sn uint32, err error) { ++func (tracker *callTracker) finalizeWithError(sn uint32, sequence Sequence, err error) { + tracker.lck.Lock() + c, ok := tracker.calls[sn] + if ok { +@@ -893,11 +938,12 @@ func (tracker *callTracker) finalizeWithError(sn uint32, err error) { + tracker.lck.Unlock() + if ok { + c.Err = err ++ c.ResponseSequence = sequence + c.done() + } + } + +-func (tracker *callTracker) finalizeAllWithError(err error) { ++func (tracker *callTracker) finalizeAllWithError(sequenceGen *sequenceGenerator, err error) { + tracker.lck.Lock() + closedCalls := make([]*Call, 0, len(tracker.calls)) + for sn := range tracker.calls { +@@ -907,6 +953,7 @@ func (tracker *callTracker) finalizeAllWithError(err error) { + tracker.lck.Unlock() + for _, call := range closedCalls { + call.Err = err ++ call.ResponseSequence = sequenceGen.next() + call.done() + } + } +diff --git a/vendor/github.com/godbus/dbus/v5/dbus.go b/vendor/github.com/godbus/dbus/v5/dbus.go +index 428923d2667..ddf3b7afde9 100644 +--- a/vendor/github.com/godbus/dbus/v5/dbus.go ++++ b/vendor/github.com/godbus/dbus/v5/dbus.go +@@ -28,6 +28,7 @@ var ( + interfaceType = reflect.TypeOf((*interface{})(nil)).Elem() + unixFDType = reflect.TypeOf(UnixFD(0)) + unixFDIndexType = reflect.TypeOf(UnixFDIndex(0)) ++ errType = reflect.TypeOf((*error)(nil)).Elem() + ) + + // An InvalidTypeError signals that a value which cannot be represented in the +@@ -63,6 +64,9 @@ func storeInterfaces(src, dest interface{}) error { + + func store(dest, src reflect.Value) error { + if dest.Kind() == reflect.Ptr { ++ if dest.IsNil() { ++ dest.Set(reflect.New(dest.Type().Elem())) ++ } + return store(dest.Elem(), src) + } + switch src.Kind() { +diff --git a/vendor/github.com/godbus/dbus/v5/default_handler.go b/vendor/github.com/godbus/dbus/v5/default_handler.go +index 6d8bf32f9f9..13132c6b479 100644 +--- a/vendor/github.com/godbus/dbus/v5/default_handler.go ++++ b/vendor/github.com/godbus/dbus/v5/default_handler.go +@@ -126,14 +126,28 @@ func (m exportedMethod) Call(args ...interface{}) ([]interface{}, error) { + } + + ret := m.Value.Call(params) +- +- err := ret[t.NumOut()-1].Interface().(*Error) +- ret = ret[:t.NumOut()-1] ++ var err error ++ nilErr := false // The reflection will find almost-nils, let's only pass back clean ones! ++ if t.NumOut() > 0 { ++ if e, ok := ret[t.NumOut()-1].Interface().(*Error); ok { // godbus *Error ++ nilErr = ret[t.NumOut()-1].IsNil() ++ ret = ret[:t.NumOut()-1] ++ err = e ++ } else if ret[t.NumOut()-1].Type().Implements(errType) { // Go error ++ i := ret[t.NumOut()-1].Interface() ++ if i == nil { ++ nilErr = ret[t.NumOut()-1].IsNil() ++ } else { ++ err = i.(error) ++ } ++ ret = ret[:t.NumOut()-1] ++ } ++ } + out := make([]interface{}, len(ret)) + for i, val := range ret { + out[i] = val.Interface() + } +- if err == nil { ++ if nilErr || err == nil { + //concrete type to interface nil is a special case + return out, nil + } +diff --git a/vendor/github.com/godbus/dbus/v5/export.go b/vendor/github.com/godbus/dbus/v5/export.go +index c277ab14262..2447b51d469 100644 +--- a/vendor/github.com/godbus/dbus/v5/export.go ++++ b/vendor/github.com/godbus/dbus/v5/export.go +@@ -69,6 +69,22 @@ func getMethods(in interface{}, mapping map[string]string) map[string]reflect.Va + return methods + } + ++func getAllMethods(in interface{}, mapping map[string]string) map[string]reflect.Value { ++ if in == nil { ++ return nil ++ } ++ methods := make(map[string]reflect.Value) ++ val := reflect.ValueOf(in) ++ typ := val.Type() ++ for i := 0; i < typ.NumMethod(); i++ { ++ methtype := typ.Method(i) ++ method := val.Method(i) ++ // map names while building table ++ methods[computeMethodName(methtype.Name, mapping)] = method ++ } ++ return methods ++} ++ + func standardMethodArgumentDecode(m Method, sender string, msg *Message, body []interface{}) ([]interface{}, error) { + pointers := make([]interface{}, m.NumArguments()) + decode := make([]interface{}, 0, len(body)) +@@ -159,7 +175,6 @@ func (conn *Conn) handleCall(msg *Message) { + if msg.Flags&FlagNoReplyExpected == 0 { + reply := new(Message) + reply.Type = TypeMethodReply +- reply.serial = conn.getSerial() + reply.Headers = make(map[HeaderField]Variant) + if hasSender { + reply.Headers[FieldDestination] = msg.Headers[FieldSender] +@@ -195,7 +210,6 @@ func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) erro + } + msg := new(Message) + msg.Type = TypeSignal +- msg.serial = conn.getSerial() + msg.Headers = make(map[HeaderField]Variant) + msg.Headers[FieldInterface] = MakeVariant(iface) + msg.Headers[FieldMember] = MakeVariant(member) +@@ -247,6 +261,18 @@ func (conn *Conn) Export(v interface{}, path ObjectPath, iface string) error { + return conn.ExportWithMap(v, nil, path, iface) + } + ++// ExportAll registers all exported methods defined by the given object on ++// the message bus. ++// ++// Unlike Export there is no requirement to have the last parameter as type ++// *Error. If you want to be able to return error then you can append an error ++// type parameter to your method signature. If the error returned is not nil, ++// it is sent back to the caller as an error. Otherwise, a method reply is ++// sent with the other return values as its body. ++func (conn *Conn) ExportAll(v interface{}, path ObjectPath, iface string) error { ++ return conn.export(getAllMethods(v, nil), path, iface, false) ++} ++ + // ExportWithMap works exactly like Export but provides the ability to remap + // method names (e.g. export a lower-case method). + // +@@ -299,19 +325,22 @@ func (conn *Conn) ExportSubtreeMethodTable(methods map[string]interface{}, path + } + + func (conn *Conn) exportMethodTable(methods map[string]interface{}, path ObjectPath, iface string, includeSubtree bool) error { +- out := make(map[string]reflect.Value) +- for name, method := range methods { +- rval := reflect.ValueOf(method) +- if rval.Kind() != reflect.Func { +- continue +- } +- t := rval.Type() +- // only track valid methods must return *Error as last arg +- if t.NumOut() == 0 || +- t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) { +- continue ++ var out map[string]reflect.Value ++ if methods != nil { ++ out = make(map[string]reflect.Value) ++ for name, method := range methods { ++ rval := reflect.ValueOf(method) ++ if rval.Kind() != reflect.Func { ++ continue ++ } ++ t := rval.Type() ++ // only track valid methods must return *Error as last arg ++ if t.NumOut() == 0 || ++ t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) { ++ continue ++ } ++ out[name] = rval + } +- out[name] = rval + } + return conn.export(out, path, iface, includeSubtree) + } +@@ -327,12 +356,12 @@ func (conn *Conn) unexport(h *defaultHandler, path ObjectPath, iface string) err + return nil + } + +-// exportWithMap is the worker function for all exports/registrations. ++// export is the worker function for all exports/registrations. + func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, iface string, includeSubtree bool) error { + h, ok := conn.handler.(*defaultHandler) + if !ok { + return fmt.Errorf( +- `dbus: export only allowed on the default hander handler have %T"`, ++ `dbus: export only allowed on the default handler. Received: %T"`, + conn.handler) + } + +diff --git a/vendor/github.com/godbus/dbus/v5/match.go b/vendor/github.com/godbus/dbus/v5/match.go +index 086ee336a9a..5a607e53e41 100644 +--- a/vendor/github.com/godbus/dbus/v5/match.go ++++ b/vendor/github.com/godbus/dbus/v5/match.go +@@ -1,6 +1,7 @@ + package dbus + + import ( ++ "strconv" + "strings" + ) + +@@ -60,3 +61,29 @@ func WithMatchPathNamespace(namespace ObjectPath) MatchOption { + func WithMatchDestination(destination string) MatchOption { + return WithMatchOption("destination", destination) + } ++ ++// WithMatchArg sets argN match option, range of N is 0 to 63. ++func WithMatchArg(argIdx int, value string) MatchOption { ++ if argIdx < 0 || argIdx > 63 { ++ panic("range of argument index is 0 to 63") ++ } ++ return WithMatchOption("arg"+strconv.Itoa(argIdx), value) ++} ++ ++// WithMatchArgPath sets argN path match option, range of N is 0 to 63. ++func WithMatchArgPath(argIdx int, path string) MatchOption { ++ if argIdx < 0 || argIdx > 63 { ++ panic("range of argument index is 0 to 63") ++ } ++ return WithMatchOption("arg"+strconv.Itoa(argIdx)+"path", path) ++} ++ ++// WithMatchArg0Namespace sets arg0namespace match option. ++func WithMatchArg0Namespace(arg0Namespace string) MatchOption { ++ return WithMatchOption("arg0namespace", arg0Namespace) ++} ++ ++// WithMatchEavesdrop sets eavesdrop match option. ++func WithMatchEavesdrop(eavesdrop bool) MatchOption { ++ return WithMatchOption("eavesdrop", strconv.FormatBool(eavesdrop)) ++} +diff --git a/vendor/github.com/godbus/dbus/v5/object.go b/vendor/github.com/godbus/dbus/v5/object.go +index 8acd7fc8b1a..664abb7fbab 100644 +--- a/vendor/github.com/godbus/dbus/v5/object.go ++++ b/vendor/github.com/godbus/dbus/v5/object.go +@@ -16,6 +16,7 @@ type BusObject interface { + AddMatchSignal(iface, member string, options ...MatchOption) *Call + RemoveMatchSignal(iface, member string, options ...MatchOption) *Call + GetProperty(p string) (Variant, error) ++ StoreProperty(p string, value interface{}) error + SetProperty(p string, v interface{}) error + Destination() string + Path() ObjectPath +@@ -109,7 +110,6 @@ func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch + method = method[i+1:] + msg := new(Message) + msg.Type = TypeMethodCall +- msg.serial = o.conn.getSerial() + msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected) + msg.Headers = make(map[HeaderField]Variant) + msg.Headers[FieldPath] = MakeVariant(o.path) +@@ -122,68 +122,31 @@ func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch + if len(args) > 0 { + msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...)) + } +- if msg.Flags&FlagNoReplyExpected == 0 { +- if ch == nil { +- ch = make(chan *Call, 1) +- } else if cap(ch) == 0 { +- panic("dbus: unbuffered channel passed to (*Object).Go") +- } +- ctx, cancel := context.WithCancel(ctx) +- call := &Call{ +- Destination: o.dest, +- Path: o.path, +- Method: method, +- Args: args, +- Done: ch, +- ctxCanceler: cancel, +- ctx: ctx, +- } +- o.conn.calls.track(msg.serial, call) +- o.conn.sendMessageAndIfClosed(msg, func() { +- o.conn.calls.handleSendError(msg, ErrClosed) +- cancel() +- }) +- go func() { +- <-ctx.Done() +- o.conn.calls.handleSendError(msg, ctx.Err()) +- }() +- +- return call +- } +- done := make(chan *Call, 1) +- call := &Call{ +- Err: nil, +- Done: done, +- } +- defer func() { +- call.Done <- call +- close(done) +- }() +- o.conn.sendMessageAndIfClosed(msg, func() { +- call.Err = ErrClosed +- }) +- return call ++ return o.conn.SendWithContext(ctx, msg, ch) + } + + // GetProperty calls org.freedesktop.DBus.Properties.Get on the given + // object. The property name must be given in interface.member notation. + func (o *Object) GetProperty(p string) (Variant, error) { ++ var result Variant ++ err := o.StoreProperty(p, &result) ++ return result, err ++} ++ ++// StoreProperty calls org.freedesktop.DBus.Properties.Get on the given ++// object. The property name must be given in interface.member notation. ++// It stores the returned property into the provided value. ++func (o *Object) StoreProperty(p string, value interface{}) error { + idx := strings.LastIndex(p, ".") + if idx == -1 || idx+1 == len(p) { +- return Variant{}, errors.New("dbus: invalid property " + p) ++ return errors.New("dbus: invalid property " + p) + } + + iface := p[:idx] + prop := p[idx+1:] + +- result := Variant{} +- err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result) +- +- if err != nil { +- return Variant{}, err +- } +- +- return result, nil ++ return o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop). ++ Store(value) + } + + // SetProperty calls org.freedesktop.DBus.Properties.Set on the given +diff --git a/vendor/github.com/godbus/dbus/v5/sequence.go b/vendor/github.com/godbus/dbus/v5/sequence.go +new file mode 100644 +index 00000000000..89435d3933b +--- /dev/null ++++ b/vendor/github.com/godbus/dbus/v5/sequence.go +@@ -0,0 +1,24 @@ ++package dbus ++ ++// Sequence represents the value of a monotonically increasing counter. ++type Sequence uint64 ++ ++const ( ++ // NoSequence indicates the absence of a sequence value. ++ NoSequence Sequence = 0 ++) ++ ++// sequenceGenerator represents a monotonically increasing counter. ++type sequenceGenerator struct { ++ nextSequence Sequence ++} ++ ++func (generator *sequenceGenerator) next() Sequence { ++ result := generator.nextSequence ++ generator.nextSequence++ ++ return result ++} ++ ++func newSequenceGenerator() *sequenceGenerator { ++ return &sequenceGenerator{nextSequence: 1} ++} +diff --git a/vendor/github.com/godbus/dbus/v5/sequential_handler.go b/vendor/github.com/godbus/dbus/v5/sequential_handler.go +new file mode 100644 +index 00000000000..ef2fcdba179 +--- /dev/null ++++ b/vendor/github.com/godbus/dbus/v5/sequential_handler.go +@@ -0,0 +1,125 @@ ++package dbus ++ ++import ( ++ "sync" ++) ++ ++// NewSequentialSignalHandler returns an instance of a new ++// signal handler that guarantees sequential processing of signals. It is a ++// guarantee of this signal handler that signals will be written to ++// channels in the order they are received on the DBus connection. ++func NewSequentialSignalHandler() SignalHandler { ++ return &sequentialSignalHandler{} ++} ++ ++type sequentialSignalHandler struct { ++ mu sync.RWMutex ++ closed bool ++ signals []*sequentialSignalChannelData ++} ++ ++func (sh *sequentialSignalHandler) DeliverSignal(intf, name string, signal *Signal) { ++ sh.mu.RLock() ++ defer sh.mu.RUnlock() ++ if sh.closed { ++ return ++ } ++ for _, scd := range sh.signals { ++ scd.deliver(signal) ++ } ++} ++ ++func (sh *sequentialSignalHandler) Terminate() { ++ sh.mu.Lock() ++ defer sh.mu.Unlock() ++ if sh.closed { ++ return ++ } ++ ++ for _, scd := range sh.signals { ++ scd.close() ++ close(scd.ch) ++ } ++ sh.closed = true ++ sh.signals = nil ++} ++ ++func (sh *sequentialSignalHandler) AddSignal(ch chan<- *Signal) { ++ sh.mu.Lock() ++ defer sh.mu.Unlock() ++ if sh.closed { ++ return ++ } ++ sh.signals = append(sh.signals, newSequentialSignalChannelData(ch)) ++} ++ ++func (sh *sequentialSignalHandler) RemoveSignal(ch chan<- *Signal) { ++ sh.mu.Lock() ++ defer sh.mu.Unlock() ++ if sh.closed { ++ return ++ } ++ for i := len(sh.signals) - 1; i >= 0; i-- { ++ if ch == sh.signals[i].ch { ++ sh.signals[i].close() ++ copy(sh.signals[i:], sh.signals[i+1:]) ++ sh.signals[len(sh.signals)-1] = nil ++ sh.signals = sh.signals[:len(sh.signals)-1] ++ } ++ } ++} ++ ++type sequentialSignalChannelData struct { ++ ch chan<- *Signal ++ in chan *Signal ++ done chan struct{} ++} ++ ++func newSequentialSignalChannelData(ch chan<- *Signal) *sequentialSignalChannelData { ++ scd := &sequentialSignalChannelData{ ++ ch: ch, ++ in: make(chan *Signal), ++ done: make(chan struct{}), ++ } ++ go scd.bufferSignals() ++ return scd ++} ++ ++func (scd *sequentialSignalChannelData) bufferSignals() { ++ defer close(scd.done) ++ ++ // Ensure that signals are delivered to scd.ch in the same ++ // order they are received from scd.in. ++ var queue []*Signal ++ for { ++ if len(queue) == 0 { ++ signal, ok := <- scd.in ++ if !ok { ++ return ++ } ++ queue = append(queue, signal) ++ } ++ select { ++ case scd.ch <- queue[0]: ++ copy(queue, queue[1:]) ++ queue[len(queue)-1] = nil ++ queue = queue[:len(queue)-1] ++ case signal, ok := <-scd.in: ++ if !ok { ++ return ++ } ++ queue = append(queue, signal) ++ } ++ } ++} ++ ++func (scd *sequentialSignalChannelData) deliver(signal *Signal) { ++ scd.in <- signal ++} ++ ++func (scd *sequentialSignalChannelData) close() { ++ close(scd.in) ++ // Ensure that bufferSignals() has exited and won't attempt ++ // any future sends on scd.ch ++ <-scd.done ++} +diff --git a/vendor/github.com/godbus/dbus/v5/sig.go b/vendor/github.com/godbus/dbus/v5/sig.go +index c1b809202cd..2d326cebc0d 100644 +--- a/vendor/github.com/godbus/dbus/v5/sig.go ++++ b/vendor/github.com/godbus/dbus/v5/sig.go +@@ -137,7 +137,7 @@ func ParseSignatureMust(s string) Signature { + return sig + } + +-// Empty retruns whether the signature is the empty signature. ++// Empty returns whether the signature is the empty signature. + func (s Signature) Empty() bool { + return s.str == "" + } +diff --git a/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go b/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go +index 0fc5b92739b..1b5ed2089d0 100644 +--- a/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go ++++ b/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go +@@ -10,6 +10,7 @@ package dbus + /* + const int sizeofPtr = sizeof(void*); + #define _WANT_UCRED ++#include + #include + */ + import "C" +diff --git a/vendor/github.com/godbus/dbus/v5/variant.go b/vendor/github.com/godbus/dbus/v5/variant.go +index 5b51828c824..f1e81f3ede6 100644 +--- a/vendor/github.com/godbus/dbus/v5/variant.go ++++ b/vendor/github.com/godbus/dbus/v5/variant.go +@@ -142,3 +142,9 @@ func (v Variant) String() string { + func (v Variant) Value() interface{} { + return v.value + } ++ ++// Store converts the variant into a native go type using the same ++// mechanism as the "Store" function. ++func (v Variant) Store(value interface{}) error { ++ return storeInterfaces(v.value, value) ++} +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 3d3f4e64658..0b3dfd7412d 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -234,7 +234,7 @@ github.com/containers/storage/types + github.com/coreos/go-iptables/iptables + # github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e + github.com/coreos/go-systemd/activation +-# github.com/coreos/go-systemd/v22 v22.2.0 ++# github.com/coreos/go-systemd/v22 v22.3.1 + github.com/coreos/go-systemd/v22/activation + github.com/coreos/go-systemd/v22/daemon + github.com/coreos/go-systemd/v22/dbus +@@ -318,7 +318,7 @@ github.com/ghodss/yaml + github.com/go-logr/logr + # github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 + github.com/go-task/slim-sprig +-# github.com/godbus/dbus/v5 v5.0.3 ++# github.com/godbus/dbus/v5 v5.0.4 + github.com/godbus/dbus/v5 + # github.com/gogo/protobuf v1.3.2 + github.com/gogo/protobuf/gogoproto diff --git a/podman.spec b/podman.spec index 8e88808..81f3d9c 100644 --- a/podman.spec +++ b/podman.spec @@ -66,6 +66,9 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz +%if 0%{?centos} +Patch1: go-systemd.patch +%endif Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From f377235765516d967724841a7066a7a0531992bd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 22 Apr 2021 09:17:57 -0400 Subject: [PATCH 073/110] podman-2:3.1.2-1 - bump to v3.1.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + go-systemd.patch | 1182 ---------------------------------------------- podman.spec | 14 +- sources | 2 +- 4 files changed, 9 insertions(+), 1190 deletions(-) delete mode 100644 go-systemd.patch diff --git a/.gitignore b/.gitignore index 2341492..9c2f14e 100644 --- a/.gitignore +++ b/.gitignore @@ -1274,3 +1274,4 @@ /v3.1.0-rc2.tar.gz /v3.1.0.tar.gz /v3.1.1.tar.gz +/v3.1.2.tar.gz diff --git a/go-systemd.patch b/go-systemd.patch deleted file mode 100644 index eccf006..0000000 --- a/go-systemd.patch +++ /dev/null @@ -1,1182 +0,0 @@ -From bdd93829d13780db3dd41548740a6b8cd5d4f31e Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Tue, 20 Apr 2021 11:54:44 -0400 -Subject: [PATCH] Bump github.com/coreos/go-systemd from 22.2.0 to 22.3.1 - -podman fails to build on CentOS 8 otherwise. - -Essentially the same as commit 5a7a1a1 but cherry-picking it gave a lot -of conflicts, so I manually vendored it in. - -Signed-off-by: Lokesh Mandvekar ---- - go.mod | 4 +- - go.sum | 6 +- - .../coreos/go-systemd/v22/dbus/methods.go | 21 ++- - .../go-systemd/v22/sdjournal/journal.go | 5 +- - vendor/github.com/godbus/dbus/v5/.travis.yml | 50 ------ - .../github.com/godbus/dbus/v5/README.markdown | 4 +- - vendor/github.com/godbus/dbus/v5/auth.go | 2 +- - vendor/github.com/godbus/dbus/v5/call.go | 9 + - vendor/github.com/godbus/dbus/v5/conn.go | 159 ++++++++++++------ - vendor/github.com/godbus/dbus/v5/dbus.go | 4 + - .../godbus/dbus/v5/default_handler.go | 22 ++- - vendor/github.com/godbus/dbus/v5/export.go | 61 +++++-- - vendor/github.com/godbus/dbus/v5/match.go | 27 +++ - vendor/github.com/godbus/dbus/v5/object.go | 65 ++----- - vendor/github.com/godbus/dbus/v5/sequence.go | 24 +++ - .../godbus/dbus/v5/sequential_handler.go | 125 ++++++++++++++ - vendor/github.com/godbus/dbus/v5/sig.go | 2 +- - .../dbus/v5/transport_unixcred_freebsd.go | 1 + - vendor/github.com/godbus/dbus/v5/variant.go | 6 + - vendor/modules.txt | 4 +- - 20 files changed, 411 insertions(+), 190 deletions(-) - delete mode 100644 vendor/github.com/godbus/dbus/v5/.travis.yml - create mode 100644 vendor/github.com/godbus/dbus/v5/sequence.go - create mode 100644 vendor/github.com/godbus/dbus/v5/sequential_handler.go - -diff --git a/go.mod b/go.mod -index d940dfbba8b..e4f2e373638 100644 ---- a/go.mod -+++ b/go.mod -@@ -17,7 +17,7 @@ require ( - github.com/containers/ocicrypt v1.1.0 - github.com/containers/psgo v1.5.2 - github.com/containers/storage v1.29.0 -- github.com/coreos/go-systemd/v22 v22.2.0 -+ github.com/coreos/go-systemd/v22 v22.3.1 - github.com/cri-o/ocicni v0.2.1-0.20210301205850-541cf7c703cf - github.com/cyphar/filepath-securejoin v0.2.2 - github.com/davecgh/go-spew v1.1.1 -@@ -28,7 +28,7 @@ require ( - github.com/docker/go-units v0.4.0 - github.com/fsnotify/fsnotify v1.4.9 - github.com/ghodss/yaml v1.0.0 -- github.com/godbus/dbus/v5 v5.0.3 -+ github.com/godbus/dbus/v5 v5.0.4 - github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf - github.com/google/uuid v1.2.0 - github.com/gorilla/mux v1.8.0 -diff --git a/go.sum b/go.sum -index c14591e9dfb..29e11eee2ac 100644 ---- a/go.sum -+++ b/go.sum -@@ -235,8 +235,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9 - github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= - github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= - github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= --github.com/coreos/go-systemd/v22 v22.2.0 h1:BBmbNtSc5PuUM3Byxs7yE5rLdxQO4/FMoEXY5Rle4GA= --github.com/coreos/go-systemd/v22 v22.2.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -+github.com/coreos/go-systemd/v22 v22.3.1 h1:7OO2CXWMYNDdaAzP51t4lCCZWwpQHmvPbm9sxWjm3So= -+github.com/coreos/go-systemd/v22 v22.3.1/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= - github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= - github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -@@ -339,6 +339,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68Fp - github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= - github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= - github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -+github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= -+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= - github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= - github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= -diff --git a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go -index 679f244e8f1..01879ba1580 100644 ---- a/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go -+++ b/vendor/github.com/coreos/go-systemd/v22/dbus/methods.go -@@ -24,6 +24,18 @@ import ( - "github.com/godbus/dbus/v5" - ) - -+// Who can be used to specify which process to kill in the unit via the KillUnitWithTarget API -+type Who string -+ -+const ( -+ // All sends the signal to all processes in the unit -+ All Who = "all" -+ // Main sends the signal to the main process of the unit -+ Main Who = "main" -+ // Control sends the signal to the control process of the unit -+ Control Who = "control" -+) -+ - func (c *Conn) jobComplete(signal *dbus.Signal) { - var id uint32 - var job dbus.ObjectPath -@@ -196,7 +208,12 @@ func (c *Conn) KillUnit(name string, signal int32) { - - // KillUnitContext same as KillUnit with context - func (c *Conn) KillUnitContext(ctx context.Context, name string, signal int32) { -- c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store() -+ c.KillUnitWithTarget(ctx, name, All, signal) -+} -+ -+// KillUnitWithTarget is like KillUnitContext, but allows you to specify which process in the unit to send the signal to -+func (c *Conn) KillUnitWithTarget(ctx context.Context, name string, target Who, signal int32) error { -+ return c.sysobj.CallWithContext(ctx, "org.freedesktop.systemd1.Manager.KillUnit", 0, name, string(target), signal).Store() - } - - // ResetFailedUnit resets the "failed" state of a specific unit. -@@ -360,7 +377,7 @@ func (c *Conn) SetUnitPropertiesContext(ctx context.Context, name string, runtim - - // Deprecated: use GetUnitTypePropertyContext instead - func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) { -- return c.GetUnitTypePropertyContext(context.Background(), unitType, unitType, propertyName) -+ return c.GetUnitTypePropertyContext(context.Background(), unit, unitType, propertyName) - } - - // GetUnitTypePropertyContext same as GetUnitTypeProperty with context -diff --git a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go -index c61a2025ff9..fb11b1179c8 100644 ---- a/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go -+++ b/vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go -@@ -310,7 +310,7 @@ package sdjournal - // } - // - // char * --// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[_SD_ARRAY_STATIC SD_ID128_STRING_MAX]) -+// my_sd_id128_to_string(void *f, sd_id128_t boot_id, char s[SD_ID128_STRING_MAX]) - // { - // char *(*sd_id128_to_string)(sd_id128_t, char *); - // -@@ -1155,7 +1155,8 @@ func (j *Journal) GetBootID() (string, error) { - return "", err - } - -- c := (*C.char)(C.malloc(33)) -+ id128StringMax := C.size_t(C.SD_ID128_STRING_MAX) -+ c := (*C.char)(C.malloc(id128StringMax)) - defer C.free(unsafe.Pointer(c)) - C.my_sd_id128_to_string(sd_id128_to_string, boot_id, c) - -diff --git a/vendor/github.com/godbus/dbus/v5/.travis.yml b/vendor/github.com/godbus/dbus/v5/.travis.yml -deleted file mode 100644 -index dd67672048b..00000000000 ---- a/vendor/github.com/godbus/dbus/v5/.travis.yml -+++ /dev/null -@@ -1,50 +0,0 @@ --dist: bionic --language: go --go_import_path: github.com/godbus/dbus -- --go: -- - 1.11.x -- - 1.12.x -- - 1.13.x -- - tip -- --matrix: -- fast_finish: true -- allow_failures: -- - go: tip -- --addons: -- apt: -- packages: -- - dbus -- - dbus-x11 -- --before_install: -- - export GO111MODULE=on -- --script: -- - go test -v -race -mod=readonly ./... # Run all the tests with the race detector enabled -- - go vet ./... # go vet is the official Go static analyzer -- --jobs: -- include: -- # The build matrix doesn't cover build stages, so manually expand -- # the jobs with anchors -- - &multiarch -- stage: "Multiarch Test" -- go: 1.11.x -- env: TARGETS="386 arm arm64 ppc64le" -- before_install: -- - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -- script: -- - | -- set -e -- for target in $TARGETS; do -- printf "\e[1mRunning test suite under ${target}.\e[0m\n" -- GOARCH="$target" go test -v ./... -- printf "\n\n" -- done -- - <<: *multiarch -- go: 1.12.x -- - <<: *multiarch -- go: 1.13.x -diff --git a/vendor/github.com/godbus/dbus/v5/README.markdown b/vendor/github.com/godbus/dbus/v5/README.markdown -index fd29648752d..1fb2eacaa15 100644 ---- a/vendor/github.com/godbus/dbus/v5/README.markdown -+++ b/vendor/github.com/godbus/dbus/v5/README.markdown -@@ -1,4 +1,4 @@ --[![Build Status](https://travis-ci.org/godbus/dbus.svg?branch=master)](https://travis-ci.org/godbus/dbus) -+![Build Status](https://github.com/godbus/dbus/workflows/Go/badge.svg) - - dbus - ---- -@@ -32,6 +32,8 @@ gives a short overview over the basic usage. - #### Projects using godbus - - [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library. - - [go-bluetooth](https://github.com/muka/go-bluetooth) provides a bluetooth client over bluez dbus API. -+- [playerbm](https://github.com/altdesktop/playerbm) a bookmark utility for media players. -+- [iwd](https://github.com/shibumi/iwd) go bindings for the internet wireless daemon "iwd". - - Please note that the API is considered unstable for now and may change without - further notice. -diff --git a/vendor/github.com/godbus/dbus/v5/auth.go b/vendor/github.com/godbus/dbus/v5/auth.go -index 31abac629d7..283487a0e31 100644 ---- a/vendor/github.com/godbus/dbus/v5/auth.go -+++ b/vendor/github.com/godbus/dbus/v5/auth.go -@@ -37,7 +37,7 @@ const ( - - // Auth defines the behaviour of an authentication mechanism. - type Auth interface { -- // Return the name of the mechnism, the argument to the first AUTH command -+ // Return the name of the mechanism, the argument to the first AUTH command - // and the next status. - FirstData() (name, resp []byte, status AuthStatus) - -diff --git a/vendor/github.com/godbus/dbus/v5/call.go b/vendor/github.com/godbus/dbus/v5/call.go -index 2cb189012e7..b06b063580f 100644 ---- a/vendor/github.com/godbus/dbus/v5/call.go -+++ b/vendor/github.com/godbus/dbus/v5/call.go -@@ -24,6 +24,15 @@ type Call struct { - // Holds the response once the call is done. - Body []interface{} - -+ // ResponseSequence stores the sequence number of the DBus message containing -+ // the call response (or error). This can be compared to the sequence number -+ // of other call responses and signals on this connection to determine their -+ // relative ordering on the underlying DBus connection. -+ // For errors, ResponseSequence is populated only if the error came from a -+ // DBusMessage that was received or if there was an error receiving. In case of -+ // failure to make the call, ResponseSequence will be NoSequence. -+ ResponseSequence Sequence -+ - // tracks context and canceler - ctx context.Context - ctxCanceler context.CancelFunc -diff --git a/vendor/github.com/godbus/dbus/v5/conn.go b/vendor/github.com/godbus/dbus/v5/conn.go -index b55bc99c854..29fe018ad82 100644 ---- a/vendor/github.com/godbus/dbus/v5/conn.go -+++ b/vendor/github.com/godbus/dbus/v5/conn.go -@@ -45,6 +45,7 @@ type Conn struct { - serialGen SerialGenerator - inInt Interceptor - outInt Interceptor -+ auth []Auth - - names *nameTracker - calls *callTracker -@@ -59,7 +60,8 @@ type Conn struct { - func SessionBus() (conn *Conn, err error) { - sessionBusLck.Lock() - defer sessionBusLck.Unlock() -- if sessionBus != nil { -+ if sessionBus != nil && -+ sessionBus.Connected() { - return sessionBus, nil - } - defer func() { -@@ -67,19 +69,7 @@ func SessionBus() (conn *Conn, err error) { - sessionBus = conn - } - }() -- conn, err = SessionBusPrivate() -- if err != nil { -- return -- } -- if err = conn.Auth(nil); err != nil { -- conn.Close() -- conn = nil -- return -- } -- if err = conn.Hello(); err != nil { -- conn.Close() -- conn = nil -- } -+ conn, err = ConnectSessionBus() - return - } - -@@ -116,7 +106,8 @@ func SessionBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Co - func SystemBus() (conn *Conn, err error) { - systemBusLck.Lock() - defer systemBusLck.Unlock() -- if systemBus != nil { -+ if systemBus != nil && -+ systemBus.Connected() { - return systemBus, nil - } - defer func() { -@@ -124,20 +115,42 @@ func SystemBus() (conn *Conn, err error) { - systemBus = conn - } - }() -- conn, err = SystemBusPrivate() -+ conn, err = ConnectSystemBus() -+ return -+} -+ -+// ConnectSessionBus connects to the session bus. -+func ConnectSessionBus(opts ...ConnOption) (*Conn, error) { -+ address, err := getSessionBusAddress() - if err != nil { -- return -+ return nil, err - } -- if err = conn.Auth(nil); err != nil { -- conn.Close() -- conn = nil -- return -+ return Connect(address, opts...) -+} -+ -+// ConnectSystemBus connects to the system bus. -+func ConnectSystemBus(opts ...ConnOption) (*Conn, error) { -+ return Connect(getSystemBusPlatformAddress(), opts...) -+} -+ -+// Connect connects to the given address. -+// -+// Returned connection is ready to use and doesn't require calling -+// Auth and Hello methods to make it usable. -+func Connect(address string, opts ...ConnOption) (*Conn, error) { -+ conn, err := Dial(address, opts...) -+ if err != nil { -+ return nil, err -+ } -+ if err = conn.Auth(conn.auth); err != nil { -+ _ = conn.Close() -+ return nil, err - } - if err = conn.Hello(); err != nil { -- conn.Close() -- conn = nil -+ _ = conn.Close() -+ return nil, err - } -- return -+ return conn, nil - } - - // SystemBusPrivate returns a new private connection to the system bus. -@@ -197,6 +210,14 @@ func WithSerialGenerator(gen SerialGenerator) ConnOption { - } - } - -+// WithAuth sets authentication methods for the auth conversation. -+func WithAuth(methods ...Auth) ConnOption { -+ return func(conn *Conn) error { -+ conn.auth = methods -+ return nil -+ } -+} -+ - // Interceptor intercepts incoming and outgoing messages. - type Interceptor func(msg *Message) - -@@ -309,6 +330,11 @@ func (conn *Conn) Context() context.Context { - return conn.ctx - } - -+// Connected returns whether conn is connected -+func (conn *Conn) Connected() bool { -+ return conn.ctx.Err() == nil -+} -+ - // Eavesdrop causes conn to send all incoming messages to the given channel - // without further processing. Method replies, errors and signals will not be - // sent to the appropriate channels and method calls will not be handled. If nil -@@ -342,8 +368,9 @@ func (conn *Conn) Hello() error { - } - - // inWorker runs in an own goroutine, reading incoming messages from the --// transport and dispatching them appropiately. -+// transport and dispatching them appropriately. - func (conn *Conn) inWorker() { -+ sequenceGen := newSequenceGenerator() - for { - msg, err := conn.ReadMessage() - if err != nil { -@@ -352,7 +379,7 @@ func (conn *Conn) inWorker() { - // anything but to shut down all stuff and returns errors to all - // pending replies. - conn.Close() -- conn.calls.finalizeAllWithError(err) -+ conn.calls.finalizeAllWithError(sequenceGen, err) - return - } - // invalid messages are ignored -@@ -381,13 +408,14 @@ func (conn *Conn) inWorker() { - if conn.inInt != nil { - conn.inInt(msg) - } -+ sequence := sequenceGen.next() - switch msg.Type { - case TypeError: -- conn.serialGen.RetireSerial(conn.calls.handleDBusError(msg)) -+ conn.serialGen.RetireSerial(conn.calls.handleDBusError(sequence, msg)) - case TypeMethodReply: -- conn.serialGen.RetireSerial(conn.calls.handleReply(msg)) -+ conn.serialGen.RetireSerial(conn.calls.handleReply(sequence, msg)) - case TypeSignal: -- conn.handleSignal(msg) -+ conn.handleSignal(sequence, msg) - case TypeMethodCall: - go conn.handleCall(msg) - } -@@ -395,7 +423,7 @@ func (conn *Conn) inWorker() { - } - } - --func (conn *Conn) handleSignal(msg *Message) { -+func (conn *Conn) handleSignal(sequence Sequence, msg *Message) { - iface := msg.Headers[FieldInterface].value.(string) - member := msg.Headers[FieldMember].value.(string) - // as per http://dbus.freedesktop.org/doc/dbus-specification.html , -@@ -421,10 +449,11 @@ func (conn *Conn) handleSignal(msg *Message) { - } - } - signal := &Signal{ -- Sender: sender, -- Path: msg.Headers[FieldPath].value.(ObjectPath), -- Name: iface + "." + member, -- Body: msg.Body, -+ Sender: sender, -+ Path: msg.Headers[FieldPath].value.(ObjectPath), -+ Name: iface + "." + member, -+ Body: msg.Body, -+ Sequence: sequence, - } - conn.signalHandler.DeliverSignal(iface, member, signal) - } -@@ -442,6 +471,9 @@ func (conn *Conn) Object(dest string, path ObjectPath) BusObject { - } - - func (conn *Conn) sendMessageAndIfClosed(msg *Message, ifClosed func()) { -+ if msg.serial == 0 { -+ msg.serial = conn.getSerial() -+ } - if conn.outInt != nil { - conn.outInt(msg) - } -@@ -473,16 +505,16 @@ func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call { - if ctx == nil { - panic("nil context") - } -+ if ch == nil { -+ ch = make(chan *Call, 1) -+ } else if cap(ch) == 0 { -+ panic("dbus: unbuffered channel passed to (*Conn).Send") -+ } - - var call *Call - ctx, canceler := context.WithCancel(ctx) - msg.serial = conn.getSerial() - if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 { -- if ch == nil { -- ch = make(chan *Call, 5) -- } else if cap(ch) == 0 { -- panic("dbus: unbuffered channel passed to (*Conn).Send") -- } - call = new(Call) - call.Destination, _ = msg.Headers[FieldDestination].value.(string) - call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath) -@@ -504,7 +536,8 @@ func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call { - }) - } else { - canceler() -- call = &Call{Err: nil} -+ call = &Call{Err: nil, Done: ch} -+ ch <- call - conn.sendMessageAndIfClosed(msg, func() { - call = &Call{Err: ErrClosed} - }) -@@ -529,7 +562,6 @@ func (conn *Conn) sendError(err error, dest string, serial uint32) { - } - msg := new(Message) - msg.Type = TypeError -- msg.serial = conn.getSerial() - msg.Headers = make(map[HeaderField]Variant) - if dest != "" { - msg.Headers[FieldDestination] = MakeVariant(dest) -@@ -548,7 +580,6 @@ func (conn *Conn) sendError(err error, dest string, serial uint32) { - func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) { - msg := new(Message) - msg.Type = TypeMethodReply -- msg.serial = conn.getSerial() - msg.Headers = make(map[HeaderField]Variant) - if dest != "" { - msg.Headers[FieldDestination] = MakeVariant(dest) -@@ -564,8 +595,14 @@ func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) { - // AddMatchSignal registers the given match rule to receive broadcast - // signals based on their contents. - func (conn *Conn) AddMatchSignal(options ...MatchOption) error { -+ return conn.AddMatchSignalContext(context.Background(), options...) -+} -+ -+// AddMatchSignalContext acts like AddMatchSignal but takes a context. -+func (conn *Conn) AddMatchSignalContext(ctx context.Context, options ...MatchOption) error { - options = append([]MatchOption{withMatchType("signal")}, options...) -- return conn.busObj.Call( -+ return conn.busObj.CallWithContext( -+ ctx, - "org.freedesktop.DBus.AddMatch", 0, - formatMatchOptions(options), - ).Store() -@@ -573,8 +610,14 @@ func (conn *Conn) AddMatchSignal(options ...MatchOption) error { - - // RemoveMatchSignal removes the first rule that matches previously registered with AddMatchSignal. - func (conn *Conn) RemoveMatchSignal(options ...MatchOption) error { -+ return conn.RemoveMatchSignalContext(context.Background(), options...) -+} -+ -+// RemoveMatchSignalContext acts like RemoveMatchSignal but takes a context. -+func (conn *Conn) RemoveMatchSignalContext(ctx context.Context, options ...MatchOption) error { - options = append([]MatchOption{withMatchType("signal")}, options...) -- return conn.busObj.Call( -+ return conn.busObj.CallWithContext( -+ ctx, - "org.freedesktop.DBus.RemoveMatch", 0, - formatMatchOptions(options), - ).Store() -@@ -639,10 +682,11 @@ func (e Error) Error() string { - // Signal represents a D-Bus message of type Signal. The name member is given in - // "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost. - type Signal struct { -- Sender string -- Path ObjectPath -- Name string -- Body []interface{} -+ Sender string -+ Path ObjectPath -+ Name string -+ Body []interface{} -+ Sequence Sequence - } - - // transport is a D-Bus transport. -@@ -825,25 +869,25 @@ func (tracker *callTracker) track(sn uint32, call *Call) { - tracker.lck.Unlock() - } - --func (tracker *callTracker) handleReply(msg *Message) uint32 { -+func (tracker *callTracker) handleReply(sequence Sequence, msg *Message) uint32 { - serial := msg.Headers[FieldReplySerial].value.(uint32) - tracker.lck.RLock() - _, ok := tracker.calls[serial] - tracker.lck.RUnlock() - if ok { -- tracker.finalizeWithBody(serial, msg.Body) -+ tracker.finalizeWithBody(serial, sequence, msg.Body) - } - return serial - } - --func (tracker *callTracker) handleDBusError(msg *Message) uint32 { -+func (tracker *callTracker) handleDBusError(sequence Sequence, msg *Message) uint32 { - serial := msg.Headers[FieldReplySerial].value.(uint32) - tracker.lck.RLock() - _, ok := tracker.calls[serial] - tracker.lck.RUnlock() - if ok { - name, _ := msg.Headers[FieldErrorName].value.(string) -- tracker.finalizeWithError(serial, Error{name, msg.Body}) -+ tracker.finalizeWithError(serial, sequence, Error{name, msg.Body}) - } - return serial - } -@@ -856,7 +900,7 @@ func (tracker *callTracker) handleSendError(msg *Message, err error) { - _, ok := tracker.calls[msg.serial] - tracker.lck.RUnlock() - if ok { -- tracker.finalizeWithError(msg.serial, err) -+ tracker.finalizeWithError(msg.serial, NoSequence, err) - } - } - -@@ -871,7 +915,7 @@ func (tracker *callTracker) finalize(sn uint32) { - } - } - --func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) { -+func (tracker *callTracker) finalizeWithBody(sn uint32, sequence Sequence, body []interface{}) { - tracker.lck.Lock() - c, ok := tracker.calls[sn] - if ok { -@@ -880,11 +924,12 @@ func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) { - tracker.lck.Unlock() - if ok { - c.Body = body -+ c.ResponseSequence = sequence - c.done() - } - } - --func (tracker *callTracker) finalizeWithError(sn uint32, err error) { -+func (tracker *callTracker) finalizeWithError(sn uint32, sequence Sequence, err error) { - tracker.lck.Lock() - c, ok := tracker.calls[sn] - if ok { -@@ -893,11 +938,12 @@ func (tracker *callTracker) finalizeWithError(sn uint32, err error) { - tracker.lck.Unlock() - if ok { - c.Err = err -+ c.ResponseSequence = sequence - c.done() - } - } - --func (tracker *callTracker) finalizeAllWithError(err error) { -+func (tracker *callTracker) finalizeAllWithError(sequenceGen *sequenceGenerator, err error) { - tracker.lck.Lock() - closedCalls := make([]*Call, 0, len(tracker.calls)) - for sn := range tracker.calls { -@@ -907,6 +953,7 @@ func (tracker *callTracker) finalizeAllWithError(err error) { - tracker.lck.Unlock() - for _, call := range closedCalls { - call.Err = err -+ call.ResponseSequence = sequenceGen.next() - call.done() - } - } -diff --git a/vendor/github.com/godbus/dbus/v5/dbus.go b/vendor/github.com/godbus/dbus/v5/dbus.go -index 428923d2667..ddf3b7afde9 100644 ---- a/vendor/github.com/godbus/dbus/v5/dbus.go -+++ b/vendor/github.com/godbus/dbus/v5/dbus.go -@@ -28,6 +28,7 @@ var ( - interfaceType = reflect.TypeOf((*interface{})(nil)).Elem() - unixFDType = reflect.TypeOf(UnixFD(0)) - unixFDIndexType = reflect.TypeOf(UnixFDIndex(0)) -+ errType = reflect.TypeOf((*error)(nil)).Elem() - ) - - // An InvalidTypeError signals that a value which cannot be represented in the -@@ -63,6 +64,9 @@ func storeInterfaces(src, dest interface{}) error { - - func store(dest, src reflect.Value) error { - if dest.Kind() == reflect.Ptr { -+ if dest.IsNil() { -+ dest.Set(reflect.New(dest.Type().Elem())) -+ } - return store(dest.Elem(), src) - } - switch src.Kind() { -diff --git a/vendor/github.com/godbus/dbus/v5/default_handler.go b/vendor/github.com/godbus/dbus/v5/default_handler.go -index 6d8bf32f9f9..13132c6b479 100644 ---- a/vendor/github.com/godbus/dbus/v5/default_handler.go -+++ b/vendor/github.com/godbus/dbus/v5/default_handler.go -@@ -126,14 +126,28 @@ func (m exportedMethod) Call(args ...interface{}) ([]interface{}, error) { - } - - ret := m.Value.Call(params) -- -- err := ret[t.NumOut()-1].Interface().(*Error) -- ret = ret[:t.NumOut()-1] -+ var err error -+ nilErr := false // The reflection will find almost-nils, let's only pass back clean ones! -+ if t.NumOut() > 0 { -+ if e, ok := ret[t.NumOut()-1].Interface().(*Error); ok { // godbus *Error -+ nilErr = ret[t.NumOut()-1].IsNil() -+ ret = ret[:t.NumOut()-1] -+ err = e -+ } else if ret[t.NumOut()-1].Type().Implements(errType) { // Go error -+ i := ret[t.NumOut()-1].Interface() -+ if i == nil { -+ nilErr = ret[t.NumOut()-1].IsNil() -+ } else { -+ err = i.(error) -+ } -+ ret = ret[:t.NumOut()-1] -+ } -+ } - out := make([]interface{}, len(ret)) - for i, val := range ret { - out[i] = val.Interface() - } -- if err == nil { -+ if nilErr || err == nil { - //concrete type to interface nil is a special case - return out, nil - } -diff --git a/vendor/github.com/godbus/dbus/v5/export.go b/vendor/github.com/godbus/dbus/v5/export.go -index c277ab14262..2447b51d469 100644 ---- a/vendor/github.com/godbus/dbus/v5/export.go -+++ b/vendor/github.com/godbus/dbus/v5/export.go -@@ -69,6 +69,22 @@ func getMethods(in interface{}, mapping map[string]string) map[string]reflect.Va - return methods - } - -+func getAllMethods(in interface{}, mapping map[string]string) map[string]reflect.Value { -+ if in == nil { -+ return nil -+ } -+ methods := make(map[string]reflect.Value) -+ val := reflect.ValueOf(in) -+ typ := val.Type() -+ for i := 0; i < typ.NumMethod(); i++ { -+ methtype := typ.Method(i) -+ method := val.Method(i) -+ // map names while building table -+ methods[computeMethodName(methtype.Name, mapping)] = method -+ } -+ return methods -+} -+ - func standardMethodArgumentDecode(m Method, sender string, msg *Message, body []interface{}) ([]interface{}, error) { - pointers := make([]interface{}, m.NumArguments()) - decode := make([]interface{}, 0, len(body)) -@@ -159,7 +175,6 @@ func (conn *Conn) handleCall(msg *Message) { - if msg.Flags&FlagNoReplyExpected == 0 { - reply := new(Message) - reply.Type = TypeMethodReply -- reply.serial = conn.getSerial() - reply.Headers = make(map[HeaderField]Variant) - if hasSender { - reply.Headers[FieldDestination] = msg.Headers[FieldSender] -@@ -195,7 +210,6 @@ func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) erro - } - msg := new(Message) - msg.Type = TypeSignal -- msg.serial = conn.getSerial() - msg.Headers = make(map[HeaderField]Variant) - msg.Headers[FieldInterface] = MakeVariant(iface) - msg.Headers[FieldMember] = MakeVariant(member) -@@ -247,6 +261,18 @@ func (conn *Conn) Export(v interface{}, path ObjectPath, iface string) error { - return conn.ExportWithMap(v, nil, path, iface) - } - -+// ExportAll registers all exported methods defined by the given object on -+// the message bus. -+// -+// Unlike Export there is no requirement to have the last parameter as type -+// *Error. If you want to be able to return error then you can append an error -+// type parameter to your method signature. If the error returned is not nil, -+// it is sent back to the caller as an error. Otherwise, a method reply is -+// sent with the other return values as its body. -+func (conn *Conn) ExportAll(v interface{}, path ObjectPath, iface string) error { -+ return conn.export(getAllMethods(v, nil), path, iface, false) -+} -+ - // ExportWithMap works exactly like Export but provides the ability to remap - // method names (e.g. export a lower-case method). - // -@@ -299,19 +325,22 @@ func (conn *Conn) ExportSubtreeMethodTable(methods map[string]interface{}, path - } - - func (conn *Conn) exportMethodTable(methods map[string]interface{}, path ObjectPath, iface string, includeSubtree bool) error { -- out := make(map[string]reflect.Value) -- for name, method := range methods { -- rval := reflect.ValueOf(method) -- if rval.Kind() != reflect.Func { -- continue -- } -- t := rval.Type() -- // only track valid methods must return *Error as last arg -- if t.NumOut() == 0 || -- t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) { -- continue -+ var out map[string]reflect.Value -+ if methods != nil { -+ out = make(map[string]reflect.Value) -+ for name, method := range methods { -+ rval := reflect.ValueOf(method) -+ if rval.Kind() != reflect.Func { -+ continue -+ } -+ t := rval.Type() -+ // only track valid methods must return *Error as last arg -+ if t.NumOut() == 0 || -+ t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) { -+ continue -+ } -+ out[name] = rval - } -- out[name] = rval - } - return conn.export(out, path, iface, includeSubtree) - } -@@ -327,12 +356,12 @@ func (conn *Conn) unexport(h *defaultHandler, path ObjectPath, iface string) err - return nil - } - --// exportWithMap is the worker function for all exports/registrations. -+// export is the worker function for all exports/registrations. - func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, iface string, includeSubtree bool) error { - h, ok := conn.handler.(*defaultHandler) - if !ok { - return fmt.Errorf( -- `dbus: export only allowed on the default hander handler have %T"`, -+ `dbus: export only allowed on the default handler. Received: %T"`, - conn.handler) - } - -diff --git a/vendor/github.com/godbus/dbus/v5/match.go b/vendor/github.com/godbus/dbus/v5/match.go -index 086ee336a9a..5a607e53e41 100644 ---- a/vendor/github.com/godbus/dbus/v5/match.go -+++ b/vendor/github.com/godbus/dbus/v5/match.go -@@ -1,6 +1,7 @@ - package dbus - - import ( -+ "strconv" - "strings" - ) - -@@ -60,3 +61,29 @@ func WithMatchPathNamespace(namespace ObjectPath) MatchOption { - func WithMatchDestination(destination string) MatchOption { - return WithMatchOption("destination", destination) - } -+ -+// WithMatchArg sets argN match option, range of N is 0 to 63. -+func WithMatchArg(argIdx int, value string) MatchOption { -+ if argIdx < 0 || argIdx > 63 { -+ panic("range of argument index is 0 to 63") -+ } -+ return WithMatchOption("arg"+strconv.Itoa(argIdx), value) -+} -+ -+// WithMatchArgPath sets argN path match option, range of N is 0 to 63. -+func WithMatchArgPath(argIdx int, path string) MatchOption { -+ if argIdx < 0 || argIdx > 63 { -+ panic("range of argument index is 0 to 63") -+ } -+ return WithMatchOption("arg"+strconv.Itoa(argIdx)+"path", path) -+} -+ -+// WithMatchArg0Namespace sets arg0namespace match option. -+func WithMatchArg0Namespace(arg0Namespace string) MatchOption { -+ return WithMatchOption("arg0namespace", arg0Namespace) -+} -+ -+// WithMatchEavesdrop sets eavesdrop match option. -+func WithMatchEavesdrop(eavesdrop bool) MatchOption { -+ return WithMatchOption("eavesdrop", strconv.FormatBool(eavesdrop)) -+} -diff --git a/vendor/github.com/godbus/dbus/v5/object.go b/vendor/github.com/godbus/dbus/v5/object.go -index 8acd7fc8b1a..664abb7fbab 100644 ---- a/vendor/github.com/godbus/dbus/v5/object.go -+++ b/vendor/github.com/godbus/dbus/v5/object.go -@@ -16,6 +16,7 @@ type BusObject interface { - AddMatchSignal(iface, member string, options ...MatchOption) *Call - RemoveMatchSignal(iface, member string, options ...MatchOption) *Call - GetProperty(p string) (Variant, error) -+ StoreProperty(p string, value interface{}) error - SetProperty(p string, v interface{}) error - Destination() string - Path() ObjectPath -@@ -109,7 +110,6 @@ func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch - method = method[i+1:] - msg := new(Message) - msg.Type = TypeMethodCall -- msg.serial = o.conn.getSerial() - msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected) - msg.Headers = make(map[HeaderField]Variant) - msg.Headers[FieldPath] = MakeVariant(o.path) -@@ -122,68 +122,31 @@ func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch - if len(args) > 0 { - msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...)) - } -- if msg.Flags&FlagNoReplyExpected == 0 { -- if ch == nil { -- ch = make(chan *Call, 1) -- } else if cap(ch) == 0 { -- panic("dbus: unbuffered channel passed to (*Object).Go") -- } -- ctx, cancel := context.WithCancel(ctx) -- call := &Call{ -- Destination: o.dest, -- Path: o.path, -- Method: method, -- Args: args, -- Done: ch, -- ctxCanceler: cancel, -- ctx: ctx, -- } -- o.conn.calls.track(msg.serial, call) -- o.conn.sendMessageAndIfClosed(msg, func() { -- o.conn.calls.handleSendError(msg, ErrClosed) -- cancel() -- }) -- go func() { -- <-ctx.Done() -- o.conn.calls.handleSendError(msg, ctx.Err()) -- }() -- -- return call -- } -- done := make(chan *Call, 1) -- call := &Call{ -- Err: nil, -- Done: done, -- } -- defer func() { -- call.Done <- call -- close(done) -- }() -- o.conn.sendMessageAndIfClosed(msg, func() { -- call.Err = ErrClosed -- }) -- return call -+ return o.conn.SendWithContext(ctx, msg, ch) - } - - // GetProperty calls org.freedesktop.DBus.Properties.Get on the given - // object. The property name must be given in interface.member notation. - func (o *Object) GetProperty(p string) (Variant, error) { -+ var result Variant -+ err := o.StoreProperty(p, &result) -+ return result, err -+} -+ -+// StoreProperty calls org.freedesktop.DBus.Properties.Get on the given -+// object. The property name must be given in interface.member notation. -+// It stores the returned property into the provided value. -+func (o *Object) StoreProperty(p string, value interface{}) error { - idx := strings.LastIndex(p, ".") - if idx == -1 || idx+1 == len(p) { -- return Variant{}, errors.New("dbus: invalid property " + p) -+ return errors.New("dbus: invalid property " + p) - } - - iface := p[:idx] - prop := p[idx+1:] - -- result := Variant{} -- err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result) -- -- if err != nil { -- return Variant{}, err -- } -- -- return result, nil -+ return o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop). -+ Store(value) - } - - // SetProperty calls org.freedesktop.DBus.Properties.Set on the given -diff --git a/vendor/github.com/godbus/dbus/v5/sequence.go b/vendor/github.com/godbus/dbus/v5/sequence.go -new file mode 100644 -index 00000000000..89435d3933b ---- /dev/null -+++ b/vendor/github.com/godbus/dbus/v5/sequence.go -@@ -0,0 +1,24 @@ -+package dbus -+ -+// Sequence represents the value of a monotonically increasing counter. -+type Sequence uint64 -+ -+const ( -+ // NoSequence indicates the absence of a sequence value. -+ NoSequence Sequence = 0 -+) -+ -+// sequenceGenerator represents a monotonically increasing counter. -+type sequenceGenerator struct { -+ nextSequence Sequence -+} -+ -+func (generator *sequenceGenerator) next() Sequence { -+ result := generator.nextSequence -+ generator.nextSequence++ -+ return result -+} -+ -+func newSequenceGenerator() *sequenceGenerator { -+ return &sequenceGenerator{nextSequence: 1} -+} -diff --git a/vendor/github.com/godbus/dbus/v5/sequential_handler.go b/vendor/github.com/godbus/dbus/v5/sequential_handler.go -new file mode 100644 -index 00000000000..ef2fcdba179 ---- /dev/null -+++ b/vendor/github.com/godbus/dbus/v5/sequential_handler.go -@@ -0,0 +1,125 @@ -+package dbus -+ -+import ( -+ "sync" -+) -+ -+// NewSequentialSignalHandler returns an instance of a new -+// signal handler that guarantees sequential processing of signals. It is a -+// guarantee of this signal handler that signals will be written to -+// channels in the order they are received on the DBus connection. -+func NewSequentialSignalHandler() SignalHandler { -+ return &sequentialSignalHandler{} -+} -+ -+type sequentialSignalHandler struct { -+ mu sync.RWMutex -+ closed bool -+ signals []*sequentialSignalChannelData -+} -+ -+func (sh *sequentialSignalHandler) DeliverSignal(intf, name string, signal *Signal) { -+ sh.mu.RLock() -+ defer sh.mu.RUnlock() -+ if sh.closed { -+ return -+ } -+ for _, scd := range sh.signals { -+ scd.deliver(signal) -+ } -+} -+ -+func (sh *sequentialSignalHandler) Terminate() { -+ sh.mu.Lock() -+ defer sh.mu.Unlock() -+ if sh.closed { -+ return -+ } -+ -+ for _, scd := range sh.signals { -+ scd.close() -+ close(scd.ch) -+ } -+ sh.closed = true -+ sh.signals = nil -+} -+ -+func (sh *sequentialSignalHandler) AddSignal(ch chan<- *Signal) { -+ sh.mu.Lock() -+ defer sh.mu.Unlock() -+ if sh.closed { -+ return -+ } -+ sh.signals = append(sh.signals, newSequentialSignalChannelData(ch)) -+} -+ -+func (sh *sequentialSignalHandler) RemoveSignal(ch chan<- *Signal) { -+ sh.mu.Lock() -+ defer sh.mu.Unlock() -+ if sh.closed { -+ return -+ } -+ for i := len(sh.signals) - 1; i >= 0; i-- { -+ if ch == sh.signals[i].ch { -+ sh.signals[i].close() -+ copy(sh.signals[i:], sh.signals[i+1:]) -+ sh.signals[len(sh.signals)-1] = nil -+ sh.signals = sh.signals[:len(sh.signals)-1] -+ } -+ } -+} -+ -+type sequentialSignalChannelData struct { -+ ch chan<- *Signal -+ in chan *Signal -+ done chan struct{} -+} -+ -+func newSequentialSignalChannelData(ch chan<- *Signal) *sequentialSignalChannelData { -+ scd := &sequentialSignalChannelData{ -+ ch: ch, -+ in: make(chan *Signal), -+ done: make(chan struct{}), -+ } -+ go scd.bufferSignals() -+ return scd -+} -+ -+func (scd *sequentialSignalChannelData) bufferSignals() { -+ defer close(scd.done) -+ -+ // Ensure that signals are delivered to scd.ch in the same -+ // order they are received from scd.in. -+ var queue []*Signal -+ for { -+ if len(queue) == 0 { -+ signal, ok := <- scd.in -+ if !ok { -+ return -+ } -+ queue = append(queue, signal) -+ } -+ select { -+ case scd.ch <- queue[0]: -+ copy(queue, queue[1:]) -+ queue[len(queue)-1] = nil -+ queue = queue[:len(queue)-1] -+ case signal, ok := <-scd.in: -+ if !ok { -+ return -+ } -+ queue = append(queue, signal) -+ } -+ } -+} -+ -+func (scd *sequentialSignalChannelData) deliver(signal *Signal) { -+ scd.in <- signal -+} -+ -+func (scd *sequentialSignalChannelData) close() { -+ close(scd.in) -+ // Ensure that bufferSignals() has exited and won't attempt -+ // any future sends on scd.ch -+ <-scd.done -+} -diff --git a/vendor/github.com/godbus/dbus/v5/sig.go b/vendor/github.com/godbus/dbus/v5/sig.go -index c1b809202cd..2d326cebc0d 100644 ---- a/vendor/github.com/godbus/dbus/v5/sig.go -+++ b/vendor/github.com/godbus/dbus/v5/sig.go -@@ -137,7 +137,7 @@ func ParseSignatureMust(s string) Signature { - return sig - } - --// Empty retruns whether the signature is the empty signature. -+// Empty returns whether the signature is the empty signature. - func (s Signature) Empty() bool { - return s.str == "" - } -diff --git a/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go b/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go -index 0fc5b92739b..1b5ed2089d0 100644 ---- a/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go -+++ b/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go -@@ -10,6 +10,7 @@ package dbus - /* - const int sizeofPtr = sizeof(void*); - #define _WANT_UCRED -+#include - #include - */ - import "C" -diff --git a/vendor/github.com/godbus/dbus/v5/variant.go b/vendor/github.com/godbus/dbus/v5/variant.go -index 5b51828c824..f1e81f3ede6 100644 ---- a/vendor/github.com/godbus/dbus/v5/variant.go -+++ b/vendor/github.com/godbus/dbus/v5/variant.go -@@ -142,3 +142,9 @@ func (v Variant) String() string { - func (v Variant) Value() interface{} { - return v.value - } -+ -+// Store converts the variant into a native go type using the same -+// mechanism as the "Store" function. -+func (v Variant) Store(value interface{}) error { -+ return storeInterfaces(v.value, value) -+} -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 3d3f4e64658..0b3dfd7412d 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -234,7 +234,7 @@ github.com/containers/storage/types - github.com/coreos/go-iptables/iptables - # github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e - github.com/coreos/go-systemd/activation --# github.com/coreos/go-systemd/v22 v22.2.0 -+# github.com/coreos/go-systemd/v22 v22.3.1 - github.com/coreos/go-systemd/v22/activation - github.com/coreos/go-systemd/v22/daemon - github.com/coreos/go-systemd/v22/dbus -@@ -318,7 +318,7 @@ github.com/ghodss/yaml - github.com/go-logr/logr - # github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 - github.com/go-task/slim-sprig --# github.com/godbus/dbus/v5 v5.0.3 -+# github.com/godbus/dbus/v5 v5.0.4 - github.com/godbus/dbus/v5 - # github.com/gogo/protobuf v1.3.2 - github.com/gogo/protobuf/gogoproto diff --git a/podman.spec b/podman.spec index 81f3d9c..c073c2d 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.1.1 +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.1 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -66,9 +66,6 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz -%if 0%{?centos} -Patch1: go-systemd.patch -%endif Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -92,7 +89,7 @@ Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-1 -Requires: containers-common >= 4:1-11 +Requires: containers-common >= 4:1-15 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -663,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Apr 22 2021 Lokesh Mandvekar - 2:3.1.2-1 +- bump to v3.1.2 + * Mon Apr 19 2021 Lokesh Mandvekar - 2:3.1.1-2 - update dependencies diff --git a/sources b/sources index b2e7baa..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.1.tar.gz) = 2348b06c81352a86f51ac9c5ab7fe21e1ce577dfd0164c043baa2fb8a89928e3fdcc13fa75dd731572175ba4232fa27a2e31a3715a2b1596a38a64de919da1b7 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From c7d1444f930f066102ff8197b10181cd3c3dee16 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 5 May 2021 21:00:22 +0000 Subject: [PATCH 074/110] podman-2:3.2.0-0.1.rc1 autobuilt v3.2.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9c2f14e..9af3053 100644 --- a/.gitignore +++ b/.gitignore @@ -1275,3 +1275,4 @@ /v3.1.0.tar.gz /v3.1.1.tar.gz /v3.1.2.tar.gz +/v3.2.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index c073c2d..a794b6f 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 05 2021 RH Container Bot - 2:3.2.0-0.1.rc1 +- autobuilt v3.2.0-rc1 + * Thu Apr 22 2021 Lokesh Mandvekar - 2:3.1.2-1 - bump to v3.1.2 diff --git a/sources b/sources index 8d469a2..a411208 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 From c419711bde9593dad0872901d5bcfb833a79fe7c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 May 2021 09:45:24 -0400 Subject: [PATCH 075/110] podman-3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable Signed-off-by: Lokesh Mandvekar (cherry picked from commit 08d06c735e2fdd51da01932ea969892ff3570704) Signed-off-by: Lokesh Mandvekar --- podman.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index a794b6f..632958a 100644 --- a/podman.spec +++ b/podman.spec @@ -40,23 +40,23 @@ %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%define built_tag v3.2.0-rc1 +# to decide whether to autobuild and set download_url (non-rawhide only) +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} -Epoch: 2 +Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 +- revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable + * Wed May 05 2021 RH Container Bot - 2:3.2.0-0.1.rc1 - autobuilt v3.2.0-rc1 diff --git a/sources b/sources index a411208..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From 9047b51057eab912cae53d8e082e33a0c748c6cd Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 11 May 2021 14:49:54 +0000 Subject: [PATCH 076/110] podman-3:3.2.0-0.1.rc1 autobuilt v3.2.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 632958a..372d340 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue May 11 2021 RH Container Bot - 3:3.2.0-0.1.rc1 +- autobuilt v3.2.0-rc1 + * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable diff --git a/sources b/sources index 8d469a2..a411208 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 From e706da7add2db370aeffc25b968c0bd7e455afaf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 May 2021 14:29:58 -0400 Subject: [PATCH 077/110] Revert "podman-3:3.2.0-0.1.rc1" looks like there was an active gitlab pipeline which pushed this commit This reverts commit b81a99de7125d8bef2477b6a8d83abe3fa45d878. (cherry picked from commit 2dd32ed7fb50eeb0d69420447ea717b62c674dd6) Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 +++------ sources | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index 372d340..632958a 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc1 +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,9 +660,6 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Tue May 11 2021 RH Container Bot - 3:3.2.0-0.1.rc1 -- autobuilt v3.2.0-rc1 - * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable diff --git a/sources b/sources index a411208..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From f17f814d349327a1216049179146219e533d1e82 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 12 May 2021 14:37:00 -0400 Subject: [PATCH 078/110] Backport upstream bugfix: https://github.com/containers/podman/pull/10253 This fixes relabeling when running podman in --privileged mode. --- ...ch-to-relabel-if-selinux-not-enabled.patch | 82 +++++++++++++++++++ podman.spec | 6 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch diff --git a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch new file mode 100644 index 0000000..0364149 --- /dev/null +++ b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch @@ -0,0 +1,82 @@ +From f528511bf6c7630408dc630d05197a49d39479c4 Mon Sep 17 00:00:00 2001 +From: Daniel J Walsh +Date: Thu, 6 May 2021 17:41:04 -0400 +Subject: [PATCH] Revert Patch to relabel if selinux not enabled + +Revert : https://github.com/containers/podman/pull/9895 + +Turns out that if Docker is in --selinux-enabeled, it still relabels if +the user tells the system to, even if running a --privileged container +or if the selinux separation is disabled --security-opt label=disable. + +Signed-off-by: Daniel J Walsh +--- + libpod/container_internal_linux.go | 10 ++-------- + test/system/410-selinux.bats | 13 ++++++++----- + 2 files changed, 10 insertions(+), 13 deletions(-) + +diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go +index f0608e2b2..14816f6aa 100644 +--- a/libpod/container_internal_linux.go ++++ b/libpod/container_internal_linux.go +@@ -377,14 +377,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { + case "z": + fallthrough + case "Z": +- if c.MountLabel() != "" { +- if c.ProcessLabel() != "" { +- if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { +- return nil, err +- } +- } else { +- logrus.Infof("Not relabeling volume %q in container %s as SELinux is disabled", m.Source, c.ID()) +- } ++ if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { ++ return nil, err + } + + default: +diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats +index 95233c1e6..f8cee0e59 100644 +--- a/test/system/410-selinux.bats ++++ b/test/system/410-selinux.bats +@@ -198,20 +198,23 @@ function check_label() { + skip_if_no_selinux + + LABEL="system_u:object_r:tmp_t:s0" ++ RELABEL="system_u:object_r:container_file_t:s0" + tmpdir=$PODMAN_TMPDIR/vol + touch $tmpdir + chcon -vR ${LABEL} $tmpdir + ls -Z $tmpdir + + run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current +- level=$(secon -l $output) + run ls -dZ ${tmpdir} + is "$output" ${LABEL} "No Relabel Correctly" + +- run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current +- level=$(secon -l $output) ++ run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current ++ run ls -dZ $tmpdir ++ is "$output" ${RELABEL} "Privileged Relabel Correctly" ++ ++ run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current + run ls -dZ $tmpdir +- is "$output" ${LABEL} "No Privileged Relabel Correctly" ++ is "$output" ${RELABEL} "Privileged Relabel Correctly" + + run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current + level=$(secon -l $output) +@@ -220,7 +223,7 @@ function check_label() { + + run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current + run ls -dZ $tmpdir +- is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly" ++ is "$output" ${RELABEL} "Shared Relabel Correctly" + } + + # vim: filetype=sh +-- +2.30.2 + diff --git a/podman.spec b/podman.spec index 632958a..c9162ff 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.2 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -66,6 +66,7 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz +Patch: 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -660,6 +661,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 12 2021 Dusty Mabe - 3:3.1.2-3 +- Backport upstream bugfix: https://github.com/containers/podman/pull/10253 + * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable From 0c04164c05cc9741034d6517284f220caf0d573d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 21 May 2021 01:56:12 +0000 Subject: [PATCH 079/110] podman-3:3.2.0-0.1.rc2 autobuilt v3.2.0-rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9af3053..5b516a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1276,3 +1276,4 @@ /v3.1.1.tar.gz /v3.1.2.tar.gz /v3.2.0-rc1.tar.gz +/v3.2.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index c9162ff..27e7679 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 0.1.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -661,6 +661,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri May 21 2021 RH Container Bot - 3:3.2.0-0.1.rc2 +- autobuilt v3.2.0-rc2 + * Wed May 12 2021 Dusty Mabe - 3:3.1.2-3 - Backport upstream bugfix: https://github.com/containers/podman/pull/10253 diff --git a/sources b/sources index 8d469a2..a6309a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc2.tar.gz) = 6baf5e7c01e9780dd9a9c590c92c896aebb8e17bde2cba7eb5f2046cd9b0906d98b1f9bd83039868c29a8358a6d8003e53d1909d3c0d158a781ac123e5e8d456 From 40cc24939ac4f828c8fb115414afa52d2b888af0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 20 May 2021 22:26:33 -0400 Subject: [PATCH 080/110] remove patch merged upstream Signed-off-by: Lokesh Mandvekar (cherry picked from commit c56edc6b676309a82bfd07361b64435fdb809372) Signed-off-by: Lokesh Mandvekar --- ...ch-to-relabel-if-selinux-not-enabled.patch | 82 ------------------- podman.spec | 1 - 2 files changed, 83 deletions(-) delete mode 100644 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch diff --git a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch deleted file mode 100644 index 0364149..0000000 --- a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f528511bf6c7630408dc630d05197a49d39479c4 Mon Sep 17 00:00:00 2001 -From: Daniel J Walsh -Date: Thu, 6 May 2021 17:41:04 -0400 -Subject: [PATCH] Revert Patch to relabel if selinux not enabled - -Revert : https://github.com/containers/podman/pull/9895 - -Turns out that if Docker is in --selinux-enabeled, it still relabels if -the user tells the system to, even if running a --privileged container -or if the selinux separation is disabled --security-opt label=disable. - -Signed-off-by: Daniel J Walsh ---- - libpod/container_internal_linux.go | 10 ++-------- - test/system/410-selinux.bats | 13 ++++++++----- - 2 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go -index f0608e2b2..14816f6aa 100644 ---- a/libpod/container_internal_linux.go -+++ b/libpod/container_internal_linux.go -@@ -377,14 +377,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { - case "z": - fallthrough - case "Z": -- if c.MountLabel() != "" { -- if c.ProcessLabel() != "" { -- if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { -- return nil, err -- } -- } else { -- logrus.Infof("Not relabeling volume %q in container %s as SELinux is disabled", m.Source, c.ID()) -- } -+ if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { -+ return nil, err - } - - default: -diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats -index 95233c1e6..f8cee0e59 100644 ---- a/test/system/410-selinux.bats -+++ b/test/system/410-selinux.bats -@@ -198,20 +198,23 @@ function check_label() { - skip_if_no_selinux - - LABEL="system_u:object_r:tmp_t:s0" -+ RELABEL="system_u:object_r:container_file_t:s0" - tmpdir=$PODMAN_TMPDIR/vol - touch $tmpdir - chcon -vR ${LABEL} $tmpdir - ls -Z $tmpdir - - run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current -- level=$(secon -l $output) - run ls -dZ ${tmpdir} - is "$output" ${LABEL} "No Relabel Correctly" - -- run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current -- level=$(secon -l $output) -+ run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current -+ run ls -dZ $tmpdir -+ is "$output" ${RELABEL} "Privileged Relabel Correctly" -+ -+ run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current - run ls -dZ $tmpdir -- is "$output" ${LABEL} "No Privileged Relabel Correctly" -+ is "$output" ${RELABEL} "Privileged Relabel Correctly" - - run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current - level=$(secon -l $output) -@@ -220,7 +223,7 @@ function check_label() { - - run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current - run ls -dZ $tmpdir -- is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly" -+ is "$output" ${RELABEL} "Shared Relabel Correctly" - } - - # vim: filetype=sh --- -2.30.2 - diff --git a/podman.spec b/podman.spec index 27e7679..402cc8f 100644 --- a/podman.spec +++ b/podman.spec @@ -66,7 +66,6 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz -Patch: 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From 9c7baf81d955c6aa52032773c3fbe5f4c1cf4667 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 26 May 2021 18:33:57 +0000 Subject: [PATCH 081/110] podman-3:3.2.0-0.2.rc3 autobuilt v3.2.0-rc3 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5b516a9..3f29d64 100644 --- a/.gitignore +++ b/.gitignore @@ -1277,3 +1277,4 @@ /v3.1.2.tar.gz /v3.2.0-rc1.tar.gz /v3.2.0-rc2.tar.gz +/v3.2.0-rc3.tar.gz diff --git a/podman.spec b/podman.spec index 402cc8f..2139e73 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc2 +%define built_tag v3.2.0-rc3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc2%{?dist} +Release: 0.2.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 26 2021 RH Container Bot - 3:3.2.0-0.2.rc3 +- autobuilt v3.2.0-rc3 + * Fri May 21 2021 RH Container Bot - 3:3.2.0-0.1.rc2 - autobuilt v3.2.0-rc2 diff --git a/sources b/sources index a6309a3..b69b462 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc2.tar.gz) = 6baf5e7c01e9780dd9a9c590c92c896aebb8e17bde2cba7eb5f2046cd9b0906d98b1f9bd83039868c29a8358a6d8003e53d1909d3c0d158a781ac123e5e8d456 +SHA512 (v3.2.0-rc3.tar.gz) = cf513d6edc3623ae51908bcad14bc2bbcc873ac7f5b671d578e437878ac51d96b001e085a213b6390c339908064e8ed1518e902df531fd96d977a96993a15c58 From c28b8862fe912395d8f766dfccd10f15ddd76a7d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 4 Jun 2021 19:09:18 +0000 Subject: [PATCH 082/110] podman-3:3.2.0-1 autobuilt v3.2.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3f29d64..a5c7c96 100644 --- a/.gitignore +++ b/.gitignore @@ -1278,3 +1278,4 @@ /v3.2.0-rc1.tar.gz /v3.2.0-rc2.tar.gz /v3.2.0-rc3.tar.gz +/v3.2.0.tar.gz diff --git a/podman.spec b/podman.spec index 2139e73..3a88e4c 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc3 +%define built_tag v3.2.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -660,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jun 04 2021 RH Container Bot - 3:3.2.0-1 +- autobuilt v3.2.0 + * Wed May 26 2021 RH Container Bot - 3:3.2.0-0.2.rc3 - autobuilt v3.2.0-rc3 diff --git a/sources b/sources index b69b462..87725b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc3.tar.gz) = cf513d6edc3623ae51908bcad14bc2bbcc873ac7f5b671d578e437878ac51d96b001e085a213b6390c339908064e8ed1518e902df531fd96d977a96993a15c58 +SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 From d194a68dcd2113493d4a90f514a316d7e8b3ac4e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Jun 2021 10:30:35 -0400 Subject: [PATCH 083/110] podman-3:3.2.0-2 - include podman-machine-cni in podman-plugins subpackage Signed-off-by: Lokesh Mandvekar (cherry picked from commit 8cd0a2dd63362dfb23eebdfdb09937f34f1a8296) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 45 +++++++++++++++++++++++++++++++++++++++------ sources | 1 + 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a5c7c96..a866f30 100644 --- a/.gitignore +++ b/.gitignore @@ -1279,3 +1279,4 @@ /v3.2.0-rc2.tar.gz /v3.2.0-rc3.tar.gz /v3.2.0.tar.gz +/podman-machine-cni-afab2d8.tar.gz diff --git a/podman.spec b/podman.spec index 3a88e4c..58c5b99 100644 --- a/podman.spec +++ b/podman.spec @@ -32,13 +32,22 @@ # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO +# dnsname %global repo_plugins dnsname -# https://github.com/containers/libpod -%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +# https://github.com/containers/dnsname +%global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} %global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +# podman-machine-cni +%global repo_mcni %{name}-machine-cni +# https://github.com/containers/podman-machine-cni +%global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni} +%global git_mcni https://%{import_path_mcni} +%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 +%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) + # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) %define built_tag v3.2.0 @@ -56,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -66,6 +75,7 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz +Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -85,11 +95,11 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containernetworking-plugins >= 0.9.1-1 +Requires: containers-common >= 4:1-16 +Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-1 -Requires: containers-common >= 4:1-15 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -443,6 +453,9 @@ file. Each CNI network will have its own dnsmasq instance. # untar dnsname tar zxf %{SOURCE1} +# untar %%{name}-machine-cni +tar zxf %{SOURCE2} + %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) @@ -492,6 +505,17 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd +pushd %{name}-machine-cni-%{commit_mcni} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_mcni} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/%{name}-machine %{import_path_mcni}/plugins/meta/%{name}-machine +popd + %{__make} docs docker-docs %install @@ -508,11 +532,16 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build mv pkg/hooks/README.md pkg/hooks/README-hooks.md -# install plugins +# install dnsname plugin pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# install machine-cni plugin +pushd %{name}-machine-cni-%{commit_mcni} +%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install +popd + # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list @@ -657,9 +686,13 @@ exit 0 %license dnsname-%{commit_plugins}/LICENSE %doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname +%{_libexecdir}/cni/%{name}-machine # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-2 +- include podman-machine-cni in podman-plugins subpackage + * Fri Jun 04 2021 RH Container Bot - 3:3.2.0-1 - autobuilt v3.2.0 diff --git a/sources b/sources index 87725b1..b6959c1 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d +SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 From 197c0f36d5ba13c8a8188253e88a7fbd8bdbd177 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Jun 2021 16:52:04 -0400 Subject: [PATCH 084/110] podman-3:3.2.0-3 - keep crun on 0.19.1-3 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 9f1960ebbb2759d57b6b918b6ecb639cdfdf655d) Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 58c5b99..5672897 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -99,7 +99,10 @@ Requires: containers-common >= 4:1-16 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.27-1 +Requires: conmon >= 2:2.0.27-2 +Requires: crun < 0.20-1 +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} +Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -690,6 +693,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-3 +- keep crun on 0.19.1-3 + * Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-2 - include podman-machine-cni in podman-plugins subpackage From aae0f10d7e292b94fa44cc42003274176216faab Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Jun 2021 10:28:48 -0400 Subject: [PATCH 085/110] podman-3:3.2.0-4 - use latest containers-common Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 5672897..f434412 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -95,7 +95,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-16 +Requires: containers-common >= 4:1-17 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables @@ -693,6 +693,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-4 +- use latest containers-common + * Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-3 - keep crun on 0.19.1-3 From 2735ad10387d33f79e372886485f88f23941dca1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 10 Jun 2021 09:33:15 -0400 Subject: [PATCH 086/110] podman-3:3.2.0-5 - fix crun dependency issue Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index f434412..208a462 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -100,7 +100,6 @@ Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-2 -Requires: crun < 0.20-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit @@ -693,6 +692,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Jun 10 2021 Lokesh Mandvekar - 3:3.2.0-5 +- fix crun dependency issue + * Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-4 - use latest containers-common From a6d0827fbdabe8cddbad38db44d4eb0667814899 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 14 Jun 2021 19:13:56 +0000 Subject: [PATCH 087/110] podman-3:3.2.1-1 autobuilt v3.2.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a866f30..7c74bef 100644 --- a/.gitignore +++ b/.gitignore @@ -1280,3 +1280,4 @@ /v3.2.0-rc3.tar.gz /v3.2.0.tar.gz /podman-machine-cni-afab2d8.tar.gz +/v3.2.1.tar.gz diff --git a/podman.spec b/podman.spec index 208a462..14fa673 100644 --- a/podman.spec +++ b/podman.spec @@ -50,7 +50,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0 +%define built_tag v3.2.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,12 +60,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.2.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 5%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -692,6 +692,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jun 14 2021 RH Container Bot - 3:3.2.1-1 +- autobuilt v3.2.1 + * Thu Jun 10 2021 Lokesh Mandvekar - 3:3.2.0-5 - fix crun dependency issue diff --git a/sources b/sources index b6959c1..7633756 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 +SHA512 (v3.2.1.tar.gz) = 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4 From 8f72641651d8d96074befe81681879f6b88e8244 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Jun 2021 08:34:03 -0400 Subject: [PATCH 088/110] adjust Source2 for kubic centos build Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 14fa673..598cf35 100644 --- a/podman.spec +++ b/podman.spec @@ -75,7 +75,7 @@ Source0: %{download_url} # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz -Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz +Source2: https://github.com/containers/%{name}-machine-cni/archive/afab2d8047bc0bd963d570686770eeb0c2e5a396/%{name}-machine-cni-afab2d8.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From d81e416c9602f2762a48c70239ebfbe41b688459 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 25 Jun 2021 20:25:48 -0400 Subject: [PATCH 089/110] podman-3:3.2.2-1 - bump to v3.2.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c74bef..9f90d5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1281,3 +1281,4 @@ /v3.2.0.tar.gz /podman-machine-cni-afab2d8.tar.gz /v3.2.1.tar.gz +/v3.2.2.tar.gz diff --git a/podman.spec b/podman.spec index 598cf35..f1f1acf 100644 --- a/podman.spec +++ b/podman.spec @@ -50,7 +50,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.1 +%define built_tag v3.2.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,7 +60,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.1 +Version: 3.2.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -95,7 +95,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-17 +Requires: containers-common >= 4:1-18 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables @@ -690,8 +690,10 @@ exit 0 %{_libexecdir}/cni/dnsname %{_libexecdir}/cni/%{name}-machine -# rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jun 25 2021 Lokesh Mandvekar - 3:3.2.2-1 +- bump to v3.2.2 + * Mon Jun 14 2021 RH Container Bot - 3:3.2.1-1 - autobuilt v3.2.1 diff --git a/sources b/sources index 7633756..62ee778 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.1.tar.gz) = 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4 +SHA512 (v3.2.2.tar.gz) = 00f20459feb72126cf8b87918dfeabe95844b7b15ef891f4c5baa850ad21b5694ec75e477c3ab3a9da08427a307fdc4421533037e72bda26392c0d42d3635e39 From 02972e18cc2482d25f3d666292b1e706067cb8ae Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 9 Jul 2021 16:36:47 -0400 Subject: [PATCH 090/110] remove conflicting manpage Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index f1f1acf..198596c 100644 --- a/podman.spec +++ b/podman.spec @@ -534,6 +534,10 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build mv pkg/hooks/README.md pkg/hooks/README-hooks.md +%if 0%{?centos} +rm %{buildroot}%{_mandir}/man5/containers-mounts.conf.5* +%endif + # install dnsname plugin pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install From 069e1b9b25d9e9a9c79ea2ee13188db24a7bb09f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Jul 2021 16:42:07 -0400 Subject: [PATCH 091/110] podman-3:3.2.3-1 - Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 - bump to v3.2.3 Signed-off-by: Lokesh Mandvekar --- podman.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 198596c..0c71df9 100644 --- a/podman.spec +++ b/podman.spec @@ -49,10 +49,9 @@ %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) # Used for comparing with latest upstream tag -# to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.2 -%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url %{git0}/archive/%{built_tag}.tar.gz +# to decide whether to autobuild +%global built_tag v3.2.3 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman %if 0%{?fedora} @@ -69,7 +68,7 @@ Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{download_url} +Source0: %{git0}/archive/%{built_tag}.tar.gz # To build a random user's fork/commit, comment out above line, # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. @@ -695,6 +694,10 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Fri Jul 16 2021 Lokesh Mandvekar - 3:3.2.3-1 +- Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 +- bump to v3.2.3 + * Fri Jun 25 2021 Lokesh Mandvekar - 3:3.2.2-1 - bump to v3.2.2 diff --git a/sources b/sources index 62ee778..e565286 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.2.tar.gz) = 00f20459feb72126cf8b87918dfeabe95844b7b15ef891f4c5baa850ad21b5694ec75e477c3ab3a9da08427a307fdc4421533037e72bda26392c0d42d3635e39 +SHA512 (v3.2.3.tar.gz) = e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf From 02893ec96b613cac66f3e694f852a29158923946 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Jul 2021 16:46:04 -0400 Subject: [PATCH 092/110] update Version field to 3.2.3 Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 0c71df9..6e73008 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.2 +Version: 3.2.3 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, From 0c3ff6a5a678b5b9a36499a7b07f198112e762d1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Aug 2021 15:49:56 -0400 Subject: [PATCH 093/110] podman-3:3.2.3-2 - Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 6e73008..14e71fa 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.2.3 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -79,7 +79,7 @@ Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: gcc -BuildRequires: golang +BuildRequires: golang >= 1.15.14 BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -694,6 +694,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Mon Aug 02 2021 Lokesh Mandvekar - 3:3.2.3-2 +- Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 + * Fri Jul 16 2021 Lokesh Mandvekar - 3:3.2.3-1 - Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 - bump to v3.2.3 From ba3eaaf6e022db6be0bd55cc1370cb33797819fc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 16 Aug 2021 10:00:50 -0400 Subject: [PATCH 094/110] podman-3:3.3.0-0.1.rc2 - Bump to v3.3.0-rc2 - Include podman-gvproxy subpackage which provides /usr/libexecdir/podman/podman-gvproxy - Bump dnsname to v1.3.0 commit dc59f28 Signed-off-by: Lokesh Mandvekar --- .gitignore | 3 ++ podman.spec | 81 +++++++++++++++++++++++++++++++++++++++++++---------- sources | 5 ++-- 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 9f90d5b..07678c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1282,3 +1282,6 @@ /podman-machine-cni-afab2d8.tar.gz /v3.2.1.tar.gz /v3.2.2.tar.gz +/dnsname-dc59f28.tar.gz +/gvisor-tap-vsock-27590a0.tar.gz +/v3.3.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 14e71fa..33fff3c 100644 --- a/podman.spec +++ b/podman.spec @@ -37,20 +37,28 @@ # https://github.com/containers/dnsname %global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b +%global commit_plugins dc59f285546a0b0d8b8f20033e1637ea82587840 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # podman-machine-cni -%global repo_mcni %{name}-machine-cni +%global repo_mcni %{name}-machine-cni # https://github.com/containers/podman-machine-cni %global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni} %global git_mcni https://%{import_path_mcni} %global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) +# gvproxy +%global repo_gvproxy gvisor-tap-vsock +# https://github.com/containers/gvisor-tap-vsock +%global import_path_gvproxy %%{provider}.%{provider_tld}/%{project}/%{repo_gvproxy} +%global git_gvproxy https://%{import_path_gvproxy} +%global commit_gvproxy 27590a075d79b4ac0554749f2be31a22a4baa27a +%global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) + # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.2.3 +%global built_tag v3.3.0-rc2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -59,12 +67,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.3 +Version: 3.3.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -73,8 +81,9 @@ Source0: %{git0}/archive/%{built_tag}.tar.gz # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz -Source2: https://github.com/containers/%{name}-machine-cni/archive/afab2d8047bc0bd963d570686770eeb0c2e5a396/%{name}-machine-cni-afab2d8.tar.gz +Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz +Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -439,6 +448,7 @@ connections as well. Summary: Plugins for %{name} Requires: dnsmasq Requires: %{name} = %{epoch}:%{version}-%{release} +Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -448,6 +458,15 @@ that dnsmasq will read in. Similarly, when a pod is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. +%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 %autosetup -Sgit -n %{name}-%{built_tag_strip} @@ -457,6 +476,9 @@ tar zxf %{SOURCE1} # untar %%{name}-machine-cni tar zxf %{SOURCE2} +# untar %%{name}-gvproxy +tar zxf %{SOURCE3} + %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) @@ -495,7 +517,7 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -pushd dnsname-%{commit_plugins} +pushd %{repo_plugins}-%{commit_plugins} mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -506,7 +528,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd -pushd %{name}-machine-cni-%{commit_mcni} +pushd %{repo_mcni}-%{commit_mcni} mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -517,6 +539,17 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/%{name}-machine %{import_path_mcni}/plugins/meta/%{name}-machine popd +pushd %{repo_gvproxy}-%{commit_gvproxy} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_gvproxy} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/%{name}-gvproxy %{import_path_gvproxy}/cmd/gvproxy +popd + %{__make} docs docker-docs %install @@ -524,7 +557,6 @@ install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin-nobuild \ install.man-nobuild \ - install.cni \ install.systemd \ install.completions \ install.docker \ @@ -538,15 +570,21 @@ rm %{buildroot}%{_mandir}/man5/containers-mounts.conf.5* %endif # install dnsname plugin -pushd dnsname-%{commit_plugins} +pushd %{repo_plugins}-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd # install machine-cni plugin -pushd %{name}-machine-cni-%{commit_mcni} +pushd %{repo_mcni}-%{commit_mcni} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# install gvproxy +pushd %{repo_gvproxy}-%{commit_gvproxy} +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m0755 bin/%{name}-gvproxy %{buildroot}%{_libexecdir}/%{name} +popd + # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list @@ -638,15 +676,16 @@ 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 %{_unitdir}/%{name}-auto-update.service %{_unitdir}/%{name}-auto-update.timer %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket +%{_unitdir}/%{name}-restart.service %{_userunitdir}/%{name}-auto-update.service %{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_userunitdir}/%{name}-restart.service %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -688,12 +727,24 @@ exit 0 %endif %files plugins -%license dnsname-%{commit_plugins}/LICENSE -%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} +%license %{repo_plugins}-%{commit_plugins}/LICENSE +%doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname %{_libexecdir}/cni/%{name}-machine +%files gvproxy +%license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE +%doc %{repo_gvproxy}-%{commit_gvproxy}/README.md +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/%{name}-gvproxy + %changelog +* Mon Aug 16 2021 Lokesh Mandvekar - 3:3.3.0-0.1.rc2 +- Bump to v3.3.0-rc2 +- Include podman-gvproxy subpackage which provides +/usr/libexecdir/podman/podman-gvproxy +- Bump dnsname to v1.3.0 commit dc59f28 + * Mon Aug 02 2021 Lokesh Mandvekar - 3:3.2.3-2 - Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 diff --git a/sources b/sources index e565286..ae7d81e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d +SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad +SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.3.tar.gz) = e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf +SHA512 (v3.3.0-rc2.tar.gz) = 2303532f2fd14b94579ead488a51106423bc2828b695c36946296396be0e2d13230bf7a389e81b8ad9dbf77e53832d5c261bd8622fbbd962305f628001311902 From 09041b67f8f7b6dc573708bd2975acc0c7fe14aa Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 17 Aug 2021 20:29:31 +0000 Subject: [PATCH 095/110] podman-3:3.3.0-0.2.rc3 autobuilt v3.3.0-rc3 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07678c9..ae84579 100644 --- a/.gitignore +++ b/.gitignore @@ -1285,3 +1285,4 @@ /dnsname-dc59f28.tar.gz /gvisor-tap-vsock-27590a0.tar.gz /v3.3.0-rc2.tar.gz +/v3.3.0-rc3.tar.gz diff --git a/podman.spec b/podman.spec index 33fff3c..8f1f542 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0-rc2 +%global built_tag v3.3.0-rc3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc2%{?dist} +Release: 0.2.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -739,6 +739,9 @@ exit 0 %{_libexecdir}/%{name}/%{name}-gvproxy %changelog +* Tue Aug 17 2021 RH Container Bot - 3:3.3.0-0.2.rc3 +- autobuilt v3.3.0-rc3 + * Mon Aug 16 2021 Lokesh Mandvekar - 3:3.3.0-0.1.rc2 - Bump to v3.3.0-rc2 - Include podman-gvproxy subpackage which provides diff --git a/sources b/sources index ae7d81e..8d5ee34 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0-rc2.tar.gz) = 2303532f2fd14b94579ead488a51106423bc2828b695c36946296396be0e2d13230bf7a389e81b8ad9dbf77e53832d5c261bd8622fbbd962305f628001311902 +SHA512 (v3.3.0-rc3.tar.gz) = 78a3f3c5c5afcfce4660e439a67afb3ae07dfc2281165b84a42613a4ad3a96b2cb28dbd6bd58c3b899120c6f7d7b5b9357f3a0c6c0829df857d916689000ce91 From b7c1d9cffcfbed06a44383d431e8b9aded6629dc Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 20 Aug 2021 19:30:47 +0000 Subject: [PATCH 096/110] podman-3:3.3.0-1 autobuilt v3.3.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ae84579..3d351be 100644 --- a/.gitignore +++ b/.gitignore @@ -1286,3 +1286,4 @@ /gvisor-tap-vsock-27590a0.tar.gz /v3.3.0-rc2.tar.gz /v3.3.0-rc3.tar.gz +/v3.3.0.tar.gz diff --git a/podman.spec b/podman.spec index 8f1f542..e447ad9 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0-rc3 +%global built_tag v3.3.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -739,6 +739,9 @@ exit 0 %{_libexecdir}/%{name}/%{name}-gvproxy %changelog +* Fri Aug 20 2021 RH Container Bot - 3:3.3.0-1 +- autobuilt v3.3.0 + * Tue Aug 17 2021 RH Container Bot - 3:3.3.0-0.2.rc3 - autobuilt v3.3.0-rc3 diff --git a/sources b/sources index 8d5ee34..300cc87 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0-rc3.tar.gz) = 78a3f3c5c5afcfce4660e439a67afb3ae07dfc2281165b84a42613a4ad3a96b2cb28dbd6bd58c3b899120c6f7d7b5b9357f3a0c6c0829df857d916689000ce91 +SHA512 (v3.3.0.tar.gz) = 0e77edfdbafc4ccb7b0b29d5e41054d52b09258fd25424be3339c256489a5d215109eda903eb620f2ed566c042a6d6b8a5d8adc26b08bba4fa66263a1ee3104d From 9cda267491909d79f0c07ce63d38f0ff678112ca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 27 Aug 2021 09:52:32 -0400 Subject: [PATCH 097/110] podman-3:3.3.0-2 - update gvproxy binary name Signed-off-by: Lokesh Mandvekar (cherry picked from commit 445da4204afa89e6b49aab6c47f8356776767c41) Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index e447ad9..432595c 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -547,7 +547,7 @@ ln -s ../../../../ src/%{import_path_gvproxy} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/%{name}-gvproxy %{import_path_gvproxy}/cmd/gvproxy +%gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy popd %{__make} docs docker-docs @@ -582,7 +582,7 @@ popd # install gvproxy pushd %{repo_gvproxy}-%{commit_gvproxy} install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m0755 bin/%{name}-gvproxy %{buildroot}%{_libexecdir}/%{name} +install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} popd # do not include docker and podman-remote man pages in main package @@ -736,9 +736,12 @@ exit 0 %license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/%{name}-gvproxy +%{_libexecdir}/%{name}/gvproxy %changelog +* Fri Aug 27 2021 Lokesh Mandvekar - 3:3.3.0-2 +- update gvproxy binary name + * Fri Aug 20 2021 RH Container Bot - 3:3.3.0-1 - autobuilt v3.3.0 From b00fb8dba774475e50dfef224ab73acb0b32a2ce Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 30 Aug 2021 20:41:06 +0000 Subject: [PATCH 098/110] podman-3:3.3.1-1 autobuilt v3.3.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d351be..d4d961d 100644 --- a/.gitignore +++ b/.gitignore @@ -1287,3 +1287,4 @@ /v3.3.0-rc2.tar.gz /v3.3.0-rc3.tar.gz /v3.3.0.tar.gz +/v3.3.1.tar.gz diff --git a/podman.spec b/podman.spec index 432595c..98002a1 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0 +%global built_tag v3.3.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -67,12 +67,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.3.0 +Version: 3.3.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -739,6 +739,9 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Mon Aug 30 2021 RH Container Bot - 3:3.3.1-1 +- autobuilt v3.3.1 + * Fri Aug 27 2021 Lokesh Mandvekar - 3:3.3.0-2 - update gvproxy binary name diff --git a/sources b/sources index 300cc87..52abe41 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0.tar.gz) = 0e77edfdbafc4ccb7b0b29d5e41054d52b09258fd25424be3339c256489a5d215109eda903eb620f2ed566c042a6d6b8a5d8adc26b08bba4fa66263a1ee3104d +SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa From 646d7dbdae6a5cd497c0772498baec43449600a8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 15 Sep 2021 13:04:02 -0400 Subject: [PATCH 099/110] update dnsname and machine-cni to latest upstream tags Signed-off-by: Lokesh Mandvekar (cherry picked from commit 6972e15200c72420008cb71f4f8d1a483ee2aa9e) --- .gitignore | 2 ++ podman.spec | 3 ++- sources | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d4d961d..28c4d35 100644 --- a/.gitignore +++ b/.gitignore @@ -1288,3 +1288,5 @@ /v3.3.0-rc3.tar.gz /v3.3.0.tar.gz /v3.3.1.tar.gz +/dnsname-18822f9.tar.gz +/podman-machine-cni-0749884.tar.gz diff --git a/podman.spec b/podman.spec index 98002a1..2954815 100644 --- a/podman.spec +++ b/podman.spec @@ -38,6 +38,7 @@ %global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} %global commit_plugins dc59f285546a0b0d8b8f20033e1637ea82587840 +%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # podman-machine-cni @@ -45,7 +46,7 @@ # https://github.com/containers/podman-machine-cni %global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni} %global git_mcni https://%{import_path_mcni} -%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 +%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) # gvproxy diff --git a/sources b/sources index 52abe41..c1e1a3b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad +SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d -SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 +SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa From 964ebf704ae0f660ea8f368eaa9ca740ccac8cc3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 16 Sep 2021 23:04:00 +0000 Subject: [PATCH 100/110] podman-3:3.4.0-0.1.rc1 autobuilt v3.4.0-rc1 Signed-off-by: RH Container Bot (cherry picked from commit 52a2adf76a2a80ce65ee4708f24d01d113bc24ae) --- .gitignore | 1 + podman.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 28c4d35..61a4e77 100644 --- a/.gitignore +++ b/.gitignore @@ -1290,3 +1290,4 @@ /v3.3.1.tar.gz /dnsname-18822f9.tar.gz /podman-machine-cni-0749884.tar.gz +/v3.4.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 2954815..4d0566c 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.1 +%global built_tag v3.4.0-rc1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -68,12 +68,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.3.1 +Version: 3.4.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -740,6 +740,12 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 +- autobuilt v3.4.0-rc1 + +* Tue Aug 31 2021 Lokesh Mandvekar - 3:3.3.1-2 +- bump release to be on par with f35 + * Mon Aug 30 2021 RH Container Bot - 3:3.3.1-1 - autobuilt v3.3.1 diff --git a/sources b/sources index c1e1a3b..da8d687 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa +SHA512 (v3.4.0-rc1.tar.gz) = 4791c16ca974ea0d8e14aa5d74649a1fb34c8aeebed8c1abfcb3237f56b16169ff1013cd4a42e90eab5cce55fb91b9cff1a5c196b9e9425130f01cd51a6de771 From a13f2a9f7ecb97246d662b3074c2bc88695baa49 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 10:35:21 -0400 Subject: [PATCH 101/110] rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post (cherry picked from commit 74e78026a213760430f43726fb1bda73517810dc) --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 4d0566c..b1bc5a7 100644 --- a/podman.spec +++ b/podman.spec @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -664,6 +664,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name} system renumber exit 0 +%post +rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -740,6 +743,9 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 +- rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post + * Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 - autobuilt v3.4.0-rc1 From 11078f3f8ee5566f6c47ef550b35a29482a3946e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 15:13:10 -0400 Subject: [PATCH 102/110] Only remove defaultCNINetExits on updgrades from podman 3.2 or less (cherry picked from commit ba3e40ee7f819ad4b4c139103836d9433807edbd) --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index b1bc5a7..c91f57a 100644 --- a/podman.spec +++ b/podman.spec @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -664,8 +664,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name} system renumber exit 0 -%post +%triggerpostun -- %{name} <= 3.2 rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists +exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -743,6 +744,9 @@ rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.3.rc1 +- Only remove defaultCNINetExits on updgrades from podman 3.2 or less + * Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 - rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post From 945df8e7c9685a20f1cef82b5cf3ba7130352472 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Sep 2021 13:20:29 -0400 Subject: [PATCH 103/110] bump conmon requirement for rootless gating tests Signed-off-by: Lokesh Mandvekar (cherry picked from commit ee589f0ad388287ec1984e372f688bc83d92d363) --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index c91f57a..842e5c3 100644 --- a/podman.spec +++ b/podman.spec @@ -108,7 +108,7 @@ Requires: containers-common >= 4:1-18 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.27-2 +Requires: conmon >= 2:2.0.30-2 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit From 49ae30dab910859b088635f10dca214e05408390 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 16 Sep 2021 15:15:05 -0600 Subject: [PATCH 104/110] gating tests: run podman-remote too A small handful of bugs have blocked us from running podman-remote in gating tests. Those are all fixed; it's time to enable testing. Signed-off-by: Ed Santiago (cherry picked from commit 967f9534f2066d95f3860536156078bce2cba4e5) Signed-off-by: Lokesh Mandvekar (cherry picked from commit 2a8f18fd0bbba328328ecfbdf303a94d3d4bed01) --- .../run_bats_tests/files/run_bats_tests.sh | 9 +++++++++ tests/test_podman.yml | 6 ++++++ tests/test_podman_remote.yml | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 tests/test_podman_remote.yml diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index 17061a0..b65d2b9 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/tests/roles/run_bats_tests/files/run_bats_tests.sh @@ -42,10 +42,19 @@ if ! cd $testdir; then exit 0 fi +if [[ $PODMAN =~ remote ]]; then + ${PODMAN%%-remote} system service -t0 &>/dev/null & + PODMAN_SERVER_PID=$! +fi + echo "\$ bats ." bats . rc=$? +if [[ -n "$PODMAN_SERVER_PID" ]]; then + kill $PODMAN_SERVER_PID +fi + echo $divider echo "bats completed with status $rc" diff --git a/tests/test_podman.yml b/tests/test_podman.yml index d5e65be..9674dea 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -39,6 +39,12 @@ loop_control: loop_var: want_cgroups + - name: test podman-remote + include_tasks: test_podman_remote.yml + + - name: test toolbox + include_tasks: test_toolbox.yml + # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so - name: check results include_tasks: check_results.yml diff --git a/tests/test_podman_remote.yml b/tests/test_podman_remote.yml new file mode 100644 index 0000000..8c61093 --- /dev/null +++ b/tests/test_podman_remote.yml @@ -0,0 +1,17 @@ +--- +- name: "podman-remote | install" + dnf: name="podman-remote" state=installed + +- include_role: + name: run_bats_tests + vars: + tests: + - name: podman-remote root + package: podman + environment: + PODMAN: /usr/bin/podman-remote + - name: podman-remote rootless + package: podman + environment: + PODMAN: /usr/bin/podman-remote + become: true From 593cee64a0bcc70daa812cf80a054902e60e7f39 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 15:11:45 -0400 Subject: [PATCH 105/110] Add shadow-utils-subid-devel requirement (cherry picked from commit 0cbb51c4081867c051633362b63137ae879929c4) (cherry picked from commit fac5da87d4d9f2cb6635f3904883b8cbddaea24a) --- podman.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 842e5c3..cdea8ae 100644 --- a/podman.spec +++ b/podman.spec @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc1%{?dist} +Release: 0.6.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -100,6 +100,9 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel +%if 0%{?fedora} >= 35 +BuildRequires: shadow-utils-subid-devel +%endif BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd @@ -743,13 +746,20 @@ exit 0 %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy +# rhcontainerbot account currently managed by lsm5 %changelog -* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.3.rc1 -- Only remove defaultCNINetExits on updgrades from podman 3.2 or less +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.6.rc1 +- Add shadow-utils-subid-devel requirement -* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.5.rc1 - rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post +* Wed Sep 22 2021 Lokesh Mandvekar - 3:3.4.0-0.4.rc1 +- bump conmon requirement for remote gating tests + +* Wed Sep 22 2021 Lokesh Mandvekar - 3:3.4.0-0.3.rc1 +- Requires: conmon >= 2:2.0.30 for remote gating tests + * Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 - autobuilt v3.4.0-rc1 From 3ae25af9bd34468d38e09fad8c17a8f38031e03f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 24 Sep 2021 14:51:23 +0000 Subject: [PATCH 106/110] podman-3:3.4.0-0.7.rc2 autobuilt v3.4.0-rc2 Signed-off-by: RH Container Bot (cherry picked from commit 30ef54bb136b45b60ee5d17f76eb57e90c54ebda) (cherry picked from commit e890f39fceb1843ce381e16e25ee7fd5bdba815d) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61a4e77..2cc1897 100644 --- a/.gitignore +++ b/.gitignore @@ -1291,3 +1291,4 @@ /dnsname-18822f9.tar.gz /podman-machine-cni-0749884.tar.gz /v3.4.0-rc1.tar.gz +/v3.4.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index cdea8ae..02e1bbc 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.4.0-rc1 +%global built_tag v3.4.0-rc2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc1%{?dist} +Release: 0.7.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -748,6 +748,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 +- autobuilt v3.4.0-rc2 + * Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.6.rc1 - Add shadow-utils-subid-devel requirement diff --git a/sources b/sources index da8d687..2fc88cf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.0-rc1.tar.gz) = 4791c16ca974ea0d8e14aa5d74649a1fb34c8aeebed8c1abfcb3237f56b16169ff1013cd4a42e90eab5cce55fb91b9cff1a5c196b9e9425130f01cd51a6de771 +SHA512 (v3.4.0-rc2.tar.gz) = dcfbad98640f408b89cc2601fae05b126a5ba91b87a53fc3673ae77ae87b429911b0103c7f680b7c213bdda472ec70af0d86d1d46e290bbd9892e3ea1f4e053e From 089f828791b430cba66b17adb2bba88f11c38f4a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Sep 2021 17:38:54 -0400 Subject: [PATCH 107/110] podman-3:3.4.0-0.10.rc2 - build with libsubid buildtag Signed-off-by: Lokesh Mandvekar (cherry picked from commit 60778e8502938dca2f46a12a8dc4fe0c5bf07b86) (cherry picked from commit b579d78b6ca9cd006a2e092ffb2e9dac9826ea81) --- podman.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 02e1bbc..c274afe 100644 --- a/podman.spec +++ b/podman.spec @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.7.rc2%{?dist} +Release: 0.10.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -507,7 +507,10 @@ popd ln -s vendor src # build %%{name} -export BUILDTAGS="$(hack/systemd_tag.sh) seccomp exclude_graphdriver_devicemapper $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh)" +%if 0%{?fedora} >= 35 +export BUILDTAGS+=" $(hack/libsubid_tag.sh)" +%endif %if 0%{?centos} export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion containers_image_ostree_stub" %endif @@ -748,6 +751,16 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 +- build with libsubid buildtag + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.9.rc2 +- depend on shadow-utils-subid for f35 and higher + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.8.rc2 +- bump release to stay ahead of older fedoras + +>>>>>>> 60778e8 (podman-3:3.4.0-0.10.rc2) * Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 - autobuilt v3.4.0-rc2 From 20b557eb8ebf81aee739ffd4e3c6a4cbfa1f9adf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Sep 2021 08:21:58 -0400 Subject: [PATCH 108/110] fix triggerpostuns (cherry picked from commit 79febf0ef04ba86750fb22c0ebfd4f91ff5b027c) --- podman.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/podman.spec b/podman.spec index c274afe..d9d4bc7 100644 --- a/podman.spec +++ b/podman.spec @@ -666,14 +666,6 @@ install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %endif -%triggerpostun -- %{name} < 1.1 -%{_bindir}/%{name} system renumber -exit 0 - -%triggerpostun -- %{name} <= 3.2 -rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists -exit 0 - #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -749,6 +741,10 @@ exit 0 %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy +%triggerpostun -- %{name} <= 3.2 +rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists +exit 0 + # rhcontainerbot account currently managed by lsm5 %changelog * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 @@ -760,7 +756,6 @@ exit 0 * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.8.rc2 - bump release to stay ahead of older fedoras ->>>>>>> 60778e8 (podman-3:3.4.0-0.10.rc2) * Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 - autobuilt v3.4.0-rc2 From 240f82e97d79127c641884d572ed1caaa429faaf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Sep 2021 10:30:09 -0400 Subject: [PATCH 109/110] centos conditionals no longer needed Signed-off-by: Lokesh Mandvekar (cherry picked from commit eaadc59b1f6dd3dce441d0c2fc338614c4c6e7f6) (cherry picked from commit 1bd5b83a36a7b6d4526c34cc246c1d01b09ec199) --- podman.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index d9d4bc7..84ab00f 100644 --- a/podman.spec +++ b/podman.spec @@ -87,7 +87,9 @@ Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +%if 0%{?fedora} && ! 0%{?rhel} +BuildRequires: btrfs-progs-devel +%endif BuildRequires: gcc BuildRequires: golang >= 1.15.14 BuildRequires: glib2-devel @@ -511,9 +513,6 @@ export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installe %if 0%{?fedora} >= 35 export BUILDTAGS+=" $(hack/libsubid_tag.sh)" %endif -%if 0%{?centos} -export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion containers_image_ostree_stub" -%endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" @@ -597,7 +596,7 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, echo "$file*" >> podman.file-list done -# source codes for building projects +# source code for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ From 9cb77b4b9666554972cad313560d4baf80765970 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 30 Sep 2021 19:11:31 +0000 Subject: [PATCH 110/110] podman-3:3.4.0-1 autobuilt v3.4.0 Signed-off-by: RH Container Bot (cherry picked from commit de01250946d3079169e50dd6b59b8dcc82e4f0bf) (cherry picked from commit 24781287fdd1f12072f6dc0e26f55b5b069d76b2) --- .gitignore | 1 + podman.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2cc1897..6a86a49 100644 --- a/.gitignore +++ b/.gitignore @@ -1292,3 +1292,4 @@ /podman-machine-cni-0749884.tar.gz /v3.4.0-rc1.tar.gz /v3.4.0-rc2.tar.gz +/v3.4.0.tar.gz diff --git a/podman.spec b/podman.spec index 84ab00f..7718be8 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.4.0-rc2 +%global built_tag v3.4.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -73,7 +73,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.10.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -486,12 +486,15 @@ tar zxf %{SOURCE2} tar zxf %{SOURCE3} %build +%set_build_flags export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) -export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" -%ifnarch %{ix86} -export CGO_CFLAGS+=" -D_FILE_OFFSET_BITS=64" -%endif +export CGO_CFLAGS=$CFLAGS +# These extra flags present in $CFLAGS have been skipped for now as they break the build +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g') + %ifarch x86_64 export CGO_CFLAGS+=" -m64 -mtune=generic" %if 0%{?fedora} || 0%{?centos} >= 8 @@ -746,6 +749,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 01 2021 Timm Bäder - 3:3.4.0-1 +- Remove individual flags from $CFLAGS instead of hardcoding all flags + * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 - build with libsubid buildtag diff --git a/sources b/sources index 2fc88cf..ad0295c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.0-rc2.tar.gz) = dcfbad98640f408b89cc2601fae05b126a5ba91b87a53fc3673ae77ae87b429911b0103c7f680b7c213bdda472ec70af0d86d1d46e290bbd9892e3ea1f4e053e +SHA512 (v3.4.0.tar.gz) = 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1