Adding HTTP POST patch wrt bug #125084

(Portage version: 2.1_pre7-r5)

7 files changed, 183 insertions, 1 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 87322f807439..fddee36485b5 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,14 @@
 # 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.32 2006/04/15 23:22:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.33 2006/04/17 01:08:27 jokey Exp $
+
+*dsniff-2.4_beta1-r2 (17 Apr 2006)
+*dsniff-2.3-r9 (17 Apr 2006)
+
+  17 Apr 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/dsniff-httppostfix.patch, +dsniff-2.3-r9.ebuild,
+  +dsniff-2.4_beta1-r2.ebuild:
+  Adding HTTP POST patch wrt bug #125084
 
   15 Apr 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
   dsniff-2.3-r8.ebuild, dsniff-2.4_beta1-r1.ebuild:
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 4f42ed2adb84..6b23d260024f 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -7,9 +7,15 @@ SHA256 605229f2fa66c43ecf02ce2e9fd1ac1ba2ce093b6cdfb24a6f6e456927d65894 dsniff-2
 MD5 727088c4fb1d4052ade95e1aa5335af5 dsniff-2.3-r8.ebuild 1792
 RMD160 f41042e47c10191e76ed9eed8ab2bb47da1440e8 dsniff-2.3-r8.ebuild 1792
 SHA256 67388a69ceb81a8cad46125172db7e9fcda607f882f0ee414cadf6d0fd314503 dsniff-2.3-r8.ebuild 1792
+MD5 b24d50f24d4e1cbf07e184903ba15fe3 dsniff-2.3-r9.ebuild 1852
+RMD160 1b0313f1d2006feff3496ee948bae18fe717bc85 dsniff-2.3-r9.ebuild 1852
+SHA256 c443674518ba4c7dc971a569994aeac9eb792cf275a1cb81f7504b9757c7d387 dsniff-2.3-r9.ebuild 1852
 MD5 2ef6613b1d8dbaac69ffd0e3b4f01838 dsniff-2.4_beta1-r1.ebuild 1715
 RMD160 d29d0cbb16e0e045657ec48f372eb85adc017af0 dsniff-2.4_beta1-r1.ebuild 1715
 SHA256 c0df15f97ec2c449eb733c0cdc936cec915f0f6b499e5f7cc0f0fc02e2254112 dsniff-2.4_beta1-r1.ebuild 1715
+MD5 af3d4962b281431fdf674f575d3017d4 dsniff-2.4_beta1-r2.ebuild 1774
+RMD160 9845e7ccdcee60a3ff18f9cbc1359ce4ce42fbe6 dsniff-2.4_beta1-r2.ebuild 1774
+SHA256 70c1ff775c6c57d8c2f1425b252a1c6017cfcc9fd99c94a1b0384f664561f046 dsniff-2.4_beta1-r2.ebuild 1774
 MD5 9206faea6a9be25f7d1aa0ac0a2ff6e3 files/2.3-libnet-1.0.patch 6110
 RMD160 955785d1f3a92615afbe4aeda200cf54fa2df42f files/2.3-libnet-1.0.patch 6110
 SHA256 7e0a1236d7c57826c3c71cd78246dfdb10e8633217aac0b1784dff2889482136 files/2.3-libnet-1.0.patch 6110
@@ -22,9 +28,18 @@ SHA256 dc0369d0febcdb5ef5f489f7c3e5b2f1e0c9a0219db420c5d2312c3e0947c888 files/di
 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 ecdfe27e4c9ebcf4ce1ea120033f0799 files/digest-dsniff-2.3-r9 232
+RMD160 2d529bfe6bec77608023bb500bbfcf32892896a2 files/digest-dsniff-2.3-r9 232
+SHA256 873e56e84042ef6b43ff2549d741f7aed70ef5adfe81324808fcc6291d5205c4 files/digest-dsniff-2.3-r9 232
 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 b109ec1eccaa5b60e6b7188576f0485e files/digest-dsniff-2.4_beta1-r2 524
