Fix parallel make issue by Nathan Phillip Brink (ohnobinki, bug #338086). Name patches consistently. Merge Makefile.ini patches.

Package-Manager: portage-2.2_rc84/cvs/Linux i686

8 files changed, 132 insertions, 24 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index b4fb52592e25..fbf3d31c4228 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/dsniff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.53 2010/05/07 18:10:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.54 2010/09/20 11:07:17 jer Exp $
+
+*dsniff-2.4_beta1-r5 (20 Sep 2010)
+
+  20 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/2.3-makefile.patch,
+  dsniff-2.4_beta1-r4.ebuild, -files/2.3-openssl.patch,
+  +dsniff-2.4_beta1-r5.ebuild, +files/2.4_beta1-httppostfix.patch,
+  +files/2.4_beta1-make.patch, -files/dsniff-httppostfix.patch:
+  Fix parallel make issue by Nathan Phillip Brink (ohnobinki, bug #338086).
+  Name patches consistently. Merge Makefile.ini patches.
 
   07 May 2010; Raúl Porcel <armin76@gentoo.org> dsniff-2.4_beta1-r4.ebuild:
   alpha stable wrt #312835
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index e9c4db6875c4..ecb38fe28c94 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -1,8 +1,9 @@
-AUX 2.3-makefile.patch 1531 RMD160 babd313c726824db4e475dc3b350e28f266f183b SHA1 599d051f55444da5ffce79b545a1bca9384ad284 SHA256 eeb39dafa708b85d309d96e48fa27f526e906f725e240142b7ad12fabac2616a
-AUX 2.3-openssl.patch 350 RMD160 fb2f099829e35935490c2928895042967c71f421 SHA1 01f6aa170340a375d259c5cd2882bc86e8dc073d SHA256 697adc7c00f7c810c884a12ff3455a18b4c0cf2db343908852a6a351015201a6
-AUX dsniff-httppostfix.patch 675 RMD160 562c527409fe633e07d9a9ce60298ed9caf14f78 SHA1 48428b11ba8471433aa3e2dd2037dc5c11d05903 SHA256 320dab87c7c7f9ce86acf8830041da39aa367ba4149fa4eeffac93041d459293
+AUX 2.3-makefile.patch 1530 RMD160 cb3c49905e80319ecf14b52278c24f4af07bd46b SHA1 5b6a31c581ded6f5c97cee51b15be30e56866a8f SHA256 e9a8f061a87d07be0ce8958c5695d1bfc05cd5f0f4f55df080c3de752372315c
+AUX 2.4_beta1-httppostfix.patch 674 RMD160 82d29b74351a0b0ab6db887397325f6e3fd035ae SHA1 d5a82948af3954a7716ba9d68e349b6eb8bb013a SHA256 3efd6ca2267540016e843af3e8d7720d888fd17a73cba410e2c68022fd3a7baf
+AUX 2.4_beta1-make.patch 1911 RMD160 63a6e4a078eaae46bdeef5bdcfd7a13a8b4168c6 SHA1 927ab5febabb731d0ffc301cf3546772645b5d43 SHA256 a888e4e958eb93865341f5718df1f81cfb22106e5c9677e7fb37d88ed5c95e38
 DIST dsniff-2.4b1.tar.gz 131666 RMD160 4d5dee193f0d252d22cfe2417f067460db9638b1 SHA1 25cfea26e9bbe016451180758a49d4d5bc9317d3 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a
 DIST dsniff_2.4b1+debian-18.diff.gz 44819 RMD160 bdfb4a6a270c84753dce39be3553df0d7e8c45e8 SHA1 d34fe16565845a2d46973671f867adad63f99667 SHA256 a65142b8d2206d3eae5db35d9972f8eac1110d45893d7f2182ca240ecd9b9d25
-EBUILD dsniff-2.4_beta1-r4.ebuild 1553 RMD160 f196889e4094415b07e2821c43f5ee3764011fd1 SHA1 b98b0c071cb694d8c39a77f9488b3f75e44f5977 SHA256 fbf04721575e70ac01528c828daddbe43e9335fb3963fd8c633e92be6e8876c6
-MISC ChangeLog 7549 RMD160 4311f56777975ad346a2bc3cccf9f4a7313fd3da SHA1 80570e233fcd44383eca13a22150195cafae65fd SHA256 3fa755d5710f58ebc107706bc8953e9814028f2ac385175e03fff52e9af70489
+EBUILD dsniff-2.4_beta1-r4.ebuild 1549 RMD160 a6f23602a707595130f90ee8ff9276f5a92b481e SHA1 9dc214b49e2731a308fd94e6d46d5a34b05c8195 SHA256 7f0b5f0ae77f7cf4323fa513c7fbb6fa97da960c9de7d3e5a886d97335c11360
+EBUILD dsniff-2.4_beta1-r5.ebuild 1485 RMD160 d63734ca1e909881e1f31af73afff1b953de728a SHA1 7147cb1a99aedbd660f19c158b240e12ebe554c0 SHA256 11d36c35d7b0296b013b320e4f35b8bb454a0f36f0b69ff135f2038ce6424bf4
+MISC ChangeLog 7975 RMD160 7a8a6b13a6b76afee4a45fade9a894b7a98f82d9 SHA1 e44e6fa1d05c32d030441609b88833da321432cc SHA256 cff85e8033dd2f9a2f2b17b83f4fd913297747c99952a569c67c28c06891fdc7
 MISC metadata.xml 715 RMD160 4e2b26891be8baba84c9833bd55af864f88b4efc SHA1 52cac2b2bc7a536372b51e95605ff45772e21e0d SHA256 38611a21d47773747c46816fcb2cfebe0a3b57fc070876e36f5347e6bcc220a1
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
index 919cb57b8dbe..256f8950a16f 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r4.ebuild,v 1.6 2010/05/07 18:10:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild,v 1.7 2010/09/20 11:07:17 jer Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -37,7 +37,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/2.3-makefile.patch
 
 	# Bug 125084
-	epatch "${FILESDIR}"/${PN}-httppostfix.patch
+	epatch "${FILESDIR}"/${PV}-httppostfix.patch
 
 	eautoreconf
 }
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r5.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r5.ebuild
new file mode 100644
index 000000000000..935258a0aba7
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 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-r5.ebuild,v 1.1 2010/09/20 11:07:17 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils flag-o-matic 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-18.diff.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="X"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	>=dev-libs/openssl-0.9.6e
+	>=sys-libs/db-4.2.52_p4
+	X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+	# Debian's patchset
+	epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
+	epatch dsniff-2.4b1+debian/debian/patches/*.dpatch
+
+	# Bug 125084
+	epatch "${FILESDIR}"/${PV}-httppostfix.patch
+
+	# various Makefile.in patches
+	epatch "${FILESDIR}"/${PV}-make.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	emake install install_prefix="${D}" || die "emake install failed"
+	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/2.3-makefile.patch b/net-analyzer/dsniff/files/2.3-makefile.patch
index 83beecee6d35..6225ec2f4473 100644
--- a/net-analyzer/dsniff/files/2.3-makefile.patch
+++ b/net-analyzer/dsniff/files/2.3-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2003-08-25 18:07:17.000000000 +1200
-+++ Makefile.in	2003-08-25 18:29:13.000000000 +1200
+--- a/Makefile.in	2003-08-25 18:07:17.000000000 +1200
++++ b/Makefile.in	2003-08-25 18:29:13.000000000 +1200
 @@ -94,7 +94,7 @@
  	$(RANLIB) $@
  
diff --git a/net-analyzer/dsniff/files/2.3-openssl.patch b/net-analyzer/dsniff/files/2.3-openssl.patch
deleted file mode 100644
index b7df13d8acd5..000000000000
--- a/net-analyzer/dsniff/files/2.3-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru dsniff-2.3~/sshcrypto.c dsniff-2.3/sshcrypto.c
---- dsniff-2.3~/sshcrypto.c	2006-12-01 23:44:43.000000000 +0100
-+++ dsniff-2.3/sshcrypto.c	2006-12-01 23:46:52.000000000 +0100
-@@ -14,6 +14,8 @@
- 
- #include <sys/types.h>
- #include <openssl/ssl.h>
-+#include <openssl/blowfish.h>
-+#include <openssl/des.h>
- 
- #include <err.h>
- #include <stdio.h>
diff --git a/net-analyzer/dsniff/files/dsniff-httppostfix.patch b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
index b02e621ccacb..62c9a90fe8e3 100644
--- a/net-analyzer/dsniff/files/dsniff-httppostfix.patch
+++ b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
@@ -1,5 +1,5 @@
---- decode_http.c.orig	2000-12-19 07:38:05.000000000 +0800
-+++ decode_http.c	2006-03-05 22:32:14.000000000 +0800
+--- a/decode_http.c	2000-12-19 07:38:05.000000000 +0800
++++ b/decode_http.c	2006-03-05 22:32:14.000000000 +0800
 @@ -139,14 +139,14 @@
  				host = p;
  			}
diff --git a/net-analyzer/dsniff/files/2.4_beta1-make.patch b/net-analyzer/dsniff/files/2.4_beta1-make.patch
new file mode 100644
index 000000000000..b0d80b0a4b06
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-make.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.in	2010-09-20 12:12:25.000000000 +0200
++++ b/Makefile.in	2010-09-20 12:12:26.000000000 +0200
+@@ -16,7 +16,7 @@
+ mandir		= @mandir@
+ 
+ CC	= @CC@
+-CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CFLAGS	= @CFLAGS@ 
+ LDFLAGS	= @LDFLAGS@
+ 
+ PCAPINC = @PCAPINC@
+@@ -75,7 +75,11 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
+ 
+-all: libmissing.a $(PROGS)
++all: $(PROGS)
++
++$(PROGS): libmissing.a
++
++$(OBJS): $(GEN)
+ 
+ mount.c: mount.x
+ 	rpcgen -h mount.x -o mount.h
+@@ -93,7 +97,7 @@
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
+ 
+ arpspoof: arpspoof.o arp.o
+ 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -114,7 +118,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
+-	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ sshow: sshow.o pcaputil.o
+ 	$(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -132,7 +136,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ webmitm: webmitm.o base64.o buf.o decode_http.o record.o
+-	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ webspy: webspy.o base64.o buf.o remote.o
+ 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)