gentoo resync : 22.12.2021

4 files changed, 97 insertions, 0 deletions

diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index d479fac0c80e..c258771a6e5f 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -6,9 +6,13 @@ AUX 1.3.0/05-cleanup.patch 722 BLAKE2B 503438de3fe4c793616b32142034e9e4e37b0ea57
 AUX 1.3.0/06-return.patch 271 BLAKE2B 958af1f4ec99a02e50d834904a5dffd611c4d949cc77ae3c548021db262dd1c875c384f879aea852ffd19d85e514e913927cc01dcc6f1fea02ae9f4074850225 SHA512 608588d4b6ab9be136493b5bbfd44461525b3e8f767c0a834b502aebcb418ba620792a29b65568e951f38565a2972cac62d09c4c957ef90f2b11a7991cecb726
 AUX 1.3.0/07-comment.patch 747 BLAKE2B 6232a744729796c4cf0b1f27ae7f9b91b079e9bb9b3d24c7f8eb9dfa96ba62def8f5bd0f37ff226971b7c75c91d361b4cee7baeaff88ab3433415e81caa2c242 SHA512 1509363c088d7a30373d3a93dfb8d702154050de5adcd743f370174d113c54330f5728f970f297a4202ad2b1538cb316325adac267e1079ac3710b2c8dfb86d8
 AUX 1.3.0/08-man8.patch 612 BLAKE2B 9d20491e8f4c138f580fef215b2ee1c30b6b02594fe0a7a2d6d1bd60e920338ec3899c228d78f10f961fd6dc3968c03f3494b33932e289e48a0e05467f4a3cb3 SHA512 5bdd6f26bc60624aaa529b57a6290a9c03ef7ebc3f25881025c4b0cd1a69424249920adaa3ec513c5475808744f49e683965a836eea5fea8321b441dfdc9e8b9
+AUX dhcp_probe-1.3.1-fix-configure-CPP.patch 884 BLAKE2B f1d55b1f89b153a654db9c0f38f1189c928fbaf73ca8dee30619da4253ef809dbc8d1619f060fce9ad078d8f184b0b148de13a7037a7f610925d6b00faaedb33 SHA512 0067420ab9f004af3f09deb8c4a478158848155ef5ee561fcb301db762689acb6b92ed95b39f520075d9f79c32f318ab01887c0d62d883396ee7a6edb8438000
+AUX dhcp_probe-1.3.1-respect-AR.patch 285 BLAKE2B c2b9f6afd5845a3e57be9bd7dff1fc8f0ec652ec13ea0a402a7379f62c3ea9015fa1d5dec11b218f28ae1949bed9561710ffbc9531e3e37a9063c74a8312df79 SHA512 b524de3671390e14792a2051703796e1b09c4e5028c739e5b8bb0a49051119656a250e4420a0a583e6fd8d96906d5c8275de7caf34626e937d4e9e5111c525b2
 AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5b8172f17fa6d3cd682b5458983074456b19f5669aa3d4e09267d0946d5e43637b009d640b1c3059b5 SHA512 c12c574da59c4727470c4add4f1bad1a6787329218f2af5cfa17dac46de1bde546011b24e95c06900c173885eb9d152965d8edaed07117cc36f19755da157f47
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
 DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
+DIST dhcp_probe-1.3.1.tar.gz 246238 BLAKE2B 86c079c4c7951f3a70ced20dbea5d4f0d716335d2f9a18b1b9986965ca0446b5a7b673c7e652405deceeef336218016418a86be1a76d452c7802061403a66e82 SHA512 1002683e6ceb3806289fa9e4879be3d957a9ddc42656d7114942708560f8efba0db058137e04cad092e5a083900987aa1f76c5a7c20db4b57c104dd6a6fcabb6
 EBUILD dhcp_probe-1.3.0-r4.ebuild 1128 BLAKE2B 3b5dcfd15dd977d8f95c5e2cdbc869ee37984c81a503950b3017b40545e86574b82928e785dd4b80599cc283c346abda5cc8031b619cbedf487dcfc47d516a3a SHA512 a43a0cfb7c3c3c784d12ab8b9aef02edc9230f773e8d0ccd07ff46f163d57fede4aae5d84c742ace7578a32053cd1784310cdca200924ad23fff4c0f8d0651e1
+EBUILD dhcp_probe-1.3.1.ebuild 1015 BLAKE2B d21276b135954047bffbafdba70f86e6a00f761ff3bef578391ee19ad786fd2531c654372a8396b3d08228f9214fc964e7f56fafbcf1992a377e5c1f6b47dfd7 SHA512 5fabdf362a49177a36ea72b3d1ab3841d54594c1791885c9d2c66216a7e179bc8c4f4c213e3221fde55de02b1c163035795f73a7f84bc42ce1642c8efd6217e3
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
new file mode 100644
index 000000000000..4bcdb5ae2887
--- /dev/null
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Discover DHCP and BootP servers on a directly-attached Ethernet network"
+HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/"
+SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r2"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+	extras/dhcp_probe.cf.sample
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-respect-AR.patch
+	"${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch
+)
+
+src_prepare() {
+	default
+
+	# for AR patch
+	eautoreconf
+}
+
+src_configure() {
+	# configure uses CPP
+	tc-export CPP
+
+	use amd64 && append-cppflags -D__ARCH__=64
+
+	STRIP=true econf
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/${PN}_mail
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch
new file mode 100644
index 000000000000..fa32f0f73164
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch
@@ -0,0 +1,26 @@
+Before this patch, with CPP exported:
+```
+checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found
+checking how to run the C preprocessor... x86_64-pc-linux-gnu-gcc -E
+./configure: 6512: ac_fn_c_try_cpp: not found
+./configure: 6512: ac_fn_c_try_cpp: not found
+configure: error: in `/var/tmp/portage/net-analyzer/dhcp_probe-1.3.1/work/dhcp_probe-1.3.1':
+configure: error: C preprocessor "x86_64-pc-linux-gnu-gcc -E" fails sanity check
+See `config.log' for more details
+```
+
+... and unexported:
+```
+checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found
+[... continues without dying ...]
+```
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AM_PROG_AR
++AC_PROG_CPP
+ 
+ dnl ##########################################################################
+ 
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch
new file mode 100644
index 000000000000..da32b63718ac
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,7 @@ dnl ##########################################################################
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl ##########################################################################
+