Add version 2.4 and Debian patchset for bug 119557.

(Portage version: 2.0.54)

6 files changed, 70 insertions, 80 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index b1e7c5ec5dec..3a3545849cb4 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/dsniff
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.24 2005/12/24 15:32:20 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.25 2006/01/19 18:03:21 vanquirius Exp $
+
+*dsniff-2.4_beta1 (19 Jan 2006)
+
+  19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r4.ebuild,
+  +dsniff-2.4_beta1.ebuild:
+  Add version 2.4 and Debian patchset for bug 119557. Thanks to <a1200ux at
+  gmail dot com>. Currently in package.mask.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> dsniff-2.3-r7.ebuild:
   Stable on ppc.
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 111dd8037cec..66c4a82003c9 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -1,8 +1,8 @@
 MD5 d5cbdf8fd1f23e35bea4b31785d4171c ChangeLog 3073
-MD5 a800c8f521b81572f53a3527f1a91d4d dsniff-2.3-r4.ebuild 2228
 MD5 8a6e4a5dbcf33713f14f38d0292f486b dsniff-2.3-r7.ebuild 1573
+MD5 db5d7c9c78be944789f531c4c54b4e37 dsniff-2.4_beta1.ebuild 1699
 MD5 9206faea6a9be25f7d1aa0ac0a2ff6e3 files/2.3-libnet-1.0.patch 6110
 MD5 f41ad0aeacc05042ec27551b257845d3 files/2.3-makefile.patch 1531
-MD5 5c5bea8cc4846925ba48ba5c9ea83341 files/digest-dsniff-2.3-r4 123
 MD5 0e5d8e4adda8f4876e972a02bed13cc3 files/digest-dsniff-2.3-r7 62
+MD5 8190b5894de76f3b0736dcec1dac4adc files/digest-dsniff-2.4_beta1 141
 MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
diff --git a/net-analyzer/dsniff/dsniff-2.3-r4.ebuild b/net-analyzer/dsniff/dsniff-2.3-r4.ebuild
deleted file mode 100644
index 69957229afb7..000000000000
--- a/net-analyzer/dsniff/dsniff-2.3-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r4.ebuild,v 1.3 2005/09/17 00:55:11 agriffis Exp $
-
-inherit eutils
-
-# dsniff needs to build it's own version of sys-libs/db, since the one
-# normally installed is for some reason unusable for dsniffs configure script.
-# The version is chosen as being the standard one around at the time i wrote
-# this ebuild, it's not set in stone.
-
-DB_VER="3.2.9"
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-${DB_VER}.tar.gz
-	http://monkey.org/~dugsong/${PN}/${P}.tar.gz"
-
-# dsniff has it's own small license which is in the docs section
-LICENSE="DSNIFF"
-SLOT="0"
-KEYWORDS="alpha ppc x86"
-IUSE=""
-
-RDEPEND="virtual/libpcap
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3
-	>=net-libs/libnids-1.18
-	>=dev-libs/openssl-0.9.6e"
-# dependencies only for building our own sys-libs/db
-DEPEND="${RDEPEND}
-	virtual/libc
-	=sys-libs/db-1*
-	sys-devel/libtool
-	sys-devel/m4"
-
-src_unpack() {
-	unpack db-${DB_VER}.tar.gz
-	unpack ${P}.tar.gz
-
-	# Making sure data files get correctly installed and that dsniff
-	# can find them
-	# Working around dsniff b0rky config script
-	# Data stuff goes into /etc/dsniff
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-	sed -i \
-		-e 's:-ldb:-ldb -lpthread:' \
-		-e "s:lib':':" \
-		configure || die "sed configure"
-	sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
-	sed -i 's:/usr/local/lib:/etc/dsniff:' pathnames.h || die "sed pathnames"
-	epatch ${FILESDIR}/${PV}-makefile.patch
-}
-
-src_compile() {
-	cd ${WORKDIR}/db-${DB_VER}/dist
-	./configure \
-		--host=${CHOST} \
-		--enable-compat185 || die "./configure of db-${DB_VER} failed"
-	emake || die "build of db-${DB_VER} failed"
-
-	# Another workaround around the crappy config script
-	cd ${S}
-	econf --with-db=../db-${DB_VER} || die
-	make || die
-}
-
-src_install() {
-	make install install_prefix=${D} || die
-	dodir /etc/dsniff
-	mv ${D}/usr/{dnsspoof.hosts,dsniff.{magic,services}} ${D}/etc/dsniff/
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
new file mode 100644
index 000000000000..b42330502f36
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild,v 1.1 2006/01/19 18:03:21 vanquirius Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="http://monkey.org/~dugsong/dsniff/beta/${P/_beta/b}.tar.gz
+	mirror://gentoo/${PN}-2.4_beta1-debian.patch.bz2"
+LICENSE="DSNIFF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.18
+	>=dev-libs/openssl-0.9.6e
+	~sys-libs/db-3.2.9
+	sys-apps/sed"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Debian's patchset
+	epatch "${DISTDIR}"/${PN}-2.4_beta1-debian.patch.bz2
+
+	# Making sure data files get correctly installed and that dsniff
+	# can find them
+	# Working around dsniff b0rky config script
+	# Data stuff goes into /etc/dsniff
+	cd "${S}"
+	sed -i \
+		-e 's:-ldb:-ldb -lpthread:' \
+		-e "s:lib':':" \
+		configure || die "sed configure"
+	sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
+	sed -i 's:/usr/local/lib:/etc/dsniff:' pathnames.h || die "sed pathnames"
+	epatch "${FILESDIR}"/2.3-makefile.patch
+
+	# Allow amd64 compilation
+	append-ldflags -lresolv
+
+	# Fix for the local ip inversion (see bug #108144)
+	sed -i "s/de->ip = htonl(lnet_ip);/de->ip = lnet_ip;/" dnsspoof.c \
+		|| die "sed dnsspoof"
+}
+
+src_install() {
+	make install install_prefix="${D}" || die
+	dodir /etc/dsniff
+	mv "${D}"/usr/{dnsspoof.hosts,dsniff.{magic,services}} "${D}"/etc/dsniff/
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/digest-dsniff-2.3-r4 b/net-analyzer/dsniff/files/digest-dsniff-2.3-r4
deleted file mode 100644
index e1135460a43f..000000000000
--- a/net-analyzer/dsniff/files/digest-dsniff-2.3-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
-MD5 183e336a45e38013f3af840bddec44b4 dsniff-2.3.tar.gz 126797
diff --git a/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1 b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
new file mode 100644
index 000000000000..f7c4bb727937
--- /dev/null
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
@@ -0,0 +1,2 @@
+MD5 a9dececf1f8ff8fc0456b4917c59f1e4 dsniff-2.4_beta1-debian.patch.bz2 33225
+MD5 2f761fa3475682a7512b0b43568ee7d6 dsniff-2.4b1.tar.gz 131666