Making glibc 2.4 ready wrt bug #127152

(Portage version: 2.1_pre7-r1)

7 files changed, 99 insertions, 4 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 7ea6d04e00b8..33faf580ca40 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2006/02/15 22:04:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.30 2006/03/26 21:38:55 jokey Exp $
+
+*dsniff-2.4_beta1-r1 (26 Mar 2006)
+*dsniff-2.3-r8 (26 Mar 2006)
+
+  26 Mar 2006; Markus Ullmann <jokey@gentoo.org> +dsniff-2.3-r8.ebuild,
+  -dsniff-2.4_beta1.ebuild, +dsniff-2.4_beta1-r1.ebuild:
+  Making glibc 2.4 ready wrt bug #127152
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
   dsniff-2.4_beta1.ebuild:
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index f2919e48d4fa..634b372ef9bd 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -4,6 +4,12 @@ SHA256 24dc1eca67df0e48d7dd4ecc4979a15e07d7ea3a266f0116f9b2a3471ab1ceaf ChangeLo
 MD5 958204e293ae28ce48f6f4eb6db50f3b dsniff-2.3-r7.ebuild 1565
 RMD160 b5f31c18f45fc742742a4db0b2a7438da1bee6ca dsniff-2.3-r7.ebuild 1565
 SHA256 015a6efe71a6fe3663092f89a4f2363df1b1bf08213025a5cd77450651570b5b dsniff-2.3-r7.ebuild 1565
+MD5 1efd975900af966bb8bcd1eb790bc4fe dsniff-2.3-r8.ebuild 1732
+RMD160 307f92bce6ad03661d4e49efd56d6e4670c90f27 dsniff-2.3-r8.ebuild 1732
+SHA256 1ebf7ae3437e724237c484004ce9203c352947e4d066d3bb473708cb4309256b dsniff-2.3-r8.ebuild 1732
+MD5 9c8f264cdb3144908631ed9d6eceb04f dsniff-2.4_beta1-r1.ebuild 1718
+RMD160 8f91c2e1659b7201b323427569496e4be4810ced dsniff-2.4_beta1-r1.ebuild 1718
+SHA256 9095cc59f92f91f9b8ff26b37787ca05176299143a69c987068f50ef0feec599 dsniff-2.4_beta1-r1.ebuild 1718
 MD5 707aaa75efb71b53fa3cdfd65177d534 dsniff-2.4_beta1.ebuild 1509
 RMD160 84c596d0af1ad3eb64dc9b4a43258b90c0d5fdaf dsniff-2.4_beta1.ebuild 1509
 SHA256 ff97e9c2b890b4a8059925316d68872d9e5398af76b17df4c1294b7cf2957999 dsniff-2.4_beta1.ebuild 1509
@@ -16,9 +22,15 @@ SHA256 eeb39dafa708b85d309d96e48fa27f526e906f725e240142b7ad12fabac2616a files/2.
 MD5 0e5d8e4adda8f4876e972a02bed13cc3 files/digest-dsniff-2.3-r7 62
 RMD160 5eed069f214a1ada7cfcb6a7dc9753f9ff77d1c3 files/digest-dsniff-2.3-r7 62
 SHA256 dc0369d0febcdb5ef5f489f7c3e5b2f1e0c9a0219db420c5d2312c3e0947c888 files/digest-dsniff-2.3-r7 62
+MD5 ecdfe27e4c9ebcf4ce1ea120033f0799 files/digest-dsniff-2.3-r8 232
+RMD160 2d529bfe6bec77608023bb500bbfcf32892896a2 files/digest-dsniff-2.3-r8 232
+SHA256 873e56e84042ef6b43ff2549d741f7aed70ef5adfe81324808fcc6291d5205c4 files/digest-dsniff-2.3-r8 232
 MD5 17ea903101a42a5b5460d6341b2ec1e6 files/digest-dsniff-2.4_beta1 144
 RMD160 b98da8f92098bd51f57424f4f40dd15ba4ec080a files/digest-dsniff-2.4_beta1 144
 SHA256 ef4445949fef062ff2bc685736ef1a0f92518a2e6c1ee736ed7b9ec2c4e2393f files/digest-dsniff-2.4_beta1 144
