gentoo auto-resync : 19:03:2023 - 06:33:49

12 files changed, 65 insertions, 28 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 9889763a496b..6933e5a5dbb6 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/shodan/Manifest b/net-analyzer/shodan/Manifest
index 4adc2cf25545..80e64c4e6b7c 100644
--- a/net-analyzer/shodan/Manifest
+++ b/net-analyzer/shodan/Manifest
@@ -1,4 +1,4 @@
 DIST shodan-1.28.0.gh.tar.gz 51277 BLAKE2B e2cd4c322ccdd1d81c998dc810c56b85de903afe9c3a59adc231d382779806909a78e994ff163639468dd9af1e8f7a547953b0e2304ac167ed7cf9c437d69adc SHA512 cb2476faf2c435d29823635e5262bdf6b224b2a5f19b77513fb6e920f4d042b15a7fd23cea7e2a29bc73b00be188dfac16f945fba090da28a72d0342357232c3
-EBUILD shodan-1.28.0.ebuild 897 BLAKE2B 492f9d3945558d67fdccd3b388686cfa4f1652e138b75b9159c082838687ac85431075ea2323e81a678f08daa8aeca5f9b60b6fcd72bc856168da15a2eaa5dec SHA512 27648f18041abf9811245cb9bf441e9649095f47fea79d46115baada19dfe7e89186f1edd85eac9a43cb79aaf78a8fde13ccf77b9149ad0d54030ace30894b9e
-EBUILD shodan-9999.ebuild 892 BLAKE2B a30462ff4a9b5d25bc3617eddf6e4f275ab629f298f895cb20ea2ca9a5db823fc95cccb33e5b2a6108977e3e4bf8bfd7e36f0118782977276c17fd0739916d1a SHA512 ad51727795db1790bb4178efc6db3bd7199108a5fa199c3de8404cae835e1170c2d552e863b7aef1155b848f23d30747482817687d20dbce99207d54002132b0
+EBUILD shodan-1.28.0.ebuild 897 BLAKE2B 13deb81e710601c0fdcf5fb7a93ce9f94afe7eb0351038bd560a532b33e49231537a35d9da259b48aa0532947f49308bf2a6ebae3196bc5c36653a6fc06b9b67 SHA512 88ee098bfd3411a8b9349750e31f1828bf80612a6f77f344206b85f5101f2b82b0b71cfeacaf4cc0e5481539e1fff0b702fbbe0f9ef75004cbcc85461c1b1b74
+EBUILD shodan-9999.ebuild 892 BLAKE2B 82f5220e588eec40c31da4208c67692747b0466a5a30e816db9719f9230355bba185b94452dc3570f00d7c75306ec275cc57d959f679919d1ea5bdda13c474ab SHA512 306dc86e618044a549afb76acb378fd7b6ba739668162ed5ac59643f79469a79db675692a94d9241e56eee3b131a4b25c78846e70214a58f61c3591733bffb76
 MISC metadata.xml 864 BLAKE2B 1eeb1a52185cac9195cc62b3e74d0dfb7df895666303bbbf562a4b75363b0179137de3cf99c8d650f59a13f972bfbdece972783ba282870a501289950d9cec6c SHA512 737b931e809418e0fe940ac6026d52edce42d0b5da30372394403210688caab00d8c99807b640de74383f3e4daafc3e09764bdde31e54d9898a11aff60f4f2c4
