From d892611c2435fa98815d647456a6cf56eca47a88 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 31 2023 01:20:57 +0000 Subject: import podman-4.3.1-2.module+el8.8.0+17695+8a9c0c1b --- diff --git a/.gitignore b/.gitignore index dbb29b8..ce20f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/dnsname-18822f9.tar.gz -SOURCES/podman-4.2.0-7fe5a41.tar.gz +SOURCES/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz SOURCES/podman-machine-cni-0749884.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v0.2.0.tar.gz +SOURCES/v4.3.1-rhel-d9a6336.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 8ba6b3e..26a286c 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,5 +1,5 @@ 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz -3407e210353afdd5fcaffe91c6eeabb5d41c3c75 SOURCES/podman-4.2.0-7fe5a41.tar.gz +4f46b03a20ca141f7ea10800282c0ba5aff9dcc2 SOURCES/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz +a2d1be2cdd5b118a046273fb9b298ca110bdd62c SOURCES/v4.3.1-rhel-d9a6336.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 666fc64..03dcdde 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -7,22 +7,23 @@ 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.1.1-rhel -%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4 +%global branch v4.3.1-rhel +%global commit0 d9a633633d23649833438faf8f2ecf7ae2be27fd %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.2.0 +%global gvproxyver 0.4.0 +%global commit_gvproxy fdc231ae7b8fe1aec4cf0b8777274fa21b70d789 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) -Epoch: 2 +Epoch: 3 Name: podman -Version: 4.2.0 -Release: 1%{?dist} +Version: 4.3.1 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -35,7 +36,7 @@ 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/%{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/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz +Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -57,6 +58,7 @@ BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: shadow-utils-subid-devel +BuildRequires: python3 # for catatonit BuildRequires: autoconf BuildRequires: automake @@ -268,15 +270,15 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/%{name}-machine github.com/containers/%{name}-machine-cni/plugins/meta/%{name}-machine popd -pushd %{gvproxyrepo}-%{gvproxyver} +pushd gvisor-tap-vsock-%{commit_gvproxy} mkdir _build pushd _build mkdir -p src/github.com/containers -ln -s ../../../../ src/github.com/containers/%{gvproxyrepo} +ln -s ../../../../ src/github.com/containers/gvisor-tap-vsock popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/gvproxy github.com/containers/%{gvproxyrepo}/cmd/gvproxy +%gobuild -o bin/gvproxy github.com/containers/gvisor-tap-vsock/cmd/gvproxy popd %install @@ -318,7 +320,7 @@ pushd %{name}-machine-cni-%{commit_mcni} popd # install gvproxy -pushd %{gvproxyrepo}-%{gvproxyver} +pushd gvisor-tap-vsock-%{commit_gvproxy} install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} popd @@ -383,6 +385,7 @@ fi %files docker %{_bindir}/docker %{_usr}/lib/tmpfiles.d/%{name}-docker.conf +%{_datadir}/user-tmpfiles.d/podman-docker.conf %files remote %license LICENSE @@ -415,12 +418,57 @@ fi %{_datadir}/%{name}/test %files gvproxy -%license %{gvproxyrepo}-%{gvproxyver}/LICENSE -%doc %{gvproxyrepo}-%{gvproxyver}/README.md +%license gvisor-tap-vsock-%{commit_gvproxy}/LICENSE +%doc gvisor-tap-vsock-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Dec 15 2022 Jindrich Novy - 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 - 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 - 3:4.3.0-2 +- fix build +- Resolves: #2124430 + +* Wed Nov 02 2022 Jindrich Novy - 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 - 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 - 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 - 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 - 2:4.2.1-3 +- switch to upstream maintenance branch +- Resolves: #2126697 +- Resolves: #2097708 + +* Thu Sep 15 2022 Jindrich Novy - 2:4.2.1-2 +- fix source tarball list +- Related: #2123641 + +* Thu Sep 08 2022 Jindrich Novy - 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 - 2:4.2.0-1 - update to https://github.com/containers/podman/releases/tag/v4.2.0 (https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4)