9 files changed, 130 insertions, 93 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 95a9c53ecd49..645d6b6ae6a0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index e27efbeb285d..0398d069ec42 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,4 +1,8 @@
 AUX scapy-2.5.0-no-install-tests.patch 339 BLAKE2B 0702c8c40d3358dd1e05eeb98ebf990925b61f8d572f053cccf3bab5111265c3d0f5c4908c1efe70c1d33525dba3553b2ed2bf2818b5d8e4fd4cbd87c55fa26f SHA512 cdffcb0b78bcb261d28c8f970e7032a116b37e818affc88009fb82c1208d812edb870d9740004ccb8ff7070407aa12a0949ff535f0ce6b5a2dc78e20d33d97a2
+AUX scapy-2.6.1-missing-autorun-test-marker.patch 326 BLAKE2B fae109f6f0504ca7ad709e3258ce1b0e7a143e0389d40ed53d247216aa4681bbc2364ef03aaa8f1cd5328db85a685efd933afc86298c1ea6b574dd1d6bfc60ba SHA512 aa4f775127c88ce3154db2c55ebfdf7789fcae6ce4ee3ea873097c217595368511637ea4ae71146f0554ebc3bc263b4f1095e283bf138b1d93724fc83ef7d68e
+AUX scapy-2.6.1-skip-test.patch 473 BLAKE2B c3c23b4ace07bc6c72d170997fc7bf2c97bca77fb1da64fd2f9007e4b1dc07977caf52658a75169595d8d33d958832ea116bb2a30362f496af934330af356fa8 SHA512 cbba634738d002ff7e414691e25111894ec0f2eebb2a707318dbdb2fc1fc3d58cd0aa08cc2ffa260f61cab57a50c129206790a2636d2783b58d5733d89331b4e
 DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
-EBUILD scapy-2.5.0.ebuild 1853 BLAKE2B 9acf2c8a9688f214b1b2c3e469c50df3bb2d13e2cedd2ce5c7c75d8207667e096e9f1167c2c2cf1939104c384fc10bd4899f59a39f015aa01ba703532500d0cb SHA512 6d48de6f814019b8e312eca23ba62ea509fda7e390d8cf058f6fe8f2d01e3f2474b2a73292e9bc35559a949fe5c9e9eae84fb840a290ed38af297c51b86044ea
+DIST scapy-2.6.1.tar.gz 7048560 BLAKE2B 5c930c3aa2d0a4d545cf64f10abd3aa962755e3fb712ea1613c4f49b159202a55e5ffadc527d429118958bad6e93f9626084d3ee974caaa6cb1733f05080d3f2 SHA512 4ab02f5b9dfcf329ee4f4837655066227b1e162e695d6cbe84ada4e2ff44589462a9843b0f16699ec974dcf6e0a81af3c5b088ceac48a679e9591f4cec0eedc8
+EBUILD scapy-2.5.0.ebuild 1896 BLAKE2B f9f0f50a9ff26af6a08e2cc40c48138a4d72a1b11a9589c9dff06bbf96fa315d32a17b412939d0afb0457b44244fa90820fe6cbf9e362d524a8ee9b43e9d66df SHA512 9ec3be9908b3e53be4eca70f01ba5bb15cd9a03ea3cd06679b2a591f6721ba794f53116a968cb6026af670477d2a3cc748d7bfdf29d2a3d8972a295d5cc9c676
+EBUILD scapy-2.6.1.ebuild 2046 BLAKE2B 235f376ec0d402ad09ce6fd266855202bcfe1f041fbec2f0a939e287d1f15d31cd5dbcddc9fad56dc477146e455dfb7f4fcc36742dbe6b9ea9555a397d5ae23b SHA512 3dc3b8e4d1c5962bc1d5e0d9d6fc34920a0c81f62001f0fda9b79328c9a81558760b8d3134cf2cd84d5730862d8f6da788a96c053ebdce94aa6aa6d347e3e78c
 MISC metadata.xml 494 BLAKE2B bb5ea4ee5cdbc940e503d4f8eb8e54185bb9bb7f1160810d4448f275a072cef31d7e3c1cfe167ef84b180a7b9a2c6b3babe8c767831fe97954381dbd38bf090b SHA512 74ec713bccc253ec16dd0178e04275a456df12ff485cbde8323b8b05ff96679ca747334441bf621d0762dd1a235f5cdcb07e4207c30d25a909d8ffefd1f29852
