commit: 829665513dc699948aac45dd46237067d05bca4f Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Sep 26 10:23:42 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Sep 26 10:26:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82966551
net-analyzer/driftnet: revert "[QA] Revert "Version 1.3.0" & followup" This reverts commit 634a58c17ef7d17ad11ced70a9830d136fc8e960. Bug: https://bugs.gentoo.org/744664 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> net-analyzer/driftnet/Manifest | 1 + net-analyzer/driftnet/driftnet-1.3.0.ebuild | 67 ++++++++++++++++++++++ .../driftnet/files/driftnet-1.3.0-CFLAGS.patch | 21 +++++++ .../driftnet/files/driftnet-1.3.0-gtk.patch | 13 +++++ 4 files changed, 102 insertions(+) diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest index bfbea558151..64dfbfd5032 100644 --- a/net-analyzer/driftnet/Manifest +++ b/net-analyzer/driftnet/Manifest @@ -1 +1,2 @@ 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 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 00000000000..a53b4a5dedf --- /dev/null +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -0,0 +1,67 @@ +# 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 ) +" +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 00000000000..2b25ed45833 --- /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 00000000000..2a8a294e8db --- /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;
