diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-09-20 11:07:17 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-20 11:07:17 +0000 |
| commit | 440818572f0d22abe3d1c33ed64c3271f95f6c98 (patch) | |
| tree | 977480caa82facb2ff0b8e4aa25c434d99b79631 /net-analyzer/dsniff/files | |
| parent | This package is not compatible with recent exo, or vala. Fix dependencies wrt... (diff) | |
| download | historical-440818572f0d22abe3d1c33ed64c3271f95f6c98.tar.gz historical-440818572f0d22abe3d1c33ed64c3271f95f6c98.tar.bz2 historical-440818572f0d22abe3d1c33ed64c3271f95f6c98.zip | |
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
Diffstat (limited to 'net-analyzer/dsniff/files')
| -rw-r--r-- | net-analyzer/dsniff/files/2.3-makefile.patch | 4 | ||||
| -rw-r--r-- | net-analyzer/dsniff/files/2.3-openssl.patch | 12 | ||||
| -rw-r--r-- | net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch (renamed from net-analyzer/dsniff/files/dsniff-httppostfix.patch) | 4 | ||||
| -rw-r--r-- | net-analyzer/dsniff/files/2.4_beta1-make.patch | 51 |
4 files changed, 55 insertions, 16 deletions
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) |