From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 14 Apr 2006 12:53:43 +0000 (+0000)
Subject: Update tcpdump to 3.9.4 to match libpcap version. Closes 479
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f2b66b7f7dca9c0487d4f8364bdb10b324c2b5bb;p=openwrt%2Fsvn-archive%2Farchive.git

Update tcpdump to 3.9.4 to match libpcap version. Closes 479
Create /var/lock for pppd


SVN-Revision: 3649
---

diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index 351571ba31..3e88236a0d 100644
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -97,6 +97,7 @@ $(IPKG_PPP):
 	install -d -m0755 $(IDIR_PPP)/usr/sbin
 	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
 	install -d -m0755 $(IDIR_PPP)/usr/lib/pppd
+	install -d -m0755 $(IDIR_PPP)/var/lock
 	echo "Depends: $(PKG_DEPEND)" >> $(IDIR_PPP)/CONTROL/control
 	$(RSTRIP) $(IDIR_PPP)
 	$(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
diff --git a/openwrt/package/tcpdump/Makefile b/openwrt/package/tcpdump/Makefile
index fabd1500bb..b19c0efe4e 100644
--- a/openwrt/package/tcpdump/Makefile
+++ b/openwrt/package/tcpdump/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpdump
-PKG_VERSION:=3.8.3
+PKG_VERSION:=3.9.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=30645001f4b97019677cad88d3811904
+PKG_MD5SUM:=4b64755bbc8ba1af49c747271a6df5b8
 
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
 	http://ftp.gwdg.de/pub/misc/tcpdump/ \
diff --git a/openwrt/package/tcpdump/patches/remove-pcap-debug.patch b/openwrt/package/tcpdump/patches/remove-pcap-debug.patch
index 7a0c9c3c21..d8993f057a 100644
--- a/openwrt/package/tcpdump/patches/remove-pcap-debug.patch
+++ b/openwrt/package/tcpdump/patches/remove-pcap-debug.patch
@@ -1,8 +1,8 @@
-diff -urN tcpdump-3.8.3.old/tcpdump.c tcpdump-3.8.3.dev/tcpdump.c
---- tcpdump-3.8.3.old/tcpdump.c	2004-03-17 20:47:48.000000000 +0100
-+++ tcpdump-3.8.3.dev/tcpdump.c	2005-04-29 00:53:20.000000000 +0200
-@@ -596,20 +596,6 @@
- 				error("invalid data link type %s", dlt_name);
+diff -urN tcpdump-3.9.4.orig/tcpdump.c tcpdump-3.9.4/tcpdump.c
+--- tcpdump-3.9.4.orig/tcpdump.c	2005-08-23 12:29:41.000000000 +0200
++++ tcpdump-3.9.4/tcpdump.c	2006-02-05 17:52:37.000000000 +0100
+@@ -762,20 +762,6 @@
+ 				error("invalid data link type %s", gndo->ndo_dltname);
  			break;
  
 -#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
@@ -19,6 +19,6 @@ diff -urN tcpdump-3.8.3.old/tcpdump.c tcpdump-3.8.3.dev/tcpdump.c
 -			}
 -			break;
 -#endif
- 		default:
- 			usage();
- 			/* NOTREACHED */
+ 		case 'Z':
+ 			if (optarg) {
+ 				username = strdup(optarg);