diff --git a/net-analyzer/scapy/files/scapy-2.6.1-missing-autorun-test-marker.patch b/net-analyzer/scapy/files/scapy-2.6.1-missing-autorun-test-marker.patch
new file mode 100644
index 000000000000..76108598d758
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.6.1-missing-autorun-test-marker.patch
@@ -0,0 +1,10 @@
+--- a/test/regression.uts
++++ b/test/regression.uts
+@@ -1139,6 +1139,7 @@ ret = autorun_get_text_interactive_session("scapy_undefined")
+ assert "NameError" in ret[0]
+ 
+ = Test autorun with logging
++~ autorun
+ 
+ cmds = """log_runtime.info(hex_bytes("446166742050756e6b"))\n"""
+ ret = autorun_get_text_interactive_session(cmds)
diff --git a/net-analyzer/scapy/files/scapy-2.6.1-skip-test.patch b/net-analyzer/scapy/files/scapy-2.6.1-skip-test.patch
new file mode 100644
index 000000000000..bf71e22cdde9
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.6.1-skip-test.patch
@@ -0,0 +1,20 @@
+Fails in network-sandbox (probably because of the namespace + fake interface
+Portage makes).
+--- a/test/regression.uts
++++ b/test/regression.uts
+@@ -470,6 +470,7 @@ conf.ifaces.providers = _bkp_providers
+ conf.ifaces.reload()
+ 
+ = Test read_routes6() - default output
++~ netaccess
+ 
+ routes6 = read_routes6()
+ if WINDOWS:
+@@ -519,6 +520,7 @@ pkt.build()
+ 
+ 
+ = Test read_routes6() - check mandatory routes
++~ netaccess
+ 
+ import re
+ ll_route = re.compile(r"fe80:\d{0,2}:")
diff --git a/net-analyzer/scapy/scapy-2.5.0.ebuild b/net-analyzer/scapy/scapy-2.5.0.ebuild
index 34e252955a74..03b6dd459ae8 100644
--- a/net-analyzer/scapy/scapy-2.5.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.5.0.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
@@ -65,7 +65,9 @@ src_prepare() {
 	# Needs ipython
 	rm test/scapy/layers/dhcp.uts || die
 	# Import failure?
-	rm test/contrib/isotp_native_socket.uts test/contrib/isotpscan.uts || die
+	rm test/contrib/isotp_native_socket.uts \
+		test/contrib/isotpscan.uts \
+		test/contrib/isotp_soft_socket.uts || die
 
 	distutils-r1_src_prepare
 }
