From 5511a2ba7b86828ae9a1f0b0567297bae87c03da Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 31 Mar 2025 07:10:40 +0000 Subject: [PATCH] net-misc/passt: Sync with Gentoo It's from Gentoo commit 1c8cb6457059ba2f20bc30e0bdfc7ce88326b4bf. --- .../portage-stable/net-misc/passt/Manifest | 7 +--- .../passt/files/Makefile-2024.03.20.patch | 13 ------ .../net-misc/passt/passt-2024.03.26.ebuild | 40 ------------------- .../net-misc/passt/passt-2024.04.05.ebuild | 40 ------------------- .../net-misc/passt/passt-2024.04.26.ebuild | 40 ------------------- .../net-misc/passt/passt-2024.05.10.ebuild | 40 ------------------- .../net-misc/passt/passt-2024.08.21-r1.ebuild | 37 ----------------- ...4.06.07.ebuild => passt-2025.02.17.ebuild} | 10 ++--- .../net-misc/passt/passt-9999.ebuild | 6 ++- 9 files changed, 9 insertions(+), 224 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/files/Makefile-2024.03.20.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.03.26.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.05.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.26.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.05.10.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.08.21-r1.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/passt/{passt-2024.06.07.ebuild => passt-2025.02.17.ebuild} (85%) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/passt/Manifest index b9a85aeb96..3b3aad55a9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/passt/Manifest @@ -1,8 +1,3 @@ -DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7 -DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a SHA512 bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b -DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98 -DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3 -DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0 -DIST passt-2024.08.21-r1.tar.xz 209692 BLAKE2B 1b6b540f64528e375e6f0cfd90cec788b2b2281f7ab6dbe0f6df933757dcc4f37e154b2cd8e9e00adbc2b647a044fca05f2c48f49d05c0443c396831a2e13754 SHA512 ec09210b471377cc9f3d0044c97924834fadcfed7523aaab2f6c0fddb2d3d098c0730d1573e7c44963334d33dba5fbf660b0b222d4c71fab27cebf8edb52abf1 DIST passt-2024.09.06.tar.xz 210976 BLAKE2B 7c59d715a80bc9df2f0c85aef3f2cb2c2517941326cfecfe683770ebebc7815422db9f76e9ffbe17850441f0ffdcdfaa0602bd69af9dd8046cddb0dce131f255 SHA512 a9e7c0c7945759a65859c7cdaa0603f9805ff1efbe82496f1e638b3ce387b4ecc3828c2b1f100ed49332a1456a62a87ac9f8b4c62ce0599da423875f026da243 DIST passt-2025.01.21.tar.xz 237504 BLAKE2B 80aafe2fbf5ba8d4065fe99a892102e2c8d18ce82ef4cee3970deeb6d07cb89d40084cf4b90c7747dbb69e3895ad254872faad394b311950412cc89b9eae819d SHA512 e2e23040f05b65e666a7ccbbaa54621a575bdc22e21e518aa17dcfdebd82e95af49feadd20d58536f99b990428d404d6d2c64c34433353a4ac1656bf76bab6c6 +DIST passt-2025.02.17.tar.xz 254640 BLAKE2B 09a505a84e8555a1c4a010f9db6189b638ae3a3a6c1202d42e73d710bfc47f75b99defc372e8ecd44ec78ab196cd3619ecbb7eb171c9606bb4d425548a08159c SHA512 9eca3d9e20121f6b40b590f50e593d7a4ab3302b30d8da705aca5bcd40e2bbb686396830b5083c24fb088d5893a538dd92f2efed7d940bc1969f85f838560504 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/files/Makefile-2024.03.20.patch b/sdk_container/src/third_party/portage-stable/net-misc/passt/files/Makefile-2024.03.20.patch deleted file mode 100644 index 30f36d1f08..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/files/Makefile-2024.03.20.patch +++ /dev/null @@ -1,13 +0,0 @@ -Addressing following bugs: -https://bugs.gentoo.org/924494 ---- a/Makefile -+++ b/Makefile -@@ -35,7 +35,7 @@ - - FLAGS := -Wall -Wextra -Wno-format-zero-length - FLAGS += -pedantic -std=c11 -D_XOPEN_SOURCE=700 -D_GNU_SOURCE --FLAGS += -D_FORTIFY_SOURCE=2 -O2 -pie -fPIE -+FLAGS += -O2 -pie -fPIE - FLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) - FLAGS += -DNETNS_RUN_DIR=\"/run/netns\" - FLAGS += -DPASST_AUDIT_ARCH=AUDIT_ARCH_$(AUDIT_ARCH) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.03.26.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.03.26.ebuild deleted file mode 100644 index 91d818f5b4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.03.26.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="4988e2b" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64 ~arm64 ~riscv" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -PATCHES=( - "${FILESDIR}"/Makefile-2024.03.20.patch -) - -src_prepare() { - default - tc-export CC -} - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.05.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.05.ebuild deleted file mode 100644 index be03e08a6f..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.05.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="954589b" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64 ~arm64 ~riscv" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -PATCHES=( - "${FILESDIR}"/Makefile-2024.03.20.patch -) - -src_prepare() { - default - tc-export CC -} - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.26.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.26.ebuild deleted file mode 100644 index cf83c50f72..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.04.26.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="d03c4e2" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64 ~arm64 ~riscv" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -PATCHES=( - "${FILESDIR}"/Makefile-2024.03.20.patch -) - -src_prepare() { - default - tc-export CC -} - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.05.10.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.05.10.ebuild deleted file mode 100644 index 022bbfc62a..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.05.10.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="7288448" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="amd64 arm64 ~riscv" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -PATCHES=( - "${FILESDIR}"/Makefile-2024.03.20.patch -) - -src_prepare() { - default - tc-export CC -} - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.08.21-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.08.21-r1.ebuild deleted file mode 100644 index c5749fff38..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.08.21-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="1d6142f" -MY_PV="${PV//./_}.${RELEASE_COMMIT}" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${MY_PV}.tar.xz -> ${PF}.tar.xz" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -src_prepare() { - default - tc-export CC -} - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}" - - emake $(usev static) -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.06.07.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2025.02.17.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.06.07.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2025.02.17.ebuild index 37ba4d13c2..46b6b649d2 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2024.06.07.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-2025.02.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="8a83b53" +RELEASE_COMMIT="a1e48a0" if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -23,13 +23,11 @@ LICENSE="BSD GPL-2+" SLOT="0" IUSE="static" -PATCHES=( - "${FILESDIR}"/Makefile-2024.03.20.patch -) - src_prepare() { default tc-export CC + # Do not install doc/demo.sh + sed -i -e "/demo/d" Makefile || die } src_compile() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-9999.ebuild index 6f333fc9d1..46b6b649d2 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/passt/passt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="6b38f07" +RELEASE_COMMIT="a1e48a0" if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -26,6 +26,8 @@ IUSE="static" src_prepare() { default tc-export CC + # Do not install doc/demo.sh + sed -i -e "/demo/d" Makefile || die } src_compile() {