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

4 files changed, 55 insertions, 18 deletions

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 )