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

import podman-4.4.1-7.module+el8.8.0+18251+ad5b274c

Browse Source
This commit is contained in:
CentOS Sources 2023-03-28 12:34:00 +00:00 committed by Stepan Oksanichenko
parent ce03b7de4a
commit 1d947613e3
3 changed files with 169 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,5 +1,4 @@
SOURCES/dnsname-18822f9.tar.gz SOURCES/dnsname-18822f9.tar.gz
SOURCES/podman-4.2.0-7fe5a41.tar.gz SOURCES/gvisor-tap-vsock-aab0ac9367fc5142f5857c36ac2352bcb3c60ab7.tar.gz
SOURCES/podman-machine-cni-0749884.tar.gz
SOURCES/v0.1.7.tar.gz SOURCES/v0.1.7.tar.gz
SOURCES/v0.2.0.tar.gz SOURCES/v4.4.1-rhel-e1703bb.tar.gz

5
.podman.metadata
View File

@ -1,5 +1,4 @@
00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
3407e210353afdd5fcaffe91c6eeabb5d41c3c75 SOURCES/podman-4.2.0-7fe5a41.tar.gz 6061718236f43608692d0f363e8cf72f3cc5ecb8 SOURCES/gvisor-tap-vsock-aab0ac9367fc5142f5857c36ac2352bcb3c60ab7.tar.gz
70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz 2d19da5cdd9445ce2a92351eeb5faff7a194d959 SOURCES/v4.4.1-rhel-e1703bb.tar.gz

202
SPECS/podman.spec
View File