+MD5 b109ec1eccaa5b60e6b7188576f0485e files/digest-dsniff-2.4_beta1-r1 524
+RMD160 1cbdedadad5dceefade75ede34ce6d6a191aee73 files/digest-dsniff-2.4_beta1-r1 524
+SHA256 0bc47b0e626badae875b48e1bba190d77345a67c47877d69166429a7ef73b80b files/digest-dsniff-2.4_beta1-r1 524
 MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
 RMD160 25237084345cb83a625ebbaf43371aefc14ee49c metadata.xml 719
 SHA256 a30d2d3541d263d4260a1306aa810f8ef1ba4f45769fc0cd6bb715cc253d34ad metadata.xml 719
diff --git a/net-analyzer/dsniff/dsniff-2.3-r8.ebuild b/net-analyzer/dsniff/dsniff-2.3-r8.ebuild
new file mode 100644
index 000000000000..141a98b44588
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.3-r8.ebuild
@@ -0,0 +1,61 @@
+# 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.3-r8.ebuild,v 1.1 2006/03/26 21:38:55 jokey Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/${PN}/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+LICENSE="DSNIFF"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3
+	=net-libs/libnids-1.18
+	>=dev-libs/openssl-0.9.6e
+	~sys-libs/db-3.2.9
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+
+	# 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
+
+	# 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_compile() {
+	econf || die "econf failed"
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags -DCLK_TCK=CLOCKS_PER_SEC
+	fi
+	emake || die "emake failed"
+}
+
+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-r1.ebuild
index a48c81ba1efd..0f38b290a3d0 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2006/02/15 22:04:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1-r1.ebuild,v 1.1 2006/03/26 21:38:55 jokey Exp $
 
 inherit eutils flag-o-matic
 
@@ -44,6 +44,14 @@ src_unpack() {
 	append-ldflags -lresolv
 }
 
+src_compile() {
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags -DCLK_TCK=CLOCKS_PER_SEC
+	fi
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install() {
 	make install install_prefix="${D}" || die
 	dodir /etc/dsniff
diff --git a/net-analyzer/dsniff/files/digest-dsniff-2.3-r8 b/net-analyzer/dsniff/files/digest-dsniff-2.3-r8
new file mode 100644
index 000000000000..9854036e78ff
--- /dev/null
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.3-r8
@@ -0,0 +1,3 @@
+MD5 183e336a45e38013f3af840bddec44b4 dsniff-2.3.tar.gz 126797
+RMD160 89dad0259e90acef30a7aa5f3471de3aaeb06147 dsniff-2.3.tar.gz 126797
+SHA256 82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5 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
deleted file mode 100644
index 53f4bd58a80f..000000000000
--- a/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 674c6ff31d58bdda51ca56accab9cc8f dsniff-2.4_beta1-debian-r1.patch.bz2 18280
-MD5 2f761fa3475682a7512b0b43568ee7d6 dsniff-2.4b1.tar.gz 131666
diff --git a/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1-r1 b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1-r1
new file mode 100644
index 000000000000..a5fcc7947779
--- /dev/null
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1-r1
@@ -0,0 +1,6 @@
+MD5 674c6ff31d58bdda51ca56accab9cc8f dsniff-2.4_beta1-debian-r1.patch.bz2 18280
+RMD160 dd4ef3e4c9274e22a9f168b6d406260d4c306427 dsniff-2.4_beta1-debian-r1.patch.bz2 18280
+SHA256 3974390e0970bbbb6ddddebf735a7de74abf110d20a867494a2ecd2298c19c39 dsniff-2.4_beta1-debian-r1.patch.bz2 18280
+MD5 2f761fa3475682a7512b0b43568ee7d6 dsniff-2.4b1.tar.gz 131666
+RMD160 4d5dee193f0d252d22cfe2417f067460db9638b1 dsniff-2.4b1.tar.gz 131666
+SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a dsniff-2.4b1.tar.gz 131666