diff --git a/net-analyzer/scapy/scapy-2.6.1.ebuild b/net-analyzer/scapy/scapy-2.6.1.ebuild
new file mode 100644
index 000000000000..687ae2c8f8c6
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.6.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/ipython
+	dev-python/matplotlib
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpdump
+	net-analyzer/tcpreplay
+	net-libs/libpcap
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.1-skip-test.patch
+	"${FILESDIR}"/${PN}-2.6.1-missing-autorun-test-marker.patch
+)
+
+src_prepare() {
+	export SCAPY_VERSION=${PV}
+
+	# Timed out
+	rm test/tftp.uts || die
+	# Needs ipython
+	rm test/scapy/layers/dhcp.uts || die
+	# Import failures
+	rm test/contrib/isotp_native_socket.uts \
+		test/contrib/isotpscan.uts \
+		test/contrib/isotp_soft_socket.uts || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# https://scapy.readthedocs.io/en/latest/development.html#testing-with-utscapy
+	# https://github.com/secdev/scapy/blob/master/tox.ini
+	#
+	# netaccess: network access, obviously
+	# tshark, tcpdump: hangs
+	# samba: needs rpcdump (and too heavy of a test dep)
+	# interact, autorun: tests fail
+	"${EPYTHON}" -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -N \
+		-K netaccess \
+		-K tshark \
+		-K tcpdump \
+		-K samba \
+		-K interact \
+		-K autorun \
+		-K ci_only || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 0437f658fcff..c445f30bf11c 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,11 +1,8 @@
 AUX gentoo.config-1.0.2 5253 BLAKE2B 2a167c760399401cd595e6b85ee8c29f8e4d3e4a44e7b6b7e42320ec9f88b1a61bcd4387815bd6f73dea71c9b39603c1809e4f1537d5de553ec77996429c0516 SHA512 59479e5af84e1f991ba8abeac42276a08a5c9f61fa0c79af96cd7c94fddb72de82ba56f31babf9b3bef5de26431ebb2b98bc1c58715b20baea350e16360108a3
-DIST sslscan-2.1.2.tar.gz 113842 BLAKE2B b4c297b9b8619f559bae28debaeab5fae89ba60823b0bd2d043436e73bbafd3ce688e505678bb4d0182c78caa0f4c086f71e40e900e40d4bea93649f4ab8baca SHA512 2d76c1908b64dc291e8e6688746544386823a2e53d61e13a3ea3109d6ccb4f7dc0199b4c4d8a2ac6d420cf85183d9c9ca42051e351531c54eb138ede01a13277
-DIST sslscan-2.1.3.tar.gz 113917 BLAKE2B 2c3dd21838bca82035dc4d1c48869d4d2c2a18ea603b947d39040744d2f51c4946e6ca6681d734aafc62cf71b6e380b31f6f29c7164c14c2d75e0d1ab5925245 SHA512 62dbb8c97598cdc5bf22cb8311eaba6cff186f6b874d8eb4165a80d0577cd0a13837222fe6ee4e015c353acef2691ff044f4538c04044869805b5455abf36155
 DIST sslscan-2.1.4.tar.gz 114318 BLAKE2B 4a2473a1fe76f276b6f2656cb9c688e4cb8fb829d76e048ddbf8693287ee50b74e5ba2bf7de44c71f4ae75e73e191c5a52e508c32dfb9cb32678dfbcd5247827 SHA512 2880df01cf4a9d05e151a67d0f7ec078645286ce467bb4ead97592d4aeb0a5d7373d67ce48cef8d211c5519fee88fbede7b90adee5e4da1feece51bf609a4318
-DIST sslscan-openssl-3.0.12.tar.gz 15352880 BLAKE2B 55a321609e97636173421e738bfb745b6e9a912744fba6d83bfecba199f8684b5625b8547e29305dacda91735cd329fc4c3f5c1f0f919d362a81995073781796 SHA512 8eb6141c1f3d43aa7dd5a5570c99302910feae0d25ab872c58432e5d11d3e330a069715fd4a0cd03234f3fb3e5e9fba38ef59977f7ecf162a2b048476dbb14c6
-DIST sslscan-openssl-3.0.13.tar.gz 15440228 BLAKE2B 00f66b5940b494c36ea8731f05691bf85206c7a93f6313f3ff2cea36d35ce99e71dadc9620188eee8ea0d7be523721af432d7fd74aa59e34634796cd0e4899a6 SHA512 272223fefae76759de40219dd05ff119b99688a807c1af01360470ac5f390426e45463c1445988bf0a6e4cca23a6e0b1649a78121f9d6f69f92563e307a7fd70
+DIST sslscan-2.1.6.tar.gz 114417 BLAKE2B e510bb6079e04f19c7cda5cbeb2759c7ff7c710748dafc8410cbc12caa5b722a7307796a3df24863134ff8c228f9b01f530dd96adccf6d061ece9d5914c2a87d SHA512 11cfde406c6c49b46f81e8942f0d2fa096b0c524abf1fdf203fca3ce668a8183c5e6800cdf12750edae8bf5b0cb6b4932219d1559dc88f802064154086807ab0
 DIST sslscan-openssl-3.0.14.tar.gz 15456760 BLAKE2B 7a7f16466ebe63d81615c67256972e2f5f56ec4c095ff851add388edd872913a41f76f6c17056e13f43896c3b1f3b2f778497c8ecc920fc00dbc90093513aabe SHA512 ebd70c82ef2b8d882858e26333c27b8975e55cc8a350b646c24505cd6feba1e92d4894026ec6b0cefe6d7dcbedb5799bd72df4114c832efb2616b68ad303f5d1
-EBUILD sslscan-2.1.2.ebuild 2054 BLAKE2B ca7d408a6ea867bb24f64f5165128e00a40a70cb15b53001197fff0e8d0cf0f9ad4ab1594afa625072584326a4ad1c35e4cbf71d14f9d3e0cb706aaa077c8c8a SHA512 a8a028449e53b8945d666427f8f2da1627b956115f05704501547e573afe447fe10d772697e82f460381e7f6cc8e0a9422526ecf7f343d195875e0ee8b297e61
-EBUILD sslscan-2.1.3-r1.ebuild 2063 BLAKE2B 8ef178e75a73ee1242980ee512b501c135f3aca609b6e6d6c7e397878e4ff0f52c14558d92f23367966d55f52afcedde4ad16eeb1be8d2ff2620b52d2d9f29b4 SHA512 befe40ece5b58a429788405a63d6a18d3fae860e8cc0f2a7d6ec8ad0f67367b2ad23865f3a2035518ff626960028515d1ef6b2588397522b377e48d14d8967e3
+DIST sslscan-openssl-3.3.3.tar.gz 18267456 BLAKE2B 72c614cbeca1022e002f0d4c07453718cc1a767ed61295705617ea1494aba68eea9c87ea3fc1d1ab1b2f9676f34d9fd9360711cfc9b641588c7231144aa857af SHA512 74256fd387b4204ae3ec0e6db8f5aeca24fd90314b5b5d2d51adcf27157c009fc4cad53a4a3ab37d97906c2c2dc79f6828177b671167835839f936a7ff205158
 EBUILD sslscan-2.1.4.ebuild 2061 BLAKE2B 068f9ba39d9467fb3d83cad9979b2032894ad7dc562f4f0b94c2355fc71e21bd812a681a1fb11daccb036288f1751dcd807cc75ad1692246a1cc310e18359db4 SHA512 c2db8775db82aacf1298e88f8f1b0d00ea4349bd1b347c17f5971492bd5a109eaab49398330c5b44028dae64b4087136486c94b46884a540086cb189d426ad1f
+EBUILD sslscan-2.1.6.ebuild 2062 BLAKE2B 68433d23443f4319b36e99c5d50e52f87f811cd578074e6e3ec5f231df2f44611cf5e1b4cc7675f299c8237fbcb860414c21aec6869859fbbf01ff4449bea750 SHA512 c3438662ea33d2882c0257dd72c6aaee18b1db5da2c2d0474c3064987bf433ff46cd01a223e3d51dc96e8ecefb895f8b75565c3f9380864f4500f3a62b4943b9
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.1.2.ebuild b/net-analyzer/sslscan/sslscan-2.1.2.ebuild
deleted file mode 100644
index b77ee2587f92..000000000000
--- a/net-analyzer/sslscan/sslscan-2.1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="openssl-3.0.12"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	# Copied from dev-libs/openssl
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	default
-}
-
-src_configure() {
-	# Copied from dev-libs/openssl
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild b/net-analyzer/sslscan/sslscan-2.1.6.ebuild
index 85086045d0da..2b10965cb44a 100644
--- a/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.1.6.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
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 # sslscan builds against a static openssl library to allow weak ciphers
 # to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="openssl-3.0.13"
+OPENSSL_RELEASE_TAG="openssl-3.3.3"
 
 DESCRIPTION="Fast SSL configuration scanner"
 HOMEPAGE="https://github.com/rbsec/sslscan"