diff --git a/net-analyzer/shodan/shodan-1.28.0.ebuild b/net-analyzer/shodan/shodan-1.28.0.ebuild
index cae4d648ff15..8c7d7860bc86 100644
--- a/net-analyzer/shodan/shodan-1.28.0.ebuild
+++ b/net-analyzer/shodan/shodan-1.28.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="The official Python library for Shodan"
diff --git a/net-analyzer/shodan/shodan-9999.ebuild b/net-analyzer/shodan/shodan-9999.ebuild
index a33a8491beea..984c33c3f1f6 100644
--- a/net-analyzer/shodan/shodan-9999.ebuild
+++ b/net-analyzer/shodan/shodan-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="The official Python library for Shodan"
diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest
index d73b6f45e957..7bef159965cc 100644
--- a/net-analyzer/wtfis/Manifest
+++ b/net-analyzer/wtfis/Manifest
@@ -1,6 +1,6 @@
 DIST wtfis-0.5.1.gh.tar.gz 462958 BLAKE2B 68d8c89e8e08ba925d5b6847656a0261aa9bfd9e998b7572a8d783c11d99ff06d27870346c8e31d2b8554a5a51b07bf6e08151c87b0a740bccc94a25259dfcb4 SHA512 32091d00d62a78f84e01735b9f9af2b38465c5f2258743b512616b3b43fac7389fa7ef62430e205a004b58a224b154a79fb2e860729925fc7df6a58252fa0093
 DIST wtfis-0.6.1.gh.tar.gz 472803 BLAKE2B 9764d54d88bc8709b67673200a295bc0520438733b45c98d779e088bbcf57778007caf7fa0dcafed881d94bb6b7216f8f00b30b0b0bd528252c18e449865c382 SHA512 75f44416979f7196879a5a3f528caed7154c29f6a79b9ba116bba98f609b5d4bf9f2f78c2eba1e1629fa9f50c60b5678adac98150843fc1ffbedff8bcae3f0f3
-EBUILD wtfis-0.5.1.ebuild 974 BLAKE2B 051eb9c0b2c590ad48b5cb8901d03ff6c762e240ff92ea1f508101460d801b668c49c04fcfe7285fb079a5f16bb0f8ace12ec5c32c538e6ec23fa9c93fc7d495 SHA512 716d3e80980e34f5c8c8bfb0e5155a21a329b4d38bef52b11d3d44c1d0e271326358a565e893baba0cb4cf952a36d1cd3121da13fb855630abb1d5e000fc86ce
-EBUILD wtfis-0.6.1.ebuild 976 BLAKE2B 32841c8bad91956864cb9444a6593d46bdd6f6087391bc92afde22fbd79580e1e404df4cb52f8ce36a1764bc23218b649e07b1b5d50484d75edb6fcebe4655c0 SHA512 8a3052e23945bd43c2d32ed8f868cde9685b00f29ec2706c4aabf8ed34a48ddea13afd545a31def9acfa9fcd7aaa39896a5cb3cce9f2399f868bd6b45a2fae52
-EBUILD wtfis-9999.ebuild 976 BLAKE2B 32841c8bad91956864cb9444a6593d46bdd6f6087391bc92afde22fbd79580e1e404df4cb52f8ce36a1764bc23218b649e07b1b5d50484d75edb6fcebe4655c0 SHA512 8a3052e23945bd43c2d32ed8f868cde9685b00f29ec2706c4aabf8ed34a48ddea13afd545a31def9acfa9fcd7aaa39896a5cb3cce9f2399f868bd6b45a2fae52
+EBUILD wtfis-0.5.1.ebuild 974 BLAKE2B a775d247aeea63cc8064851e3ff39cf514cbc0325c9211670a226e535e01ad0a12d0ef8964bc7d6ddc0f8add835e0bf2f32895d4204f975f8803cce9d82bd080 SHA512 dc04116c00a55fde85ea939266a579f42f5c4749895aa7264b99b2bdd9b44fa68c9d018c2f2de52f209000ea76f59d3e6be38327b0250abc45edce996d4e0a6a
+EBUILD wtfis-0.6.1.ebuild 976 BLAKE2B a20a444bc8ed16c06c9642bf83e1bd8dc7efedd522d7e33ba3cb6b0ce0bb01768607cb0defdad5396a3c2f30a5454aabfda5d77c57bf09b36c368af533e6deae SHA512 eb000f1d9100560bd8daf93b5c2fe75ec79cb5ba0bd5a3131064ae4f2ee21c057fcc2597853563fe8cb5f159855cd998639734d96ae1947059e1ab74e05ec9e8
+EBUILD wtfis-9999.ebuild 976 BLAKE2B a20a444bc8ed16c06c9642bf83e1bd8dc7efedd522d7e33ba3cb6b0ce0bb01768607cb0defdad5396a3c2f30a5454aabfda5d77c57bf09b36c368af533e6deae SHA512 eb000f1d9100560bd8daf93b5c2fe75ec79cb5ba0bd5a3131064ae4f2ee21c057fcc2597853563fe8cb5f159855cd998639734d96ae1947059e1ab74e05ec9e8
 MISC metadata.xml 855 BLAKE2B 552b9998e0eada39d9a0f0e092c566e9a75c5ac2e2360df66d9b7334e663a9fb4a82be51f31623f31644e2863d78570405dc94e36769be7cbbcc3539cf49d920 SHA512 56593e8b58a019e4cdbf23946331c34f66fc72e318271916b33f3f63ccfb2d7a546dcbf05fcd0bd0bce9e5e0ce8f7b0cfd621b4b938c0eed135c34d025fdfc32
