rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import podman-4.1.1-2.module+el8.6.0+15917+093ca6f8

Browse Source
This commit is contained in:
CentOS Sources 2022-08-02 03:09:57 -04:00 committed by root
parent 7951229396
commit d35957fc13
3 changed files with 61 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/dnsname-18822f9.tar.gz
SOURCES/podman-machine-cni-0749884.tar.gz
SOURCES/v0.1.0.tar.gz
SOURCES/v0.1.7.tar.gz
SOURCES/v4.0-rhel-3d24a66.tar.gz
SOURCES/v0.2.0.tar.gz
SOURCES/v4.1.1-rhel-fa692a6.tar.gz

4
.podman.metadata
View File

@ -1,5 +1,5 @@
00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz
94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
5893bd5b68df60051c709c6df7778cc8929d1d83 SOURCES/v4.0-rhel-3d24a66.tar.gz
64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz
296575ffc7e39bd2167a05d959ff572ee57f6b44 SOURCES/v4.1.1-rhel-fa692a6.tar.gz

224
SPECS/podman.spec
View File

@ -7,22 +7,22 @@
GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
%global import_path github.com/containers/podman
%global branch v4.0-rhel
%global commit0 3d24a66f0dccc7cbf62dfb2d406409c88a568cdf
%global branch v4.1.1-rhel
%global commit0 fa692a6b4a1131c76eb3d5beacb155855e733785
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global cataver 0.1.7
#%%global dnsnamever 1.3.0
%global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
%global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
%global gvproxyrepo gvisor-tap-vsock
%global gvproxyver 0.1.0
%global gvproxyver 0.2.0
%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
Epoch: 2
Name: podman
Version: 4.0.2
Release: 6%{?dist}
Version: 4.1.1
Release: 2%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+
URL: https://%{name}.io/
@ -40,7 +40,7 @@ Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar
ExclusiveArch: %{go_arches}
Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
BuildRequires: golang >= 1.16.6
BuildRequires: golang >= 1.17.7
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: glibc-static
@ -63,8 +63,9 @@ BuildRequires: automake
BuildRequires: file
BuildRequires: gcc
BuildRequires: libtool
Requires: containers-common >= 2:1-2
Requires: containers-common >= 2:1-27
Requires: containernetworking-plugins >= 0.9.1-1
Suggests: netavark
Requires: iptables
Requires: nftables
Obsoletes: oci-systemd-hook < 1
@ -178,7 +179,11 @@ dynamic port forwarding.
%autosetup -Sgit -n %{name}-%{commit0}
%endif
sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
sed -i 's,-Werror,,' pkg/rootless/rootless_linux.go
tar fx %{SOURCE1}
pushd catatonit-%{cataver}
sed -i '$d' configure.ac
popd
tar fx %{SOURCE2}
tar fx %{SOURCE3}
tar fx %{SOURCE4}
@ -189,6 +194,21 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md
rm -rf docs/source/markdown/containers-mounts.conf.5.md
%build
# build catatonit first because C code
pushd catatonit-%{cataver}
autoreconf -fi
%configure
CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
%{__make} %{?_smp_mflags}
# Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers
# that don't have the necessary shared libs.
file catatonit | grep 'statically linked'
if [ $? != 0 ]; then
echo "ERROR: catatonit binary must be statically linked!"
exit 1
fi
popd
export GO111MODULE=off
export GOPATH=$(pwd)/_build:$(pwd)
CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
@ -210,10 +230,11 @@ ln -s vendor src
rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go
unset LDFLAGS
# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
# build rootlessport first
# build rootlessport
%gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport
export BUILDTAGS="seccomp btrfs_noversion exclude_graphdriver_devicemapper exclude_graphdriver_btrfs $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
@ -225,22 +246,6 @@ export BUILDTAGS="remote $BUILDTAGS"
%{__make} docs
# build catatonit
LDFLAGS="%__global_ldflags"
CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
pushd catatonit-%{cataver}
autoreconf -fi
%configure
%{__make} %{?_smp_mflags}
# Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers
# that don't have the necessary shared libs.
file catatonit | grep 'statically linked'
if [ $? != 0 ]; then
echo "ERROR: catatonit binary must be statically linked!"
exit 1
fi
popd
# build dnsname plugin
unset LDFLAGS
pushd dnsname-%{commit_dnsname}
@ -409,155 +414,40 @@ exit 0
%{_libexecdir}/%{name}/gvproxy
%changelog
* Wed Mar 30 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-6
- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
(https://github.com/containers/podman/commit/3d24a66)
- Related: #2059296
* Fri Jul 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-2
- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel
(https://github.com/containers/podman/commit/fa692a6)
* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-5
- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
(https://github.com/containers/podman/commit/bb1e6e6)
- Related: #2059296
* Thu Jun 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.1.1-2
- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel
(https://github.com/containers/podman/commit/edcbcfd)
- fixes a gating test
- Related: #2097049
* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-4
- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
(https://github.com/containers/podman/commit/5a54f81)
- Resolves: #2066493
* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.1-1
- update to https://github.com/containers/podman/releases/tag/v4.1.1
- Related: #2061390
* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
- depend on libseccomp >= 2.5
- Resolves: #2065292
* Wed May 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-2
- Require CNI and make netavark optional
- Related: #2061390
* Tue Mar 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
(https://github.com/containers/podman/commit/9237d75)
- Related: #2059296
* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.1.0-1
- update to https://github.com/containers/podman/releases/tag/v4.1.0
- Related: #2061390
* Wed Mar 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-1
* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-2
- Related: #2061390
* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-1
- update to https://github.com/containers/podman/releases/tag/v4.0.3
* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-0.8
- bump minimal libseccomp version requirement
- Related: #2061390
* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-0.7
- update to https://github.com/containers/podman/releases/tag/v4.0.2
- Related: #2059754
* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.1-1
- update to https://github.com/containers/podman/releases/tag/v4.0.1
- Related: #2001445
* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.0.0-3
- use correct commit 49f8da72 for podman, previous commit said 4.0.1-dev
- Related: #2001445
* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.0.0-2
- install podman-plugins for gating tests
- Related: #2001445
* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-1
- update to podman-4.0.0 final
- Related: #2001445
* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.31
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/a34f279)
- Related: #2001445
* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.30
- fix linker flags to assure -D_FORTIFY_SOURCE=2 is present at the command line
- Related: #2001445
* Tue Feb 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.29
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/ab3e566)
- Related: #2001445
* Mon Feb 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.28
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/b0a445e)
- Related: #2001445
* Fri Feb 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.27
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/c4a9aa7)
- Related: #2001445
* Thu Feb 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.26
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/5b2d96f)
- Related: #2001445
* Wed Feb 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.25
- set CGO_CFLAGS explicitly
- Related: #2001445
* Mon Feb 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.24
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/2dca7b2)
- Related: #2001445
* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.23
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/4ad9e00)
- Related: #2001445
* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.22
- update to the latest content of https://github.com/containers/podman/tree/v4.0
(https://github.com/containers/podman/commit/337f706)
- Related: #2001445
* Thu Jan 27 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.7
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/a54320a)
- Related: #2001445
* Thu Jan 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:3.4.5-0.6
- update gating tests
- Related: #2001445
* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.5
- add git-daemon to test subpackage
(https://github.com/containers/podman/issues/12851)
- Related: #2001445
* Fri Jan 14 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.4
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/63134a1)
- Related: #2001445
* Tue Jan 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.3
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/3f57b6e)
- Related: #2001445
* Fri Dec 17 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.2
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/17788ed)
- Related: #2001445
* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.5-0.1
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/b8fde5c)
- Related: #2001445
* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.4-0.2
- drop patch applied upstream
- Related: #2001445
* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.4-0.1
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/49f589d)
- Related: #2001445
* Mon Dec 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-0.9
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/fe44757)
- Related: #2001445
* Thu Dec 02 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-0.8
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/815f36a)
- Related: #2001445
* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-0.7
- update to the latest content of https://github.com/containers/podman/tree/v3.4
(https://github.com/containers/podman/commit/31bc358)
- Related: #2001445
* Tue Nov 23 2021 Jindrich Novy <jnovy@redhat.com> - 1:3.4.3-0.6
- update to the latest content of https://github.com/containers/podman/tree/v3.4