gentoo resync : 09.03.2018

3 files changed, 124 insertions, 0 deletions

diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 794c002482aa..6b2b1c8b72e1 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -3,10 +3,12 @@ AUX 2.4_beta1-httppostfix.patch 674 BLAKE2B b716835e750e4029f974115ee54e86b05675
 AUX 2.4_beta1-libtirpc.patch 590 BLAKE2B ea64ccdee4f518e9b667460805d82609df114082a4046c308d8978baa92be81c973b28b07da5b7277043ed3a4f2257a671db56e3d6c717c5e217e66096ab0e22 SHA512 c794ba7d43d7fac77a4d427f164efed1514a9caf93af8c11d6e094448b8b5c26be2d3da85e3ad62611a4bf337a3cca68ba27d3813c51d0692e9a793788c31f9d
 AUX 2.4_beta1-macof-size-calculation.patch 369 BLAKE2B 0562e78434326d7e5b4d266b607d67f6b23a58fafd0deb5db23fd896ecc9c8f7fc05de71b43698926b8eeed6f033998b7942844e1e845d8e55cb12705d286271 SHA512 070695aae4a0374f6d073e71f4e9362387b3b6a444058c9371564779b22c2218f32e830c7a1e39879860e956f8c826199ba90a0cb67423379358c1d0dd857ff1
 AUX 2.4_beta1-make.patch 2086 BLAKE2B 5808455a9751c64f17f08bfdd04073acc80e21d9ff18cc8ab41fbcc57ac7046348e6b1a8fe77ff6410afebcd10c77e7418dcae9cec57254e7eba039cb79ebfeb SHA512 bd16046e6ed429494f036234ac741f32d14e6f61f9cfdf303a18e04ed378ee2485d3b10cb2371d0cad30c18d7d2805dbb005cd48eece1bc2956187238a05b0b1
+AUX 2.4_beta1-rpc.patch 1157 BLAKE2B 9055c393ff3f8fe5c31ddf1141c2b2edf0d93b27b754d08e27124b196a9c30e28054a6a9c0e12481ce5247c46b9a69bb979831974fdb16a9db65111842ae87e3 SHA512 c45a3ab69222a25ac66a07c557431dd84e13ae8082ddf0ccf9f94e395a1b68a09fb136a36a8e3ba4dae4fe8e1f2f67c229ca1dc7488174893b2d43dc2eb8a471
 AUX 2.4_beta1-urlsnarf-pcap_timestamps.patch 463 BLAKE2B 77512cb1fc1449d90006c4a2d795172a8bd20532b3c5e4d37c993f45def3894950c254bec7cd406757f8db8973270b3d9ccc7eab8f583bfb5ddbb3b6f2e39853 SHA512 57a7e9e50b76ae260617f3c66036de41329c744ac1f08d70993a2bf724e22828320107776ca726b3c0bf20d921134368087dedeae19f287770cee6dca7d6e3e1
 DIST dsniff-2.4b1.tar.gz 131666 BLAKE2B f0cc3c875ed37ee573a28d2c54e7dc89bd14df233b047273ebb054820c2f8c61be22b0310c9354446a9ca6e99fdcd7f027fa7a122da667d4a809362dcb8c957f SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f
 DIST dsniff_2.4b1+debian-18.diff.gz 44819 BLAKE2B 79b5614cbe4f36c2d321cd392cbfd2db94530680fbbab35f5069850ab6bda0fab6b7a2a93a983773793b9f645499c24393d6c652f0aba6c48651ae17ff4b24fe SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5
 DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 BLAKE2B 88333aad1498cb5b4fd68776f8e0599672c9c69ee5b0d5424f0a8e9f0958412fb420a6d6ae6d46dc5e6c73c4ab39b1fedbef1a4c6879bb4c2bd363271cb6d98b SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3
