From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- net-analyzer/dsniff/files/2.3-makefile.patch | 29 ---------- .../dsniff/files/2.4_beta1-httppostfix.patch | 20 ------- net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch | 22 -------- .../files/2.4_beta1-macof-size-calculation.patch | 11 ---- net-analyzer/dsniff/files/2.4_beta1-make.patch | 62 ---------------------- net-analyzer/dsniff/files/2.4_beta1-rpc.patch | 39 -------------- .../files/2.4_beta1-urlsnarf-pcap_timestamps.patch | 15 ------ 7 files changed, 198 deletions(-) delete mode 100644 net-analyzer/dsniff/files/2.3-makefile.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-make.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-rpc.patch delete mode 100644 net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch (limited to 'net-analyzer/dsniff/files') diff --git a/net-analyzer/dsniff/files/2.3-makefile.patch b/net-analyzer/dsniff/files/2.3-makefile.patch deleted file mode 100644 index 6225ec2f4473..000000000000 --- a/net-analyzer/dsniff/files/2.3-makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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) $@ - - 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) -@@ -115,7 +115,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) - - tcpkill: tcpkill.o pcaputil.o - $(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) -@@ -130,7 +130,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) diff --git a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch deleted file mode 100644 index 62c9a90fe8e3..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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; - } - 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) diff --git a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch b/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch deleted file mode 100644 index 00c271ab9f93..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -37,8 +37,8 @@ - X11INC = @X_CFLAGS@ - X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@ - --INCS = -I. $(X11INC) -I$(srcdir)/missing --LIBS = @LIBS@ -L$(srcdir) -lmissing -+INCS = -I. $(X11INC) -I$(srcdir)/missing @TIRPC_CFLAGS@ -+LIBS = @LIBS@ -L$(srcdir) -lmissing @TIRPC_LIBS@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ ---- a/configure.in -+++ b/configure.in -@@ -338,4 +338,6 @@ - AC_SUBST(SSLINC) - AC_SUBST(SSLLIB) - -+PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [AC_MSG_NOTICE([Using glibc rpc support])]) -+ - AC_OUTPUT(Makefile) diff --git a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch deleted file mode 100644 index 068133de2e4d..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/macof.c -+++ b/macof.c -@@ -134,7 +134,7 @@ main(int argc, char *argv[]) - libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512, - 0, 0, LIBNET_TCP_H, NULL, 0, l, 0); - -- libnet_build_ipv4(LIBNET_TCP_H, 0, -+ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0, - libnet_get_prand(LIBNET_PRu16), 0, 64, - IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0); - diff --git a/net-analyzer/dsniff/files/2.4_beta1-make.patch b/net-analyzer/dsniff/files/2.4_beta1-make.patch deleted file mode 100644 index 29964eb28ac8..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-make.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -16,7 +16,7 @@ - mandir = @mandir@ - - CC = @CC@ --CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" -+CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - - PCAPINC = @PCAPINC@ -@@ -75,12 +75,20 @@ - .c.o: - $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c - --all: libmissing.a $(PROGS) -+all: $(PROGS) -+ -+$(PROGS): libmissing.a -+ -+$(OBJS): $(GEN) - -+mount.h: mount.x -+ rpcgen -h mount.x -o mount.h -+ - mount.c: mount.x -- rpcgen -h mount.x -o mount.h - rpcgen -c mount.x -o mount.c - -+nfs_prot.h: nfs_prot.x -+ rpcgen -h nfs_prot.x -o nfs_prot.h -+ - nfs_prot.c: nfs_prot.x -- rpcgen -h nfs_prot.x -o nfs_prot.h - rpcgen -c nfs_prot.x -o nfs_prot.c -@@ -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) diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch deleted file mode 100644 index b43c91d95815..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -37,8 +37,8 @@ - X11INC = @X_CFLAGS@ - X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@ - --INCS = -I. $(X11INC) -I$(srcdir)/missing --LIBS = @LIBS@ -L$(srcdir) -lmissing -+INCS = -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@ -+LIBS = @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ ---- a/configure.in -+++ b/configure.in -@@ -337,4 +337,23 @@ - AC_SUBST(SSLINC) - AC_SUBST(SSLLIB) - -+AC_ARG_WITH([libtirpc], -+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]), -+ [], [ with_libtirpc=no ]) -+ -+AS_IF([test "x$with_libtirpc" != xno], -+ [PKG_CHECK_MODULES([TIRPC], -+ [libtirpc], -+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;], -+ [AC_MSG_ERROR([libtirpc requested, but library not found.])] -+ )], -+ [AC_CHECK_HEADER(rpc/rpc.h, -+ [RPC_CFLAGS=""; RPC_LIBS="";], -+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] -+ )] -+) -+ -+AC_SUBST(RPC_CFLAGS) -+AC_SUBST(RPC_LIBS) -+ - AC_OUTPUT(Makefile) diff --git a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch b/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch deleted file mode 100644 index a2a7a36966ac..000000000000 --- a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Hilko Bengen -Description: urlsnarf: use timestamps from pcap file if available. Closes: #573365 -Index: dsniff-2.4b1+debian/urlsnarf.c -=================================================================== ---- a/urlsnarf.c -+++ b/urlsnarf.c -@@ -57,7 +57,7 @@ - { - static char tstr[32], sign; - struct tm *t, gmt; -- time_t tt = time(NULL); -+ time_t tt = nids_last_pcap_header->ts.tv_sec; - int days, hours, tz, len; - - gmt = *gmtime(&tt); -- cgit v1.2.3