diff --git a/net-analyzer/wtfis/wtfis-0.5.1.ebuild b/net-analyzer/wtfis/wtfis-0.5.1.ebuild
index 98a16230fa10..dc39ae77fcb0 100644
--- a/net-analyzer/wtfis/wtfis-0.5.1.ebuild
+++ b/net-analyzer/wtfis/wtfis-0.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots"
diff --git a/net-analyzer/wtfis/wtfis-0.6.1.ebuild b/net-analyzer/wtfis/wtfis-0.6.1.ebuild
index bc0d8ff31d44..4ab2cc180a22 100644
--- a/net-analyzer/wtfis/wtfis-0.6.1.ebuild
+++ b/net-analyzer/wtfis/wtfis-0.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots"
diff --git a/net-analyzer/wtfis/wtfis-9999.ebuild b/net-analyzer/wtfis/wtfis-9999.ebuild
index bc0d8ff31d44..4ab2cc180a22 100644
--- a/net-analyzer/wtfis/wtfis-9999.ebuild
+++ b/net-analyzer/wtfis/wtfis-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots"
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 561705095906..5fc1fbc151cc 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,5 @@
+AUX zmap-2.1.1-always-install-config.patch 973 BLAKE2B cdba75ff09b19c851234745cce6ff4a82bbca3b944b442885aab81eb7a10221cfe62f34d2842f3c4c7c8e38f19c25dcf2aacf155aed3bb8251840f9690175a9e SHA512 c583fd3acdbfb21ab613fac1c4cf0da82e2e0d1d7f537415f6eb5f0b7e5f0101c518c336590590f4a153c191c12fed1ba35c934bacc95cbf63053f43a80c8485
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r4.ebuild 981 BLAKE2B e26d1b4f46269e0c6e0b085e5057c8c53b62a2765894df3d9ebeb1867c23107fde7f22d093448232941334825d31a592d358f01c373243f193a87c1efadf7035 SHA512 0ddcef4556975772d9b32110db9b2ee143c0c4a00659314dc3e17b11578927fb3f1ec5986c6564cc7ccc4ede09fae073f086b88ed7f6197d6207bdc9b8e876e6
-EBUILD zmap-9999.ebuild 697 BLAKE2B 71cf94e911b688e14d77a17f718e5b5f160cf2d36f4a45ddffa01b0a2104e6e406e9b4cd677a220cb2bb7a41beecd5d9fda698df1ba5995caca005a98006117e SHA512 8d1a436617239b754cbabc95461306a283bebf099aba9994e6829180a131066e9b08b6bfe04fae2bd58904ad336d971ef8e20e02068c0c99239327c33aff4e92
+EBUILD zmap-2.1.1-r5.ebuild 1064 BLAKE2B 22eb68fafcd031255a4f5506d2580eaa17af9da281cc7c8a93a56f4174ecc646bfc5f804372b4112b743ecbcd216f24c6acf6cc3d48b54fc4d663b0753e8e749 SHA512 3b836d576116352b134e9fe43d22fa61e8cc0e1ec8aea6ef72ca052783d54fb5a57eb1f8b27a6eb23d7ecdd162d197b310244a9fe7f3ca86a66f033453431963
+EBUILD zmap-9999.ebuild 777 BLAKE2B 8c3f86f3d2fec996ef73249e0b6315fbd985595fd1cc4e986898611f6414791c86d06f555ad8d3dad4df42238ef338d1c396aec27b0594e4caa262a410228efa SHA512 030c83b9c1dbf7b307ff69e68b1a81b80427bd52af6e0e47b3991991725ae4b0c0f76dc9017a6ec14307b5c488c6ffec852eada753d4c8d6f462d07a0a1208ce
 MISC metadata.xml 1103 BLAKE2B e4f1a96e95895158f2ae5eddfd27705b3838a50b3b2188f6ab1b6ea8cf1713d1e7519e3ba61c87f82acccf59c172f559f68fb55f2d8885cd99ae1450475f483d SHA512 090657110d0e299669504e3f021147d2c4601783a9240326d2cd5c7965c7ffeecef6512455f57f54c7056a9da8b312a8f89b18ed7c309a797ea044e80a506f66