+RMD160 1cbdedadad5dceefade75ede34ce6d6a191aee73 files/digest-dsniff-2.4_beta1-r2 524
+SHA256 0bc47b0e626badae875b48e1bba190d77345a67c47877d69166429a7ef73b80b files/digest-dsniff-2.4_beta1-r2 524
+MD5 449ef7ee0534e261c2ce91d9b754b290 files/dsniff-httppostfix.patch 675
+RMD160 562c527409fe633e07d9a9ce60298ed9caf14f78 files/dsniff-httppostfix.patch 675
+SHA256 320dab87c7c7f9ce86acf8830041da39aa367ba4149fa4eeffac93041d459293 files/dsniff-httppostfix.patch 675
 MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
 RMD160 25237084345cb83a625ebbaf43371aefc14ee49c metadata.xml 719
 SHA256 a30d2d3541d263d4260a1306aa810f8ef1ba4f45769fc0cd6bb715cc253d34ad metadata.xml 719
diff --git a/net-analyzer/dsniff/dsniff-2.3-r9.ebuild b/net-analyzer/dsniff/dsniff-2.3-r9.ebuild
new file mode 100644
index 000000000000..9a18de06bc3a
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.3-r9.ebuild
@@ -0,0 +1,65 @@
+# 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-r9.ebuild,v 1.1 2006/04/17 01:08:27 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="http://monkey.org/~dugsong/${PN}/${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
+	|| ( virtual/x11 x11-libs/libXmu )"
+
+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"
+
+	# bug 125084
+	epatch ${FILESDIR}/${PN}-httppostfix.patch
+}
+
+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-r2.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r2.ebuild
new file mode 100644
index 000000000000..3f8ed7281e28
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r2.ebuild
@@ -0,0 +1,65 @@
+# 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-r2.ebuild,v 1.1 2006/04/17 01:08:27 jokey 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-r1.patch.bz2"
+LICENSE="DSNIFF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	=net-libs/libnids-1.18
+	>=dev-libs/openssl-0.9.6e
+	>=sys-libs/db-4.2.52_p4
+	sys-apps/sed
+	|| ( virtual/x11 x11-libs/libXmu )"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Debian's patchset
+	epatch "${DISTDIR}"/${PN}-2.4_beta1-debian-r1.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:-ldb2:-ldb2 -lpthread:' \
+		-e "s:lib':':" \
+		configure || die "sed configure"
+	sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
+	epatch "${FILESDIR}"/2.3-makefile.patch
+
+	# Bug 125084
+	epatch ${FILESDIR}/${PN}-httppostfix.patch
+
+	# Allow amd64 compilation
+	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
+	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.3-r9 b/net-analyzer/dsniff/files/digest-dsniff-2.3-r9
new file mode 100644
index 000000000000..9854036e78ff
--- /dev/null
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.3-r9
@@ -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-r2 b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1-r2
new file mode 100644
index 000000000000..a5fcc7947779
--- /dev/null
+++ b/net-analyzer/dsniff/files/digest-dsniff-2.4_beta1-r2
@@ -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
diff --git a/net-analyzer/dsniff/files/dsniff-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-httppostfix.patch
new file mode 100644
index 000000000000..b02e621ccacb
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-httppostfix.patch
@@ -0,0 +1,20 @@
+--- decode_http.c.orig	2000-12-19 07:38:05.000000000 +0800
++++ decode_http.c	2006-03-05 22:32:14.000000000 +0800
+@@ -139,14 +139,14 @@
+ 				host = p;
+ 			}
+ 			else if (req[0] == 'P') {
+-				if (strncmp(p, "Content-type: ", 14) == 0) {
+-					if (strncmp(p + 14, "application/"
++				if (strncasecmp(p, "Content-type: ", 14) == 0) {
++					if (strncasecmp(p + 14, "application/"
+ 						    "x-www-form-urlencoded",
+ 						    33) != 0) {
+ 						query = NULL;
+ 					}
+ 				}
+-				else if (strncmp(p, "Content-length: ", 16) == 0) {
++				else if (strncasecmp(p, "Content-length: ", 16) == 0) {
+ 					p += 16;
+ 					i = atoi(p);
+ 					if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)