@ -7,22 +7,21 @@
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 %{?**}; 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 import_path github.com/containers/podman
#%%global branch v4.1.1-rhel %global branch v4.4.1-rhel
%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4 %global commit0 e1703bb7f47675964852173c465769bef9ef4e1b
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global cataver 0.1.7 %global cataver 0.1.7
#%%global dnsnamever 1.3.0 #%%global dnsnamever 1.3.0
%global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
%global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
%global gvproxyrepo gvisor-tap-vsock %global gvproxyrepo gvisor-tap-vsock
%global gvproxyver 0.2.0 %global gvproxyver 0.5.0
%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
Epoch: 2 Epoch: 3
Name: podman Name: podman
Version: 4.2.0 Version: 4.4.1
Release: 1%{?dist} Release: 7%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+ License: ASL 2.0 and GPLv3+
URL: https://%{name}.io/ URL: https://%{name}.io/
@ -34,8 +33,7 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
#Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz #Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz
Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.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/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz
Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
ExclusiveArch: %{go_arches} ExclusiveArch: %{go_arches}
Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
@ -57,10 +55,10 @@ BuildRequires: make
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: shadow-utils-subid-devel BuildRequires: shadow-utils-subid-devel
BuildRequires: python3
# for catatonit # for catatonit
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: file
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libtool BuildRequires: libtool
Requires: containers-common >= 2:1-27 Requires: containers-common >= 2:1-27
@ -185,7 +183,6 @@ pushd catatonit-%{cataver}
sed -i '$d' configure.ac sed -i '$d' configure.ac
popd popd
tar fx %{SOURCE2} tar fx %{SOURCE2}
tar fx %{SOURCE3}
tar fx %{SOURCE4} tar fx %{SOURCE4}
# this is shipped by skopeo: containers-common subpackage # this is shipped by skopeo: containers-common subpackage
@ -200,11 +197,13 @@ CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURC
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
# Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers # Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers
# that don't have the necessary shared libs. # that don't have the necessary shared libs.
file catatonit | grep 'statically linked' set +e
if [ $? != 0 ]; then /usr/bin/ldd catatonit
if [ $? != 1 ]; then
echo "ERROR: catatonit binary must be statically linked!" echo "ERROR: catatonit binary must be statically linked!"
exit 1 exit 1
fi fi
set -e
popd popd
export GO111MODULE=off export GO111MODULE=off
@ -242,6 +241,9 @@ export BUILDTAGS="seccomp btrfs_noversion exclude_graphdriver_devicemapper exclu
export BUILDTAGS="remote $BUILDTAGS" export BUILDTAGS="remote $BUILDTAGS"
%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
# build quadlet
%gobuild -o bin/quadlet %{import_path}/cmd/quadlet
%{__make} docs %{__make} docs
# build dnsname plugin # build dnsname plugin
@ -257,26 +259,15 @@ export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname %gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname
popd popd
pushd %{name}-machine-cni-%{commit_mcni} pushd gvisor-tap-vsock-%{commit_gvproxy}
mkdir _build mkdir _build
pushd _build pushd _build
mkdir -p src/github.com/containers mkdir -p src/github.com/containers
ln -s ../../../../ src/github.com/containers/%{name}-machine-cni ln -s ../../../../ src/github.com/containers/gvisor-tap-vsock
popd popd
ln -s vendor src ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd) export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/%{name}-machine github.com/containers/%{name}-machine-cni/plugins/meta/%{name}-machine %gobuild -o bin/gvproxy github.com/containers/gvisor-tap-vsock/cmd/gvproxy
popd
pushd %{gvproxyrepo}-%{gvproxyver}
mkdir _build
pushd _build
mkdir -p src/github.com/containers
ln -s ../../../../ src/github.com/containers/%{gvproxyrepo}
popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/gvproxy github.com/containers/%{gvproxyrepo}/cmd/gvproxy
popd popd
%install %install
@ -312,13 +303,8 @@ pushd dnsname-%{commit_dnsname}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd popd
# install machine-cni plugin
pushd %{name}-machine-cni-%{commit_mcni}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd
# install gvproxy # install gvproxy
pushd %{gvproxyrepo}-%{gvproxyver} pushd gvisor-tap-vsock-%{commit_gvproxy}
install -dp %{buildroot}%{_libexecdir}/%{name} install -dp %{buildroot}%{_libexecdir}/%{name}
install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
popd popd
@ -363,6 +349,7 @@ fi
%license LICENSE %license LICENSE
%doc README.md CONTRIBUTING.md install.md transfer.md %doc README.md CONTRIBUTING.md install.md transfer.md
%{_bindir}/%{name} %{_bindir}/%{name}
%{_libexecdir}/%{name}/quadlet
%{_libexecdir}/%{name}/rootlessport %{_libexecdir}/%{name}/rootlessport
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
# By "owning" the site-functions dir, we don't need to Require zsh # By "owning" the site-functions dir, we don't need to Require zsh
@ -383,6 +370,7 @@ fi
%files docker %files docker
%{_bindir}/docker %{_bindir}/docker
%{_usr}/lib/tmpfiles.d/%{name}-docker.conf %{_usr}/lib/tmpfiles.d/%{name}-docker.conf
%{_datadir}/user-tmpfiles.d/podman-docker.conf
%files remote %files remote
%license LICENSE %license LICENSE
@ -403,24 +391,164 @@ fi
%{_libexecdir}/catatonit/catatonit %{_libexecdir}/catatonit/catatonit
%dir %{_libexecdir}/podman %dir %{_libexecdir}/podman
%{_libexecdir}/podman/catatonit %{_libexecdir}/podman/catatonit
%{_usr}/lib/systemd/system-generators/podman-system-generator
%{_usr}/lib/systemd/user-generators/podman-user-generator
%files plugins %files plugins
%license dnsname-%{commit_dnsname}/LICENSE %license dnsname-%{commit_dnsname}/LICENSE
%doc dnsname-%{commit_dnsname}/{README.md,README_PODMAN.md} %doc dnsname-%{commit_dnsname}/{README.md,README_PODMAN.md}
%{_libexecdir}/cni/dnsname %{_libexecdir}/cni/dnsname
%{_libexecdir}/cni/%{name}-machine
%files tests %files tests
%license LICENSE %license LICENSE
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%files gvproxy %files gvproxy
%license %{gvproxyrepo}-%{gvproxyver}/LICENSE %license gvisor-tap-vsock-%{commit_gvproxy}/LICENSE
%doc %{gvproxyrepo}-%{gvproxyver}/README.md %doc gvisor-tap-vsock-%{commit_gvproxy}/README.md
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/gvproxy %{_libexecdir}/%{name}/gvproxy
%changelog %changelog
* Wed Feb 22 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-7
- use ldd directly to check for static link - avoid broken file utility
- Related: #2123641
* Wed Feb 22 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-6
- see the output of 'file catatonit' in the log to figure out why it is not
statically linked
- Related: #2123641
* Tue Feb 21 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-5
- update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel
(https://github.com/containers/podman/commit/e1703bb)
- Related: #2123641
* Mon Feb 20 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-4
- update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel
(https://github.com/containers/podman/commit/0b38633)
- Related: #2123641
* Fri Feb 17 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-3
- update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel
(https://github.com/containers/podman/commit/4f1dc3c)
- Related: #2123641
* Fri Feb 17 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-2
- update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel
(https://github.com/containers/podman/commit/ff4af7c)
- Related: #2123641
* Thu Feb 09 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-1
- update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel
(https://github.com/containers/podman/commit/d4e285a)
- Related: #2123641
* Wed Feb 08 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.1-0.1
- update to the latest content of https://github.com/containers/podman/tree/v4.4
(https://github.com/containers/podman/commit/f5670f0)
- Related: #2123641
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-1
- update to podman-4.4 release
- Related: #2123641
* Thu Feb 02 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.10
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/68bbdc2)
- Related: #2123641
* Tue Jan 31 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.9
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/ddd8a61)
- Related: #2123641
* Mon Jan 30 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.8
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/929d03a)
- Related: #2123641
* Fri Jan 27 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.7
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/8fce9dc)
- Related: #2123641
* Wed Jan 25 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.6
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/c35e74f)
- Related: #2123641
* Tue Jan 24 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.5
- remove podman-machine-cni, it is now part of podman 4.0 or newer
- update gvisor-tap-vsock to 0.5.0
- Related: #2123641
* Tue Jan 24 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.4
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/ce504bb)
- Related: #2123641
* Wed Jan 18 2023 Lokesh Mandvekar <lsm5@redhat.com> - 3:4.4.0-0.3
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/24cc02a)
- Related: #2123641
* Tue Jan 17 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.2
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/7093d1f)
- Related: #2123641
* Fri Jan 13 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.4.0-0.1
- podman-4.4.0-rc1
- update to the latest content of https://github.com/containers/podman/tree/main
(https://github.com/containers/podman/commit/f1af5b3)
- Related: #2123641
* Thu Dec 15 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.3.1-2
- update to the latest content of https://github.com/containers/podman/tree/v4.3.1-rhel
(https://github.com/containers/podman/commit/d9a6336)
- Resolves: #2144754
* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.3.1-1
- update to https://github.com/containers/podman/releases/tag/v4.3.1
- Related: #2123641
* Mon Nov 07 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.3.0-2
- fix build
- Resolves: #2124430
* Wed Nov 02 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.3.0-1
- update to https://github.com/containers/podman/releases/tag/v4.3.0
- Related: #2123641
* Mon Oct 31 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.2.0-3
- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel
(https://github.com/containers/podman/commit/35c0df3)
- Related: #2123641
* Fri Oct 21 2022 Jindrich Novy <jnovy@redhat.com> - 3:4.2.0-2
- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel
(https://github.com/containers/podman/commit/d520a5c)
- Related: #2123641
* Mon Oct 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-1
- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel
(https://github.com/containers/podman/commit/4978898)
- Related: #2123641
* Wed Sep 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.1-3
- switch to upstream maintenance branch
- Resolves: #2126697
- Resolves: #2097708
* Thu Sep 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.1-2
- fix source tarball list
- Related: #2123641
* Thu Sep 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.1-1
- update to https://github.com/containers/podman/releases/tag/v4.2.1
- Related: #2123641
* Thu Aug 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-1 * Thu Aug 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-1
- update to https://github.com/containers/podman/releases/tag/v4.2.0 - update to https://github.com/containers/podman/releases/tag/v4.2.0
(https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4) (https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4)