diff --git a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
new file mode 100644
index 000000000000..b3a8f9003dc5
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
@@ -0,0 +1,20 @@
+We always want to install configs as the host machine may be different from
+the one where zmap is installed to. Plus we have CONFIG_PROTECT in Gentoo
+for protecting the user's existing configuration.
+
+Bug: https://bugs.gentoo.org/885707
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configuration file location is /etc/zmap")
+ foreach(EACH_CONF ${CONF_FILES})
+     get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
+     message(STATUS "Checking if ${CONF_BASENAME} exists there...")
+-    if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
+-        install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
+-    else()
+-        message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!")
+-    endif()
++    install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
+ endforeach()
+ 
+ # Allow Debian Packaging
diff --git a/net-analyzer/zmap/zmap-2.1.1-r4.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
index 6b1d7f0b8261..97210a199bd6 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r4.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake fcaps
 
@@ -14,18 +14,28 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="mongo redis"
 
-RDEPEND="dev-libs/gmp:=
+RDEPEND="
+	dev-libs/gmp:=
 	net-libs/libpcap
 	dev-libs/json-c:=
 	mongo? (
 		dev-db/mongodb
 		dev-libs/mongo-c-driver
 	)
-	redis? ( dev-libs/hiredis:= )"
-DEPEND="${RDEPEND}
+	redis? ( dev-libs/hiredis:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gengetopt
 	sys-devel/flex
-	dev-util/byacc"
+	dev-util/byacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-always-install-config.patch
+)
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
 
 src_prepare() {
 	sed \
@@ -40,8 +50,7 @@ src_configure() {
 		-DWITH_WERROR=OFF
 		-DWITH_MONGO="$(usex mongo)"
 		-DWITH_REDIS="$(usex redis)"
-		)
+	)
+
 	cmake_src_configure
 }
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 6a7cb8480b94..b8a99df048df 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake fcaps git-r3
 
@@ -17,20 +17,27 @@ RDEPEND="
 	dev-libs/gmp:=
 	net-libs/libpcap
 	dev-libs/json-c:=
-	redis? ( dev-libs/hiredis:= )"
-DEPEND="${RDEPEND}
+	redis? ( dev-libs/hiredis:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gengetopt
 	sys-devel/flex
 	dev-util/byacc
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-always-install-config.patch
+)
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEVELOPMENT=OFF
 		-DWITH_WERROR=OFF
 		-DWITH_REDIS="$(usex redis)"
-		)
+	)
+
 	cmake_src_configure
 }
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )