From 6af34192250f0570043f98778944991eccf022fd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 12 Mar 2019 12:41:58 +0000 Subject: [PATCH 01/63] podman-2:1.0.1-32.dev.git228d1cb - Resolves: #1686636 - do not depend on conmon (conmon moved to modules) Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index b1bd42d..bf95c5c 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.0.1 -Release: 31.dev.git%{shortcommit0}%{?dist} +Release: 32.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -74,7 +74,6 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables -Requires: conmon Recommends: container-selinux Recommends: slirp4netns %if 0%{?fedora} > 28 @@ -513,6 +512,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.0.1-32.dev.git228d1cb +- Resolves: #1686636 - do not depend on conmon (conmon moved to modules) + * Tue Feb 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-31.dev.git228d1cb - autobuilt 228d1cb From c29859e974e2d7b0ff5c04af84ea802ec11948af Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 12 Mar 2019 13:11:46 +0000 Subject: [PATCH 02/63] podman-2:1.1.2-1.dev.git0ad9b6b - bump to v1.1.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 63605b1..66c91d6 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,4 @@ /libpod-1cb16bd.tar.gz /libpod-3f32eae.tar.gz /libpod-228d1cb.tar.gz +/libpod-0ad9b6b.tar.gz diff --git a/podman.spec b/podman.spec index bf95c5c..2e43901 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 228d1cbcd372b086669e35c1237fc5064b24ea7d +%global commit0 0ad9b6bf2aea4ba37e8c9738feabec61343ba175 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -43,8 +43,8 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.0.1 -Release: 32.dev.git%{shortcommit0}%{?dist} +Version: 1.1.2 +Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -512,6 +512,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-1.dev.git0ad9b6b +- bump to v1.1.2 + * Tue Mar 12 2019 Lokesh Mandvekar - 2:1.0.1-32.dev.git228d1cb - Resolves: #1686636 - do not depend on conmon (conmon moved to modules) diff --git a/sources b/sources index 96494a3..1e5a780 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d +SHA512 (libpod-0ad9b6b.tar.gz) = 1654cae54eaaa0588ba981dc36a85b6ff58b33533b5b27a02ff295b2c4653414b456a3e7410d2d7576bc40de6bd65f6bba3aa9ade43a4ca2c6c2096a3c30b6dc SHA512 (libpod-228d1cb.tar.gz) = f865d6c86e0fb373b277a05fe74b90b2c82ed6768fca731c63d44fdbb04049798b8989009481bcabe64c9a2e8416f57009ee1e98195dfccddecc7e123d8f3329 From 6ca447fd654f194fb57e9b65297938d684f84b99 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 12 Mar 2019 10:04:07 -0400 Subject: [PATCH 03/63] podman-2:1.1.2-2.dev.git0ad9b6b - missed the system renumber scriptlet in the previous build Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2e43901..75bbc07 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.1.2 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 2.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -511,7 +511,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%triggerpostun -- %{name} < 1.1 +%{_bindir}/%{name} system renumber +exit 0 + %changelog +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-2.dev.git0ad9b6b +- missed the system renumber scriptlet in the previous build + * Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-1.dev.git0ad9b6b - bump to v1.1.2 From 40c2979e723a95a43e7e742349fe8defd5b0e63a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Fri, 18 Jan 2019 10:59:24 -0700 Subject: [PATCH 04/63] New tests subpackage Define a new podman-tests subpackage, containing a set of tests intended to be run as gates. As of this initial checkin, this consists of a set of BATS tests in /usr/share/podman . Include a configuration for running under Fedora CI Signed-off-by: Ed Santiago --- .gitignore | 1 + podman.spec | 31 ++++++++++++++--- sources | 3 +- tests/test_podman.sh | 79 +++---------------------------------------- tests/test_podman.yml | 10 +++++- 5 files changed, 42 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index 66c91d6..5468879 100644 --- a/.gitignore +++ b/.gitignore @@ -187,3 +187,4 @@ /libpod-3f32eae.tar.gz /libpod-228d1cb.tar.gz /libpod-0ad9b6b.tar.gz +/libpod-b33a00e.tar.gz diff --git a/podman.spec b/podman.spec index 75bbc07..c4f046e 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 0ad9b6bf2aea4ba37e8c9738feabec61343ba175 +%global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.1.2 -Release: 2.dev.git%{shortcommit0}%{?dist} +Release: 3.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -195,7 +195,7 @@ Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce Conflicts: docker-ee -Conflicts: moby-engine +Conflicts: moby-engine %description docker This package installs a script named docker that emulates the Docker CLI by @@ -362,6 +362,18 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%package tests +Summary: Tests for %{name} + +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: jq + +%description tests +%{summary} + +This package contains system tests for %{name} + %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -470,13 +482,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if ! 0%{?gotest:1} %global gotest go test %endif - + %gotest %{import_path}/cmd/%{name} %gotest %{import_path}/libkpod %gotest %{import_path}/libpod %gotest %{import_path}/pkg/registrar %endif +install -d -p %{buildroot}/%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -515,7 +530,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_bindir}/%{name} system renumber exit 0 +%files tests +%license LICENSE +%{_datadir}/%{name}/test + %changelog +* Wed Mar 13 2019 Eduardo Santiago - 2:1.1.2-3.dev.gitb33a00e +- new -tests subpackage + * Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-2.dev.git0ad9b6b - missed the system renumber scriptlet in the previous build @@ -1241,4 +1263,3 @@ containernetworking-cni * Wed Jan 10 2018 Frantisek Kluknavsky - 0-0.1.gitc1b2278 - First package for Fedora - diff --git a/sources b/sources index 1e5a780..e6fc603 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-0ad9b6b.tar.gz) = 1654cae54eaaa0588ba981dc36a85b6ff58b33533b5b27a02ff295b2c4653414b456a3e7410d2d7576bc40de6bd65f6bba3aa9ade43a4ca2c6c2096a3c30b6dc -SHA512 (libpod-228d1cb.tar.gz) = f865d6c86e0fb373b277a05fe74b90b2c82ed6768fca731c63d44fdbb04049798b8989009481bcabe64c9a2e8416f57009ee1e98195dfccddecc7e123d8f3329 +SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1 diff --git a/tests/test_podman.sh b/tests/test_podman.sh index abb33cb..da220bf 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -3,80 +3,11 @@ # Simple podman tests # -set -x +rm -f /tmp/test.log /tmp/test.debug.log -exec >/tmp/test.debug.log 2>&1 +# Log program versions +rpm -q podman podman-tests >/tmp/test.debug.log -echo "************************************************************************" -echo "* This log contains the debug output from test_podman.sh." -echo "*" -echo "* Short test PASS/FAIL summary is in test.log" -echo "************************************************************************" +bats /usr/share/podman/test/system &> /tmp/test.log -rm -f /tmp/test.log -touch /tmp/test.log - -counter_file=/tmp/test.counter.txt -echo 0 >| $counter_file - -do_test() { - local cmd="$1"; shift - local expected_status="$1"; shift - local expected_stdout="$1"; shift - - counter=$(expr $(< $counter_file) + 1) - echo $counter >| $counter_file - - # Make debug log easier to read - echo - echo "--------------------------------------------------------------------" - echo "-- test $counter" - echo - - stdout=$(eval podman $cmd) - status=$? - if [ $status -ne $expected_status ]; then - echo "FAIL $counter $cmd: status=$status (expected $expected_status)" >>/tmp/test.log - return - fi - - if [ "$expected_stdout" = "-" ]; then - : - elif [ -z "$expected_stdout" ]; then - if [ -n "$stdout" ]; then - echo "FAIL $counter $cmd : stdout='$stdout' (expected '')" >>/tmp/test.log - return - fi - else - if ! expr "$stdout" : "$expected_stdout"; then - echo "FAIL $counter $cmd : stdout='$stdout' (expected '$expected_stdout')" >>/tmp/test.log - return - fi - fi - - echo "PASS $counter $cmd" >>/tmp/test.log -} - -# Clean slate -do_test "rm -a -f" 0 "-" -do_test "rmi -a -f" 0 "-" - -do_test "info --format '{{.host.rootless}}'" 0 "false" -do_test "info --format '{{.store.GraphDriverName}}'" 0 "overlay" - -do_test "pull alpine" 0 "-" -do_test "images --format {{.Repository}}:{{.Tag}}" 0 \ - "docker.io/library/alpine:latest" - -do_test "run alpine sh -c 'echo hi'" 0 "hi" -do_test "run alpine date" 0 "-" -do_test "run alpine /bin/false" 1 "" - -do_test "ps -a | wc -l" 0 "4" -do_test "ps -a | grep false | grep -q 'Exited (1)'" 0 "" - -# Final exit status: nonzero if the word FAIL is present in results -if grep -q FAIL /tmp/test.log; then - exit 1 -fi -exit 0 +echo "bats completed with status $?" >>/tmp/test.debug.log diff --git a/tests/test_podman.yml b/tests/test_podman.yml index f77c322..694b6d6 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -2,8 +2,15 @@ - hosts: localhost vars: - artifacts: ./artifacts + # FIXME! It would be cleaner to include 'podman' in this list; but the + # dnf module is broken in ansible <= 2.8, it doesn't report failures + # to install as long as _one_ package installs! So if podman installs + # but podman-tests doesn't, the `dnf` stanza succeeds, then the test + # one fails with a less-than-helpful error. + # + # See https://github.com/ansible/ansible/pull/49760 - required_packages: - - podman + - podman-tests tags: - classic - container @@ -14,6 +21,7 @@ enablerepo=updates-testing - block: + # FIXME: how to make two passes, one as root and one rootless? - name: Run test script: ./test_podman.sh always: From 14cf121258cd57027dfcefbda3581791dbc3ebe5 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Sun, 17 Mar 2019 09:16:57 -0600 Subject: [PATCH 05/63] Package zsh completion. Note that we declare ownership of /usr/share/zsh/site-functions (directory). This seems to be legit; see curl and mercurial packages. The alternatives are to explicitly Require: zsh or to bundle the completion script in a separate rpm. Signed-off-by: Ed Santiago --- .gitignore | 1 + podman.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5468879..055e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,4 @@ /libpod-228d1cb.tar.gz /libpod-0ad9b6b.tar.gz /libpod-b33a00e.tar.gz +/libpod-6aa8078.tar.gz diff --git a/podman.spec b/podman.spec index c4f046e..192d835 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e +%global commit0 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.1.2 -Release: 3.dev.git%{shortcommit0}%{?dist} +Release: 4.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -502,6 +502,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +# By "owning" the site-functions dir, we don't need to Require zsh +%{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf @@ -535,6 +538,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 +- include zsh completion + * Wed Mar 13 2019 Eduardo Santiago - 2:1.1.2-3.dev.gitb33a00e - new -tests subpackage diff --git a/sources b/sources index e6fc603..2e58642 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1 +SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa From d47816a3de2655a1e302c6fb935f02f9403b2c2c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 19 Mar 2019 12:55:36 +0100 Subject: [PATCH 06/63] Fix the build by ensuring that the %{_unitdir} RPM macro is defined A BuildRequires on systemd should be added as specified in the Fedora packaging guidelines: https://fedoraproject.org/wiki/Packaging:Systemd It's likely that something in the dependency chain is implicitly pulling in the systemd RPM, but that might change. --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index 192d835..4ec6b48 100644 --- a/podman.spec +++ b/podman.spec @@ -69,6 +69,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make +BuildRequires: systemd Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 From cb72f22e9f4379bea4c060ddb79eb30841d7b724 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:05:05 -0400 Subject: [PATCH 07/63] include zsh completion --- podman.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index 4ec6b48..5605065 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e +%global commit0 3bd528e583182b4249f3e6bbd8497a8831d89950 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -43,8 +43,8 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.1.2 -Release: 4.dev.git%{shortcommit0}%{?dist} +Version: 1.2.0 +Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -76,10 +76,8 @@ Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables Recommends: container-selinux -Recommends: slirp4netns -%if 0%{?fedora} > 28 -Recommends: fuse-overlayfs -%endif +Recommends: slirp4netns >= 0.3-0 +Recommends: fuse-overlayfs >= 0.3-8 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort From 3da628c6a1948bae23256f12ee4a31f7220d6783 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:12:03 -0400 Subject: [PATCH 08/63] include zsh completion --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 055e62c..5d1dc56 100644 --- a/.gitignore +++ b/.gitignore @@ -189,3 +189,4 @@ /libpod-0ad9b6b.tar.gz /libpod-b33a00e.tar.gz /libpod-6aa8078.tar.gz +/libpod-3bd528e.tar.gz diff --git a/sources b/sources index 2e58642..294bbc2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa +SHA512 (libpod-3bd528e.tar.gz) = 6993886a244775e029fb9cb1cb20c28e94a29cee2f199ce2fa765d6c9630d9e1f2e9de985dc574acee8a98eb378bb738c24ca928ee0f749df3c13594b04fdc52 From 91f36f3b7ad68086ff5b1ec284291adb42e9b342 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:30:23 -0400 Subject: [PATCH 09/63] include zsh completion --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 5605065..23e4675 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.2.0 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -537,6 +537,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon April 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 +- New Release of podman + * Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 - include zsh completion From 8b6243c172c611c9b953d1b0394b01c777eae7d9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:30:48 -0400 Subject: [PATCH 10/63] New Release of podman --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 23e4675..a2a09c0 100644 --- a/podman.spec +++ b/podman.spec @@ -537,7 +537,7 @@ exit 0 %{_datadir}/%{name}/test %changelog -* Mon April 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 +* Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 - New Release of podman * Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 From c31edba33be7f93cfe5a94019e965243c3f6cf2b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 17 May 2019 11:20:29 -0400 Subject: [PATCH 11/63] New Release of podman --- .gitignore | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++--- podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5d1dc56..aad89cc 100644 --- a/.gitignore +++ b/.gitignore @@ -186,7 +186,58 @@ /libpod-1cb16bd.tar.gz /libpod-3f32eae.tar.gz /libpod-228d1cb.tar.gz -/libpod-0ad9b6b.tar.gz -/libpod-b33a00e.tar.gz +/libpod-3b88c73.tar.gz +/libpod-4934bf2.tar.gz +/libpod-1788add.tar.gz +/libpod-b223d4e.tar.gz +/libpod-cc4addd.tar.gz +/libpod-553ac80.tar.gz +/libpod-cf52144.tar.gz +/libpod-623fcfa.tar.gz +/libpod-5afae0b.tar.gz +/libpod-9137315.tar.gz +/libpod-9adcda7.tar.gz +/libpod-f3a3d8e.tar.gz +/libpod-4b80517.tar.gz +/libpod-40f7843.tar.gz +/libpod-614409f.tar.gz +/libpod-1b2f867.tar.gz +/libpod-9b21f14.tar.gz +/libpod-d95f97a.tar.gz +/libpod-de0192a.tar.gz +/libpod-883566f.tar.gz +/libpod-7426d4f.tar.gz +/libpod-31f11a8.tar.gz /libpod-6aa8078.tar.gz -/libpod-3bd528e.tar.gz +/libpod-ac523cb.tar.gz +/libpod-537c382.tar.gz +/libpod-c230f0c.tar.gz +/libpod-68e3df3.tar.gz +/libpod-0458daf.tar.gz +/libpod-d0c6a35.tar.gz +/libpod-fc546d4.tar.gz +/libpod-850326c.tar.gz +/libpod-fdf979a.tar.gz +/libpod-7b73974.tar.gz +/libpod-833204d.tar.gz +/libpod-cd35e20.tar.gz +/libpod-ad467ba.tar.gz +/libpod-4bda537.tar.gz +/libpod-bda28c6.tar.gz +/libpod-bc320be.tar.gz +/libpod-c94903a.tar.gz +/libpod-60ef8f8.tar.gz +/libpod-6cd6eb6.tar.gz +/libpod-387d601.tar.gz +/libpod-1572367.tar.gz +/libpod-b926005.tar.gz +/libpod-167ce59.tar.gz +/libpod-c1e2b58.tar.gz +/libpod-a87cf6f.tar.gz +/libpod-bf5ffda.tar.gz +/libpod-e4947e5.tar.gz +/libpod-9f92b21.tar.gz +/libpod-d652c86.tar.gz +/libpod-b01fdcb.tar.gz +/libpod-9ae3221.tar.gz +/libpod-7210727.tar.gz diff --git a/podman.spec b/podman.spec index a2a09c0..b67cf09 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 3bd528e583182b4249f3e6bbd8497a8831d89950 +%global commit0 7210727e205c333af9a2d0ed0bb66adcf92a6369 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -43,8 +43,8 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.2.0 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.3.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -504,6 +504,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ # By "owning" the site-functions dir, we don't need to Require zsh %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* +%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf @@ -537,6 +538,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 +- New Release of podman + * Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 - New Release of podman diff --git a/sources b/sources index 294bbc2..e794229 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-3bd528e.tar.gz) = 6993886a244775e029fb9cb1cb20c28e94a29cee2f199ce2fa765d6c9630d9e1f2e9de985dc574acee8a98eb378bb738c24ca928ee0f749df3c13594b04fdc52 +SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a From 6dac147346649ce734b3ae4b7c88a81d7e2722b2 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 17 May 2019 12:52:51 -0400 Subject: [PATCH 12/63] New Release of podman --- podman.spec | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index b67cf09..ae44648 100644 --- a/podman.spec +++ b/podman.spec @@ -75,6 +75,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables +Recommends: podman-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 @@ -182,9 +183,12 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description +Podman (Pod Manager) is a fully featured container engine that is a simple daemonless tool. Podman provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=podman. Most Podman commands can be run as a regular user, without requiring additional privileges. + +Podman uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. + %{summary} -%{repo} provides a library for applications looking to use -the Container Pod concept popularized by Kubernetes. +%{repo} Simple management tool for pods, containers and images %package docker Summary: Emulate Docker CLI using podman @@ -387,6 +391,7 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote export BUILDTAGS="varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gogenerate ./cmd/%{name}/varlink/... %gobuild -o bin/%{name} %{import_path}/cmd/%{name} @@ -498,7 +503,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh @@ -529,6 +533,33 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%package manpages +Summary: Man pages for the podman commands +BuildArch: noarch + +%files manpages +%{_mandir}/man1/podman*.1* + +%description manpages +Man pages for the podman commands + +%package remote +Summary: (Experimental) Remote client for managing podman containers +Recommends: podman-manpages = %{epoch}:%{version}-%{release} + +%description remote +Remote client for managing podman containers. + +This experimental remote client is under heavy development. Please do not +run podman-remote in production. + +podman-remote uses the varlink connection to connect to a podman client to +manage pods, containers and container images. Podman-remote supports ssh +connections as well. + +%files remote +%{_bindir}/podman-remote + %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber exit 0 From 8ee8c0993903c313ef498e2c6192be18ff53114e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 10 Jun 2019 18:04:14 +0530 Subject: [PATCH 13/63] podman-2:1.4.0-1 - Resolves: #1715668 - CVE-2019-10152 - bump to v1.4.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 3 ++ podman.spec | 113 ++++++++++++++++++++++++++++------------------------ sources | 4 +- 3 files changed, 66 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index aad89cc..47ec809 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,6 @@ /libpod-b01fdcb.tar.gz /libpod-9ae3221.tar.gz /libpod-7210727.tar.gz +/conmon-5995229.tar.gz +/libpod-41365a8.tar.gz +/libpod-6d285b8.tar.gz diff --git a/podman.spec b/podman.spec index ae44648..0bdd358 100644 --- a/podman.spec +++ b/podman.spec @@ -5,7 +5,7 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} >= 28 +%if 0%{?fedora} %bcond_without varlink %define gogenerate go generate %else @@ -27,12 +27,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7210727e205c333af9a2d0ed0bb66adcf92a6369 +%global commit0 41365a8f6760349cac826a7c1d50ba2c4057ed50 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/kubernetes-sigs/cri-o +%global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5 +%global commit_conmon 59952292a3b07ac125575024ae21956efe0ecdfb %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman @@ -43,13 +43,13 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.3.1 -Release: 1.git%{shortcommit0}%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: https://podman.io/ +URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -72,10 +72,10 @@ BuildRequires: make BuildRequires: systemd Requires: runc >= 2:1.0.0-57 Requires: containers-common -Requires: containernetworking-plugins >= 0.7.3-2 +Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Recommends: podman-manpages = %{epoch}:%{version}-%{release} +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 @@ -183,15 +183,15 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description -Podman (Pod Manager) is a fully featured container engine that is a simple daemonless tool. Podman provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=podman. Most Podman commands can be run as a regular user, without requiring additional privileges. +%{name} (Pod Manager) is a fully featured container engine that is a simple daemonless tool. %{name} provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=%{name}. Most %{name} commands can be run as a regular user, without requiring additional privileges. -Podman uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. +%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. %{summary} %{repo} Simple management tool for pods, containers and images %package docker -Summary: Emulate Docker CLI using podman +Summary: Emulate Docker CLI using %{name} BuildArch: noarch Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: docker @@ -202,8 +202,29 @@ Conflicts: moby-engine %description docker This package installs a script named docker that emulates the Docker CLI by -executes podman commands, it also creates links between all Docker CLI man -pages and podman. +executes %{name} commands, it also creates links between all Docker CLI man +pages and %{name}. + +%package manpages +Summary: Man pages for the %{name} commands +BuildArch: noarch + +%description manpages +Man pages for the %{name} commands + +%package remote +Summary: (Experimental) Remote client for managing %{name} containers +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} + +%description remote +Remote client for managing %{name} containers. + +This experimental remote client is under heavy development. Please do not +run %{name}-remote in production. + +%{name}-remote uses the varlink connection to connect to a %{name} client to +manage pods, containers and container images. %{name}-remote supports ssh +connections as well. %if 0%{?with_devel} %package devel @@ -340,7 +361,7 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running @@ -366,7 +387,7 @@ providing packages with %{import_path} prefix. %endif %package tests -Summary: Tests for %{name} +Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats @@ -391,28 +412,26 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote -export BUILDTAGS="varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gogenerate ./cmd/%{name}/varlink/... + +# build %%{name} +export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +# build %%{name}-remote +export BUILDTAGS="rmeoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} + # build conmon -pushd cri-o-%{commit_conmon} -mkdir _output -pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} -ln -s $(dirs +1 -l) src/%{import_path_conmon} -popd -ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd) -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -BUILDTAGS=$BUILDTAGS make -C conmon +pushd conmon-%{commit_conmon} +%{__make} all popd %install install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ + install.remote \ install.man \ install.cni \ install.systemd \ @@ -426,8 +445,11 @@ install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers # install conmon +pushd conmon-%{commit_conmon} +%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{name} +popd # source codes for building projects %if 0%{?with_devel} @@ -510,6 +532,8 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_datadir}/zsh/site-functions/* %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon +%dir %{_libexecdir}/crio +%{_libexecdir}/crio/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -533,32 +557,11 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif -%package manpages -Summary: Man pages for the podman commands -BuildArch: noarch - %files manpages -%{_mandir}/man1/podman*.1* - -%description manpages -Man pages for the podman commands - -%package remote -Summary: (Experimental) Remote client for managing podman containers -Recommends: podman-manpages = %{epoch}:%{version}-%{release} - -%description remote -Remote client for managing podman containers. - -This experimental remote client is under heavy development. Please do not -run podman-remote in production. - -podman-remote uses the varlink connection to connect to a podman client to -manage pods, containers and container images. Podman-remote supports ssh -connections as well. +%{_mandir}/man1/%{name}*.1* %files remote -%{_bindir}/podman-remote +%{_bindir}/%{name}-remote %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -569,6 +572,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 +- Resolves: #1715668 - CVE-2019-10152 +- bump to v1.4.0 + * Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 - New Release of podman diff --git a/sources b/sources index e794229..f30e3a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d +SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 +SHA512 (libpod-41365a8.tar.gz) = 2a826f73df1be4d6bcaf8de19f9dc7448f4147e2de93b27caed32abec0552d798553ef958e5109b4e24f5e0b4078d4eb87d8c143440ae9f0d81d6f4696d0b092 +SHA512 (libpod-6d285b8.tar.gz) = 67ccdf0ce69ece8c4cc6758af7b6f9b785f7d23dc09dba9eefdcf5d82bbf104a13c9faec033801d94e685af738fa8deab6810d6550bc3ea68e4f317c4fb512a5 SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a From 0234e54eee559ba9f9014a84673143ffb7a745b2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 10 Jun 2019 09:10:41 -0400 Subject: [PATCH 14/63] buildable on centos, deps updated Signed-off-by: Lokesh Mandvekar --- podman.spec | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/podman.spec b/podman.spec index 0bdd358..7bbff70 100644 --- a/podman.spec +++ b/podman.spec @@ -19,6 +19,11 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) 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 %{?**}; +%define gogenerate go generate +%endif + %global provider github %global provider_tld com %global project containers @@ -36,13 +41,9 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -# Epoch is 2 for f30 (rawhide), 1 for f28 and f29 -# BEWARE while using on other distros -%if 0%{?fedora} >= 30 +%if 0%{?fedora} Epoch: 2 -%else -Epoch: 1 -%endif +%endif # fedora Version: 1.4.0 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images @@ -50,9 +51,6 @@ License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -#ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -70,15 +68,23 @@ BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd +BuildRequires: systemd-devel Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 +%else +Requires: %{name}-manpages = %{epoch}:%{version}-%{release} +Requires: container-selinux +Requires: slirp4netns >= 0.3-0 +%endif #fedora + # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -212,6 +218,7 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands +%if 0%{?fedora} %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -225,6 +232,7 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. +%endif #fedora %if 0%{?with_devel} %package devel @@ -412,15 +420,24 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) + +%if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... +%endif # fedora # build %%{name} +%if 0%{?fedora} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%else +export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%endif # fedora %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +%if 0%{?fedora} # build %%{name}-remote -export BUILDTAGS="rmeoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} +%endif # fedora # build conmon pushd conmon-%{commit_conmon} @@ -431,7 +448,9 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ +%if 0%{?fedora} install.remote \ +%endif # fedora install.man \ install.cni \ install.systemd \ @@ -518,6 +537,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%triggerpostun -- %{name} < 1.1 +%{_bindir}/%{name} system renumber +exit 0 + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -560,12 +583,10 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files manpages %{_mandir}/man1/%{name}*.1* +%if 0%{?fedora} %files remote %{_bindir}/%{name}-remote - -%triggerpostun -- %{name} < 1.1 -%{_bindir}/%{name} system renumber -exit 0 +%endif # fedora %files tests %license LICENSE From 2ac7ef9a1b5d3e0e0f522c78e7c252ba7a44031f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Jun 2019 17:36:44 +0530 Subject: [PATCH 15/63] podman-2:1.4.0-2 - do not install /usr/libexec/crio - conflicts with crio Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index 7bbff70..619078e 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ Name: podman Epoch: 2 %endif # fedora Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -466,8 +466,7 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers # install conmon pushd conmon-%{commit_conmon} %{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install -install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{name} +mv %{buildroot}%{_libexecdir}/crio %{buildroot}%{_libexecdir}/%{name} popd # source codes for building projects @@ -555,8 +554,6 @@ exit 0 %{_datadir}/zsh/site-functions/* %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon -%dir %{_libexecdir}/crio -%{_libexecdir}/crio/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -593,6 +590,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 +- do not install /usr/libexec/crio - conflicts with crio + * Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 - Resolves: #1715668 - CVE-2019-10152 - bump to v1.4.0 From a010642f8c5820f26f593e97084ed6778a6960c3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Jun 2019 15:32:58 -0400 Subject: [PATCH 16/63] correct dependencies for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 619078e..cddbf99 100644 --- a/podman.spec +++ b/podman.spec @@ -69,7 +69,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -77,12 +76,14 @@ Requires: nftables %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux -Recommends: slirp4netns >= 0.3-0 +Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +Requires: runc >= 2:1.0.0-57 %else Requires: %{name}-manpages = %{epoch}:%{version}-%{release} Requires: container-selinux -Requires: slirp4netns >= 0.3-0 +Requires: slirp4netns >= 0.3.0-2 +Requires: runc >= 1.0.0-57 %endif #fedora From 984c99cf265112d01d207b88624d7f02bd0d7645 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Jun 2019 15:55:30 -0400 Subject: [PATCH 17/63] buildable on centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index cddbf99..98e535a 100644 --- a/podman.spec +++ b/podman.spec @@ -80,7 +80,7 @@ Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Requires: runc >= 2:1.0.0-57 %else -Requires: %{name}-manpages = %{epoch}:%{version}-%{release} +Requires: %{name}-manpages = %{version}-%{release} Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 @@ -200,7 +200,11 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch +%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} +%else +Requires: %{name} = %{version}-%{release} +%endif # fedora Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -395,6 +399,7 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -406,6 +411,7 @@ Requires: jq %{summary} This package contains system tests for %{name} +%endif # fedora %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -534,8 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +%if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%endif # fedora %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -584,11 +592,11 @@ exit 0 %if 0%{?fedora} %files remote %{_bindir}/%{name}-remote -%endif # fedora %files tests %license LICENSE %{_datadir}/%{name}/test +%endif # fedora %changelog * Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 From 5f4deb63a8232babee98f4aebd10c866f87edf31 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 19 Jun 2019 08:29:15 -0400 Subject: [PATCH 18/63] Bump to v1.4.2 --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 4 +--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 47ec809..155a2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /conmon-5995229.tar.gz /libpod-41365a8.tar.gz /libpod-6d285b8.tar.gz +/libpod-9b6a98c.tar.gz diff --git a/podman.spec b/podman.spec index 98e535a..859b51d 100644 --- a/podman.spec +++ b/podman.spec @@ -32,7 +32,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 41365a8f6760349cac826a7c1d50ba2c4057ed50 +%global commit0 9b6a98cfd7813513e5697888baa93318395a2055 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -44,8 +44,8 @@ Name: podman %if 0%{?fedora} Epoch: 2 %endif # fedora -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -78,6 +78,7 @@ Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +Recommends: libvarlink-util >= 18-1 Requires: runc >= 2:1.0.0-57 %else Requires: %{name}-manpages = %{version}-%{release} @@ -599,6 +600,9 @@ exit 0 %endif # fedora %changelog +* Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 +- Bump to v1.4.2 + * Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 - do not install /usr/libexec/crio - conflicts with crio diff --git a/sources b/sources index f30e3a3..481d5c4 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-41365a8.tar.gz) = 2a826f73df1be4d6bcaf8de19f9dc7448f4147e2de93b27caed32abec0552d798553ef958e5109b4e24f5e0b4078d4eb87d8c143440ae9f0d81d6f4696d0b092 -SHA512 (libpod-6d285b8.tar.gz) = 67ccdf0ce69ece8c4cc6758af7b6f9b785f7d23dc09dba9eefdcf5d82bbf104a13c9faec033801d94e685af738fa8deab6810d6550bc3ea68e4f317c4fb512a5 -SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a +SHA512 (libpod-9b6a98c.tar.gz) = 5395cbdb30ec8d4279636cbf1add1dd8521e9969be1313db56d3120cb7c3e0f1d18ccf81ad52635d268cfce44fdc84b1baeab04d221e5ad4769c2b9c03516e1d From a69f3294094fd37e787b41222c2cdb8ef8b567ed Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 26 Jun 2019 08:43:05 -0400 Subject: [PATCH 19/63] Bump to v1.4.3 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 155a2d6..04e6715 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ /libpod-41365a8.tar.gz /libpod-6d285b8.tar.gz /libpod-9b6a98c.tar.gz +/libpod-7fd6528.tar.gz diff --git a/podman.spec b/podman.spec index 859b51d..4ce2f2b 100644 --- a/podman.spec +++ b/podman.spec @@ -32,7 +32,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9b6a98cfd7813513e5697888baa93318395a2055 +%global commit0 7fd65288f177b059ccde987ad87450be1ca2fa27 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -44,7 +44,7 @@ Name: podman %if 0%{?fedora} Epoch: 2 %endif # fedora -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -600,6 +600,9 @@ exit 0 %endif # fedora %changelog +* Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 +- Bump to v1.4.3 + * Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 - Bump to v1.4.2 diff --git a/sources b/sources index 481d5c4..991fb72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-9b6a98c.tar.gz) = 5395cbdb30ec8d4279636cbf1add1dd8521e9969be1313db56d3120cb7c3e0f1d18ccf81ad52635d268cfce44fdc84b1baeab04d221e5ad4769c2b9c03516e1d +SHA512 (libpod-7fd6528.tar.gz) = c09853040fb5a778e09f6e89071d84eb7c0bbd63cd89f6591b7f9340d1c2146305a011b88daafdae31c501b0fe5bcc581a815c5a7e239839f81d2fe115f4c3a0 From 34d64b1d321f18d90bfcc398c89058a9deff7058 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 26 Jun 2019 22:56:47 -0400 Subject: [PATCH 20/63] Bump to v1.4.3 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 991fb72..ad56865 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-7fd6528.tar.gz) = c09853040fb5a778e09f6e89071d84eb7c0bbd63cd89f6591b7f9340d1c2146305a011b88daafdae31c501b0fe5bcc581a815c5a7e239839f81d2fe115f4c3a0 +SHA512 (libpod-7fd6528.tar.gz) = 76c945cef309ebe66e81e61ec0130961eee524de192bd35b3c2473a42b70ecbc14f99e2bfa6cb2c1101cb71d8ce705f5c130e8608724b8ecc3507c9033ee5de6 From 4a519ff85c09f11c02189ab19e0a96b357483cd9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 27 Jun 2019 11:35:07 -0400 Subject: [PATCH 21/63] Bump to v1.4.3 --- podman.spec | 52 +++++++--------------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/podman.spec b/podman.spec index 4ce2f2b..2b7f157 100644 --- a/podman.spec +++ b/podman.spec @@ -5,12 +5,8 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} %bcond_without varlink %define gogenerate go generate -%else -%bcond_with varlink -%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -19,11 +15,6 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} -%define gobuild(o:) 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 %{?**}; -%define gogenerate go generate -%endif - %global provider github %global provider_tld com %global project containers @@ -41,9 +32,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -%if 0%{?fedora} Epoch: 2 -%endif # fedora Version: 1.4.3 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images @@ -69,24 +58,16 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel +Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: libvarlink-util >= 18-1 -Requires: runc >= 2:1.0.0-57 -%else -Requires: %{name}-manpages = %{version}-%{release} -Requires: container-selinux -Requires: slirp4netns >= 0.3.0-2 -Requires: runc >= 1.0.0-57 -%endif #fedora - # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -201,11 +182,7 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch -%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} -%else -Requires: %{name} = %{version}-%{release} -%endif # fedora Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -224,7 +201,9 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands -%if 0%{?fedora} +%files manpages +%{_mandir}/man1/%{name}*.1* + %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -238,7 +217,6 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. -%endif #fedora %if 0%{?with_devel} %package devel @@ -400,7 +378,6 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -412,7 +389,6 @@ Requires: jq %{summary} This package contains system tests for %{name} -%endif # fedora %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -429,23 +405,18 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%if 0%{?fedora} +export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... -%endif # fedora # build %%{name} -%if 0%{?fedora} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -%else -export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -%endif # fedora +export GO111MODULE=off %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%if 0%{?fedora} # build %%{name}-remote export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export GO111MODULE=off %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif # fedora # build conmon pushd conmon-%{commit_conmon} @@ -456,9 +427,7 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ -%if 0%{?fedora} install.remote \ -%endif # fedora install.man \ install.cni \ install.systemd \ @@ -541,10 +510,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif -%if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ -%endif # fedora %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -587,17 +554,12 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif -%files manpages -%{_mandir}/man1/%{name}*.1* - -%if 0%{?fedora} %files remote %{_bindir}/%{name}-remote %files tests %license LICENSE %{_datadir}/%{name}/test -%endif # fedora %changelog * Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 From f9aac439c27bb80a6b203c7255e91cb74bedd86a Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 2 Jul 2019 19:19:25 -0500 Subject: [PATCH 22/63] 1.4.4 Signed-off-by: baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- tests/test_podman.sh | 13 ------------- tests/test_podman.yml | 35 ----------------------------------- tests/tests.yml | 1 - 6 files changed, 7 insertions(+), 52 deletions(-) delete mode 100755 tests/test_podman.sh delete mode 100644 tests/test_podman.yml delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 04e6715..e84c5cc 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,4 @@ /libpod-6d285b8.tar.gz /libpod-9b6a98c.tar.gz /libpod-7fd6528.tar.gz +/libpod-2371158.tar.gz diff --git a/podman.spec b/podman.spec index 2b7f157..dc9b2ae 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7fd65288f177b059ccde987ad87450be1ca2fa27 +%global commit0 23711589f06b243fde07b9fcecb1cdc11c98a616 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -33,7 +33,7 @@ Name: podman Epoch: 2 -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -562,6 +562,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Tue Jul 02 2019 bbaude - 2:1.4.4-1 +- Bump to v1.4.4 + * Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 - Bump to v1.4.3 diff --git a/sources b/sources index ad56865..b85593d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-7fd6528.tar.gz) = 76c945cef309ebe66e81e61ec0130961eee524de192bd35b3c2473a42b70ecbc14f99e2bfa6cb2c1101cb71d8ce705f5c130e8608724b8ecc3507c9033ee5de6 +SHA512 (libpod-2371158.tar.gz) = d9af4d6fae424131fe7ecc43d7dd73c8cb5d48cf9a78d61e3480efb01a76058a629baca250f97e59489c11a8e15c90f38c3ec1be21e99c60a795ddc3963d9a1e diff --git a/tests/test_podman.sh b/tests/test_podman.sh deleted file mode 100755 index da220bf..0000000 --- a/tests/test_podman.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# Simple podman tests -# - -rm -f /tmp/test.log /tmp/test.debug.log - -# Log program versions -rpm -q podman podman-tests >/tmp/test.debug.log - -bats /usr/share/podman/test/system &> /tmp/test.log - -echo "bats completed with status $?" >>/tmp/test.debug.log diff --git a/tests/test_podman.yml b/tests/test_podman.yml deleted file mode 100644 index 694b6d6..0000000 --- a/tests/test_podman.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- hosts: localhost - vars: - - artifacts: ./artifacts - # FIXME! It would be cleaner to include 'podman' in this list; but the - # dnf module is broken in ansible <= 2.8, it doesn't report failures - # to install as long as _one_ package installs! So if podman installs - # but podman-tests doesn't, the `dnf` stanza succeeds, then the test - # one fails with a less-than-helpful error. - # - # See https://github.com/ansible/ansible/pull/49760 - - required_packages: - - podman-tests - tags: - - classic - - container - - tasks: - - name: install packages - dnf: name="{{ required_packages }}" state=installed - enablerepo=updates-testing - - - block: - # FIXME: how to make two passes, one as root and one rootless? - - name: Run test - script: ./test_podman.sh - always: - - name: Pull out logs - fetch: - src: "/tmp/{{ item }}" - dest: "{{ artifacts }}/{{ item }}" - flat: yes - with_items: - - test.log - - test.debug.log diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 80caee7..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_podman.yml From 9a4372d544a2b6438717a42899bb2b881dffc0eb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 4 Jul 2019 10:26:30 -0400 Subject: [PATCH 23/63] build 1.4.4 for centos re-add centos conditionals This reverts commit 4a519ff85c09f11c02189ab19e0a96b357483cd9. Signed-off-by: Lokesh Mandvekar --- podman.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/podman.spec b/podman.spec index dc9b2ae..4ed5f81 100644 --- a/podman.spec +++ b/podman.spec @@ -1,12 +1,15 @@ -%{?python_enable_dependency_generator} %global with_devel 0 %global with_bundled 1 %global with_debug 1 %global with_check 0 %global with_unit_test 0 +%if 0%{?fedora} %bcond_without varlink %define gogenerate go generate +%else +%bcond_with varlink +%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -15,6 +18,11 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) 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 %{?**}; +%define gogenerate go generate +%endif + %global provider github %global provider_tld com %global project containers @@ -32,7 +40,9 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman +%if 0%{?fedora} Epoch: 2 +%endif # fedora Version: 1.4.4 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images @@ -58,16 +68,25 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: libvarlink-util >= 18-1 +Requires: runc >= 2:1.0.0-57 +%else +#### DO NOT REMOVE - NEEDED FOR CENTOS +Requires: %{name}-manpages = %{version}-%{release} +Requires: container-selinux +Requires: slirp4netns >= 0.3.0-2 +Requires: runc >= 1.0.0-57 +%endif #fedora + # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -182,7 +201,12 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch +%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} +%else +#### DO NOT REMOVE - NEEDED FOR CENTOS +Requires: %{name} = %{version}-%{release} +%endif # fedora Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -201,9 +225,8 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands -%files manpages -%{_mandir}/man1/%{name}*.1* - +#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -217,6 +240,7 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. +%endif #fedora %if 0%{?with_devel} %package devel @@ -378,9 +402,9 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%if 0%{?fedora} %package tests Summary: Tests for %{name} - Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq @@ -389,6 +413,7 @@ Requires: jq %{summary} This package contains system tests for %{name} +%endif # fedora %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -405,18 +430,25 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -export GO111MODULE=off +%if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... +%endif # fedora # build %%{name} +%if 0%{?fedora} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -export GO111MODULE=off +%else +#### DO NOT REMOVE - NEEDED FOR CENTOS +export GO111MODULE=off +export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%endif # fedora %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +%if 0%{?fedora} # build %%{name}-remote export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -export GO111MODULE=off %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} +%endif # fedora # build conmon pushd conmon-%{commit_conmon} @@ -427,7 +459,9 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ +%if 0%{?fedora} install.remote \ +%endif # fedora install.man \ install.cni \ install.systemd \ @@ -510,8 +544,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +%if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%endif # fedora %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -554,12 +590,18 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%files manpages +%{_mandir}/man1/%{name}*.1* + +#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} %files remote %{_bindir}/%{name}-remote %files tests %license LICENSE %{_datadir}/%{name}/test +%endif # fedora %changelog * Tue Jul 02 2019 bbaude - 2:1.4.4-1 From 9a7ab2473e784e63b829247adf53a0aba9044d95 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 8 Jul 2019 10:35:31 -0500 Subject: [PATCH 24/63] add libsseccomp depend Signed-off-by: baude --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 4ed5f81..1b6c489 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ Name: podman Epoch: 2 %endif # fedora Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -72,6 +72,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +Requires: libseccomp >= 2.4.1 %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -604,6 +605,9 @@ exit 0 %endif # fedora %changelog +* Mon Jul 08 2019 bbaude - 2:1.4.4-2 +- Add runtime depend for libseccomp + * Tue Jul 02 2019 bbaude - 2:1.4.4-1 - Bump to v1.4.4 From b9ef8282adac78f86c41c564798963536498f5a2 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 8 Jul 2019 16:34:46 -0500 Subject: [PATCH 25/63] correct podman commit Signed-off-by: baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e84c5cc..f22c0ba 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /libpod-9b6a98c.tar.gz /libpod-7fd6528.tar.gz /libpod-2371158.tar.gz +/libpod-b3f10c8.tar.gz diff --git a/podman.spec b/podman.spec index 1b6c489..037a056 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 23711589f06b243fde07b9fcecb1cdc11c98a616 +%global commit0 b3f10c8be229bcc58c1673b0431285fd5fce1293 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -44,7 +44,7 @@ Name: podman Epoch: 2 %endif # fedora Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -605,6 +605,9 @@ exit 0 %endif # fedora %changelog +* Mon Jul 08 2019 bbaude - 2:1.4.4-3 +- correct 1.4.4 commit + * Mon Jul 08 2019 bbaude - 2:1.4.4-2 - Add runtime depend for libseccomp diff --git a/sources b/sources index b85593d..6c39d43 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-2371158.tar.gz) = d9af4d6fae424131fe7ecc43d7dd73c8cb5d48cf9a78d61e3480efb01a76058a629baca250f97e59489c11a8e15c90f38c3ec1be21e99c60a795ddc3963d9a1e +SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 From 2ce1b09966e739edb216f5db191cbac57092a7f1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Jul 2019 19:04:47 +0530 Subject: [PATCH 26/63] spec file conditionals cleanup, add GO111MODULE=off before podman-remote Signed-off-by: Lokesh Mandvekar --- podman.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/podman.spec b/podman.spec index 037a056..ee7616a 100644 --- a/podman.spec +++ b/podman.spec @@ -42,7 +42,7 @@ Name: podman %if 0%{?fedora} Epoch: 2 -%endif # fedora +%endif Version: 1.4.4 Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images @@ -86,7 +86,7 @@ Requires: %{name}-manpages = %{version}-%{release} Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 -%endif #fedora +%endif # vendored libraries @@ -207,7 +207,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: %{name} = %{version}-%{release} -%endif # fedora +%endif Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -241,7 +241,7 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. -%endif #fedora +%endif %if 0%{?with_devel} %package devel @@ -414,7 +414,7 @@ Requires: jq %{summary} This package contains system tests for %{name} -%endif # fedora +%endif %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -433,7 +433,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... -%endif # fedora +%endif # build %%{name} %if 0%{?fedora} @@ -442,14 +442,15 @@ export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hac #### DO NOT REMOVE - NEEDED FOR CENTOS export GO111MODULE=off export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -%endif # fedora +%endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} # build %%{name}-remote +export GO111MODULE=off export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif # fedora +%endif # build conmon pushd conmon-%{commit_conmon} @@ -548,7 +549,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ -%endif # fedora +%endif %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -602,7 +603,7 @@ exit 0 %files tests %license LICENSE %{_datadir}/%{name}/test -%endif # fedora +%endif %changelog * Mon Jul 08 2019 bbaude - 2:1.4.4-3 From 238f787fee110c838a96d51389bd94b1e8c6032b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Jul 2019 20:11:35 +0530 Subject: [PATCH 27/63] fix build issues Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/podman.spec b/podman.spec index ee7616a..6b11d5d 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,11 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git +%if 0%{?fedora} > 30 +BuildRequires: golang-github-cpuguy83-md2man +%else BuildRequires: go-md2man +%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel @@ -432,6 +436,7 @@ ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) %if 0%{?fedora} +export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... %endif From e66ee7c272980b32319cf0d55f0d40fabcf06e4a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Jul 2019 20:27:38 +0530 Subject: [PATCH 28/63] GO111MODULE=off only before all build steps Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 6b11d5d..910be58 100644 --- a/podman.spec +++ b/podman.spec @@ -435,8 +435,9 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%if 0%{?fedora} export GO111MODULE=off + +%if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... %endif @@ -445,14 +446,12 @@ export GO111MODULE=off export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %else #### DO NOT REMOVE - NEEDED FOR CENTOS -export GO111MODULE=off export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} # build %%{name}-remote -export GO111MODULE=off export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif From 4a32bdd50807411336604a8e94ae8d19c1cc87f7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 15 Jul 2019 03:12:00 +0530 Subject: [PATCH 29/63] go-md2man present on rawhide as well Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/podman.spec b/podman.spec index 910be58..536c728 100644 --- a/podman.spec +++ b/podman.spec @@ -57,11 +57,7 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git -%if 0%{?fedora} > 30 -BuildRequires: golang-github-cpuguy83-md2man -%else BuildRequires: go-md2man -%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel From f24c7b5b26bd63db5d186c1853838dd3df7cd2c8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Jul 2019 20:50:50 +0530 Subject: [PATCH 30/63] podman-2:1.4.4-4 - use conmon v1.0.0-rc2 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 f22c0ba..cde4b04 100644 --- a/.gitignore +++ b/.gitignore @@ -248,3 +248,4 @@ /libpod-7fd6528.tar.gz /libpod-2371158.tar.gz /libpod-b3f10c8.tar.gz +/conmon-1de71ad.tar.gz diff --git a/podman.spec b/podman.spec index 536c728..597807e 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon 59952292a3b07ac125575024ae21956efe0ecdfb +%global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman @@ -44,7 +44,7 @@ Name: podman Epoch: 2 %endif Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -478,8 +478,7 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers # install conmon pushd conmon-%{commit_conmon} -%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install -mv %{buildroot}%{_libexecdir}/crio %{buildroot}%{_libexecdir}/%{name} +%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name} popd # source codes for building projects @@ -606,6 +605,9 @@ exit 0 %endif %changelog +* Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 +- use conmon v1.0.0-rc2 + * Mon Jul 08 2019 bbaude - 2:1.4.4-3 - correct 1.4.4 commit diff --git a/sources b/sources index 6c39d43..5b00597 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 +SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 From 325f24134813336713362806b23d9d5630e25257 Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Fri, 19 Jul 2019 10:33:28 +0200 Subject: [PATCH 31/63] Revert tests; incorporate fixes from bgoncalv Tests were clobbered (accidentally, I assume) by f9aac43. Revert, and incorporate changes from bgoncalv that address changes to CI system in last few months (artifact handling, new ansible version, add rootless tests) Signed-off-by: Ed Santiago --- tests/test_podman.sh | 9 +++++++++ tests/test_podman.yml | 20 ++++++++++++++++++++ tests/tests.yml | 1 + 3 files changed, 30 insertions(+) create mode 100755 tests/test_podman.sh create mode 100644 tests/test_podman.yml create mode 100644 tests/tests.yml diff --git a/tests/test_podman.sh b/tests/test_podman.sh new file mode 100755 index 0000000..5a339e9 --- /dev/null +++ b/tests/test_podman.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e +# +# Simple podman tests +# + +# Log program versions +rpm -q podman podman-tests + +bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml new file mode 100644 index 0000000..0e00f56 --- /dev/null +++ b/tests/test_podman.yml @@ -0,0 +1,20 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + required_packages: + - bats + - podman + - podman-tests + tests: + - root-test: + dir: ./ + run: ./test_podman.sh + - rootless-test: + # running the test with su doesn't create the directory for fedora user on /run/user/ + # so create it manually + dir: ./ + run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..80caee7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- import_playbook: test_podman.yml From 0b885083f0c7463ffb81267da3d74ef28683275f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 31 Jul 2019 04:57:52 +0530 Subject: [PATCH 32/63] built_tag macro records exact upstream tag built Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 597807e..83d0e44 100644 --- a/podman.spec +++ b/podman.spec @@ -39,6 +39,10 @@ %global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v1.4.4 + Name: podman %if 0%{?fedora} Epoch: 2 From 021e5c9ad889489ccc68c48701c895bd8f2b86d8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 8 Aug 2019 04:15:01 +0530 Subject: [PATCH 33/63] avoid `make` in `make install` RE: upstream pr 3757 https://github.com/containers/libpod/pull/3757 Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 83d0e44..4c8fae1 100644 --- a/podman.spec +++ b/podman.spec @@ -423,9 +423,13 @@ This package contains system tests for %{name} %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar cri-o +# untar conmon tar zxf %{SOURCE1} +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +sed -i 's/install.man: docs/install.man:/' Makefile + %build mkdir _build pushd _build From 7070857c4759ef2eeb76dfbb2d02e00aeae15131 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 9 Aug 2019 20:29:02 +0530 Subject: [PATCH 34/63] use conmon v2.0.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 2 +- sources | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cde4b04..52c12fa 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /libpod-2371158.tar.gz /libpod-b3f10c8.tar.gz /conmon-1de71ad.tar.gz +/conmon-e217fdf.tar.gz diff --git a/podman.spec b/podman.spec index 4c8fae1..b6fe89b 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b +%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) # Used for comparing with latest upstream tag diff --git a/sources b/sources index 5b00597..9a0d219 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 -SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 +SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 From 92267971e378fe881adee7e3fd2f76c2c5428af1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 9 Aug 2019 21:26:37 +0000 Subject: [PATCH 35/63] podman-2:1.5.0-2 - bump to v1.5.0 - autobuilt 54b394b Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 52c12fa..ad4c92e 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /libpod-b3f10c8.tar.gz /conmon-1de71ad.tar.gz /conmon-e217fdf.tar.gz +/libpod-54b394b.tar.gz diff --git a/podman.spec b/podman.spec index b6fe89b..780c4b3 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b3f10c8be229bcc58c1673b0431285fd5fce1293 +%global commit0 54b394bd3ec07d11c7ed176531a752261acc71a7 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -41,14 +41,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.4.4 +%global built_tag v1.5.0 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.4.4 -Release: 4%{?dist} +Version: 1.5.0 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -613,6 +613,10 @@ exit 0 %endif %changelog +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 +- bump to v1.5.0 +- autobuilt 54b394b + * Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 - use conmon v1.0.0-rc2 diff --git a/sources b/sources index 9a0d219..7fe54d2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 +SHA512 (libpod-54b394b.tar.gz) = 693e789cb412cfdf8495842c05efec589f4181f902e6180e287366af99ba3b9cca4d3cc67e012fa43298775a57920c190be73f574af6e42298e8d001d8c8207a From 99f07fae09d3b000ab3afc154fc9f753c62dead7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 10 Aug 2019 07:03:47 -0400 Subject: [PATCH 36/63] bump to v1.5.0 autobuilt 54b394b --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index 780c4b3..ae518de 100644 --- a/podman.spec +++ b/podman.spec @@ -454,6 +454,8 @@ export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_ %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} docs + %if 0%{?fedora} # build %%{name}-remote export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" From f4f88918c4e60e70ffba4760463fb1135bfbcd01 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 13:36:09 -0400 Subject: [PATCH 37/63] Add recommends libvarlink-util --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ae518de..ab7a254 100644 --- a/podman.spec +++ b/podman.spec @@ -48,7 +48,7 @@ Name: podman Epoch: 2 %endif Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -77,6 +77,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Requires: libseccomp >= 2.4.1 +Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -615,6 +616,9 @@ exit 0 %endif %changelog +* Tue Aug 13 2019 Dan Walsh - 2:1.5.0-3 +- Add recommends libvarlink-util + * Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 - bump to v1.5.0 - autobuilt 54b394b From 75e122c0cd6bbbdcfc028ed04ac280d1a2dbf6e2 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 15 Aug 2019 23:25:35 +0000 Subject: [PATCH 38/63] podman-2:1.5.1-2 - bump to v1.5.1 - autobuilt 0005792 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ad4c92e..a95d824 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /conmon-1de71ad.tar.gz /conmon-e217fdf.tar.gz /libpod-54b394b.tar.gz +/libpod-0005792.tar.gz diff --git a/podman.spec b/podman.spec index ab7a254..0983e27 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 54b394bd3ec07d11c7ed176531a752261acc71a7 +%global commit0 00057929f5acfd98341964d85722383363376d52 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -41,14 +41,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.5.0 +%global built_tag v1.5.1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.5.0 -Release: 3%{?dist} +Version: 1.5.1 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -616,6 +616,10 @@ exit 0 %endif %changelog +* Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 +- bump to v1.5.1 +- autobuilt 0005792 + * Tue Aug 13 2019 Dan Walsh - 2:1.5.0-3 - Add recommends libvarlink-util diff --git a/sources b/sources index 7fe54d2..c1a6163 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-54b394b.tar.gz) = 693e789cb412cfdf8495842c05efec589f4181f902e6180e287366af99ba3b9cca4d3cc67e012fa43298775a57920c190be73f574af6e42298e8d001d8c8207a +SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 From 4b520db9b18b3c0113b53914b7aaa131a1578110 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:17:36 -0400 Subject: [PATCH 39/63] list unitfiles in /usr/lib/systemd/user correctly (correct commit message) Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 0983e27..eb4a3f2 100644 --- a/podman.spec +++ b/podman.spec @@ -48,7 +48,7 @@ Name: podman Epoch: 2 %endif Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -583,6 +583,9 @@ exit 0 %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket + %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -616,6 +619,9 @@ exit 0 %endif %changelog +* Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 +- list unitfiles in /usr/lib/systemd/user + * Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 - bump to v1.5.1 - autobuilt 0005792 From 6f31a965e301fc1a98470d8b7ca33eec1be20951 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 17 Aug 2019 00:07:35 +0530 Subject: [PATCH 40/63] recommends tag only for fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/podman.spec b/podman.spec index eb4a3f2..4d82fdb 100644 --- a/podman.spec +++ b/podman.spec @@ -77,7 +77,6 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Requires: libseccomp >= 2.4.1 -Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux From fe6ddf4fedc269ae53ba38efc44715006675debc Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 26 Aug 2019 09:56:03 -0600 Subject: [PATCH 41/63] Enable gating tests on f30 Also: bring in the 15-minute test timeout from master. Note that the decision_context is 'push_TESTING' for branches other than rawhide, so gating.yaml has a one-line difference against master. Signed-off-by: Ed Santiago --- gating.yaml | 6 ++++++ tests/test_podman.yml | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..9571536 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +rules: + - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} diff --git a/tests/test_podman.yml b/tests/test_podman.yml index 0e00f56..c73bf48 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -13,8 +13,10 @@ - root-test: dir: ./ run: ./test_podman.sh + timeout: 15m - rootless-test: # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + timeout: 15m From f0080806618b4dcbd3ccb17c55e227be6332960d Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Sep 2019 19:06:44 +0000 Subject: [PATCH 42/63] podman-2:1.6.0-2 - bump to v1.6.0-rc1 - autobuilt ca5ff03 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a95d824..5798fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /conmon-e217fdf.tar.gz /libpod-54b394b.tar.gz /libpod-0005792.tar.gz +/libpod-ca5ff03.tar.gz diff --git a/podman.spec b/podman.spec index 4d82fdb..bf5a79d 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 00057929f5acfd98341964d85722383363376d52 +%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -41,14 +41,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.5.1 +%global built_tag v1.6.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.6.0 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -618,6 +618,10 @@ exit 0 %endif %changelog +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 +- bump to v1.6.0-rc1 +- autobuilt ca5ff03 + * Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 - list unitfiles in /usr/lib/systemd/user diff --git a/sources b/sources index c1a6163..baeac5e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 +SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a From 153b8b99c8f44f659f673d9717829c15d29ad8a6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 25 Sep 2019 10:13:42 -0400 Subject: [PATCH 43/63] use standalone conmon as dep Signed-off-by: Lokesh Mandvekar --- podman.spec | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/podman.spec b/podman.spec index bf5a79d..4065847 100644 --- a/podman.spec +++ b/podman.spec @@ -34,11 +34,6 @@ %global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/containers/conmon -%global git_conmon https://%{import_path_conmon} -%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f -%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %global built_tag v1.6.0-rc1 @@ -53,7 +48,6 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -77,6 +71,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Requires: libseccomp >= 2.4.1 +Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -423,9 +418,6 @@ This package contains system tests for %{name} %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar conmon -tar zxf %{SOURCE1} - sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile sed -i 's/install.man: docs/install.man:/' Makefile @@ -462,11 +454,6 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif -# build conmon -pushd conmon-%{commit_conmon} -%{__make} all -popd - %install install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -486,11 +473,6 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers -# install conmon -pushd conmon-%{commit_conmon} -%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name} -popd - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -576,8 +558,6 @@ exit 0 # By "owning" the site-functions dir, we don't need to Require zsh %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service From 9d8f6f511cdddbaa2000b4d3aed37cd2f1812983 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Sep 2019 19:27:42 +0000 Subject: [PATCH 44/63] podman-2:1.6.0-0.2.rc2 - bump to v1.6.0-rc2 - autobuilt 9181c65 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 3 +-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5798fd0..8c04d99 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ /libpod-54b394b.tar.gz /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz +/libpod-9181c65.tar.gz diff --git a/podman.spec b/podman.spec index 4065847..a13260c 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 +%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0-rc1 +%global built_tag v1.6.0-rc2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.0 -Release: 2%{?dist} +Release: 0.2.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2 +- bump to v1.6.0-rc2 +- autobuilt 9181c65 + * Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 - bump to v1.6.0-rc1 - autobuilt ca5ff03 diff --git a/sources b/sources index baeac5e..6df3385 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a +SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 From 101c787115ea35f9f568a95790172882df0715ed Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Oct 2019 18:16:54 +0000 Subject: [PATCH 45/63] podman-2:1.6.0-2 - bump to v1.6.0 - autobuilt b02b072 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8c04d99..5ad21bd 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,4 @@ /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz +/libpod-b02b072.tar.gz diff --git a/podman.spec b/podman.spec index a13260c..0d57e76 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 +%global commit0 b02b072832cac26d7cc468d713303843d2935a36 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0-rc2 +%global built_tag v1.6.0 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.0 -Release: 0.2.rc2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 RH Container Bot - 2:1.6.0-2 +- bump to v1.6.0 +- autobuilt b02b072 + * Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2 - bump to v1.6.0-rc2 - autobuilt 9181c65 diff --git a/sources b/sources index 6df3385..41d9b17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 +SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c From 898858285f93bb701d1b9784ff4b8ced106bada9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:29:05 -0400 Subject: [PATCH 46/63] bump 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 0d57e76..46b1b4f 100644 --- a/podman.spec +++ b/podman.spec @@ -43,7 +43,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,9 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 +- bump release tag + * Tue Oct 01 2019 RH Container Bot - 2:1.6.0-2 - bump to v1.6.0 - autobuilt b02b072 From 0d788ed684099145c59db7a62da55a443825a6fe Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 1 Oct 2019 13:30:50 -0600 Subject: [PATCH 47/63] rootless: chown the /run/user dir gating tests are failing with: Error: could not get runtime: cannot mkdir /run/user/1000/libpod: mkdir /run/user/1000/libpod: no such file or directory That's a directory we create; try chowning it Signed-off-by: Ed Santiago --- tests/test_podman.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_podman.yml b/tests/test_podman.yml index c73bf48..c0c3315 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -18,5 +18,5 @@ # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ - run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + run: mkdir /run/user/$(id -u fedora); chown fedora /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora timeout: 15m From 8b18a60e747eb945dbf93ee9bfb529dd36bf0e18 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 18:00:22 +0000 Subject: [PATCH 48/63] podman-2:1.6.1-0.2.rc1 - bump to v1.6.1-rc1 - autobuilt a2fdb6e Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5ad21bd..97db4ae 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz +/libpod-a2fdb6e.tar.gz diff --git a/podman.spec b/podman.spec index 46b1b4f..7979ff9 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b02b072832cac26d7cc468d713303843d2935a36 +%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0 +%global built_tag v1.6.1-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.0 -Release: 3%{?dist} +Version: 1.6.1 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-0.2.rc1 +- bump to v1.6.1-rc1 +- autobuilt a2fdb6e + * Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 - bump release tag diff --git a/sources b/sources index 41d9b17..5a8c9a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c +SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a From 98fab4c8ffedbf2ddb230f6429de3b626e92e6fa Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 23:16:55 +0000 Subject: [PATCH 49/63] podman-2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97db4ae..eaf2b95 100644 --- a/.gitignore +++ b/.gitignore @@ -256,3 +256,4 @@ /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz +/libpod-233d95f.tar.gz diff --git a/podman.spec b/podman.spec index 7979ff9..7d448fa 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c +%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.1-rc1 +%global built_tag v1.6.1 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.1 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 +- bump to v1.6.1 +- autobuilt 233d95f + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-0.2.rc1 - bump to v1.6.1-rc1 - autobuilt a2fdb6e diff --git a/sources b/sources index 5a8c9a9..d9bde40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a +SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 From a03e221e27e990dcec97af0f3a0a6cfa8f3aace1 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 3 Oct 2019 08:26:19 -0600 Subject: [PATCH 50/63] gating tests: log important package versions Signed-off-by: Ed Santiago --- tests/test_podman.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 5a339e9..47c382f 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -3,7 +3,11 @@ # Simple podman tests # -# Log program versions -rpm -q podman podman-tests +# Log program and kernel versions +echo "Important package versions:" +( + uname -r + rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort +) | sed -e 's/^/ /' bats /usr/share/podman/test/system From ff0aa5a201da844c19206adafa4f9cebb0552d9e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 9 Oct 2019 08:10:13 -0600 Subject: [PATCH 51/63] Gating tests: use loginctl, dump env - instead of hacky mkdir /run/user/, use loginctl enable-linger and hope that it has the same effect. reason: the mkdir doesn't seem to be 100% effective. There are cases in which the first rootless podman invocation fails with: Error: could not get runtime: cannot mkdir /run/user/1000/libpod: mkdir /run/user/1000/libpod: no such file or directory - for future spelunking, dump environment at start of each test (both root and rootless). Suggested by Giuseppe. Signed-off-by: Ed Santiago --- tests/test_podman.sh | 4 ++++ tests/test_podman.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 47c382f..1f7b3f7 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -10,4 +10,8 @@ echo "Important package versions:" rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort ) | sed -e 's/^/ /' +# Log environment; or at least the useful bits +echo "Environment:" +env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' + bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml index c0c3315..7002972 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -18,5 +18,5 @@ # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ - run: mkdir /run/user/$(id -u fedora); chown fedora /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora timeout: 15m From e229ca66626cfbc86f057ad08ff31b51624549f6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 16 Oct 2019 20:47:57 +0000 Subject: [PATCH 52/63] podman-2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eaf2b95..55284f2 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,4 @@ /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz /libpod-233d95f.tar.gz +/libpod-4d653f0.tar.gz diff --git a/podman.spec b/podman.spec index 7d448fa..34ceb55 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 +%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.1 +%global built_tag v1.6.2-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.2 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 +- bump to v1.6.2-rc1 +- autobuilt 4d653f0 + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f diff --git a/sources b/sources index d9bde40..8fd79f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 +SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 From c29719e5d3244e1387ea0800b0d834f2baf39721 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Oct 2019 22:16:51 +0000 Subject: [PATCH 53/63] podman-2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 55284f2..a24c5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -258,3 +258,4 @@ /libpod-a2fdb6e.tar.gz /libpod-233d95f.tar.gz /libpod-4d653f0.tar.gz +/libpod-f3ffda1.tar.gz diff --git a/podman.spec b/podman.spec index 34ceb55..583c5dc 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 +%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.2-rc1 +%global built_tag v1.6.2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.2 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 +- bump to v1.6.2 +- autobuilt f3ffda1 + * Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 diff --git a/sources b/sources index 8fd79f6..88750c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 +SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c From cca6083e8bfb70804fb8123002d46fe3a9fa953b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 11 Dec 2019 19:10:24 +0000 Subject: [PATCH 54/63] podman-2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a24c5e7..65756ca 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,4 @@ /libpod-233d95f.tar.gz /libpod-4d653f0.tar.gz /libpod-f3ffda1.tar.gz +/libpod-7bbef41.tar.gz diff --git a/podman.spec b/podman.spec index 583c5dc..a098abf 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a +%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.2 +%global built_tag v1.7.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.7.0 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 +- bump to v1.7.0-rc1 +- autobuilt 7bbef41 + * Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 diff --git a/sources b/sources index 88750c6..fc074cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c +SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c From 999bf283704119f03c0c1a61f089dd4f7d04693c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 2 Jan 2020 21:10:29 +0000 Subject: [PATCH 55/63] podman-2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 65756ca..13621d7 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ /libpod-4d653f0.tar.gz /libpod-f3ffda1.tar.gz /libpod-7bbef41.tar.gz +/libpod-9090c47.tar.gz diff --git a/podman.spec b/podman.spec index a098abf..0c4f1fc 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 +%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc1 +%global built_tag v1.7.0-rc2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -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/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 +- bump to v1.7.0-rc2 +- autobuilt 9090c47 + * Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 diff --git a/sources b/sources index fc074cb..b50c5cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c +SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b From 18089b05fb4cee0013b77191c3108cec09c60feb Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Jan 2020 17:10:24 +0000 Subject: [PATCH 56/63] podman-2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 13621d7..d16d605 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,4 @@ /libpod-f3ffda1.tar.gz /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz +/libpod-b7ce115.tar.gz diff --git a/podman.spec b/podman.spec index 0c4f1fc..5c61258 100644 --- a/podman.spec +++ b/podman.spec @@ -31,19 +31,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c +%global commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc2 +%global built_tag v1.7.0 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -Release: 0.3.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -598,6 +598,10 @@ exit 0 %endif %changelog +* Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 +- bump to v1.7.0 +- autobuilt b7ce115 + * Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 diff --git a/sources b/sources index b50c5cc..b5c7bc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b +SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 From 0aaf5925fda4c9573d4bdeaa6de9cfe02afc698e Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 9 Jan 2020 10:27:10 +0100 Subject: [PATCH 57/63] podman-1.7.0-3.fc30 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) - merge podman-manpages with podman package - minor spec file updates Signed-off-by: Jindrich Novy --- podman.spec | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/podman.spec b/podman.spec index 5c61258..2243b0f 100644 --- a/podman.spec +++ b/podman.spec @@ -43,11 +43,13 @@ Name: podman Epoch: 2 %endif Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.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. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -72,17 +74,14 @@ Requires: iptables Requires: nftables Requires: libseccomp >= 2.4.1 Requires: conmon +Requires: (container-selinux if selinux-policy) %if 0%{?fedora} -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} -Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: libvarlink-util >= 18-1 Requires: runc >= 2:1.0.0-57 %else #### DO NOT REMOVE - NEEDED FOR CENTOS -Requires: %{name}-manpages = %{version}-%{release} -Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 %endif @@ -191,9 +190,16 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description -%{name} (Pod Manager) is a fully featured container engine that is a simple daemonless tool. %{name} provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=%{name}. Most %{name} commands can be run as a regular user, without requiring additional privileges. +%{name} (Pod Manager) is a fully featured container engine that is a simple +daemonless tool. %{name} provides a Docker-CLI comparable command line that +eases the transition from other container engines and allows the management of +pods, containers and images. Simply put: alias docker=%{name}. +Most %{name} commands can be run as a regular user, without requiring +additional privileges. -%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. +%{name} uses Buildah(1) internally to create container images. +Both tools share image (not container) storage, hence each can use or +manipulate images (but not containers) created by the other. %{summary} %{repo} Simple management tool for pods, containers and images @@ -218,18 +224,10 @@ This package installs a script named docker that emulates the Docker CLI by executes %{name} commands, it also creates links between all Docker CLI man pages and %{name}. -%package manpages -Summary: Man pages for the %{name} commands -BuildArch: noarch - -%description manpages -Man pages for the %{name} commands - #### DO NOT REMOVE - NEEDED FOR CENTOS %if 0%{?fedora} %package remote Summary: (Experimental) Remote client for managing %{name} containers -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} %description remote Remote client for managing %{name} containers. @@ -396,7 +394,8 @@ Requires: golang(github.com/urfave/cli) %description unit-test-devel %{summary} -libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%{repo} provides a library for applications looking to use the +Container Pod concept popularized by Kubernetes. This package contains unit tests for project providing packages with %{import_path} prefix. @@ -473,6 +472,11 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# 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 +done + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -549,11 +553,10 @@ exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files +%files -f podman.file-list %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh %{_datadir}/zsh/site-functions @@ -564,7 +567,6 @@ exit 0 %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket - %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -584,13 +586,12 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif -%files manpages -%{_mandir}/man1/%{name}*.1* - #### DO NOT REMOVE - NEEDED FOR CENTOS %if 0%{?fedora} %files remote %{_bindir}/%{name}-remote +%{_mandir}/man1/%{name}-remote*.1* +%{_mandir}/man5/%{name}-remote*.5* %files tests %license LICENSE @@ -598,6 +599,12 @@ exit 0 %endif %changelog +* Thu Jan 09 2020 Jindrich Novy - 2:1.7.0-3 +- require container-selinux only when selinux-policy is installed and + move podman-remote man pages to dedicated package (#1765818) +- merge podman-manpages with podman package +- minor spec file updates + * Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 From 3118b58c277304800c75cf5107aaa0a54046e2e4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:46:53 -0500 Subject: [PATCH 58/63] set Epoch:0 for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index 2243b0f..b958c5c 100644 --- a/podman.spec +++ b/podman.spec @@ -41,6 +41,8 @@ Name: podman %if 0%{?fedora} Epoch: 2 +%else +Epoch: 0 %endif Version: 1.7.0 Release: 3%{?dist} From c34020e07708b649f2e2dc136e8a6381e9ea6a4b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Feb 2020 17:01:34 -0500 Subject: [PATCH 59/63] use define instead of global Signed-off-by: Lokesh Mandvekar --- podman.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/podman.spec b/podman.spec index b958c5c..952a6b3 100644 --- a/podman.spec +++ b/podman.spec @@ -23,20 +23,20 @@ %define gogenerate go generate %endif -%global provider github -%global provider_tld com -%global project containers -%global repo libpod +%define provider github +%define provider_tld com +%define project containers +%define repo libpod # https://github.com/containers/libpod -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%define import_path %{provider_prefix} +%define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} +%define commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 +%define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0 +%define built_tag v1.7.0 Name: podman %if 0%{?fedora} From 7b85663ab734cfd34877a7e9db7b4c4fbcbf159c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 14 Feb 2020 10:49:37 -0500 Subject: [PATCH 60/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 - Resolves: #1795838, #1802903 - Security fix for CVE-2020-8945 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 + podman.spec | 889 +++++++++++++++++++++++++++++++++++++++++++++------- sources | 3 +- 3 files changed, 780 insertions(+), 114 deletions(-) diff --git a/.gitignore b/.gitignore index d16d605..db5ddd8 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,5 @@ /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz /libpod-b7ce115.tar.gz +/dnsname-f5af33d.tar.gz +/v1.8.0.tar.gz diff --git a/podman.spec b/podman.spec index 952a6b3..61cfa21 100644 --- a/podman.spec +++ b/podman.spec @@ -1,16 +1,21 @@ %global with_devel 0 %global with_bundled 1 -%global with_debug 1 %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 +#### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink -%define gogenerate go generate %else %bcond_with varlink %endif +%if 0%{?fedora} +%global with_debug 1 +%else +%global with_debug 0 +%endif + %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -19,9 +24,9 @@ %endif %if ! 0%{?gobuild:1} -%define gobuild(o:) 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 %{?**}; -%define gogenerate go generate +%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 %define provider github %define provider_tld com @@ -31,12 +36,21 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 +%define commit0 2ced9094d4728dd09f60a177faa32339a8d0f721 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%define repo_plugins dnsname +# https://github.com/containers/libpod +%define import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%define git_plugins https://github.com/containers/dnsname +%define commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%define 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 v1.7.0 +%define built_tag v1.8.0 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -44,17 +58,17 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.7.0 -Release: 3%{?dist} +Version: 1.8.0 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source0: %{download_url} +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. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: btrfs-progs-devel +BuildRequires: golang BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -65,7 +79,6 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd @@ -74,20 +87,25 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Requires: libseccomp >= 2.4.1 Requires: conmon -Requires: (container-selinux if selinux-policy) +Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Requires: container-selinux %if 0%{?fedora} +BuildRequires: btrfs-progs-devel +BuildRequires: ostree-devel +Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 -Recommends: libvarlink-util >= 18-1 -Requires: runc >= 2:1.0.0-57 +Recommends: runc +Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 -Requires: runc >= 1.0.0-57 +Requires: runc +%endif +%if 0%{?centos} >= 8 +Requires: libvarlink-util %endif - # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -209,12 +227,7 @@ manipulate images (but not containers) created by the other. %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch -%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} -%else -#### DO NOT REMOVE - NEEDED FOR CENTOS -Requires: %{name} = %{version}-%{release} -%endif Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -226,22 +239,6 @@ This package installs a script named docker that emulates the Docker CLI by executes %{name} commands, it also creates links between all Docker CLI man pages and %{name}. -#### DO NOT REMOVE - NEEDED FOR CENTOS -%if 0%{?fedora} -%package remote -Summary: (Experimental) Remote client for managing %{name} containers - -%description remote -Remote client for managing %{name} containers. - -This experimental remote client is under heavy development. Please do not -run %{name}-remote in production. - -%{name}-remote uses the varlink connection to connect to a %{name} client to -manage pods, containers and container images. %{name}-remote supports ssh -connections as well. -%endif - %if 0%{?with_devel} %package devel Summary: Library for applications looking to use Container Pods @@ -377,7 +374,7 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running @@ -403,9 +400,9 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} + Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq @@ -414,54 +411,90 @@ Requires: jq %{summary} This package contains system tests for %{name} + +%if 0%{?fedora} || 0%{?centos} >= 8 +%package remote +Summary: (Experimental) Remote client for managing %{name} containers + +%description remote +Remote client for managing %{name} containers. + +This experimental remote client is under heavy development. Please do not +run %{name}-remote in production. + +%{name}-remote uses the varlink connection to connect to a %{name} client to +manage pods, containers and container images. %{name}-remote supports ssh +connections as well. %endif -%prep -%autosetup -Sgit -n %{repo}-%{commit0} +%package plugins +Summary: Plugins for %{name} -sed -i 's/install.remote: podman-remote/install.remote:/' Makefile -sed -i 's/install.bin: podman/install.bin:/' Makefile -sed -i 's/install.man: docs/install.man:/' Makefile +%description plugins +This plugin sets up the use of dnsmasq on a given CNI network so +that Pods can resolve each other by name. When configured, +the pod and its IP address are added to a network specific hosts file +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. + +%prep +%autosetup -Sgit -n %{repo}-%{built_tag_strip} + +# untar dnsname +tar zxf %{SOURCE1} %build +export GO111MODULE=off + +# build plugins first cause we don't wanna use podman's buildtags +pushd dnsname-%{commit_plugins} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_plugins} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname +popd + +export GOPATH=$(pwd)/_build:$(pwd) mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) - -export GO111MODULE=off - -%if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... -%endif # build %%{name} -%if 0%{?fedora} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -%else -#### DO NOT REMOVE - NEEDED FOR CENTOS -export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%if 0%{?centos} +export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} docs - -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS+="remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif +%endif %install +%if 0%{?fedora} +sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i +%endif +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +rm -rf docs/containers-mounts.conf.5.md + install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 install.remote \ -%endif # fedora +%endif install.man \ install.cni \ install.systemd \ @@ -474,11 +507,23 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install plugins +pushd dnsname-%{commit_plugins} +%{__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 done +# do not install remote manpages on centos7 +%if ! 0%{?fedora} && 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 +%endif + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -543,10 +588,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif -%if 0%{?fedora} 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 @@ -561,8 +604,8 @@ exit 0 %{_bindir}/%{name} %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh -%{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/* +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -574,6 +617,7 @@ exit 0 %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_usr}/lib/tmpfiles.d/%{name}-docker.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list @@ -589,28 +633,53 @@ exit 0 %endif #### DO NOT REMOVE - NEEDED FOR CENTOS -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 %files remote +%license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.1* %{_mandir}/man5/%{name}-remote*.5* +%endif %files tests %license LICENSE -%{_datadir}/%{name}/test -%endif +%dir %{_datadir}/%{name}/test +%dir %{_datadir}/%{name}/test/system +%{_datadir}/%{name}/test/system/* + +%files plugins +%license dnsname-%{commit_plugins}/LICENSE +%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} +%{_libexecdir}/cni/dnsname %changelog -* Thu Jan 09 2020 Jindrich Novy - 2:1.7.0-3 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 +- Resolves: #1795838, #1802903 - Security fix for CVE-2020-8945 + +* Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 +- bump crun dependency + +* Mon Feb 03 2020 Lokesh Mandvekar - 2:1.8.0-0.1 +- built v1.8.0-rc1 + +* Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) -- merge podman-manpages with podman package -- minor spec file updates * Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 +* Tue Jan 07 2020 Jindrich Novy - 2:1.7.0-0.5.rc2 +- merge podman-manpages with podman package +- require container-selinux (#1765818) +- minor spec file updates + +* Mon Jan 06 2020 Lokesh Mandvekar - 2:1.7.0-0.4.rc2 +- use correct rc tag + * Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 @@ -619,6 +688,12 @@ exit 0 - bump to v1.7.0-rc1 - autobuilt 7bbef41 +* Fri Nov 08 2019 Lokesh Mandvekar - 2:1.6.2-4 +- add podman-plugins subpackage + +* Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 +- crun only for fedora ATM + * Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 @@ -627,6 +702,15 @@ exit 0 - bump to v1.6.2-rc1 - autobuilt 4d653f0 +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-5 +- remove polkit dependency for now + +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-4 +- Requires: crun >= 0.10.2-1 and polkit + +* Tue Oct 08 2019 Lokesh Mandvekar - 2:1.6.1-3 +- add Recommends: runc for fedora + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f @@ -635,6 +719,9 @@ exit 0 - bump to v1.6.1-rc1 - autobuilt a2fdb6e +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-4 +- Requires: crun >= 0.10-1 + * Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 - bump release tag @@ -642,73 +729,649 @@ exit 0 - bump to v1.6.0 - autobuilt b02b072 -* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2 +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 -* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2.gitca5ff03 - bump to v1.6.0-rc1 - autobuilt ca5ff03 -* Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 -- list unitfiles in /usr/lib/systemd/user +* Sat Sep 14 2019 Lokesh Mandvekar - 2:1.5.1-3.git0005792 +- use v1.5.1 tag +- use conmon package as runtime dep -* Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 -- bump to v1.5.1 -- autobuilt 0005792 +* Fri Sep 13 2019 Daniel J Walsh - 2:1.5.1-2.18 +- Grab specific version of crun or newer. -* Tue Aug 13 2019 Dan Walsh - 2:1.5.0-3 +* Tue Aug 27 2019 Daniel J Walsh - 2:1.5.1-2.17 +- Require crun rather then runc +- Switch to crun by default for cgroupsV2 support + +* Thu Aug 22 2019 Daniel J Walsh - 2:1.5.1-2.16.dev.gitce64c14 +- Move man5 man pages into podman-manpage package + +* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.16.dev.gitce64c14 - Add recommends libvarlink-util -* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 -- bump to v1.5.0 -- autobuilt 54b394b +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.16.dev.gitce64c14 +- autobuilt ce64c14 -* Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 -- use conmon v1.0.0-rc2 +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.15.dev.git7a859f0 +- autobuilt 7a859f0 -* Mon Jul 08 2019 bbaude - 2:1.4.4-3 -- correct 1.4.4 commit +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.14.dev.git031437b +- autobuilt 031437b -* Mon Jul 08 2019 bbaude - 2:1.4.4-2 -- Add runtime depend for libseccomp +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.13.dev.gitc48243e +- autobuilt c48243e -* Tue Jul 02 2019 bbaude - 2:1.4.4-1 -- Bump to v1.4.4 +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.12.dev.gitf634fd3 +- autobuilt f634fd3 -* Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 -- Bump to v1.4.3 +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.11.dev.git3cf4567 +- autobuilt 3cf4567 -* Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 -- Bump to v1.4.2 +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.10.dev.git9bee690 +- autobuilt 9bee690 -* Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.9.dev.gitca7bae7 +- autobuilt ca7bae7 + +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.8.dev.gitec93c9d +- autobuilt ec93c9d + +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.7.dev.gitf18cfa4 +- autobuilt f18cfa4 + +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.6.dev.git2348c28 +- autobuilt 2348c28 + +* Sun Aug 11 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.5.dev.git1467197 +- autobuilt 1467197 + +* Sun Aug 11 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.4.dev.git7bbaa36 +- autobuilt 7bbaa36 + +* Sat Aug 10 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.3.dev.git3bc861c +- autobuilt 3bc861c + +* Sat Aug 10 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.2.dev.git926901d +- autobuilt 926901d + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.1.dev.git2018faa +- bump to 1.5.1 +- autobuilt 2018faa + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.99.dev.gitbb80586 +- autobuilt bb80586 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.98.dev.gitd05798e +- autobuilt d05798e + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.97.dev.git4b91f60 +- autobuilt 4b91f60 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.96.dev.gitdc38168 +- autobuilt dc38168 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.95.dev.git00a20f7 +- autobuilt 00a20f7 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.94.dev.git2a19036 +- autobuilt 2a19036 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.93.dev.git76840f2 +- autobuilt 76840f2 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.92.dev.git4349f42 +- autobuilt 4349f42 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.91.dev.git202eade +- autobuilt 202eade + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.90.dev.git09cedd1 +- autobuilt 09cedd1 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.89.dev.git3959a35 +- autobuilt 3959a35 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.88.dev.git5701fe6 +- autobuilt 5701fe6 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.87.dev.git31bfb12 +- autobuilt 31bfb12 + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.86.dev.git41de7b1 +- autobuilt 41de7b1 + +* Wed Aug 07 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.85.dev.git35ecf49 +- autobuilt 35ecf49 + +* Wed Aug 07 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.84.dev.git66ea32c +- autobuilt 66ea32c + +* Tue Aug 06 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.83.dev.gitf0a5b7f +- autobuilt f0a5b7f + +* Tue Aug 06 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.82.dev.gitb5618d9 +- autobuilt b5618d9 + +* Mon Aug 05 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.81.dev.git3bffe77 +- autobuilt 3bffe77 + +* Mon Aug 05 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.80.dev.git337358a +- autobuilt 337358a + +* Mon Aug 05 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.79.dev.git626dfdb +- autobuilt 626dfdb + +* Mon Aug 05 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.78.dev.gite2f38cd +- autobuilt e2f38cd + +* Mon Aug 05 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.77.dev.gitb609de2 +- autobuilt b609de2 + +* Sun Aug 04 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.76.dev.git389a7b7 +- autobuilt 389a7b7 + +* Sun Aug 04 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.75.dev.gitd9ea4db +- autobuilt d9ea4db + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.74.dev.git140e08e +- autobuilt 140e08e + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.73.dev.git3cc9ab8 +- autobuilt 3cc9ab8 + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.72.dev.git5370c53 +- autobuilt 5370c53 + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.71.dev.git2cc5913 +- autobuilt 2cc5913 + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.70.dev.gite3240da +- autobuilt e3240da + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.69.dev.gite48dc50 +- autobuilt e48dc50 + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.68.dev.git1bbcb2f +- autobuilt 1bbcb2f + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.67.dev.gite1a099e +- autobuilt e1a099e + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.66.dev.gitafb493a +- autobuilt afb493a + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.65.dev.git6f62dac +- autobuilt 6f62dac + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.64.dev.gitee15e76 +- autobuilt ee15e76 + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.63.dev.git5056964 +- autobuilt 5056964 + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.62.dev.git3215ea6 +- autobuilt 3215ea6 + +* Thu Aug 01 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.61.dev.gitccf4ec2 +- autobuilt ccf4ec2 + +* Wed Jul 31 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.60.dev.gita622f8d +- autobuilt a622f8d + +* Tue Jul 30 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.59.dev.git680a383 +- autobuilt 680a383 + +* Tue Jul 30 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.58.dev.gite84ed3c +- autobuilt e84ed3c + +* Tue Jul 30 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.57.dev.git1a00895 +- autobuilt 1a00895 + +* Tue Jul 30 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.56.dev.git4196a59 +- autobuilt 4196a59 + +* Tue Jul 30 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.55.dev.git040355d +- autobuilt 040355d + +* Mon Jul 29 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.54.dev.git7d635ac +- autobuilt 7d635ac + +* Mon Jul 29 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.53.dev.gitc3c45f3 +- autobuilt c3c45f3 + +* Mon Jul 29 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.52.dev.git6665269 +- autobuilt 6665269 + +* Mon Jul 29 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.51.dev.git2ca7861 +- autobuilt 2ca7861 + +* Sun Jul 28 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.50.dev.git2c98bd5 +- autobuilt 2c98bd5 + +* Fri Jul 26 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.49.dev.git0c4dfcf +- autobuilt 0c4dfcf + +* Fri Jul 26 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.48.dev.giteca157f +- autobuilt eca157f + +* Fri Jul 26 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.47.dev.git1910d68 +- autobuilt 1910d68 + +* Fri Jul 26 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.46.dev.git4674d00 +- autobuilt 4674d00 + +* Thu Jul 25 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.45.dev.gitdff82d9 +- autobuilt dff82d9 + +* Thu Jul 25 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.44.dev.git5763618 +- autobuilt 5763618 + +* Thu Jul 25 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.43.dev.git7c9095e +- autobuilt 7c9095e + +* Wed Jul 24 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.42.dev.git2283471 +- autobuilt 2283471 + +* Wed Jul 24 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.41.dev.git0917783 +- autobuilt 0917783 + +* Wed Jul 24 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.40.dev.giteae9a00 +- autobuilt eae9a00 + +* Wed Jul 24 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.39.dev.git3c6b111 +- autobuilt 3c6b111 + +* Tue Jul 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.38.dev.git7dbc6d8 +- autobuilt 7dbc6d8 + +* Tue Jul 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.37.dev.gitbb253af +- autobuilt bb253af + +* Tue Jul 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.36.dev.gitce60c4d +- autobuilt ce60c4d + +* Tue Jul 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.35.dev.git2674920 +- autobuilt 2674920 + +* Mon Jul 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.34.dev.gita12a231 +- autobuilt a12a231 + +* Mon Jul 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.33.dev.gitcf9efa9 +- autobuilt cf9efa9 + +* Mon Jul 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.32.dev.git69f74f1 +- autobuilt 69f74f1 + +* Mon Jul 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.31.dev.gitab7b47c +- autobuilt ab7b47c + +* Mon Jul 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.30.dev.git3b52e4d +- autobuilt 3b52e4d + +* Sun Jul 21 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.29.dev.gitd6b41eb +- autobuilt d6b41eb + +* Sat Jul 20 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.28.dev.gita5aa44c +- autobuilt a5aa44c + +* Sat Jul 20 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.27.dev.git8364552 +- autobuilt 8364552 + +* Fri Jul 19 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.26.dev.git02140ea +- autobuilt 02140ea + +* Fri Jul 19 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.25.dev.git398aeac +- autobuilt 398aeac + +* Fri Jul 19 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.24.dev.gitdeb087d +- autobuilt deb087d + +* Fri Jul 19 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.23.dev.gitb59abdc +- autobuilt b59abdc + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.22.dev.git2254a35 +- autobuilt 2254a35 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.21.dev.git1065548 +- autobuilt 1065548 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.20.dev.gitade0d87 +- autobuilt ade0d87 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.19.dev.git22e62e8 +- autobuilt 22e62e8 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.18.dev.gitadcde23 +- autobuilt adcde23 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.17.dev.git456c045 +- autobuilt 456c045 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.16.dev.git7488ed6 +- autobuilt 7488ed6 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.15.dev.gitb2734ba +- autobuilt b2734ba + +* Wed Jul 17 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.14.dev.git1c02905 +- autobuilt 1c02905 + +* Wed Jul 17 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.13.dev.git04a9cb0 +- autobuilt 04a9cb0 + +* Tue Jul 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.12.dev.gitfe83308 +- autobuilt fe83308 + +* Tue Jul 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.11.dev.git400851a +- autobuilt 400851a + +* Tue Jul 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.10.dev.gita449e9a +- autobuilt a449e9a + +* Tue Jul 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.9.dev.git386ffd2 +- autobuilt 386ffd2 + +* Tue Jul 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.8.dev.git7e4db44 +- autobuilt 7e4db44 + +* Mon Jul 15 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.7.dev.gitd2291ec +- autobuilt d2291ec + +* Sun Jul 14 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.6.dev.git456b6ab +- autobuilt 456b6ab + +* Fri Jul 12 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.5.dev.gite2e8477 +- built conmon 1de71ad + +* Thu Jul 11 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.4.dev.gite2e8477 +- autobuilt e2e8477 + +* Wed Jul 10 2019 Lokesh Mandvekar (Bot) - 2:1.4.5-0.3.dev.gitdf3f5af +- autobuilt df3f5af + +* Tue Jul 09 2019 Lokesh Mandvekar - 2:1.4.5-0.2.dev.gitcea0e93 +- Resolves: #1727933 - containers-monuts.conf.5 moved to containers-common + +* Sun Jul 07 2019 Lokesh Mandvekar - 2:1.4.5-0.1.dev.gitf7407f2 +- bump to v1.4.5-dev +- use new name for go-md2man +- include centos conditionals + +* Sun Jun 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.30.dev.git7c4e444 +- autobuilt 7c4e444 + +* Sat Jun 22 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.29.dev.gitd9bdd3c +- autobuilt d9bdd3c + +* Fri Jun 21 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.28.dev.git39fdf91 +- autobuilt 39fdf91 + +* Thu Jun 20 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.27.dev.gitb4f9bc8 +- autobuilt b4f9bc8 + +* Wed Jun 19 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.26.dev.git240b846 +- bump to 1.4.3 +- autobuilt 240b846 + +* Tue Jun 18 2019 Lokesh Mandvekar (Bot) - 2:1.4.2-0.25.dev.git8bcfd24 +- autobuilt 8bcfd24 + +* Sun Jun 16 2019 Lokesh Mandvekar (Bot) - 2:1.4.2-0.24.dev.git670fc03 +- autobuilt 670fc03 + +* Sat Jun 15 2019 Lokesh Mandvekar (Bot) - 2:1.4.2-0.23.dev.git185b413 +- bump to 1.4.2 +- autobuilt 185b413 + +* Fri Jun 14 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.22.dev.git2784cf3 +- autobuilt 2784cf3 + +* Thu Jun 13 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.21.dev.git77d1cf0 +- autobuilt 77d1cf0 + +* Wed Jun 12 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.20.dev.gitf8a84fd +- autobuilt f8a84fd + +* Tue Jun 11 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.19.dev.gitc93b8d6 - do not install /usr/libexec/crio - conflicts with crio -* Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 -- Resolves: #1715668 - CVE-2019-10152 -- bump to v1.4.0 +* Tue Jun 11 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.18.dev.gitc93b8d6 +- autobuilt c93b8d6 -* Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 -- New Release of podman +* Mon Jun 10 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.17.dev.gitfcb7c14 +- autobuilt fcb7c14 -* Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 -- New Release of podman +* Sun Jun 09 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.16.dev.git39f5ea4 +- autobuilt 39f5ea4 -* Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 +* Sat Jun 08 2019 Lokesh Mandvekar (Bot) - 2:1.4.1-0.15.dev.gitcae5af5 +- bump to 1.4.1 +- autobuilt cae5af5 + +* Fri Jun 07 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.14.dev.gitba36a5f +- autobuilt ba36a5f + +* Fri Jun 07 2019 Lokesh Mandvekar - 2:1.3.2-0.13.dev.git6d285b8 +- Resolves: #1716809 - use conmon v0.2.0 + +* Thu Jun 06 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.12.dev.git6d285b8 +- autobuilt 6d285b8 + +* Wed Jun 05 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.11.dev.git3fb9669 +- autobuilt 3fb9669 + +* Tue Jun 04 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.10.dev.git0ede794 +- autobuilt 0ede794 + +* Sun Jun 02 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.9.dev.git176a41c +- autobuilt 176a41c + +* Sat Jun 01 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.8.dev.git2068919 +- autobuilt 2068919 + +* Fri May 31 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.7.dev.git558ce8d +- autobuilt 558ce8d + +* Thu May 30 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.6.dev.gitc871653 +- autobuilt c871653 + +* Wed May 29 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.5.dev.git8649dbd +- autobuilt 8649dbd + +* Mon May 27 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.4.dev.git25f8c21 +- autobuilt 25f8c21 + +* Sun May 26 2019 Lokesh Mandvekar (Bot) - 2:1.3.2-0.3.dev.gitb1d590b +- autobuilt b1d590b + +* Fri May 24 2019 Lokesh Mandvekar - 2:1.3.2-0.2.dev.git1ac06d8 +- built commit 1ac06d8 +- BR: systemd-devel +- correct build steps for %%{name}-remote + +* Fri May 24 2019 Dan Walsh - 2:1.3.2-0.1.dev.git5296428 +- Bump up to latest on master + +* Fri May 10 2019 Lokesh Mandvekar - 2:1.3.1-0.1.dev.git9ae3221 +- bump to v1.3.1-dev +- built 9ae3221 +- correct release tag format for unreleased versions + +* Thu Apr 25 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-21.dev.gitb01fdcb +- autobuilt b01fdcb + +* Tue Apr 23 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-20.dev.gitd652c86 +- autobuilt d652c86 + +* Sat Apr 20 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-19.dev.git9f92b21 +- autobuilt 9f92b21 + +* Fri Apr 19 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-18.dev.gite4947e5 +- autobuilt e4947e5 + +* Thu Apr 18 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-17.dev.gitbf5ffda +- autobuilt bf5ffda + +* Wed Apr 17 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-16.dev.gita87cf6f +- autobuilt a87cf6f + +* Tue Apr 16 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-15.dev.gitc1e2b58 +- autobuilt c1e2b58 + +* Mon Apr 15 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-14.dev.git167ce59 +- autobuilt 167ce59 + +* Sun Apr 14 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-13.dev.gitb926005 +- autobuilt b926005 + +* Sat Apr 13 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-12.dev.git1572367 +- autobuilt 1572367 + +* Fri Apr 12 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-11.dev.git387d601 +- autobuilt 387d601 + +* Thu Apr 11 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-10.dev.git6cd6eb6 +- autobuilt 6cd6eb6 + +* Wed Apr 10 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-9.dev.git60ef8f8 +- autobuilt 60ef8f8 + +* Tue Apr 09 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-8.dev.gitc94903a +- autobuilt c94903a + +* Sat Apr 06 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-7.dev.gitbc320be +- autobuilt bc320be + +* Fri Apr 05 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-6.dev.gitbda28c6 +- autobuilt bda28c6 + +* Thu Apr 04 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-5.dev.git4bda537 +- autobuilt 4bda537 + +* Wed Apr 03 2019 Lokesh Mandvekar - 2:1.3.0-4.dev.gitad467ba +- Resolves: #1695492 - own /usr/libexec/podman + +* Tue Apr 02 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-3.dev.gitad467ba +- autobuilt ad467ba + +* Mon Apr 01 2019 Lokesh Mandvekar (Bot) - 2:1.3.0-2.dev.gitcd35e20 +- bump to 1.3.0 +- autobuilt cd35e20 + +* Sun Mar 31 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-30.dev.git833204d +- autobuilt 833204d + +* Sat Mar 30 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-29.dev.git7b73974 +- autobuilt 7b73974 + +* Fri Mar 29 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-28.dev.gitfdf979a +- autobuilt fdf979a + +* Thu Mar 28 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-27.dev.git850326c +- autobuilt 850326c + +* Wed Mar 27 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-26.dev.gitfc546d4 +- autobuilt fc546d4 + +* Mon Mar 25 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-25.dev.gitd0c6a35 +- autobuilt d0c6a35 + +* Sat Mar 23 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-24.dev.git0458daf +- autobuilt 0458daf + +* Fri Mar 22 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-23.dev.git68e3df3 +- autobuilt 68e3df3 + +* Thu Mar 21 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-22.dev.gitc230f0c +- autobuilt c230f0c + +* Wed Mar 20 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-21.dev.git537c382 +- autobuilt 537c382 + +* Tue Mar 19 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-20.dev.gitac523cb +- autobuilt ac523cb + +* Mon Mar 18 2019 Eduardo Santiago - 2:1.2.0-19.dev.git6aa8078 - include zsh completion -* Wed Mar 13 2019 Eduardo Santiago - 2:1.1.2-3.dev.gitb33a00e +* Fri Mar 15 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-18.dev.git31f11a8 +- autobuilt 31f11a8 + +* Thu Mar 14 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-17.dev.git7426d4f +- autobuilt 7426d4f + +* Wed Mar 13 2019 Eduardo Santiago - 2:1.2.0-16.dev.git883566f - new -tests subpackage -* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-2.dev.git0ad9b6b -- missed the system renumber scriptlet in the previous build +* Wed Mar 13 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-15.dev.git883566f +- autobuilt 883566f -* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-1.dev.git0ad9b6b -- bump to v1.1.2 +* Tue Mar 12 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-14.dev.gitde0192a +- autobuilt de0192a -* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.0.1-32.dev.git228d1cb -- Resolves: #1686636 - do not depend on conmon (conmon moved to modules) +* Sun Mar 10 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-13.dev.gitd95f97a +- autobuilt d95f97a + +* Sat Mar 09 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-12.dev.git9b21f14 +- autobuilt 9b21f14 + +* Fri Mar 08 2019 Lokesh Mandvekar - 2:1.2.0-11.dev.git1b2f867 +- Resolves: #1686813 - conmon bundled inside podman rpm + +* Fri Mar 08 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-10.dev.git1b2f867 +- autobuilt 1b2f867 + +* Thu Mar 07 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-9.dev.git614409f +- autobuilt 614409f + +* Wed Mar 06 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-8.dev.git40f7843 +- autobuilt 40f7843 + +* Tue Mar 05 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-7.dev.git4b80517 +- autobuilt 4b80517 + +* Mon Mar 04 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-6.dev.gitf3a3d8e +- autobuilt f3a3d8e + +* Sat Mar 02 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-5.dev.git9adcda7 +- autobuilt 9adcda7 + +* Fri Mar 01 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-4.dev.git9137315 +- autobuilt 9137315 + +* Thu Feb 28 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-3.dev.git5afae0b +- autobuilt 5afae0b + +* Wed Feb 27 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-2.dev.git623fcfa +- bump to 1.2.0 +- autobuilt 623fcfa + +* Tue Feb 26 2019 Dan Walsh - 2:1.0.1-39.dev.gitcf52144 +* Tue Feb 26 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-38.dev.gitcf52144 +- autobuilt cf52144 + +* Mon Feb 25 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-37.dev.git553ac80 +- autobuilt 553ac80 + +* Sun Feb 24 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-36.dev.gitcc4addd +- autobuilt cc4addd + +* Sat Feb 23 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-35.dev.gitb223d4e +- autobuilt b223d4e + +* Fri Feb 22 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-34.dev.git1788add +- autobuilt 1788add + +* Thu Feb 21 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-33.dev.git4934bf2 +- autobuilt 4934bf2 + +* Wed Feb 20 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-32.dev.git3b88c73 +- autobuilt 3b88c73 * Tue Feb 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-31.dev.git228d1cb - autobuilt 228d1cb diff --git a/sources b/sources index b5c7bc6..c178719 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 +SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc +SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 From 74e1b2ca919a6f048e4256bef12946413d67136b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 20 Feb 2020 08:00:24 -0700 Subject: [PATCH 61/63] Require: skopeo (in tests package) ...for new tests which check skopeo-podman credential compatibility Signed-off-by: Ed Santiago --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 61cfa21..54433cd 100644 --- a/podman.spec +++ b/podman.spec @@ -406,6 +406,7 @@ Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq +Requires: skopeo %description tests %{summary} @@ -479,7 +480,7 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" # build %%{name}-remote export BUILDTAGS+="remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif +%endif %install %if 0%{?fedora} From 675f2d0d10232a64b6a249f9a8ed73b30a25613d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 28 Feb 2020 11:04:53 -0500 Subject: [PATCH 62/63] podman-2:1.8.0-3 - Suggests: crun for f30 Signed-off-by: Lokesh Mandvekar --- podman.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 54433cd..e935708 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -97,7 +97,6 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 @@ -106,6 +105,12 @@ Requires: runc %if 0%{?centos} >= 8 Requires: libvarlink-util %endif +%if 0%{?fedora} >= 31 +Requires: crun >= 0.12.1-1 +%else +Suggests: crun >= 0.12.1-1 +%endif + # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -654,6 +659,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Feb 28 2020 Lokesh Mandvekar - 2:1.8.0-3 +- Suggests: crun for f30 + * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 6c8609b70816b50ace29ad323ade068ca46d99b5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Mar 2020 10:57:11 -0500 Subject: [PATCH 63/63] podman-2:1.8.0-4 - use crun only for f31+ Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index e935708..906784c 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -488,7 +488,7 @@ export BUILDTAGS+="remoteclient" %endif %install -%if 0%{?fedora} +%if 0%{?fedora} >= 31 sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i %endif sed -i 's/install.remote: podman-remote/install.remote:/' Makefile @@ -659,6 +659,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Mar 02 2020 Lokesh Mandvekar - 2:1.8.0-4 +- use crun only for f31+ + * Fri Feb 28 2020 Lokesh Mandvekar - 2:1.8.0-3 - Suggests: crun for f30