summaryrefslogtreecommitdiffstats
path: root/openwrt
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-03 01:03:38 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-03 01:03:38 +0000
commit5d4f1a1841e6fb6debc5bf5fd8d9e31b9df12420 (patch)
treebc8e3f1cb4adb6ae8f6fe9ae933c67ce6a17c088 /openwrt
parent013e04a018a55287faff4ec9f5fe3305525e03cd (diff)
update dsniff to 2.4b1 and fix some compile issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3298 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
-rw-r--r--openwrt/package/dsniff/Makefile8
-rw-r--r--openwrt/package/dsniff/patches/arpspoof-fix.patch42
-rw-r--r--openwrt/package/dsniff/patches/openssl-fix.patch11
-rw-r--r--openwrt/package/dsniff/patches/time_h.patch22
4 files changed, 59 insertions, 24 deletions
diff --git a/openwrt/package/dsniff/Makefile b/openwrt/package/dsniff/Makefile
index ee5a19863..bad122210 100644
--- a/openwrt/package/dsniff/Makefile
+++ b/openwrt/package/dsniff/Makefile
@@ -3,15 +3,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dsniff
-PKG_VERSION:=2.3
+PKG_VERSION:=2.4b1
PKG_RELEASE:=2
-PKG_MD5SUM:=183e336a45e38013f3af840bddec44b4
+PKG_MD5SUM:=2f761fa3475682a7512b0b43568ee7d6
-PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/
+PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/beta
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2.4
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
diff --git a/openwrt/package/dsniff/patches/arpspoof-fix.patch b/openwrt/package/dsniff/patches/arpspoof-fix.patch
index 7c20db542..fd2922700 100644
--- a/openwrt/package/dsniff/patches/arpspoof-fix.patch
+++ b/openwrt/package/dsniff/patches/arpspoof-fix.patch
@@ -1,25 +1,25 @@
-diff -Nur dsniff-2.3.orig/arp.c dsniff-2.3/arp.c
---- dsniff-2.3.orig/arp.c 2000-11-14 16:51:03.000000000 +0100
-+++ dsniff-2.3/arp.c 2005-09-12 16:13:44.101915800 +0200
-@@ -37,7 +37,7 @@
- #ifdef BSD
+diff -urN dsniff.old/arp.c dsniff.dev/arp.c
+--- dsniff.old/arp.c 2001-03-15 09:32:58.000000000 +0100
++++ dsniff.dev/arp.c 2006-03-03 01:41:10.000000000 +0100
+@@ -39,7 +39,7 @@
+ #ifdef BSD
int
-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
-+arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif)
{
int mib[6];
size_t len;
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
#endif
int
-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
-+arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* lif)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif)
{
int sock;
struct arpreq ar;
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
memset((char *)&ar, 0, sizeof(ar));
#ifdef __linux__
@@ -28,19 +28,21 @@ diff -Nur dsniff-2.3.orig/arp.c dsniff-2.3/arp.c
#endif
sin = (struct sockaddr_in *)&ar.arp_pa;
sin->sin_family = AF_INET;
-diff -Nur dsniff-2.3.orig/arpspoof.c dsniff-2.3/arpspoof.c
---- dsniff-2.3.orig/arpspoof.c 2000-11-28 08:43:43.000000000 +0100
-+++ dsniff-2.3/arpspoof.c 2005-09-12 16:16:49.244769808 +0200
-@@ -23,7 +23,7 @@
- #include "version.h"
+diff -urN dsniff.old/arp.h dsniff.dev/arp.h
+--- dsniff.old/arp.h 2001-03-15 09:27:08.000000000 +0100
++++ dsniff.dev/arp.h 2006-03-03 01:42:23.000000000 +0100
+@@ -11,6 +11,6 @@
+ #ifndef _ARP_H_
+ #define _ARP_H_
- extern char *ether_ntoa(struct ether_addr *);
--extern int arp_cache_lookup(in_addr_t, struct ether_addr *);
-+extern int arp_cache_lookup(in_addr_t, struct ether_addr *, const char* intf);
+-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether);
++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif);
- static struct libnet_link_int *llif;
- static struct ether_addr spoof_mac, target_mac;
-@@ -111,7 +111,7 @@
+ #endif /* _ARP_H_ */
+diff -urN dsniff.old/arpspoof.c dsniff.dev/arpspoof.c
+--- dsniff.old/arpspoof.c 2001-03-15 09:32:58.000000000 +0100
++++ dsniff.dev/arpspoof.c 2006-03-03 01:42:00.000000000 +0100
+@@ -113,7 +113,7 @@
int i = 0;
do {
diff --git a/openwrt/package/dsniff/patches/openssl-fix.patch b/openwrt/package/dsniff/patches/openssl-fix.patch
new file mode 100644
index 000000000..1b2f9e7be
--- /dev/null
+++ b/openwrt/package/dsniff/patches/openssl-fix.patch
@@ -0,0 +1,11 @@
+--- dsniff-2.4b1.orig/sshcrypto.c
++++ dsniff-2.4b1/sshcrypto.c
+@@ -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/openwrt/package/dsniff/patches/time_h.patch b/openwrt/package/dsniff/patches/time_h.patch
new file mode 100644
index 000000000..280b8c1e8
--- /dev/null
+++ b/openwrt/package/dsniff/patches/time_h.patch
@@ -0,0 +1,22 @@
+diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/msgsnarf.c dsniff-2.4b1/msgsnarf.c
+--- dsniff-2.4b1/msgsnarf.c 2001-03-15 08:33:04.000000000 +0000
++++ dsniff-2.4b1/msgsnarf.c 2005-07-11 20:15:50.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <nids.h>
+ #include <pcap.h>
+ #include <pcaputil.h>
++#include <time.h>
+
+ #include "buf.h"
+ #include "decode.h"
+diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/sshow.c dsniff-2.4b1/sshow.c
+--- dsniff-2.4b1/sshow.c 2005-07-11 20:14:19.000000000 +0000
++++ dsniff-2.4b1/sshow.c 2005-07-11 20:15:26.000000000 +0000
+@@ -15,6 +15,7 @@
+
+ #include <sys/types.h>
+ #include <sys/times.h>
++#include <time.h>
+
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>