gentoo resync : 30.09.2020

5 files changed, 106 insertions, 66 deletions

diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index e67095232e1d..001a078f3a54 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,8 @@
 AUX driftnet-0.1.6-giflib-5.patch 1060 BLAKE2B 6bd972e9c7e66eda935058daf75b5667f93f1a808499023e70087d7dd3a904762cd7139f23338321a0f7292974cd8dd206a97b33e665944fd32c9b14aae3908a SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c
+AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04
+AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b
 DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
+DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
 EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1818 BLAKE2B cfaa0f1513e946a3ab25d88735f42f3d7c4c0fafd9b8eacb31c7ba4bef35c46f0196a3e4dd2f084e83717abe854fa977a7694170d6b486c7fe6063746571c684 SHA512 344eab963fbaccc2cfbd020fcdf962f6e590c86d77654df5b0eb805d31649126a5bb432de1000ea080488e0d13d2b1905855383372439a3a72c63fc316aace60
-EBUILD driftnet-0.1.6_p20090401.ebuild 1504 BLAKE2B 5074d44094102c0a9026f9506e5c230f662ffa927dc15319607e38c574d6da4f8d3ffad3f9a34f351fb655d52194bb50bbc1aa13f3d1862c1d2fd0551b580861 SHA512 1ac56e06f09a71d7a6c62793ce455ad3ebbfd803bc18a6c1327cf0b3cbe739a13a80d7d51659f68e63de349a4f7d345ce8b31c18fdb6360889904dbfb738b889
+EBUILD driftnet-1.3.0.ebuild 1345 BLAKE2B af0fd32a79845b824a57ed6e059caae0c330efacfd89944733996e5ef448b76f7c9de32fc55c400ad1b2b0983df11ff56a7c839163360c26b25430213cc9fd6e SHA512 4c1085b74a40d3af3265a829f6c146f6b7f6cc3cc34fb425ce8c83396c2385d1c43074c86245a615df16b88434b5a243f9a7bcebb263c373c8d4857e20466f83
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
deleted file mode 100644
index 9de58dda9d5f..000000000000
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
-HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc -sparc x86"
-SLOT="0"
-IUSE="gtk mp3 suid"
-
-CDEPEND="net-libs/libpcap
-	gtk? ( x11-libs/gtk+:2
-		virtual/jpeg
-		media-libs/giflib
-		media-libs/libpng )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	mp3? ( media-sound/mpg123 )"
-
-src_prepare() {
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-	# With newer libpng, --cflags causes build failures.
-	sed -i \
-		-e 's:pkg-config --cflags libpng:pkg-config --libs libpng:' \
-		Makefile || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	if use gtk; then
-		emake
-		mv driftnet driftnet-gtk || die
-		emake clean
-	fi
-
-	# build a non-gtk version for all users
-	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
-	append-flags -DNO_DISPLAY_WINDOW
-	emake
-}
-
-src_install() {
-	dosbin driftnet
-	doman driftnet.1
-
-	use gtk && dosbin driftnet-gtk
-
-	dodoc CHANGES CREDITS README TODO
-
-	if use suid ; then
-		elog "marking the no-display driftnet as setuid root."
-		fowners root:wheel "/usr/sbin/driftnet"
-		fperms 710 "/usr/sbin/driftnet"
-		fperms u+s "/usr/sbin/driftnet"
-	fi
-}
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
new file mode 100644
index 000000000000..5472c3464801
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools fcaps toolchain-funcs
+
+DESCRIPTION="Watches network traffic and displays media from TCP streams observed"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 -sparc ~x86"
+SLOT="0"
+IUSE="debug gtk suid test"
+
+RDEPEND="
+	net-libs/libpcap
+	net-libs/libwebsockets:=[client,http-proxy,socks5]
+	gtk? (
+		media-libs/giflib:=
+		media-libs/libpng:=
+		virtual/jpeg:0
+		x11-libs/gtk+:2
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+RESTRICT="!test? ( test )"
+DOCS="
+	Changelog CREDITS README.md TODO
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable gtk display)
+}
+
+src_install() {
+	default
+
+	gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die
+
+	if use suid ; then
+		elog "marking the no-display driftnet as setuid root."
+		fowners root:wheel "/usr/bin/driftnet"
+		fperms 710 "/usr/bin/driftnet"
+		fperms u+s "/usr/bin/driftnet"
+	fi
+}
+
+pkg_postinst() {
+	fcaps \
+		cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/driftnet
+}
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
new file mode 100644
index 000000000000..2b25ed45833a
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,12 +68,12 @@
+     ,
+     [enable_debug=yes])
+ 
+-if test "x$enable_debug" = xyes; then
+-    CFLAGS="-O2 -g -DDEBUG"
+-else
+-	CFLAGS="-O2 -DNDEBUG"
+-fi
+-#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
++#if test "x$enable_debug" = xyes; then
++#    CFLAGS="-O2 -g -DDEBUG"
++#else
++#	CFLAGS="-O2 -DNDEBUG"
++#fi
++AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+ 
+ #
+ # Checks for programs.
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
new file mode 100644
index 000000000000..2a8a294e8dbe
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
@@ -0,0 +1,13 @@
+--- a/src/options.h
++++ b/src/options.h
+@@ -32,10 +32,8 @@
+     char *audio_mpeg_player;
+     int mpeg_player_specified;
+     int newpfx;
+-#ifndef NO_DISPLAY_WINDOW
+     char *savedimgpfx;
+     int enable_gtk_display;
+-#endif
+     char *drop_username;
+ 	int list_interfaces;
+     int monitor_mode;