+EBUILD dsniff-2.4_beta1-r10.ebuild 1971 BLAKE2B 6119b39b1d96ef00cf73e92447750b06e6ae351cd17ff75206163829b21e6b720f1b7d88dd33997dbef0ebfc962ee4965cee329815800ab0e15c881608674639 SHA512 95cd00f4758b4d779201453d98484ed1c2e25c815c1aafe6baa016e42f5f50912aa9d85cdf05932279bf3d5e0f3a7d65e406722b13c0ea72333f4c2a777fb255
 EBUILD dsniff-2.4_beta1-r4.ebuild 1418 BLAKE2B 9b7a847cd8e524b0e553b8d847b55660f2af0e9e889cab1a01944d37b7309581d0d2e68a0bfe55d42fdc0b5965f7c5f8989d808b49e06fb48cf72afd7024908b SHA512 6dfbc3a94e4c9361dcb5875097c15547b61d8754f282b9b71c223be033712c8d2e0fe83ebf45017ad00c26f2646320077c7c102053f452ca5f60e0297cadcb32
 EBUILD dsniff-2.4_beta1-r7.ebuild 1563 BLAKE2B 18a30d1705e82d23edd6fb19ad5474c7f00d6a627f819ad6b39942755ab0344874f73757d9404edf0e2c029426858d1a7ae8486f8f4ac694d7a4a40ec60fcdc1 SHA512 941d3954e19d99513298fc8c18a2c9bc257efb2611311aeb1d0e9a079c4e2f4439f95389e8e3f103e97a7c8dc87860c1b45b29c6a43f579ce7a001a0c4d4e8fe
 EBUILD dsniff-2.4_beta1-r9.ebuild 2082 BLAKE2B de5c86f3f0d7944314893e9fef88b35c6794445c250e5adae147eaedbee3c107f9f2830fe74ae28ebaa196e6abb1097236d33c003ed2586f5820dc6d479e9231 SHA512 54484074acf7b0f906985530d3f7a1c0139bbd30325ba53234627d40d154377e6e53ef5fc99c33db6381d3ba329d6b26d7002e8a979eabfa5db69dcb9de1a2c9
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
new file mode 100644
index 000000000000..6cf8570555a7
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="
+	http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl X"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	net-libs/libnsl:0=
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=sys-libs/db-4:*
+	X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+	# replace Debian patch 23 with a simpler one (bug #506076)
+	mv -v \
+		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
+	cp -v \
+		"${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
+		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
+
+	# Debian patchset, needs to be applied in the exact order that "series"
+	# lists or patching will fail.
+	# Bug #479882
+	eapply $(
+		for file in $(< "${WORKDIR}"/debian/patches/series ); do
+			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+		done
+	)
+
+	# Bug 125084
+	eapply "${FILESDIR}"/${PV}-httppostfix.patch
+
+	# various Makefile.in patches
+	eapply "${FILESDIR}"/${PV}-make.patch
+
+	# bug #538462
+	eapply "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+	# libtirpc support
+	eapply "${FILESDIR}"/${PV}-rpc.patch
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-libtirpc \
+		$(use_with X x) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install install_prefix="${D}"
+	dodir /etc/dsniff
+	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${D}"/etc/dsniff/ || die
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
new file mode 100644
index 000000000000..b43c91d95815
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,8 +37,8 @@
+ X11INC	= @X_CFLAGS@
+ X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+ 
+-INCS	= -I. $(X11INC) -I$(srcdir)/missing 
+-LIBS	= @LIBS@ -L$(srcdir) -lmissing
++INCS	= -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@
++LIBS	= @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
+ 
+ INSTALL	= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- a/configure.in
++++ b/configure.in
+@@ -337,4 +337,23 @@
+ AC_SUBST(SSLINC)
+ AC_SUBST(SSLLIB)
+ 
++AC_ARG_WITH([libtirpc],
++	    AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++	    [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno], 
++      [PKG_CHECK_MODULES([TIRPC], 
++                         [libtirpc], 
++                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++			 [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++	                )], 
++      [AC_CHECK_HEADER(rpc/rpc.h, 
++		       [RPC_CFLAGS=""; RPC_LIBS="";],
++		       [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++	              )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_OUTPUT(Makefile)