Commit 38f8ea03 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import podman-3.4.2-9.module+el8.5.0+13852+150547f7

parent 0db54292
SOURCES/podman-machine-cni-afab2d8.tar.gz
SOURCES/podman-machine-cni-0749884.tar.gz
SOURCES/v0.1.0.tar.gz
SOURCES/v0.1.5.tar.gz
SOURCES/v0.1.7.tar.gz
SOURCES/v1.3.0.tar.gz
SOURCES/v3.3.1-rhel-910b09c.tar.gz
SOURCES/v3.4.2-rhel-16e80e0.tar.gz
2b197d002b649ea3c8ff91500a1d56c21e1bf749 SOURCES/podman-machine-cni-afab2d8.tar.gz
70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz
4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz
d1eb93515f32065e3cb5b539bf4060d8615366ac SOURCES/v3.3.1-rhel-910b09c.tar.gz
a872c26ceca5af56335e85e43fcdf4e14219efdd SOURCES/v3.4.2-rhel-16e80e0.tar.gz
From 2ddd2b76b672fa48e38c4d855c749fed395cb1f4 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 8 Dec 2021 09:31:25 +0100
Subject: [PATCH] utils: reintroduce moveToCgroup
commit ee62711136339c5daf38e38859227d85b06fc32a introduced the
regression.
It was mistakenly removed as part of a cleanup, but this code is
needed by another code path, where we move conmon for the exec session
to the same cgroup used by conmon for the process.
Closes: https://github.com/containers/podman/issues/12535
[NO NEW TESTS NEEDED] it fixes a regression in the CI
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
utils/utils_supported.go | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/utils/utils_supported.go b/utils/utils_supported.go
index 0f0c9a9ba00..1404e319416 100644
--- a/utils/utils_supported.go
+++ b/utils/utils_supported.go
@@ -44,6 +44,15 @@ func RunUnderSystemdScope(pid int, slice string, unitName string) error {
ch := make(chan string)
_, err = conn.StartTransientUnit(unitName, "replace", properties, ch)
if err != nil {
+ // On errors check if the cgroup already exists, if it does move the process there
+ if props, err := conn.GetUnitTypeProperties(unitName, "Scope"); err == nil {
+ if cgroup, ok := props["ControlGroup"].(string); ok && cgroup != "" {
+ if err := moveUnderCgroup(cgroup, "", []uint32{uint32(pid)}); err == nil {
+ return nil
+ }
+ // On errors return the original error message we got from StartTransientUnit.
+ }
+ }
return err
}
%global with_check 0
# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
%global _lto_cflags %%{nil}
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
......@@ -16,19 +13,19 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%endif
%global import_path github.com/containers/podman
%global branch v3.3.1-rhel
%global commit0 910b09c2551b168efec4ac05adfa4d5b95782b54
%global branch v3.4.2-rhel
%global commit0 16e80e07d5e32b3fc597634fe27b8b7ffb28dbf8
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global cataver 0.1.5
%global cataver 0.1.7
%global dnsnamever 1.3.0
%global gvproxyrepo gvisor-tap-vsock
%global gvproxyver 0.1.0
%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396
%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
Epoch: 1
Name: podman
Version: 3.3.1
Version: 3.4.2
Release: 9%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+
......@@ -42,10 +39,11 @@ Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz
Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz
Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz
Patch0: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/12540.patch
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
ExclusiveArch: %{go_arches}
Provides: %{name}-manpages = %{version}-%{release}
Obsoletes: %{name}-manpages < %{version}-%{release}
Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
BuildRequires: golang >= 1.16.6
BuildRequires: glib2-devel
BuildRequires: glibc-devel
......@@ -79,7 +77,7 @@ Requires: (container-selinux if selinux-policy)
Requires: slirp4netns >= 0.4.0-1
Requires: runc >= 1.0.0-57
Requires: fuse-overlayfs
Requires: %{name}-catatonit >= %{version}-%{release}
Requires: %{name}-catatonit >= %{epoch}:%{version}-%{release}
Requires: oci-runtime
%description
......@@ -100,8 +98,8 @@ manipulate images (but not containers) created by the other.
%package docker
Summary: Emulate Docker CLI using %{name}
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Provides: docker = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: docker = %{epoch}:%{version}-%{release}
%description docker
This package installs a script named docker that emulates the Docker CLI by
......@@ -122,7 +120,7 @@ variables, or in containers.conf.
%package catatonit
Summary: A signal-forwarding process manager for containers
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
%description catatonit
Catatonit is a /sbin/init program for use within containers. It
......@@ -137,7 +135,7 @@ signalfd(2)) and has no additional features.
%package plugins
Summary: Plugins for %{name}
Requires: dnsmasq
Recommends: %{name}-gvproxy = %{version}-%{release}
Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
%description plugins
This plugin sets up the use of dnsmasq on a given CNI network so
......@@ -149,7 +147,7 @@ file. Each CNI network will have its own dnsmasq instance.
%package tests
Summary: Tests for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
#Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this)
Requires: nmap-ncat
Requires: httpd-tools
......@@ -158,6 +156,7 @@ Requires: socat
Requires: skopeo
Requires: openssl
Requires: buildah
Requires: gnupg
%description tests
%{summary}
......@@ -216,6 +215,7 @@ export BUILDTAGS="remote $BUILDTAGS"
# build catatonit
unset LDFLAGS
CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
pushd catatonit-%{cataver}
autoreconf -fi
%configure
......@@ -399,6 +399,95 @@ exit 0
%{_libexecdir}/%{name}/gvproxy
%changelog
* Thu Jan 13 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-9
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/16e80e0)
- Related: #2021990
* Mon Jan 10 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-8
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/75e9870)
- Related: #2021990
* Wed Jan 05 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-7
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/30a6e0d)
- Related: #2021990
* Thu Dec 16 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-6
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/90fb2cf)
- Related: #2021990
* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-5
- add Patch0: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/12540.patch
which reverts removal of code which is in fact required for proper podman functionality
- Related: #2021990
* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-4
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/4853c18)
- Related: #2021990
* Mon Dec 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-3
- drop applied patch
- Related: #2021990
* Mon Dec 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-2
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
(https://github.com/containers/podman/commit/f601d7a)
- Related: #2021990
* Fri Dec 03 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-1
- update to the latest content of https://github.com/containers/podman/tree/v3.4.2-rhel
* Thu Dec 02 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-9
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/815f36a)
- Related: #2021990
* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-8
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/31bc358)
- Related: #2021990
* Tue Nov 23 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-7
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/e3a7a74)
- Related: #2021990
* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-6
- remove shadow-utils-subid-devel as it is not present in 8.5
- Related: #2021990
* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-5
- do not put patch URL as the backported patch will get overwritten when
"spectool -g -f" is executed
- Related: #2021990
* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-4
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/7203178)
- Related: #2021990
* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-3
- remove -t 0 from podman gating test
- Related: #2021990
* Mon Nov 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-2
- add BuildRequires: shadow-utils-subid-devel
- Related: #2021990
* Mon Nov 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-1
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/4808a63)
- Related: #2021990
* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.2-1
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/8de9950)
- Related: #2001445
* Tue Sep 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.1-9
- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel
(https://github.com/containers/podman/commit/910b09c)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment