diff --git a/.gitignore b/.gitignore index b9b2950..f65946d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/v0.1.5.tar.gz -SOURCES/v2.0.5.tar.gz +SOURCES/v2.0.5-rhel.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 2c6c15f..14794dd 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,2 +1,2 @@ 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz -7019f49189ce53755635c87ce891d7f5219a06fd SOURCES/v2.0.5.tar.gz +37b745b326f055b5b3793ef64c8f00d19874104e SOURCES/v2.0.5-rhel.tar.gz diff --git a/SOURCES/podman-1872263.patch b/SOURCES/podman-1872263.patch deleted file mode 100755 index 5c706d6..0000000 --- a/SOURCES/podman-1872263.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a60b4cc1d8d06782b4df13a08ea6440e27809d0b Mon Sep 17 00:00:00 2001 -From: Ed Santiago -Date: Tue, 25 Aug 2020 07:18:05 -0600 -Subject: [PATCH] run test: use explicit uid/gid - -Fixes Fedora gating test failure: if the host tests are running -under UID 1000, --userns=keep-id will (of course) add current -user as 1000, and the in-container 'adduser' will assign 1001. -To prevent that, assign UID 4242 (and hope that that's not -our calling user's UID). - -Signed-off-by: Ed Santiago ---- - test/system/030-run.bats | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/system/030-run.bats b/test/system/030-run.bats -index 12c82bc4c2..5e0ab3d6a6 100644 ---- a/test/system/030-run.bats -+++ b/test/system/030-run.bats -@@ -286,10 +286,10 @@ echo $rand | 0 | $rand - cid="$output" - - gecos="$(random_string 6) $(random_string 8)" -- run_podman exec --user root $cid adduser -D -g "$gecos" -s /bin/sh newuser3 -+ run_podman exec --user root $cid adduser -u 4242 -G ping -D -g "$gecos" -s /bin/sh newuser3 - is "$output" "" "output from adduser" - run_podman exec $cid tail -1 /etc/passwd -- is "$output" "newuser3:x:1000:1000:$gecos:/home/newuser3:/bin/sh" \ -+ is "$output" "newuser3:x:4242:999:$gecos:/home/newuser3:/bin/sh" \ - "newuser3 added to /etc/passwd in container" - - run_podman exec $cid touch /stop diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 49472ae..0ab7eee 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -28,15 +28,12 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: podman Version: 2.0.5 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ -Source0: %{git0}/archive/v%{version}.tar.gz +Source0: %{git0}/archive/v%{version}-rhel.tar.gz Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz -# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1872263 -# patch: https://github.com/containers/podman/commit/a60b4cc1d8d06782b4df13a08ea6440e27809d0b.patch -Patch0: podman-1872263.patch # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686 ExcludeArch: i686 Provides: %{name}-manpages = %{version}-%{release} @@ -143,7 +140,7 @@ Requires: jq This package contains system tests for %{name} %prep -%autosetup -Sgit +%autosetup -Sgit -n %{name}-%{version}-rhel tar fx %{SOURCE1} mv pkg/hooks/README.md pkg/hooks/README-hooks.md @@ -295,6 +292,14 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Fri Sep 11 2020 Jindrich Novy - 2.0.5-4 +- consume content directly from the dedicated upstream branch +- Related: #1877187 + +* Thu Sep 10 2020 Jindrich Novy - 2.0.5-3 +- fix "[FJ8.3 Bug]: [REG] "--oom-score-adj" flag is ignored in "podman run" and "podman create"" +- Resolves: #1877187 + * Thu Aug 27 2020 Jindrich Novy - 2.0.5-2 - fix gating test errors - thanks for patches to Ed Santiago - Related: #1872263