diff --git a/.gitignore b/.gitignore index 545da87..e23465f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/dnsname-18822f9.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.0-rhel-33084eb.tar.gz +SOURCES/v4.0-rhel-d54ecc8.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 54ad2bd..3c7a358 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,5 +1,5 @@ 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.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 -29136b52394c601345c3169510fe283b3ff7f7bf SOURCES/v4.0-rhel-33084eb.tar.gz +6f2429965ee695f727c0e2ea94adf5aedf008d10 SOURCES/v4.0-rhel-d54ecc8.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 2a85b0d..3dec6ba 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -8,21 +8,22 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global import_path github.com/containers/podman %global branch v4.0-rhel -%global commit0 33084ebddd42a41d50e3426ff81d69115404ab33 +%global commit0 d54ecc8c3b635ee79d60a6eb4b04bd2a046f60f0 %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 Name: podman Version: 4.0.2 -Release: 8%{?dist} +Release: 20%{?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 @@ -265,15 +267,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 @@ -315,7 +317,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 @@ -403,12 +405,71 @@ exit 0 %{_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 +* Fri Feb 17 2023 Jindrich Novy - 2:4.0.2-20 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/d54ecc8) +- Related: #2123641 + +* Thu Feb 09 2023 Jindrich Novy - 2:4.0.2-19 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/0b00627) +- Related: #2123641 + +* Mon Feb 06 2023 Jindrich Novy - 2:4.0.2-18 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/ccfe4dd) +- Resolves: #2121541 + +* Fri Feb 03 2023 Jindrich Novy - 2:4.0.2-17 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/1cc1f6c) +- Related: #2129766 + +* Wed Jan 25 2023 Jindrich Novy - 2:4.0.2-16 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/11afff3) +- Related: #2129766 + +* Tue Jan 24 2023 Jindrich Novy - 2:4.0.2-15 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/1602793) +- Related: #2129766 + +* Fri Jan 13 2023 Jindrich Novy - 2:4.0.2-14 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/0a1d0e8) +- Related: #2129766 + +* Fri Nov 18 2022 Jindrich Novy - 2:4.0.2-13 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/94d8498) +- Related: #2129766 + +* Tue Nov 15 2022 Jindrich Novy - 2:4.0.2-12 +- fix build of gvproxy +- Related: #2123641 + +* Wed Nov 02 2022 Jindrich Novy - 2:4.0.2-11 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/ee04ef9) +- Related: #2129766 + +* Tue Oct 18 2022 Jindrich Novy - 2:4.0.2-10 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/66518b4) +- Related: #2129766 + +* Tue Sep 13 2022 Jindrich Novy - 2:4.0.2-9 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/d661d8e) +- Related: #2123641 + * Tue Aug 02 2022 Jindrich Novy - 2:4.0.2-8 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel (https://github.com/containers/podman/commit/33084eb)