More fixes for bug 119557.

(Portage version: 2.0.54)

4 files changed, 15 insertions, 15 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 3a3545849cb4..28e4f31586b2 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/dsniff
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.26 2006/01/21 21:10:08 vanquirius Exp $
+
+  21 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> dsniff-2.4_beta1.ebuild:
+  More fixes for bug 119557. Thanks to a1200ux <a1200ux at gmail dot com> for
+  his hard work.
 
 *dsniff-2.4_beta1 (19 Jan 2006)
 
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 8a52a5a7c1ab..1bcf1eef686a 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -1,8 +1,8 @@
 MD5 41be1da6d4de5cb0b1231b476d67b9f8 ChangeLog 3335
 MD5 8a6e4a5dbcf33713f14f38d0292f486b dsniff-2.3-r7.ebuild 1573
-MD5 614053c0592f0a4648ecc9a2c1e313f4 dsniff-2.4_beta1.ebuild 1706
+MD5 a3d39383ca7040ad4175e8a6bf7f0bf7 dsniff-2.4_beta1.ebuild 1514
 MD5 9206faea6a9be25f7d1aa0ac0a2ff6e3 files/2.3-libnet-1.0.patch 6110
 MD5 f41ad0aeacc05042ec27551b257845d3 files/2.3-makefile.patch 1531
 MD5 0e5d8e4adda8f4876e972a02bed13cc3 files/digest-dsniff-2.3-r7 62
-MD5 8190b5894de76f3b0736dcec1dac4adc files/digest-dsniff-2.4_beta1 141
+MD5 17ea903101a42a5b5460d6341b2ec1e6 files/digest-dsniff-2.4_beta1 144
 MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
index b42330502f36..3b2ba9042d79 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild,v 1.2 2006/01/21 21:10:08 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"
+	mirror://gentoo/${PN}-2.4_beta1-debian-r1.patch.bz2"
 LICENSE="DSNIFF"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
@@ -17,7 +17,7 @@ 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-libs/db-4.2.52_p4
 	sys-apps/sed"
 
 S="${WORKDIR}/${P/_beta1/}"
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	# Debian's patchset
-	epatch "${DISTDIR}"/${PN}-2.4_beta1-debian.patch.bz2
+	epatch "${DISTDIR}"/${PN}-2.4_beta1-debian-r1.patch.bz2
 
 	# Making sure data files get correctly installed and that dsniff
 	# can find them
@@ -34,24 +34,20 @@ src_unpack() {
 	# Data stuff goes into /etc/dsniff
 	cd "${S}"
 	sed -i \
-		-e 's:-ldb:-ldb -lpthread:' \
+		-e 's:-ldb2:-ldb2 -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/
+	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+	"${D}"/etc/dsniff/
 	dodoc CHANGES README TODO
 }
diff --git a/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1 b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
index f7c4bb727937..53f4bd58a80f 100644
--- a/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
@@ -1,2 +1,2 @@
-MD5 a9dececf1f8ff8fc0456b4917c59f1e4 dsniff-2.4_beta1-debian.patch.bz2 33225
+MD5 674c6ff31d58bdda51ca56accab9cc8f dsniff-2.4_beta1-debian-r1.patch.bz2 18280
 MD5 2f761fa3475682a7512b0b43568ee7d6 dsniff-2.4b1.tar.gz 131666