gentoo resync : 15.06.2021

4 files changed, 102 insertions, 4 deletions

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 525607261840..22e3f75d46a4 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,6 +3,9 @@ AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f
 DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
-EBUILD libpcap-1.10.0.ebuild 2418 BLAKE2B 3675c881d73801eee1e38818e7e0fa954bdcbdf162bc10c93c9d9fb68b8b75d2b670104e4147a89bb3174f23d7daaeb3720272c76ec75d357d0171816e2b2aa6 SHA512 41e504348a2d39382a78647954c7f79dd1e1fd7a4898b4c8697b76c34350bf28ed2a9bbe90182003b0cbcd72cbb40ca48d6d2ad6cbf10e5e05910c84a16f9d6b
-EBUILD libpcap-9999.ebuild 2309 BLAKE2B 24a952820fa0260ab8d69058e9095dadb8a4f8e65507d9d81339334db3c203d14f2153e6e9c0eef2da7d188c6eafd69fcd23c64abf53f79e8b517d1f0dda343b SHA512 e3a07417a2a4ef534480f63e7fe574f6b293efb5ff9da1ecf94b139af9caa56c615c2878845915e9cb29a20be6e4c8b18e624489c5e94a0f0e3ca1cf31705ded
+DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
+DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
+EBUILD libpcap-1.10.0.ebuild 2416 BLAKE2B f7c316c08ead5741042b315d93cc8b0cb76d29ffd1a94fc46b29ffb5278800f64891c92a21d134c03f302f5e3775d6068f2d09cf28073d8de52f50c294fe963d SHA512 d0540c69b9bdb36d5082ce3b0343e14aa9ff0b7523315511697ac18088297aa5bb1d8679888184a2b71ff41e9199af0a00beb3265d05774b99e15142f5c8cad3
+EBUILD libpcap-1.10.1.ebuild 2423 BLAKE2B 01b8fce44be6b3196e4632c6ff4a2fb038ed50fafdd24e72d4bfda2954fdf499c7e98dad7a5910a4803206056c4ebd20515dcaaa148a6ab906fc566500ea985f SHA512 434c79ba8146210357ef403109b8bf21b631d73786eccbd8f78693b5544be90f494ee8ff183d5a73230920fd21b0fddabb0009dddaf3d0782cfec1785989558e
+EBUILD libpcap-9999.ebuild 2307 BLAKE2B 8c7a39c7edd37117c7c91bcdd901354be1e0ffee5adc09d7ba8d4d89d709daa9510b5b27fca92789a3890c08d5761a719d1629db88ce648db42052a0e00269b6 SHA512 2fb3b924dbd7825e2f7983be43f939bf61678a233777e5ff254b4ed1ae364a9e53c00854e840a1b8fd472580299ceb60670ebd1489a7bff0c126586c318655fa
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index e17ca9253266..ead6948c37ee 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libpcap/libpcap-1.10.1.ebuild b/net-libs/libpcap/libpcap-1.10.1.ebuild
new file mode 100644
index 000000000000..16825c3bbf14
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	# Note: drop -upstream on bump, this is just because we switched to the official
+	# distfiles for verify-sig
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
+)
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b0505e64ff65..f7cc40d1b868 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )