4 files changed, 70 insertions, 3 deletions
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index cea55d1fb70f..87ae3a52a60e 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -1,6 +1,9 @@
+AUX Makefile-2024.03.20.patch 433 BLAKE2B 5e64a2a449806698bc812e38bfe46860e13a3bf64e1e6c7c96e3d43d8b30f1e6d6eedad8a89b500dced6ba81e8a8c0e7dfd74d889fed8dc1d7d7755d38e60156 SHA512 cbf5f29c96364438064ae65cc56501b1a5793530dedfeadf5184fa1a7df8c1b45786f39686e058178c2b7e58f0ae2aaa507fe986f01c4a6a6984276cd00c062e
 DIST passt-2023.12.04.tar.xz 188136 BLAKE2B f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc SHA512 febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001
 DIST passt-2023.12.30.tar.xz 188596 BLAKE2B 75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd SHA512 4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
+DIST passt-2024.03.20.tar.xz 195332 BLAKE2B 1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7 SHA512 3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
 EBUILD passt-2023.12.04.ebuild 707 BLAKE2B fe3b6c4c697e725c51b3cefec18e7501055c3abb0d2cb74d8b5983a73a6803ff2a5fafa2502b54725e4225072a5fa2dc6e0043524c89c6019d5380df79314aeb SHA512 0845a4d1dda79af28f08b2735297cd8fc515460df24fa9cf8d5d8653ffa3c20379e3ab5167b895fcd35b7f2068531aebe7c2e51fe9b86a65aa526f9a2cbf3306
 EBUILD passt-2023.12.30.ebuild 714 BLAKE2B afabcac34eb836f21812deeb1946d657a9bb7ed3e87868a2d50641ca8a21f43f869397f6ffe8736f66f96bf890f19f3c59f8f4c43956abfc9a0f8d17fa278b17 SHA512 e75a6066c5d13053047843c2bb0be917941d97305a53138e68dd6b5f758be01a623ca66c4d7dee37e14fc8fab212248d131cc1ccec049a506bc4ca0f679f2ec7
-EBUILD passt-9999.ebuild 707 BLAKE2B fe3b6c4c697e725c51b3cefec18e7501055c3abb0d2cb74d8b5983a73a6803ff2a5fafa2502b54725e4225072a5fa2dc6e0043524c89c6019d5380df79314aeb SHA512 0845a4d1dda79af28f08b2735297cd8fc515460df24fa9cf8d5d8653ffa3c20379e3ab5167b895fcd35b7f2068531aebe7c2e51fe9b86a65aa526f9a2cbf3306
+EBUILD passt-2024.03.20.ebuild 828 BLAKE2B 30fa7b8125eea8b5b8f9e2d9b70700caf3a708975ecc81e367ec0b85b15a5e508c0a3e3115339f1d216b739bbf0cb9ccc1b53f8c7b5a70be585276571dc505e9 SHA512 961b85c55944641da46246b89be11bea440a9786b57b71fdcc8aff0e22e6ffa4b436d8fe81bcb2ecc22056a9c1befd13e783b1d6ca7ea2ad2cee89585d03599f
+EBUILD passt-9999.ebuild 828 BLAKE2B 30fa7b8125eea8b5b8f9e2d9b70700caf3a708975ecc81e367ec0b85b15a5e508c0a3e3115339f1d216b739bbf0cb9ccc1b53f8c7b5a70be585276571dc505e9 SHA512 961b85c55944641da46246b89be11bea440a9786b57b71fdcc8aff0e22e6ffa4b436d8fe81bcb2ecc22056a9c1befd13e783b1d6ca7ea2ad2cee89585d03599f
 MISC metadata.xml 1299 BLAKE2B 8ec4a845b7f02959ec065e10e9603cc3ae91195b72dc3f759cfd16f7588b833596efcade19a11c464b2d534e9c57b6051236b8f54c19a9fc794d7dfb97e4fe69 SHA512 8a0eb2aa96b1e543898e1171f469cbed4188eae71f4bff63b864713b2ce08a2fbab6e9bce05d26d398942865c9f10ec4199504021297a7eeb43bb61f676c1dcd
diff --git a/net-misc/passt/files/Makefile-2024.03.20.patch b/net-misc/passt/files/Makefile-2024.03.20.patch
new file mode 100644
index 000000000000..30f36d1f084d
--- /dev/null
+++ b/net-misc/passt/files/Makefile-2024.03.20.patch
@@ -0,0 +1,13 @@
+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/net-misc/passt/passt-2024.03.20.ebuild b/net-misc/passt/passt-2024.03.20.ebuild
new file mode 100644
index 000000000000..effdc66105d0
--- /dev/null
+++ b/net-misc/passt/passt-2024.03.20.ebuild
@@ -0,0 +1,40 @@
+# 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="71dd405"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://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"
+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/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild
index 5683bd6f8693..effdc66105d0 100644
--- a/net-misc/passt/passt-9999.ebuild
+++ b/net-misc/passt/passt-9999.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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="b86afe3"
+RELEASE_COMMIT="71dd405"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -21,6 +23,15 @@ 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}"