various patches

nico: buildroot-20040825-kmodules.patch.txt buildroot-20040825-tcpdump.patch.txt buildroot-20040825-libpcap.patch.txt buildroot-20040825-libpthread.patch.txt buildroot-20040825-fprobe.patch.txt buildroot-20040825-pptp-client.patch.txt twolife: iproute2.patch.txt git-svn-id: svn://svn.openwrt.org/openwrt/trunk@149 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2004-08-27 00:42:33 +0000
committer: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2004-08-27 00:42:33 +0000
commit: f0c8400658ac5b039bb48dbb74b02f75d52b9723 (patch)
tree: 7ef2c062b8733bbd08473f6c2bed78c7ad9708d1
parent: aa210b58909434abaa63a7a6cd898a43ba61c3f3 (diff)
51 files changed, 2442 insertions, 273 deletions
diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index 6decbdf311..71cabcb4e2 100644
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -97,7 +97,7 @@ INSTALL_LIBGCJ:=false
 #############################################################
 TARGETS:=host-sed openwrt-code.bin
 
-PACKAGES:=oidentd iproute2 sched-modules wshaper zlib openssl openssh pppoecd dropbear chillispot dhcp-fwd ip6tables kmod-ipt6 kmod-ipv6 nfs-modules ppp-async-module ppp-mppe-module ppp pppoecd pptp-server tun-module
+PACKAGES:=oidentd iproute2 kmod-sched wshaper zlib openssl openssh pppoecd dropbear chillispot dhcp-fwd ip6tables kmod-ipt6 kmod-ipv6 kmod-nfs kmod-ppp-async kmod-ppp-mppe-mppc ppp pppoecd pptp-server kmod-tun fprobe libpcap libpthread pptp-client
 
 #############################################################
 #
diff --git a/obsolete-buildroot/make/fprobe.mk b/obsolete-buildroot/make/fprobe.mk
new file mode 100644
index 0000000000..409029cbda
--- /dev/null
+++ b/obsolete-buildroot/make/fprobe.mk
@@ -0,0 +1,101 @@
+## fprobe
+
+FPROBE_VERSION:=1.0.5
+FPROBE_RELEASE:=1
+
+FPROBE_SOURCE:=fprobe-$(FPROBE_VERSION).tar.bz2
+FPROBE_SITE:=http://dl.sourceforge.net/sourceforge/fprobe/
+FPROBE_DIR:=$(BUILD_DIR)/fprobe-$(FPROBE_VERSION)
+FPROBE_CAT:=bzcat
+
+FPROBE_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/fprobe
+
+FPROBE_BUILD_DIR := $(BUILD_DIR)/fprobe_$(FPROBE_VERSION)-$(FPROBE_RELEASE)
+FPROBE_IPK_DIR := $(OPENWRT_IPK_DIR)/fprobe
+FPROBE_IPK := $(FPROBE_BUILD_DIR)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(FPROBE_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(FPROBE_SITE)/$(FPROBE_SOURCE)
+
+
+$(FPROBE_DIR)/.stamp-unpacked: $(DL_DIR)/$(FPROBE_SOURCE)
+	$(FPROBE_CAT) $(DL_DIR)/$(FPROBE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+	touch $(FPROBE_DIR)/.stamp-unpacked
+
+
+$(FPROBE_DIR)/.stamp-configured: $(FPROBE_DIR)/.stamp-unpacked
+	cd $(FPROBE_DIR) ; \
+	rm -rf config.cache ; \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --sbindir=/usr/sbin \
+	  --libexecdir=/usr/lib/locate \
+	  --sysconfdir=/etc \
+	  --datadir=/usr/share \
+	  --localstatedir=/var/lib \
+	  --mandir=/usr/share/man \
+	  --infodir=/usr/share/info \
+	  --includedir=/usr/include \
+	  --libdir=/usr/lib \
+	  $(DISABLE_NLS) \
+	  --with-membulk=index8 \
+	  --with-hash=xor8
+
+	touch $(FPROBE_DIR)/.stamp-configured
+
+
+$(FPROBE_DIR)/.stamp-built: $(FPROBE_DIR)/.stamp-configured
+	cd $(FPROBE_DIR) ; \
+	$(MAKE) \
+	  CC=$(TARGET_CC) \
+
+	touch $(FPROBE_DIR)/.stamp-built
+
+
+$(FPROBE_DIR)/.stamp-installed: $(FPROBE_DIR)/.stamp-built
+	mkdir -p $(FPROBE_BUILD_DIR)
+	cd $(FPROBE_DIR) ; \
+	$(MAKE) \
+	  DESTDIR="$(FPROBE_BUILD_DIR)" \
+	 install \
+	 
+	install -m0755 -d $(FPROBE_BUILD_DIR)/etc
+	install -m0644 $(FPROBE_IPK_DIR)/root/etc/fprobe.conf $(FPROBE_BUILD_DIR)/etc/
+
+	install -m0755 -d $(FPROBE_BUILD_DIR)/etc/init.d
+	install -m0755 $(FPROBE_IPK_DIR)/root/etc/init.d/fprobe $(FPROBE_BUILD_DIR)/etc/init.d/
+
+	rm -rf $(FPROBE_BUILD_DIR)/usr/share
+
+	$(STRIP) $(FPROBE_BUILD_DIR)/usr/sbin/*
+	
+	touch $(FPROBE_DIR)/.stamp-installed
+
+
+$(FPROBE_IPK): $(FPROBE_DIR)/.stamp-installed
+	cp -a $(FPROBE_IPK_DIR)/CONTROL $(FPROBE_BUILD_DIR)/
+	perl -pi -e "s/^Vers.*:.*$$/Version: $(FPROBE_VERSION)-$(FPROBE_RELEASE)/" $(FPROBE_BUILD_DIR)/CONTROL/control
+	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(FPROBE_BUILD_DIR)/CONTROL/control
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(FPROBE_BUILD_DIR)
+
+
+fprobe-source: $(DL_DIR)/$(FPROBE_SOURCE)
+
+fprobe-ipk: ipkg-utils libpcap-ipk $(FPROBE_IPK)
+
+fprobe-clean:
+	$(MAKE) -C $(FPROBE_DIR) clean
+
+fprobe-clean-all:
+	rm -rf $(FPROBE_DIR)
+	rm -rf $(FPROBE_BUILD_DIR)
+	rm -rf $(FPROBE_IPK)
diff --git a/obsolete-buildroot/make/iproute2.mk b/obsolete-buildroot/make/iproute2.mk
index 86608ea4bb..94bed41c0e 100644
--- a/obsolete-buildroot/make/iproute2.mk
+++ b/obsolete-buildroot/make/iproute2.mk
@@ -5,6 +5,8 @@
 #############################################################
 
 IPROUTE2_DIR=$(BUILD_DIR)/iproute2
+IP_IPK_DIR=$(BUILD_DIR)/ip-2.0-ipk
+TC_IPK_DIR=$(BUILD_DIR)/tc-2.0-ipk
 
 #IPROUTE2_SOURCE_URL=ftp://ftp.inr.ac.ru/ip-routing/
 #IPROUTE2_SOURCE=iproute2-2.4.7-now-ss020116-try.tar.gz
@@ -15,10 +17,6 @@ IPROUTE2_SOURCE=iproute_20010824.orig.tar.gz
 IPROUTE2_PATCH:=iproute_20010824-8.diff.gz
 IPROUTE2_PATCH_2:=iproute2-*.patch
 
-IPROUTE2_IPKTARGET=iproute.ipk
-IPROUTE2_IPKSRC:=iproute-pkg.tgz
-IPROUTE2_IPKSITE:=http://openwrt.rozeware.bc.ca/ipkg-dev
-
 
 $(DL_DIR)/$(IPROUTE2_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(IPROUTE2_SOURCE_URL)$(IPROUTE2_SOURCE)
@@ -26,9 +24,6 @@ $(DL_DIR)/$(IPROUTE2_SOURCE):
 $(DL_DIR)/$(IPROUTE2_PATCH):
 	$(WGET) -P $(DL_DIR) $(IPROUTE2_SOURCE_URL)/$(IPROUTE2_PATCH)
 
-$(DL_DIR)/$(IPROUTE2_IPKSRC):
-	$(WGET) -P $(DL_DIR) $(IPROUTE2_IPKSITE)/$(IPROUTE2_IPKSRC)
-
 
 iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE) #$(DL_DIR)/$(IPROUTE2_PATCH)
 
@@ -58,7 +53,6 @@ $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
 
 $(IPROUTE2_DIR)/tc/tc: $(IPROUTE2_DIR)/.configured
 	$(MAKE) -C $(IPROUTE2_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include
-	$(STRIP) $(IPROUTE2_DIR)/tc/tc
 
 $(TARGET_DIR)/usr/sbin/tc: $(IPROUTE2_DIR)/tc/tc
 	@# Make sure our $(TARGET_DIR)/usr/sbin/ exists.
@@ -74,13 +68,19 @@ iproute2-clean:
 	-$(MAKE) -C $(IPROUTE2_DIR) clean
 
 iproute2-dirclean:
-	rm -rf $(IPROUTE2_DIR)
+	rm -rf $(IPROUTE2_DIR) $(IP_IPK_DIR) $(TC_IPK_DIR)
 	
-iproute2-ipk:	$(IPROUTE2_IPKTARGET)
 
-$(IPROUTE2_IPKTARGET):	$(IPROUTE2_DIR)/ipkg/rules
-	(cd $(IPROUTE2_DIR); $(IPKG_BUILDPACKAGE) )
-	
-$(IPROUTE2_DIR)/ipkg/rules:	$(IPROUTE2_DIR)/tc/tc $(DL_DIR)/$(IPROUTE2_IPKSRC)
-	tar -C $(IPROUTE2_DIR) -zxf $(DL_DIR)/$(IPROUTE2_IPKSRC)
-	
+iproute2-ipk:	$(IPROUTE2_DIR)/tc/tc
+	mkdir -p $(IP_IPK_DIR)
+	mkdir -p $(TC_IPK_DIR)
+	cp -a $(OPENWRT_IPK_DIR)/iproute/ip/CONTROL $(IP_IPK_DIR)/CONTROL
+	cp -a $(OPENWRT_IPK_DIR)/iproute/tc/CONTROL $(TC_IPK_DIR)/CONTROL
+	mkdir -p $(IP_IPK_DIR)/usr/sbin
+	mkdir -p $(TC_IPK_DIR)/usr/sbin
+	install -m 755 $(IPROUTE2_DIR)/ip/ip $(IP_IPK_DIR)/usr/sbin/
+	install -m 755 $(IPROUTE2_DIR)/tc/tc $(TC_IPK_DIR)/usr/sbin/
+	$(STRIP) $(IP_IPK_DIR)/usr/sbin/ip
+	$(STRIP) $(TC_IPK_DIR)/usr/sbin/tc
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(IP_IPK_DIR)
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(TC_IPK_DIR)
diff --git a/obsolete-buildroot/make/kmod-ipt6.mk b/obsolete-buildroot/make/kmod-ipt6.mk
index cc8e4271cd..c3d78b903d 100644
--- a/obsolete-buildroot/make/kmod-ipt6.mk
+++ b/obsolete-buildroot/make/kmod-ipt6.mk
@@ -1,15 +1,4 @@
-KMOD-IPT6:=kmod-ipt6
-KMOD-IPT6_IPK:=$(KMOD-IPT6)_2.4.20-1_mipsel.ipk
-KMOD-IPT6_IPK_DIR:=$(BUILD_DIR)/$(KMOD-IPT6)-2.4.20-ipk
-
-$(BUILD_DIR)/$(KMOD-IPT6_IPK):
-	mkdir -p $(KMOD-IPT6_IPK_DIR)/CONTROL
-	mkdir -p $(KMOD-IPT6_IPK_DIR)/lib/modules/2.4.20/kernel/net/ipv6/netfilter
-	install -m 644 $(OPENWRT_IPK_DIR)/$(KMOD-IPT6)/$(KMOD-IPT6).control $(KMOD-IPT6_IPK_DIR)/CONTROL/control
-	install -m 644 $(BUILD_DIR)/linux/modules/lib/modules/2.4.20/kernel/net/ipv6/netfilter/* $(KMOD-IPT6_IPK_DIR)/lib/modules/2.4.20/kernel/net/ipv6/netfilter/
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(KMOD-IPT6_IPK_DIR)
-
-kmod-ipt6-ipk:	$(BUILD_DIR)/$(KMOD-IPT6_IPK)
-
-kmod-ipt6-distclean:
-	rm -rf $(KMOD-IPT6_IPK_DIR)
+kmod-ipt6-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-ipt6/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-ipt6/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-ipt6 ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-ipt6_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-ipv6.mk b/obsolete-buildroot/make/kmod-ipv6.mk
index 62c7b274c2..ce7959e620 100644
--- a/obsolete-buildroot/make/kmod-ipv6.mk
+++ b/obsolete-buildroot/make/kmod-ipv6.mk
@@ -1,15 +1,4 @@
-KMOD-IPV6:=kmod-ipv6
-KMOD-IPV6_IPK:=$(KMOD-IPV6)_2.4.20-1_mipsel.ipk
-KMOD-IPV6_IPK_DIR:=$(BUILD_DIR)/$(KMOD-IPV6)-2.4.20-ipk
-
-$(BUILD_DIR)/$(KMOD-IPV6_IPK):
-	mkdir -p $(KMOD-IPV6_IPK_DIR)/CONTROL
-	mkdir -p $(KMOD-IPV6_IPK_DIR)/lib/modules/2.4.20/kernel/net/ipv6
-	install -m 644 $(OPENWRT_IPK_DIR)/$(KMOD-IPV6)/$(KMOD-IPV6).control $(KMOD-IPV6_IPK_DIR)/CONTROL/control
-	install -m 644 $(BUILD_DIR)/linux/modules/lib/modules/2.4.20/kernel/net/ipv6/ipv6.o $(KMOD-IPV6_IPK_DIR)/lib/modules/2.4.20/kernel/net/ipv6
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(KMOD-IPV6_IPK_DIR)
-
-kmod-ipv6-ipk:	$(BUILD_DIR)/$(KMOD-IPV6_IPK)
-
-kmod-ipv6-distclean:
-	rm -rf $(KMOD-IPV6_IPK_DIR)
+kmod-ipv6-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-ipv6/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-ipv6/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-ipv6 ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-ipv6_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-nfs.mk b/obsolete-buildroot/make/kmod-nfs.mk
new file mode 100644
index 0000000000..45cc60c1f3
--- /dev/null
+++ b/obsolete-buildroot/make/kmod-nfs.mk
@@ -0,0 +1,4 @@
+kmod-nfs-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-nfs/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-nfs/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-nfs ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-nfs_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-ppp-async.mk b/obsolete-buildroot/make/kmod-ppp-async.mk
new file mode 100644
index 0000000000..3b076ab4f7
--- /dev/null
+++ b/obsolete-buildroot/make/kmod-ppp-async.mk
@@ -0,0 +1,4 @@
+kmod-ppp-async-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-ppp-async/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-ppp-async/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-ppp-async ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-ppp-async_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-ppp-mppe-mppc.mk b/obsolete-buildroot/make/kmod-ppp-mppe-mppc.mk
new file mode 100644
index 0000000000..4dc24bf95c
--- /dev/null
+++ b/obsolete-buildroot/make/kmod-ppp-mppe-mppc.mk
@@ -0,0 +1,4 @@
+kmod-ppp-mppe-mppc-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-ppp-mppe-mppc/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-ppp-mppe-mppc/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-ppp-mppe-mppc ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-ppp-mppe-mppc_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-sched.mk b/obsolete-buildroot/make/kmod-sched.mk
new file mode 100644
index 0000000000..eb09d966b4
--- /dev/null
+++ b/obsolete-buildroot/make/kmod-sched.mk
@@ -0,0 +1,4 @@
+kmod-sched-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-sched/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-sched/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-sched ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-sched_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/kmod-tun.mk b/obsolete-buildroot/make/kmod-tun.mk
new file mode 100644
index 0000000000..75a5c540db
--- /dev/null
+++ b/obsolete-buildroot/make/kmod-tun.mk
@@ -0,0 +1,4 @@
+kmod-tun-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/kmod-tun/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/kmod-tun/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/kmod-tun ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/kmod-tun_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/libpcap.mk b/obsolete-buildroot/make/libpcap.mk
new file mode 100644
index 0000000000..c63d08f97e
--- /dev/null
+++ b/obsolete-buildroot/make/libpcap.mk
@@ -0,0 +1,115 @@
+## libpcap
+
+LIBPCAP_VERSION:=0.8.3
+LIBPCAP_RELEASE:=1
+
+LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
+LIBPCAP_SITE:=http://www.tcpdump.org/release/
+LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VERSION)
+LIBPCAP_CAT:=zcat
+
+LIBPCAP_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/libpcap
+
+LIBPCAP_BUILD_DIR := $(BUILD_DIR)/libpcap_$(LIBPCAP_VERSION)-$(LIBPCAP_RELEASE)
+LIBPCAP_IPK_DIR := $(OPENWRT_IPK_DIR)/libpcap
+LIBPCAP_IPK := $(LIBPCAP_BUILD_DIR)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(LIBPCAP_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(LIBPCAP_SITE)/$(LIBPCAP_SOURCE)
+
+
+$(LIBPCAP_DIR)/.stamp-unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
+	$(LIBPCAP_CAT) $(DL_DIR)/$(LIBPCAP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+	touch $(LIBPCAP_DIR)/.stamp-unpacked
+
+
+$(LIBPCAP_DIR)/.stamp-patched: $(LIBPCAP_DIR)/.stamp-unpacked
+	$(SOURCE_DIR)/patch-kernel.sh $(LIBPCAP_DIR) $(LIBPCAP_PATCH_DIR)
+	$(SOURCE_DIR)/patch-kernel.sh $(LIBPCAP_DIR) $(LIBPCAP_DIR)/debian/patches *patch
+
+	touch $(LIBPCAP_DIR)/.stamp-patched
+
+
+$(LIBPCAP_DIR)/.stamp-configured: $(LIBPCAP_DIR)/.stamp-patched
+	cd $(LIBPCAP_DIR) ; \
+	rm -rf config.cache ; \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	ac_cv_linux_vers="2" \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --sbindir=/usr/sbin \
+	  --libexecdir=/usr/lib/locate \
+	  --sysconfdir=/etc \
+	  --datadir=/usr/share \
+	  --localstatedir=/var/lib \
+	  --mandir=/usr/share/man \
+	  --infodir=/usr/share/info \
+	  --includedir=/usr/include \
+	  --libdir=/usr/lib \
+	  $(DISABLE_NLS) \
+	  --enable-shared \
+	  --disable-static \
+	  --with-pcap=linux \
+
+	touch $(LIBPCAP_DIR)/.stamp-configured
+
+
+$(LIBPCAP_DIR)/.stamp-built: $(LIBPCAP_DIR)/.stamp-configured
+	cd $(LIBPCAP_DIR) ; \
+	$(MAKE) \
+	  CC=$(TARGET_CC) \
+	  CCOPT="$(TARGET_OPTIMIZATION)" \
+
+	touch $(LIBPCAP_DIR)/.stamp-built
+
+
+$(LIBPCAP_DIR)/.stamp-installed: $(LIBPCAP_DIR)/.stamp-built
+	mkdir -p $(LIBPCAP_BUILD_DIR)
+	cd $(LIBPCAP_DIR) ; \
+	$(MAKE) \
+	  DESTDIR="$(LIBPCAP_BUILD_DIR)" \
+	 install \
+	 
+	install -m0644 $(LIBPCAP_BUILD_DIR)/usr/include/pcap*.h $(STAGING_DIR)/include/
+	install -m0644 $(LIBPCAP_BUILD_DIR)/usr/lib/libpcap.a $(STAGING_DIR)/lib/
+	install -m0755 $(LIBPCAP_BUILD_DIR)/usr/lib/libpcap.so* $(STAGING_DIR)/lib/
+
+	rm -rf $(LIBPCAP_BUILD_DIR)/usr/share
+	rm -rf $(LIBPCAP_BUILD_DIR)/usr/include
+	rm -rf $(LIBPCAP_BUILD_DIR)/usr/lib/*.a
+	rm -rf $(LIBPCAP_BUILD_DIR)/usr/lib/*.so
+
+	$(STRIP) $(LIBPCAP_BUILD_DIR)/usr/lib/libpcap.so.*
+	
+	touch $(LIBPCAP_DIR)/.stamp-installed
+
+
+$(LIBPCAP_IPK): $(LIBPCAP_DIR)/.stamp-installed
+	cp -a $(LIBPCAP_IPK_DIR)/CONTROL $(LIBPCAP_BUILD_DIR)/
+	perl -pi -e "s/^Vers.*:.*$$/Version: $(LIBPCAP_VERSION)-$(LIBPCAP_RELEASE)/" $(LIBPCAP_BUILD_DIR)/CONTROL/control
+	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(LIBPCAP_BUILD_DIR)/CONTROL/control
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBPCAP_BUILD_DIR)
+
+
+libpcap-source: $(DL_DIR)/$(LIBPCAP_SOURCE)
+
+libpcap-ipk: ipkg-utils $(LIBPCAP_IPK)
+
+libpcap-clean:
+	$(MAKE) -C $(LIBPCAP_DIR) clean
+
+libpcap-clean-all:
+	rm -rf $(LIBPCAP_DIR)
+	rm -rf $(LIBPCAP_BUILD_DIR)
+	rm -rf $(LIBPCAP_IPK)
+	rm -rf $(STAGING_DIR)/include/pcap*.h
+	rm -rf $(STAGING_DIR)/lib/libpcap.a
+	rm -rf $(STAGING_DIR)/lib/libpcap.so*
diff --git a/obsolete-buildroot/make/libpthread.mk b/obsolete-buildroot/make/libpthread.mk
new file mode 100644
index 0000000000..d247337428
--- /dev/null
+++ b/obsolete-buildroot/make/libpthread.mk
@@ -0,0 +1,4 @@
+libpthread-ipk: ipkg-utils $(OPENWRT_IPK_DIR)/libpthread/CONTROL/*
+	chmod a+x $(OPENWRT_IPK_DIR)/libpthread/CONTROL/rules
+	cd $(OPENWRT_IPK_DIR)/libpthread ; $(IPKG_BUILDPACKAGE)
+	mv $(OPENWRT_IPK_DIR)/libpthread_*.ipk $(BUILD_DIR)
+\ No newline at end of file
diff --git a/obsolete-buildroot/make/nfs-modules.mk b/obsolete-buildroot/make/nfs-modules.mk
deleted file mode 100644
index f00fe7fb96..0000000000
--- a/obsolete-buildroot/make/nfs-modules.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-## nfs-modules
-
-NFS_MODULES_VERSION := $(SNAPSHOT)
-NFS_MODULES_RELEASE := 1
-
-NFS_MODULES_BUILD_DIR := $(BUILD_DIR)/nfs-modules_$(NFS_MODULES_VERSION)-$(NFS_MODULES_RELEASE)
-NFS_MODULES_IPK_DIR := $(OPENWRT_IPK_DIR)/nfs-modules
-NFS_MODULES_IPK := $(NFS_MODULES_BUILD_DIR)_$(ARCH).ipk
-
-
-$(NFS_MODULES_BUILD_DIR)/CONTROL/control: $(BASE_DIR)/openwrt-kmodules.tar.bz2
-	rm -rf $(NFS_MODULES_BUILD_DIR)
-	mkdir -p $(NFS_MODULES_BUILD_DIR)/lib/
-	bzcat $(BASE_DIR)/openwrt-kmodules.tar.bz2 | tar -C $(NFS_MODULES_BUILD_DIR)/lib/ -xvf - \
-	 modules/$(LINUX_VERSION)/kernel/fs/lockd/lockd.o \
-	 modules/$(LINUX_VERSION)/kernel/fs/nfs/nfs.o \
-	 modules/$(LINUX_VERSION)/kernel/net/sunrpc/sunrpc.o
-	mv -f \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/lockd/*.o \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	mv -f \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/nfs/*.o \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	mv -f \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/net/sunrpc/*.o \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	rm -rf \
-	 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel
-	chmod 0755 $(NFS_MODULES_BUILD_DIR)/lib
-	chmod 0755 $(NFS_MODULES_BUILD_DIR)/lib/modules
-	chmod 0755 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)
-	chmod 0755 $(NFS_MODULES_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/*
-	cp -a $(NFS_MODULES_IPK_DIR)/CONTROL $(NFS_MODULES_BUILD_DIR)/
-	perl -pi -e "s/^Vers.*:.*$$/Version: $(NFS_MODULES_VERSION)-$(NFS_MODULES_RELEASE)/" $(NFS_MODULES_BUILD_DIR)/CONTROL/control
-	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(NFS_MODULES_BUILD_DIR)/CONTROL/control
-
-	touch $(NFS_MODULES_BUILD_DIR)/CONTROL/control
-
-
-$(NFS_MODULES_IPK): $(NFS_MODULES_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(IPKG_BUILD) $(NFS_MODULES_BUILD_DIR)
-
-
-nfs-modules-ipk: ipkg-utils $(NFS_MODULES_IPK)
-
-nfs-modules-clean:
-	rm -rf $(NFS_MODULES_IPK)
-	rm -rf $(NFS_MODULES_BUILD_DIR)
-
diff --git a/obsolete-buildroot/make/ppp-async-module.mk b/obsolete-buildroot/make/ppp-async-module.mk
deleted file mode 100644
index bdad3076f0..0000000000
--- a/obsolete-buildroot/make/ppp-async-module.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-## ppp-async-module
-
-PPP_ASYNC_MODULE_VERSION := $(SNAPSHOT)
-PPP_ASYNC_MODULE_RELEASE := 1
-
-PPP_ASYNC_MODULE_BUILD_DIR := $(BUILD_DIR)/ppp-async-module_$(PPP_ASYNC_MODULE_VERSION)-$(PPP_ASYNC_MODULE_RELEASE)
-PPP_ASYNC_MODULE_IPK_DIR := $(OPENWRT_IPK_DIR)/ppp-async-module
-PPP_ASYNC_MODULE_IPK := $(PPP_ASYNC_MODULE_BUILD_DIR)_$(ARCH).ipk
-
-
-$(PPP_ASYNC_MODULE_BUILD_DIR)/CONTROL/control: $(BASE_DIR)/openwrt-kmodules.tar.bz2
-	rm -rf $(PPP_ASYNC_MODULE_BUILD_DIR)
-	mkdir -p $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/
-	bzcat $(BASE_DIR)/openwrt-kmodules.tar.bz2 | tar -C $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/ -xvf - \
-	 modules/$(LINUX_VERSION)/kernel/drivers/net/ppp_async.o
-	mv -f \
-	 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/drivers/net/ppp_async.o \
-	 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	rm -rf \
-	 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel
-	chmod 0755 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib
-	chmod 0755 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules
-	chmod 0755 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)
-	chmod 0755 $(PPP_ASYNC_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/*
-	cp -a $(PPP_ASYNC_MODULE_IPK_DIR)/CONTROL $(PPP_ASYNC_MODULE_BUILD_DIR)/
-	perl -pi -e "s/^Vers.*:.*$$/Version: $(PPP_ASYNC_MODULE_VERSION)-$(PPP_ASYNC_MODULE_RELEASE)/" $(PPP_ASYNC_MODULE_BUILD_DIR)/CONTROL/control
-	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(PPP_ASYNC_MODULE_BUILD_DIR)/CONTROL/control
-
-	touch $(PPP_ASYNC_MODULE_BUILD_DIR)/CONTROL/control
-
-
-$(PPP_ASYNC_MODULE_IPK): $(PPP_ASYNC_MODULE_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(IPKG_BUILD) $(PPP_ASYNC_MODULE_BUILD_DIR)
-
-
-ppp-async-module-ipk: ipkg-utils $(PPP_ASYNC_MODULE_IPK)
-
-ppp-async-module-clean:
-	rm -rf $(PPP_ASYNC_MODULE_IPK)
-	rm -rf $(PPP_ASYNC_MODULE_BUILD_DIR)
-
diff --git a/obsolete-buildroot/make/ppp-mppe-module.mk b/obsolete-buildroot/make/ppp-mppe-module.mk
deleted file mode 100644
index ff1a558d2d..0000000000
--- a/obsolete-buildroot/make/ppp-mppe-module.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-## ppp-mppe-module
-
-PPP_MPPE_MODULE_VERSION := $(SNAPSHOT)
-PPP_MPPE_MODULE_RELEASE := 1
-
-PPP_MPPE_MODULE_BUILD_DIR := $(BUILD_DIR)/ppp-mppe-module_$(PPP_MPPE_MODULE_VERSION)-$(PPP_MPPE_MODULE_RELEASE)
-PPP_MPPE_MODULE_IPK_DIR := $(OPENWRT_IPK_DIR)/ppp-mppe-module
-PPP_MPPE_MODULE_IPK := $(PPP_MPPE_MODULE_BUILD_DIR)_$(ARCH).ipk
-
-
-$(PPP_MPPE_MODULE_BUILD_DIR)/CONTROL/control: $(BASE_DIR)/openwrt-kmodules.tar.bz2
-	rm -rf $(PPP_MPPE_MODULE_BUILD_DIR)
-	mkdir -p $(PPP_MPPE_MODULE_BUILD_DIR)/lib/
-	bzcat $(BASE_DIR)/openwrt-kmodules.tar.bz2 | tar -C $(PPP_MPPE_MODULE_BUILD_DIR)/lib/ -xvf - \
-	 modules/$(LINUX_VERSION)/kernel/drivers/net/ppp_mppe_mppc.o
-	mv -f \
-	 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/drivers/net/ppp_mppe_mppc.o \
-	 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	rm -rf \
-	 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel
-	chmod 0755 $(PPP_MPPE_MODULE_BUILD_DIR)/lib
-	chmod 0755 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules
-	chmod 0755 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)
-	chmod 0755 $(PPP_MPPE_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/*
-	cp -a $(PPP_MPPE_MODULE_IPK_DIR)/CONTROL $(PPP_MPPE_MODULE_BUILD_DIR)/
-	perl -pi -e "s/^Vers.*:.*$$/Version: $(PPP_MPPE_MODULE_VERSION)-$(PPP_MPPE_MODULE_RELEASE)/" $(PPP_MPPE_MODULE_BUILD_DIR)/CONTROL/control
-	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(PPP_MPPE_MODULE_BUILD_DIR)/CONTROL/control
-
-	touch $(PPP_MPPE_MODULE_BUILD_DIR)/CONTROL/control
-
-
-$(PPP_MPPE_MODULE_IPK): $(PPP_MPPE_MODULE_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(IPKG_BUILD) $(PPP_MPPE_MODULE_BUILD_DIR)
-
-
-ppp-mppe-module-ipk: ipkg-utils $(PPP_MPPE_MODULE_IPK)
-
-ppp-mppe-module-clean:
-	rm -rf $(PPP_MPPE_MODULE_IPK)
-	rm -rf $(PPP_MPPE_MODULE_BUILD_DIR)
-
diff --git a/obsolete-buildroot/make/ppp.mk b/obsolete-buildroot/make/ppp.mk
index 36481bb75b..66b17a69b4 100644
--- a/obsolete-buildroot/make/ppp.mk
+++ b/obsolete-buildroot/make/ppp.mk
@@ -38,6 +38,7 @@ $(PPP_DIR)/.stamp-patched: $(PPP_DIR)/.stamp-unpacked
 $(PPP_DIR)/.stamp-configured: $(PPP_DIR)/.stamp-patched
 	cd $(PPP_DIR)/pppd/plugins/radius/radiusclient ; \
 	rm -rf config.cache ; \
+	echo > aclocal.m4; \
 	$(TARGET_CONFIGURE_OPTS) \
 	ac_cv_func_setvbuf_reversed=no \
 	ac_cv_func_uname=no \
diff --git a/obsolete-buildroot/make/pptp-client.mk b/obsolete-buildroot/make/pptp-client.mk
new file mode 100644
index 0000000000..5fbddc1a05
--- /dev/null
+++ b/obsolete-buildroot/make/pptp-client.mk
@@ -0,0 +1,80 @@
+## pptp-client
+
+PPTPC_VERSION := 1.5.0
+PPTPC_RELEASE := 1
+
+PPTPC_SOURCE := pptp-linux-$(PPTPC_VERSION).tar.gz
+PPTPC_SITE := dl.sourceforge.net/sourceforge/pptpclient/
+PPTPC_DIR := $(BUILD_DIR)/pptp-linux-$(PPTPC_VERSION)
+PPTPC_CAT := zcat
+
+PPTPC_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/pptp-client
+
+PPTPC_BUILD_DIR := $(BUILD_DIR)/pptp-client_$(PPTPC_VERSION)-$(PPTPC_RELEASE)
+PPTPC_IPK_DIR := $(OPENWRT_IPK_DIR)/pptp-client
+PPTPC_IPK := $(PPTPC_BUILD_DIR)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(PPTPC_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PPTPC_SITE)/$(PPTPC_SOURCE)
+
+
+$(PPTPC_DIR)/.stamp-unpacked: $(DL_DIR)/$(PPTPC_SOURCE)
+	$(PPTPC_CAT) $(DL_DIR)/$(PPTPC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+	touch $(PPTPC_DIR)/.stamp-unpacked
+
+
+$(PPTPC_DIR)/.stamp-patched: $(PPTPC_DIR)/.stamp-unpacked
+
+	touch $(PPTPC_DIR)/.stamp-patched
+
+
+$(PPTPC_DIR)/.stamp-configured: $(PPTPC_DIR)/.stamp-patched
+	  
+	touch $(PPTPC_DIR)/.stamp-configured
+
+
+$(PPTPC_DIR)/.stamp-built: $(PPTPC_DIR)/.stamp-configured
+	cd  $(PPTPC_DIR) ; \
+	$(MAKE) \
+	  CC=$(TARGET_CC) \
+	  DEBUG="" \
+	  OPTIMIZE="$(TARGET_CFLAGS)" \
+	 all \
+
+	touch $(PPTPC_DIR)/.stamp-built
+
+
+$(PPTPC_BUILD_DIR): $(PPTPC_DIR)/.stamp-built
+	mkdir -p $(PPTPC_BUILD_DIR)
+
+	install -m0755 -d $(PPTPC_BUILD_DIR)/usr/sbin
+	install -m0755 $(PPTPC_DIR)/pptp $(PPTPC_BUILD_DIR)/usr/sbin
+
+	install -m0755 -d $(PPTPC_BUILD_DIR)/etc/ppp
+	install -m0644 $(PPTPC_IPK_DIR)/root/etc/ppp/pptp-client-options $(PPTPC_BUILD_DIR)/etc/ppp/
+	install -m0755 -d $(PPTPC_BUILD_DIR)/etc/ppp/peers
+	install -m0644 $(PPTPC_IPK_DIR)/root/etc/ppp/peers/pptp-client-sample $(PPTPC_BUILD_DIR)/etc/ppp/peers/
+	
+	$(STRIP) $(PPTPC_BUILD_DIR)/usr/sbin/*
+
+	touch $(PPTPC_DIR)/.stamp-installed
+
+
+$(PPTPC_IPK): $(PPTPC_BUILD_DIR)
+	cp -a $(PPTPC_IPK_DIR)/CONTROL $(PPTPC_BUILD_DIR)/
+	perl -pi -e "s/^Vers.*:.*$$/Version: $(PPTPC_VERSION)-$(PPTPC_RELEASE)/" $(PPTPC_BUILD_DIR)/CONTROL/control
+	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(PPTPC_BUILD_DIR)/CONTROL/control
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(PPTPC_BUILD_DIR)
+
+
+pptp-client-ipk: ipkg-utils $(PPTPC_IPK)
+
+pptp-client-clean:
+	$(MAKE) -C $(PPTPC_DIR) clean
+
+pptp-client-clean-all:
+	rm -rf $(PPTPC_IPK)
+	rm -rf $(PPTPC_BUILD_DIR)
+	rm -rf $(PPTPC_DIR)
diff --git a/obsolete-buildroot/make/sched-mod.mk b/obsolete-buildroot/make/sched-mod.mk
deleted file mode 100644
index c04bceea80..0000000000
--- a/obsolete-buildroot/make/sched-mod.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-######################################################
-#
-#  A really simple example that doesn't actually build anything
-#  It'll fetch a package from another repository for inclusion
-#  into our final list
-#  Using one from the openwrt home as an example
-#
-######################################################
-
-
-SCHEDM=sched-modules
-
-SCHEDM_TARGET=sched-modules_2.4.20_mipsel.ipk
-SCHEDM_SITE=http://openwrt.rozeware.bc.ca/ipkg-dev
-SCHEDM_SOURCE=openwrt-kmodules.tar.bz2
-SCHEDMIPK_SRC=sched-modules-ipk.tgz
-
-
-sched-modules-ipk:	$(BUILD_DIR)/$(SCHEDM_TARGET)
-
-
-# fetch the ipkg rules stuff
-$(DL_DIR)/$(SCHEDMIPK_SRC)  :  
-	$(WGET) -P $(DL_DIR) $(SCHEDM_SITE)/$(SCHEDMIPK_SRC)
-	
-#make sure we have a directory to extract to
-$(BUILD_DIR)/$(SCHEDM) :
-	mkdir $(BUILD_DIR)/$(SCHEDM)
-		
-#extract the archive
-$(BUILD_DIR)/$(SCHEDM)/modules/2.4.20/net/sched/cls_fw.o :	$(BUILD_DIR)/$(SCHEDM) $(SCHEDM_SOURCE)
-	tar -C $(BUILD_DIR)/$(SCHEDM) -jxf $(SCHEDM_SOURCE)
-	
-# extract the ipkg overlay
-$(BUILD_DIR)/$(SCHEDM)/ipkg/control : $(DL_DIR)/$(SCHEDMIPK_SRC) $(BUILD_DIR)/$(SCHEDM)/modules/2.4.20/net/sched/cls_fw.o
-	tar -C $(BUILD_DIR)/$(SCHEDM) -zxf $(DL_DIR)/$(SCHEDMIPK_SRC)
-
-# now that we have it all in place, just build it
-$(BUILD_DIR)/$(SCHEDM_TARGET):	$(BUILD_DIR)/$(SCHEDM)/ipkg/control $(BUILD_DIR)/$(SCHEDM)/modules/2.4.20/net/sched/cls_fw.o
-	cd $(BUILD_DIR)/$(SCHEDM); $(IPKG_BUILDPACKAGE)
- 		
-
-
-
diff --git a/obsolete-buildroot/make/tcpdump.mk b/obsolete-buildroot/make/tcpdump.mk
new file mode 100644
index 0000000000..f8d29e2da2
--- /dev/null
+++ b/obsolete-buildroot/make/tcpdump.mk
@@ -0,0 +1,108 @@
+## tcpdump
+
+TCPDUMP_VERSION:=3.8.3
+TCPDUMP_RELEASE:=1
+
+TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
+TCPDUMP_SITE:=http://www.tcpdump.org/release/
+TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VERSION)
+TCPDUMP_CAT:=zcat
+
+TCPDUMP_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/tcpdump
+
+TCPDUMP_BUILD_DIR := $(BUILD_DIR)/tcpdump_$(TCPDUMP_VERSION)-$(TCPDUMP_RELEASE)
+TCPDUMP_IPK_DIR := $(OPENWRT_IPK_DIR)/tcpdump
+TCPDUMP_IPK := $(TCPDUMP_BUILD_DIR)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(TCPDUMP_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(TCPDUMP_SITE)/$(TCPDUMP_SOURCE)
+
+
+$(TCPDUMP_DIR)/.stamp-unpacked: $(DL_DIR)/$(TCPDUMP_SOURCE)
+	$(TCPDUMP_CAT) $(DL_DIR)/$(TCPDUMP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+	touch $(TCPDUMP_DIR)/.stamp-unpacked
+
+
+$(TCPDUMP_DIR)/.stamp-patched: $(TCPDUMP_DIR)/.stamp-unpacked
+	$(SOURCE_DIR)/patch-kernel.sh $(TCPDUMP_DIR) $(TCPDUMP_PATCH_DIR)
+	$(SOURCE_DIR)/patch-kernel.sh $(TCPDUMP_DIR) $(TCPDUMP_DIR)/debian/patches *patch
+
+	touch $(TCPDUMP_DIR)/.stamp-patched
+
+
+$(TCPDUMP_DIR)/.stamp-configured: $(TCPDUMP_DIR)/.stamp-patched
+	cd $(TCPDUMP_DIR) ; \
+	rm -rf config.cache ; \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	ac_cv_linux_vers="2" \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --sbindir=/usr/sbin \
+	  --libexecdir=/usr/lib/locate \
+	  --sysconfdir=/etc \
+	  --datadir=/usr/share \
+	  --localstatedir=/var/lib \
+	  --mandir=/usr/share/man \
+	  --infodir=/usr/share/info \
+	  --includedir=/usr/include \
+	  --libdir=/usr/lib \
+	  $(DISABLE_NLS) \
+	  --enable-shared \
+	  --disable-static \
+
+	touch $(TCPDUMP_DIR)/.stamp-configured
+
+
+$(TCPDUMP_DIR)/.stamp-built: $(TCPDUMP_DIR)/.stamp-configured
+	cd $(TCPDUMP_DIR) ; \
+	$(MAKE) \
+	  CC=$(TARGET_CC) \
+	  CCOPT="$(TARGET_OPTIMIZATION)" \
+	  INCLS="-I. -I$(srcdir)/missing" \
+	  LDFLAGS="-lpcap" \
+	  LIBS="" \
+
+	touch $(TCPDUMP_DIR)/.stamp-built
+
+
+$(TCPDUMP_DIR)/.stamp-installed: $(TCPDUMP_DIR)/.stamp-built
+	mkdir -p $(TCPDUMP_BUILD_DIR)
+	cd $(TCPDUMP_DIR) ; \
+	$(MAKE) \
+	  DESTDIR="$(TCPDUMP_BUILD_DIR)" \
+	 install \
+	 
+	rm -rf $(TCPDUMP_BUILD_DIR)/usr/share
+
+	$(STRIP) $(TCPDUMP_BUILD_DIR)/usr/sbin/*
+	
+	touch $(TCPDUMP_DIR)/.stamp-installed
+
+
+$(TCPDUMP_IPK): $(TCPDUMP_DIR)/.stamp-installed
+	cp -a $(TCPDUMP_IPK_DIR)/CONTROL $(TCPDUMP_BUILD_DIR)/
+	perl -pi -e "s/^Vers.*:.*$$/Version: $(TCPDUMP_VERSION)-$(TCPDUMP_RELEASE)/" $(TCPDUMP_BUILD_DIR)/CONTROL/control
+	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(TCPDUMP_BUILD_DIR)/CONTROL/control
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(TCPDUMP_BUILD_DIR)
+
+
+tcpdump-source: $(DL_DIR)/$(TCPDUMP_SOURCE)
+
+# libpcap-clean prevent configure to find a local libpcap library
+tcpdump-ipk: ipkg-utils libpcap-ipk libpcap-clean $(TCPDUMP_IPK)
+
+tcpdump-clean:
+	$(MAKE) -C $(TCPDUMP_DIR) clean
+
+tcpdump-clean-all:
+	rm -rf $(TCPDUMP_DIR)
+	rm -rf $(TCPDUMP_BUILD_DIR)
+	rm -rf $(TCPDUMP_IPK)
diff --git a/obsolete-buildroot/make/tun-module.mk b/obsolete-buildroot/make/tun-module.mk
deleted file mode 100644
index e78fc8e880..0000000000
--- a/obsolete-buildroot/make/tun-module.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-## tun-module
-
-TUN_MODULE_VERSION := $(SNAPSHOT)
-TUN_MODULE_RELEASE := 1
-
-TUN_MODULE_BUILD_DIR := $(BUILD_DIR)/tun-module_$(TUN_MODULE_VERSION)-$(TUN_MODULE_RELEASE)
-TUN_MODULE_IPK_DIR := $(OPENWRT_IPK_DIR)/tun-module
-TUN_MODULE_IPK := $(TUN_MODULE_BUILD_DIR)_$(ARCH).ipk
-
-
-$(TUN_MODULE_BUILD_DIR)/CONTROL/control: $(BASE_DIR)/openwrt-kmodules.tar.bz2
-	rm -rf $(TUN_MODULE_BUILD_DIR)
-	mkdir -p $(TUN_MODULE_BUILD_DIR)/lib/
-	bzcat $(BASE_DIR)/openwrt-kmodules.tar.bz2 | tar -C $(TUN_MODULE_BUILD_DIR)/lib/ -xvf - \
-	 modules/$(LINUX_VERSION)/kernel/drivers/net/tun.o
-	mv -f \
-	 $(TUN_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel/drivers/net/tun.o \
-	 $(TUN_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/
-	rm -rf \
-	 $(TUN_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/kernel
-	chmod 0755 $(TUN_MODULE_BUILD_DIR)/lib
-	chmod 0755 $(TUN_MODULE_BUILD_DIR)/lib/modules
-	chmod 0755 $(TUN_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)
-	chmod 0755 $(TUN_MODULE_BUILD_DIR)/lib/modules/$(LINUX_VERSION)/*
-	cp -a $(TUN_MODULE_IPK_DIR)/CONTROL $(TUN_MODULE_BUILD_DIR)/
-	perl -pi -e "s/^Vers.*:.*$$/Version: $(TUN_MODULE_VERSION)-$(TUN_MODULE_RELEASE)/" $(TUN_MODULE_BUILD_DIR)/CONTROL/control
-	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(TUN_MODULE_BUILD_DIR)/CONTROL/control
-
-	touch $(TUN_MODULE_BUILD_DIR)/CONTROL/control
-
-
-$(TUN_MODULE_IPK): $(TUN_MODULE_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(IPKG_BUILD) $(TUN_MODULE_BUILD_DIR)
-
-
-tun-module-ipk: ipkg-utils $(TUN_MODULE_IPK)
-
-tun-module-clean:
-	rm -rf $(TUN_MODULE_IPK)
-	rm -rf $(TUN_MODULE_BUILD_DIR)
-
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/fprobe/CONTROL/conffiles b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/CONTROL/conffiles
new file mode 100644
index 0000000000..d498dc49c7
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/CONTROL/conffiles
@@ -0,0 +1 @@
+/etc/fprobe.conf
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/ppp-async-module/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/CONTROL/control
index bb38c2a863..d17142d3a6 100644
--- a/obsolete-buildroot/sources/openwrt/ipkg/ppp-async-module/CONTROL/control
+++ b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/CONTROL/control
@@ -1,8 +1,9 @@
-Package: ppp-async-module
+Package: fprobe
 Priority: optional
 Section: net
 Version: TBDL
 Architecture: TBDL
 Maintainer: Nico <nthill@free.fr>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
-Description: a PPP async serial channel driver kernel module
+Description: a NetFlow probe
+Depends: libpcap, libpthread
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/fprobe.conf b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/fprobe.conf
new file mode 100644
index 0000000000..3abfba6f95
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/fprobe.conf
@@ -0,0 +1,8 @@
+# Interface to listen on
+IFNAME=any
+
+# NetFlow collector (host:port)
+REMOTE=192.168.1.100:2055
+
+# Maximum log level (0=EMERG, 1=ALERT, 2=CRIT, 3=ERR, 4=WARNING, 5=NOTICE, 6=INFO, 7=DEBUG)
+LOG_LEVEL=3
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/init.d/fprobe b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/init.d/fprobe
new file mode 100644
index 0000000000..2a61fceb98
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/fprobe/root/etc/init.d/fprobe
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+DEFAULT=/etc/fprobe.conf
+OPTIONS=""
+[ -f $DEFAULT ] && . $DEFAULT
+[ -n "$IFNAME" ] && OPTIONS="$OPTIONS -i $IFNAME"
+[ -n "$LOG_LEVEL" ] && OPTIONS="$OPTIONS -v $LOG_LEVEL"
+[ -n "$REMOTE" ] && OPTIONS="$OPTIONS $REMOTE"
+
+case $1 in
+ start)
+  [ -d /var/run ] || mkdir -p /var/run
+  /usr/sbin/fprobe $OPTIONS
+  ;;
+ stop)
+  [ -f /var/run/fprobe.pid ] && kill $(cat /var/run/fprobe.pid) >/dev/null 2>&1
+  ;;
+ *)
+  echo "usage: $0 (start|stop)"
+  exit 1
+esac
+
+exit $?
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/iproute/ip/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/iproute/ip/CONTROL/control
new file mode 100644
index 0000000000..ed54f31131
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/iproute/ip/CONTROL/control
@@ -0,0 +1,9 @@
+Package: ip
+Architecture: mipsel
+Version: 2.0
+Section: net
+Priority: optional
+Maintainer: Gerry Rozema <gerryr@rozeware.bc.ca>
+Source: http://ftp.debian.org/debian/pool/main/i/iproute/iproute-20010824.orig.tar.gz 
+Depends:
+Description: iproute2 stuff
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/iproute/tc/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/iproute/tc/CONTROL/control
new file mode 100644
index 0000000000..064a52e9aa
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/iproute/tc/CONTROL/control
@@ -0,0 +1,9 @@
+Package: tc
+Architecture: mipsel
+Version: 2.0
+Section: net
+Priority: optional
+Maintainer: Gerry Rozema <gerryr@rozeware.bc.ca>
+Source: http://ftp.debian.org/debian/pool/main/i/iproute/iproute-20010824.orig.tar.gz 
+Depends: sched-modules
+Description: iproute2 stuff
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/control
new file mode 100644
index 0000000000..957732b161
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/control
@@ -0,0 +1,9 @@
+Package: kmod-ipt6
+Architecture: mipsel
+Version: 2.4.20-1
+Section: kernel
+Priority: optional
+Maintainer: Sebastien NOEL <me@twolife.org>
+Source: Embedded in the main OpenWrt buildroot
+Depends: kmod-ipv6, ip6tables
+Description: ip6tables kernel modules
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/rules
new file mode 100755
index 0000000000..82afed80ad
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipt6/CONTROL/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-ipt6
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/net/ipv6/netfilter/*.o \
+	
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/modules/2.4.20/ipt6
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/net/ipv6/netfilter/*.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/ipt6/
+	
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/control
new file mode 100644
index 0000000000..fdeb1c70eb
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/control
@@ -0,0 +1,9 @@
+Package: kmod-ipv6
+Architecture: mipsel
+Version: 2.4.20-1
+Section: kernel
+Priority: optional
+Maintainer: Sebastien NOEL <me@twolife.org>
+Source: Embedded in the main OpenWrt buildroot
+Depends:
+Description: Kernel modules for the IPv6 protocol
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/rules
new file mode 100755
index 0000000000..a1e8111f91
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ipv6/CONTROL/rules
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-ipv6
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/net/ipv6/ipv6.o \
+	
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/net/ipv6/ipv6.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/control
new file mode 100644
index 0000000000..87cf40940e
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/control
@@ -0,0 +1,8 @@
+Package: kmod-nfs
+Priority: optional
+Section: kernel
+Version: 2.4.20-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: NFS kernel modules
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/rules
new file mode 100755
index 0000000000..94129b70b1
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-nfs/CONTROL/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-nfs
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/fs/lockd/lockd.o \
+	 modules/2.4.20/kernel/fs/nfs/nfs.o \
+	 modules/2.4.20/kernel/net/sunrpc/sunrpc.o \
+	 
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/fs/lockd/*.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/fs/nfs/*.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/net/sunrpc/*.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/control
new file mode 100644
index 0000000000..108ae2b854
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/control
@@ -0,0 +1,8 @@
+Package: kmod-ppp-async
+Priority: optional
+Section: kernel
+Version: 2.4.20-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: PPP async serial channel driver kernel module
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/rules
new file mode 100755
index 0000000000..7e137ed48f
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-async/CONTROL/rules
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-ppp-async
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/drivers/net/ppp_async.o \
+	 
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/drivers/net/ppp_async.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/control
new file mode 100644
index 0000000000..fb668fd7c7
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/control
@@ -0,0 +1,8 @@
+Package: kmod-ppp-mppe-mppc
+Priority: optional
+Section: kernel
+Version: 2.4.20-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: Microsoft PPP compression/encryption (MPPC/MPPE) kernel module
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/rules
new file mode 100755
index 0000000000..df1683904e
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-ppp-mppe-mppc/CONTROL/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-ppp-mppe-mppc
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/drivers/net/ppp_mppe_mppc.o \
+	 
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/drivers/net/ppp_mppe_mppc.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/control
new file mode 100644
index 0000000000..f7669af842
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/control
@@ -0,0 +1,8 @@
+Package: kmod-sched
+Priority: optional
+Section: kernel
+Version: 2.4.20-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: Traffic Control (TC) kernel modules
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/rules
new file mode 100755
index 0000000000..bf3e6b4af4
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-sched/CONTROL/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-sched
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/net/sched/*.o \
+	 
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/modules/2.4.20/sched
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/net/sched/*.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/sched/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/control
new file mode 100644
index 0000000000..3c9ab98877
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/control
@@ -0,0 +1,8 @@
+Package: kmod-tun
+Priority: optional
+Section: kernel
+Version: 2.4.20-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: Universal TUN/TAP device driver kernel module
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/rules
new file mode 100755
index 0000000000..58e95f7415
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/kmod-tun/CONTROL/rules
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+PACKAGE := kmod-tun
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib/
+	bzcat $(TOPDIR)/openwrt-kmodules.tar.bz2 | tar -C $(MY_INSTALL_DIR)/lib/ -xvf - \
+	 modules/2.4.20/kernel/drivers/net/tun.o \
+	 
+	mv -f \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel/drivers/net/tun.o \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/
+	 
+	rm -rf \
+	 $(MY_INSTALL_DIR)/lib/modules/2.4.20/kernel
+
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/nfs-modules/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/libpcap/CONTROL/control
index 906b5ffc0f..3ea09b3205 100644
--- a/obsolete-buildroot/sources/openwrt/ipkg/nfs-modules/CONTROL/control
+++ b/obsolete-buildroot/sources/openwrt/ipkg/libpcap/CONTROL/control
@@ -1,8 +1,8 @@
-Package: nfs-modules
+Package: libpcap
 Priority: optional
-Section: kernel
+Section: libs
 Version: TBDL
 Architecture: TBDL
 Maintainer: Nico <nthill@free.fr>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
-Description: the NFS kernel modules
+Description: a low-level packet capture library
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/control
new file mode 100644
index 0000000000..0bd1da1095
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/control
@@ -0,0 +1,8 @@
+Package: libpthread
+Priority: optional
+Section: libs
+Version: 0.9.26-1
+Architecture: mipsel
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: POSIX threads library
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/rules b/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/rules
new file mode 100755
index 0000000000..9f742d4def
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/libpthread/CONTROL/rules
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
+ifeq ($(strip $(TOPDIR)),)
+TOPDIR := $(shell pwd)/../../../..
+endif
+
+
+# variables extracted from $(TOPDIR)/Makefile
+ARCH:= mipsel
+STAGING_DIR=$(TOPDIR)/build_$(ARCH)/staging_dir
+REAL_GNU_TARGET_NAME=$(ARCH)-linux-uclibc
+TARGET_CROSS=$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
+STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
+# could be better if replaced with:
+#include $(TOPDIR)/Config
+
+
+PACKAGE := libpthread
+
+MY_INSTALL_DIR := /tmp/$(PACKAGE)
+
+
+build:
+
+
+install:
+	rm -rf $(MY_INSTALL_DIR)
+	install -m0755 -d $(MY_INSTALL_DIR)/lib
+	install -m0755 $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libpthread-0.9.26.so $(MY_INSTALL_DIR)/lib
+	$(STRIP) $(MY_INSTALL_DIR)/lib/libpthread*.so*
+	ln -fs libpthread-0.9.26.so $(MY_INSTALL_DIR)/lib/libpthread.so.0
+
+clean:
+
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/ppp/root/etc/ppp/peers/.placeholder b/obsolete-buildroot/sources/openwrt/ipkg/ppp/root/etc/ppp/peers/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/ppp/root/etc/ppp/peers/.placeholder
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/CONTROL/conffiles b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/CONTROL/conffiles
new file mode 100644
index 0000000000..7b134c170a
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/CONTROL/conffiles
@@ -0,0 +1 @@
+/etc/ppp/pptp-client-options
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/ppp-mppe-module/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/CONTROL/control
index 418058bd71..a2f866288c 100644
--- a/obsolete-buildroot/sources/openwrt/ipkg/ppp-mppe-module/CONTROL/control
+++ b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/CONTROL/control
@@ -1,8 +1,9 @@
-Package: ppp-mppe-module
+Package: pptp-client
 Priority: optional
 Section: net
 Version: TBDL
 Architecture: TBDL
 Maintainer: Nico <nthill@free.fr>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
-Description: a Microsoft PPP compression/encryption (MPPC/MPPE) kernel module
+Description: a Point-to-Point Tunneling Protocol (PPTP) client
+Depends: ppp
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/peers/pptp-client-sample b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/peers/pptp-client-sample
new file mode 100644
index 0000000000..9872791136
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/peers/pptp-client-sample
@@ -0,0 +1,5 @@
+#pty "/usr/sbin/pptp HOST --nolaunchpppd"
+#name USERNAME
+#remotename PROVIDER
+#require-mppe-128
+#file /etc/ppp/pptp-client-options
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/pptp-client-options b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/pptp-client-options
new file mode 100644
index 0000000000..35cea631c8
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/pptp-client/root/etc/ppp/pptp-client-options
@@ -0,0 +1,7 @@
+lock
+defaultroute
+noauth
+nobsdcomp
+nodeflate
+noipdefault
+asyncmap 0
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/tun-module/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/tcpdump/CONTROL/control
index 39762a309a..ac349d44de 100644
--- a/obsolete-buildroot/sources/openwrt/ipkg/tun-module/CONTROL/control
+++ b/obsolete-buildroot/sources/openwrt/ipkg/tcpdump/CONTROL/control
@@ -1,8 +1,9 @@
-Package: tun-module
+Package: tcpdump
 Priority: optional
-Section: kernel
+Section: net
 Version: TBDL
 Architecture: TBDL
 Maintainer: Nico <nthill@free.fr>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
-Description: the Universal TUN/TAP device driver
+Description: a powerful network traffic monitoring tool
+Depends: libpcap
diff --git a/obsolete-buildroot/sources/openwrt/patches/libpcap/00_debian_libpcap0.8_0.8.3-4.diff b/obsolete-buildroot/sources/openwrt/patches/libpcap/00_debian_libpcap0.8_0.8.3-4.diff
new file mode 100644
index 0000000000..6b42218215
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/patches/libpcap/00_debian_libpcap0.8_0.8.3-4.diff
@@ -0,0 +1,838 @@
+--- libpcap0.8-0.8.3.orig/debian/compat
++++ libpcap0.8-0.8.3/debian/compat
+@@ -0,0 +1,2 @@
++4
++
+--- libpcap0.8-0.8.3.orig/debian/copyright
++++ libpcap0.8-0.8.3/debian/copyright
+@@ -0,0 +1,115 @@
++This package was debianized by Romain Francoise <rfrancoise@debian.org>
++on Fri, 16 Apr 2004 18:41:39 +0200, based on work by:
++ + Anand Kumria <wildfire@progsoc.org>
++ + Torsten Landschoff <torsten@debian.org>
++
++It was downloaded from http://tcpdump.org/release/libpcap-0.8.3.tar.gz
++
++Upstream Authors: tcpdump-workers@tcpdump.org
++
++Licensed under the 3-clause BSD license: 
++
++  Redistribution and use in source and binary forms, with or without
++  modification, are permitted provided that the following conditions
++  are met:
++
++    1. Redistributions of source code must retain the above copyright
++       notice, this list of conditions and the following disclaimer.
++    2. Redistributions in binary form must reproduce the above copyright
++       notice, this list of conditions and the following disclaimer in
++       the documentation and/or other materials provided with the
++       distribution.
++    3. The names of the authors may not be used to endorse or promote
++       products derived from this software without specific prior
++       written permission.
++
++  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++Current upstream maintainers:
++	Bill Fenner			<fenner@research.att.com>
++	Fulvio Risso			<risso@polito.it>
++	Guy Harris	 		<guy@alum.mit.edu>
++	Hannes Gredler			<hannes@juniper.net>
++	Jun-ichiro itojun Hagino	<itojun@iijlab.net>
++	Michael Richardson	 	<mcr@sandelman.ottawa.on.ca>
++
++Additional people who have contributed patches:
++
++	Alan Bawden			<Alan@LCS.MIT.EDU>
++	Alexey Kuznetsov		<kuznet@ms2.inr.ac.ru>
++	Albert Chin			<china@thewrittenword.com>
++	Andrew Brown			<atatat@atatdot.net>
++	Antti Kantee			<pooka@netbsd.org>
++	Arkadiusz Miskiewicz		<misiek@pld.org.pl>
++	Armando L. Caro Jr.		<acaro@mail.eecis.udel.edu>
++	Assar Westerlund	 	<assar@sics.se>
++	Brian Ginsbach			<ginsbach@cray.com>
++	Charles M. Hannum		<mycroft@netbsd.org>
++	Chris G. Demetriou		<cgd@netbsd.org>
++	Chris Pepper			<pepper@mail.reppep.com>
++	Darren Reed			<darrenr@reed.wattle.id.au>
++	David Kaelbling			<drk@sgi.com>
++	David Young			<dyoung@ojctech.com>
++	Don Ebright			<Don.Ebright@compuware.com> 
++	Eric Anderson			<anderse@hpl.hp.com>
++	Franz Schaefer			<schaefer@mond.at>
++	Gianluca Varenni		<varenni@netgroup-serv.polito.it>
++	Gisle Vanem			<giva@bgnett.no>
++	Graeme Hewson			<ghewson@cix.compulink.co.uk>
++	Greg Stark			<gsstark@mit.edu>
++	Greg Troxel			<gdt@ir.bbn.com>
++	Guillaume Pelat			<endymion_@users.sourceforge.net>
++	Hyung Sik Yoon			<hsyn@kr.ibm.com>
++	Igor Khristophorov		<igor@atdot.org>
++	Jan-Philip Velders		<jpv@veldersjes.net>
++	Jason R. Thorpe			<thorpej@netbsd.org>
++	Javier Achirica			<achirica@ttd.net>
++	Jean Tourrilhes			<jt@hpl.hp.com>
++	Jefferson Ogata			<jogata@nodc.noaa.gov>
++	Jesper Peterson			<jesper@endace.com>
++	John Bankier			<jbankier@rainfinity.com>
++	Jon Lindgren			<jonl@yubyub.net>
++	Juergen Schoenwaelder		<schoenw@ibr.cs.tu-bs.de>
++	Kazushi Sugyo			<sugyo@pb.jp.nec.com>
++	Klaus Klein			<kleink@netbsd.org>
++	Koryn Grant			<koryn@endace.com>
++	Krzysztof Halasa		<khc@pm.waw.pl>
++	Lorenzo Cavallaro		<sullivan@sikurezza.org>
++	Loris Degioanni			<loris@netgroup-serv.polito.it>
++	Love H�rnquist-�strand		<lha@stacken.kth.se>
++	Maciej W. Rozycki		<macro@ds2.pg.gda.pl>
++	Marcus Felipe Pereira		<marcus@task.com.br>
++	Martin Husemann			<martin@netbsd.org>
++	Mike Wiacek			<mike@iroot.net>
++	Monroe Williams			<monroe@pobox.com>
++	Octavian Cerna			<tavy@ylabs.com>
++	Olaf Kirch			<okir@caldera.de>
++	Onno van der Linden		<onno@simplex.nl>
++	Paul Mundt			<lethal@linux-sh.org>
++	Pavel Kankovsky			<kan@dcit.cz>
++	Peter Fales			<peter@fales-lorenz.net>
++	Peter Jeremy			<peter.jeremy@alcatel.com.au>
++	Phil Wood			<cpw@lanl.gov>
++	Rafal Maszkowski		<rzm@icm.edu.pl>
++	Rick Jones			<raj@cup.hp.com>
++	Scott Barron			<sb125499@ohiou.edu>
++	Scott Gifford			<sgifford@tir.com>
++	Sebastian Krahmer		<krahmer@cs.uni-potsdam.de>
++	Shaun Clowes			<delius@progsoc.uts.edu.au>
++	Solomon Peachy			<pizza@shaftnet.org>
++	Stefan Hudson			<hudson@mbay.net>
++	Takashi Yamamoto		<yamt@mwd.biglobe.ne.jp>
++	Tony Li				<tli@procket.com>
++	Torsten Landschoff	 	<torsten@debian.org>
++	Uns Lider			<unslider@miranda.org>
++	Uwe Girlich			<Uwe.Girlich@philosys.de>
++	Xianjie Zhang			<xzhang@cup.hp.com>
++	Yen Yen Lim
++	Yoann Vandoorselaere		<yoann@prelude-ids.org>
++
++The original LBL crew:
++	Steve McCanne
++	Craig Leres
++	Van Jacobson
+--- libpcap0.8-0.8.3.orig/debian/control
++++ libpcap0.8-0.8.3/debian/control
+@@ -0,0 +1,44 @@
++Source: libpcap0.8
++Section: devel
++Priority: optional
++Maintainer: Romain Francoise <rfrancoise@debian.org>
++Uploaders: Torsten Landschoff <torsten@debian.org>
++Build-Depends: debhelper (>= 4), flex, bison, dpatch, perl
++Standards-Version: 3.6.1.0
++
++Package: libpcap0.8-dev
++Section: libdevel
++Architecture: any
++Depends: libpcap0.8 (= ${Source-Version}), libc6-dev
++Conflicts: libpcap-dev, libpcap0.7-dev
++Description: Development library and header files for libpcap 0.8
++ Headers, static libraries, and documentation for the libpcap library.
++ .
++ libpcap (Packet CAPture) provides a portable framework for low-level
++ network monitoring.  Applications include network statistics
++ collection, security monitoring, network debugging, etc.
++ .
++ Since almost every system vendor provides a different interface for 
++ packet capture, and since there are several tools that require this 
++ functionality, we've created this system-independent API to ease in 
++ porting and to alleviate the need for several system-dependent packet 
++ capture modules in each application.
++ .
++ Further information is available at <URL: http://www.tcpdump.org/>
++
++Package: libpcap0.8
++Section: libs
++Architecture: any
++Depends: ${shlibs:Depends}
++Description: System interface for user-level packet capture
++ libpcap (Packet CAPture) provides a portable framework for low-level 
++ network monitoring.  Applications include network statistics collection, 
++ security monitoring, network debugging, etc.  
++ .
++ Since almost every system vendor provides a different interface for 
++ packet capture, and since there are several tools that require this 
++ functionality, we've created this system-independent API to ease in 
++ porting and to alleviate the need for several system-dependent packet 
++ capture modules in each application.
++ .
++ Further information is available at <URL: http://www.tcpdump.org/>
+--- libpcap0.8-0.8.3.orig/debian/changelog
++++ libpcap0.8-0.8.3/debian/changelog
+@@ -0,0 +1,236 @@
++libpcap0.8 (0.8.3-4) unstable; urgency=low
++
++  * debian/patches/30_man_fixes.dpatch: Explicitly mention `pcap_handler'
++    as routine type for pcap_loop() and pcap_dispatch() callbacks,
++    suggested by Florian Weimer <fw@deneb.enyo.de> (closes: #255267).
++
++ -- Romain Francoise <rfrancoise@debian.org>  Wed, 21 Jul 2004 19:46:07 +0200
++
++libpcap0.8 (0.8.3-3) unstable; urgency=low
++
++  * debian/control: libpcap0.8-dev conflicts with libpcap0.7-dev.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Wed,  9 Jun 2004 11:44:50 +0200
++
++libpcap0.8 (0.8.3-2) unstable; urgency=low
++
++  * debian/control:
++    + Put back URL markers in description.
++    + Switch Maintainer and Uploaders fields to match reality.
++  * debian/patches/30_man_fixes.dpatch: Patch to fix some inconsistencies 
++    in the upstream man page (tcpdump is in section 8, not 1).
++  * debian/patches/00list: Add 30_man_fixes.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Fri, 14 May 2004 23:43:02 +0200
++
++libpcap0.8 (0.8.3-1) unstable; urgency=low
++
++  * New upstream release (closes: #235155).
++    + bpf_filter.c now has config.h (closes: #171210).
++    + Does not ship CVS directories anymore (closes: #119750).
++    + Has improved "truncated file" messages (closes: #207535).
++  * New source package to ease the 0.7 -> 0.8 transition, each source
++    package builds corresponding libpcap0.x{,-dev} binary packages.  The
++    libpcap-dev package is provided by libpcap0.7 for now.
++  * debian/copyright: Rewrite.  Licensing information is now complete in
++    the upstream tarball.
++  * debian/control: 
++    + Update source and binary package names.
++    + Build-Depend on dpatch, perl.
++    + Bump Standards-Version to 3.6.1.0.
++  * debian/rules:
++    + Clean up CFLAGS handling.
++    + Support DEB_BUILD_OPTIONS.
++    + Use dpatch for patch management.
++    + Compute major/minor versions from the changelog instead of
++      hardcoding them.
++  * debian/patches: New directory.
++  * debian/patches/10_shared_lib.dpatch: Patch split off the Debian diff 
++    to build a shared library (upstream does not support it).
++  * debian/patches/20_mac_syntax.dpatch: Patch split off the Debian diff 
++    to support more MAC address syntaxes (by Torsten Landschoff).
++  * debian/patches/00list: New file (patch list).
++
++ -- Romain Francoise <rfrancoise@debian.org>  Fri, 30 Apr 2004 16:14:10 +0200
++
++libpcap (0.7.2-5) unstable; urgency=low
++
++  * debian/rules: Update version variables, this is version 0.7.2.
++  * Makefile.in: Fix version.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Tue, 11 Nov 2003 12:14:28 +0100
++
++libpcap (0.7.2-4) unstable; urgency=low
++
++  * debian/libpcap-dev.preinst: New file.  Remove old symlink from
++    /usr/share/doc/libpcap-dev to libpcap0 since we now have a real
++    libpcap-dev directory.  Closes: #175742.
++  * debian/rules: Add -A flag to dh_installdocs so that it acts on all
++    binary packages.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Mon, 20 Oct 2003 18:49:22 +0200
++
++libpcap (0.7.2-3) unstable; urgency=low
++
++  * debian/control: libpcap-dev is in section libdevel, not in section
++    devel.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Sun, 19 Oct 2003 19:22:12 +0200
++
++libpcap (0.7.2-2) unstable; urgency=low
++
++  * debian/control: 
++    + Adding myself as co-maintainer, with Torsten's blessing.
++    + Repeat extended description in libpcap-dev description
++      (closes: #209728)
++    + Remove Emacs-style <URL: ...> markers from the descriptions.
++      (closes: #196727).
++    + Remove full stops from synopsis as per Policy.
++    + Add versioned build-dependency on debhelper (>= 4).
++  * debian/copyright: Remove dh-make boilerplates.
++  * debian/compat: New file.
++  * debian/rules: Remove obsolete DH_COMPAT variable.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Sun, 19 Oct 2003 18:17:41 +0200
++
++libpcap (0.7.2-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Torsten Landschoff <torsten@debian.org>  Sat,  7 Jun 2003 22:57:55 +0200
++
++libpcap (0.7.1-1) unstable; urgency=low
++
++  * New upstream release (closes: #145538).
++  * debian/rules: Build the library with _FILE_OFFSET_BITS set to 64
++    to allow for files bigger than 2GB (closes: #129213).
++  * Rename the library package to libpcap0.7 and change the SONAME so that we
++    can account for interface changes (closes: #132359).
++  * Run ldconfig as appropriate (lintian).
++  * Remove watch.ex template and the silly symlink from libpcap-dev's 
++    documentation to libpcap0 (lintian).
++
++ -- Torsten Landschoff <torsten@debian.org>  Sat,  3 Aug 2002 23:33:56 +0200
++
++libpcap (0.6.2-2) unstable; urgency=low
++
++  * debian/control: Change section of libpcap0 from net to libs
++    (Debian installer message).
++  * aclocal.m4: Treat the ia64 as a cpu which can't handle unaligned 
++    memory access (closes: #112152). Thanks for the report go to 
++    John R. Daily.
++
++ -- Torsten Landschoff <torsten@debian.org>  Fri, 14 Sep 2001 10:15:52 +0200
++
++libpcap (0.6.2-1) unstable; urgency=medium
++
++  * New upstream release.
++  * debian/control: Removed Build-Depends already satisfied by the
++    build-essential package.
++  * gencode.c (gen_scode): Add the missing default branch of the protocol
++    family switch (closes: 88688).
++  * debian/libpcap.post{rm,inst}: Run ldconfig (lintian).
++  * debian/copyright: Fix the "similiar" typo (lintian).
++
++ -- Torsten Landschoff <torsten@debian.org>  Tue,  6 Mar 2001 04:27:27 +0100
++
++libpcap (0.6.1-2) unstable; urgency=low
++
++  * debian/rules: Changed the shlibs info so that only pcap 0.6
++    is okay for packages linked against this version.
++
++ -- Torsten Landschoff <torsten@debian.org>  Thu, 18 Jan 2001 01:13:20 +0100
++
++libpcap (0.6.1-1) unstable; urgency=low
++
++  * Taking back the package. Kudos to Anand for helping out.
++  * debian/rules: Pass --enable-ipv6 to configure (closes: #80223).
++
++ -- Torsten Landschoff <torsten@debian.org>  Tue, 16 Jan 2001 15:40:37 +0100
++
++libpcap (0.5.2-2) unstable; urgency=low
++
++  * Update config.guess and config.sub (Closes #26031)
++  * Source builds would not always work. Fix that.
++  * Kernel interface problem is really a module not loaded problem. 
++    Note this in README.Debian. (Closes #21356)
++
++ -- Anand Kumria <wildfire@progsoc.org>  Tue, 28 Nov 2000 02:03:25 +1100
++
++libpcap (0.5.2-1) unstable; urgency=low
++
++  * New upstream release
++  * New maintainer
++  * Migrate to Debhelper and insert Build-Depends
++
++ -- Anand Kumria <wildfire@progsoc.org>  Sun, 12 Nov 2000 03:19:44 +1100
++
++libpcap (0.4a6-3) unstable; urgency=low
++
++  * New maintainer.
++  * scanner.l: Allow a 12 digit hex number as ether address as well as 
++    BB.BB.BB.BB.BB.BB (closes: #48735)
++  * nametoaddr.c (pcap_ether_aton): Adjust for change in scanner.l
++
++ -- Torsten Landschoff <torsten@debian.org>  Mon, 22 Nov 1999 02:39:45 +0100
++
++libpcap (0.4a6-2.1) unstable; urgency=low
++
++  * Non maintainer upload.
++    config.{guess,sub} changed to recognize a Arm architecture.
++
++ -- Turbo Fredriksson <turbo@debian.org>  Thu, 20 Aug 1998 23:12:36 -0400
++
++libpcap (0.4a6-2) frozen unstable; urgency=low
++
++  * renamed /usr/doc/libpcap to /usr/doc/libpcap0 (should fix several
++    lintian warnings)
++  * updated standards-version
++  * rebuild with latest debmake
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Mon, 30 Mar 1998 00:46:44 +0200
++
++
++libpcap (0.4a6-1) unstable; urgency=low
++
++  * upgraded to latest upstream version, fixes: Bug#17164
++  * added patch from Michael Alan Dorman <mdorman@mdorman.law.miami.edu>
++    for building libpcap on alpha systems, fixes: Bug#15556
++  * fixed aclocal.m4 script
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Sat, 31 Jan 1998 23:19:42 +0100
++
++
++libpcap (0.4a2-2) unstable; urgency=low
++
++  * fixed detection of IFF_LOOPBACK for linux systems
++  * link shared library with -l
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Wed, 19 Nov 1997 23:44:34 +0100
++
++
++libpcap (0.4a2-1) unstable; urgency=low
++
++  * new maintainer
++  * latest upstream release
++  * libc6 version
++  * compiled with _REENTRANT
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Wed, 17 Sep 1997 20:40:01 +0200
++
++
++libpcap (0.3.1a3-1) unstable; urgency=low
++
++  * Latest upstream release.  Fixes bug #6670.
++
++ -- Karl Sackett <krs@debian.org>  Wed, 2 Apr 1997 10:19:28 -0600
++
++
++libpcap (0.3-1) unstable; urgency=low
++
++  * First Debian release.
++  * Makefile.in: supports libpcap.so target.
++
++ -- Karl Sackett <krs@debian.org>  Wed, 8 Jan 1997 09:38:31 -0600
++
++
+--- libpcap0.8-0.8.3.orig/debian/rules
++++ libpcap0.8-0.8.3/debian/rules
+@@ -0,0 +1,81 @@
++#!/usr/bin/make -f
++
++include /usr/share/dpatch/dpatch.make
++
++version := $(shell head -1 debian/changelog | \
++	perl -nle 'm/\S+\s+\((\S+)-\S+\)/ and print $$1')
++major := $(shell head -1 debian/changelog | perl -nle \
++	'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
++
++export CFLAGS=-D_FILE_OFFSET_BITS=64
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++        CFLAGS += -O0
++endif
++
++build: patch build-stamp
++build-stamp:
++	dh_testdir
++
++	./configure --prefix=/usr \
++		--mandir=\$${prefix}/share/man \
++		--enable-ipv6 --infodir=\$${prefix}/share/info
++	$(MAKE)
++
++	touch build-stamp
++
++clean: clean-patched unpatch
++clean-patched:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++
++	-$(MAKE) distclean
++
++	rm -f net
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	$(MAKE) install prefix=`pwd`/debian/libpcap0.8-dev/usr
++
++binary-indep: build install
++# We have nothing to do by default.
++
++binary-arch: build install
++#	dh_testversion
++	dh_testdir
++	dh_testroot
++        #
++        # build libpcap${major} package by moving files from libpcap0.8-dev
++        #
++	dh_movefiles -plibpcap$(major) --sourcedir=debian/libpcap0.8-dev \
++		usr/lib/libpcap.so.$(major)        \
++		usr/lib/libpcap.so.$(version)
++
++#	dh_installdebconf	
++	dh_installdocs -A debian/README.Debian
++	dh_installexamples
++	dh_installmenu
++	dh_installmanpages -plibpcap0.8-dev
++	dh_installinfo
++#	dh_undocumented
++	dh_installchangelogs CHANGES
++	dh_link -plibpcap0.8-dev
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_makeshlibs
++	dh_installdeb
++	dh_shlibdeps 
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install
+--- libpcap0.8-0.8.3.orig/debian/patches/10_shared_lib.dpatch
++++ libpcap0.8-0.8.3/debian/patches/10_shared_lib.dpatch
+@@ -0,0 +1,144 @@
++#! /bin/sh -e
++## 10_shared_lib.dpatch by Romain Francoise <rfrancoise@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Debian-specific modifications to the upstream Makefile.in to
++## DP: build a shared library.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/Makefile.in libpcap0.8-0.8.3/Makefile.in
++--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/Makefile.in	2004-04-30 16:40:33.000000000 +0200
+++++ libpcap0.8-0.8.3/Makefile.in	2004-04-30 16:41:43.000000000 +0200
++@@ -37,6 +37,15 @@
++ srcdir = @srcdir@
++ VPATH = @srcdir@
++ 
+++# some defines for shared library compilation
+++MAJ=$(shell head -1 debian/changelog | perl -nle 'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
+++MIN=$(shell head -1 debian/changelog | perl -nle 'm/\S+\s+\(\d\.\d\.(\d+)-\S+\)/ and print $$1')
+++VERSION=$(MAJ).$(MIN)
+++LIBNAME=pcap
+++LIBRARY=lib$(LIBNAME).a
+++SOLIBRARY=lib$(LIBNAME).so
+++SHAREDLIB=$(SOLIBRARY).$(VERSION)
+++
++ #
++ # You shouldn't need to edit anything below.
++ #
++@@ -49,6 +58,7 @@
++ 
++ # Standard CFLAGS
++ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
++ 
++ INSTALL = @INSTALL@
++ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++@@ -68,7 +78,11 @@
++ # problem if you don't own the file but can write to the directory.
++ .c.o:
++ 	@rm -f $@
++-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
+++	$(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
+++
+++%_pic.o: %.c
+++	@rm -f $@
+++	$(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
++ 
++ PSRC =	pcap-@V_PCAP@.c
++ FSRC =  fad-@V_FINDALLDEVS@.c
++@@ -83,6 +97,7 @@
++ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
++ # hack the extra indirection
++ OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
+++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
++ HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
++ 	ethertype.h gencode.h gnuc.h
++ GENHDR = \
++@@ -94,15 +109,22 @@
++ TAGFILES = \
++ 	$(SRC) $(HDR) $(TAGHDR)
++ 
++-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
+++CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
++ 
++-all: libpcap.a
+++all: libpcap.a $(SHAREDLIB)
++ 
++ libpcap.a: $(OBJ)
++ 	@rm -f $@
++ 	ar rc $@ $(OBJ) $(LIBS)
++ 	$(RANLIB) $@
++ 
+++$(SHAREDLIB): $(OBJ_PIC)
+++	-@rm -f $@
+++	-@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
+++	$(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
+++	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
+++	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
+++
++ scanner.c: $(srcdir)/scanner.l
++ 	@rm -f $@
++ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
++@@ -110,6 +132,9 @@
++ scanner.o: scanner.c tokdefs.h
++ 	$(CC) $(CFLAGS) -c scanner.c
++ 
+++scanner_pic.o: scanner.c tokdefs.h
+++	$(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
+++
++ pcap.o: version.h
++ 
++ tokdefs.h: grammar.c
++@@ -123,9 +148,17 @@
++ 	@rm -f $@
++ 	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
++ 
+++grammar_pic.o: grammar.c
+++	@rm -f $@
+++	$(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c 
+++
++ version.o: version.c
++ 	$(CC) $(CFLAGS) -c version.c
++ 
+++version_pic.o: version.c
+++	$(CC) -fPIC $(CFLAGS) -c version.c -o $@
+++
+++
++ snprintf.o: $(srcdir)/missing/snprintf.c
++ 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
++ 
++@@ -151,10 +184,16 @@
++ bpf_filter.o: bpf_filter.c
++ 	$(CC) $(CFLAGS) -c bpf_filter.c
++ 
+++bpf_filter_pic.o: bpf_filter.c
+++	$(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
+++
++ install:
++ 	[ -d $(DESTDIR)$(libdir) ] || \
++ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
++ 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+++	$(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
+++	ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
+++	ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
++ 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
++ 	[ -d $(DESTDIR)$(includedir) ] || \
++ 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+--- libpcap0.8-0.8.3.orig/debian/patches/20_mac_syntax.dpatch
++++ libpcap0.8-0.8.3/debian/patches/20_mac_syntax.dpatch
+@@ -0,0 +1,68 @@
++#! /bin/sh -e
++## 20_mac_syntax.dpatch by Torsten Landschoff <torsten@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Adds more possible syntaxes to input MAC addresses:
++## DP: - the nn.nn.nn.nn.nn.nn syntax
++## DP: - the hexadecimal syntax
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/nametoaddr.c libpcap0.8-0.8.3/nametoaddr.c
++--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/nametoaddr.c	2004-04-30 15:45:14.000000000 +0200
+++++ libpcap0.8-0.8.3/nametoaddr.c	2004-04-30 15:57:54.000000000 +0200
++@@ -333,7 +333,7 @@
++ 	e = ep = (u_char *)malloc(6);
++ 
++ 	while (*s) {
++-		if (*s == ':')
+++		if (*s == ':' || *s == '.')
++ 			s += 1;
++ 		d = xdtoi(*s++);
++ 		if (isxdigit((unsigned char)*s)) {
++diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/scanner.l libpcap0.8-0.8.3/scanner.l
++--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/scanner.l	2004-04-30 15:45:14.000000000 +0200
+++++ libpcap0.8-0.8.3/scanner.l	2004-04-30 15:57:54.000000000 +0200
++@@ -80,6 +80,7 @@
++ N		([0-9]+|(0X|0x)[0-9A-Fa-f]+)
++ B		([0-9A-Fa-f][0-9A-Fa-f]?)
++ W		([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
+++X		[0-9A-Fa-f]
++ 
++ %a 16000
++ %o 19000
++@@ -296,7 +297,7 @@
++ {N}			{ yylval.i = stoi((char *)yytext); return NUM; }
++ ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})	{
++ 			yylval.s = sdup((char *)yytext); return HID; }
++-{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
+++({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext);
++ 			  return EID; }
++ {V6}			{
++ #ifdef INET6
++@@ -314,6 +315,8 @@
++ #endif /*INET6*/
++ 			}
++ {B}:+({B}:+)+		{ bpf_error("bogus ethernet address %s", yytext); }
+++{X}{12}			{ yylval.e = pcap_ether_aton((char *)yytext); return EID;}
+++
++ icmptype		{ yylval.i = 0; return NUM; }
++ icmpcode		{ yylval.i = 1; return NUM; }
++ icmp-echoreply		{ yylval.i = 0; return NUM; }
+--- libpcap0.8-0.8.3.orig/debian/patches/00list
++++ libpcap0.8-0.8.3/debian/patches/00list
+@@ -0,0 +1,3 @@
++10_shared_lib
++20_mac_syntax
++30_man_fixes
+--- libpcap0.8-0.8.3.orig/debian/patches/30_man_fixes.dpatch
++++ libpcap0.8-0.8.3/debian/patches/30_man_fixes.dpatch
+@@ -0,0 +1,57 @@
++#! /bin/sh -e
++## 30_man_fixes.dpatch by Romain Francoise <rfrancoise@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Misc. fixes to the upstream man page.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/libpcap0.8/libpcap0.8-0.8.3/pcap.3 libpcap0.8-0.8.3/pcap.3
++--- /home/romain/Work/Debian/libpcap0.8/libpcap0.8-0.8.3/pcap.3	2004-07-21 19:41:53.000000000 +0200
+++++ libpcap0.8-0.8.3/pcap.3	2004-07-21 19:42:28.000000000 +0200
++@@ -201,7 +201,7 @@
++ .I fname
++ specifies the name of the file to open. The file has
++ the same format as those used by
++-.B tcpdump(1)
+++.B tcpdump(8)
++ and
++ .BR tcpslice(1) .
++ The name "-" in a synonym for
++@@ -404,7 +404,9 @@
++ live capture, or all the packets in the file when reading a
++ ``savefile''.
++ .I callback
++-specifies a routine to be called with three arguments:
+++specifies a 
+++.I pcap_handler
+++routine to be called with three arguments:
++ a
++ .I u_char
++ pointer which is passed in from
++@@ -1168,7 +1170,7 @@
++ closes the ``savefile.''
++ .PP
++ .SH SEE ALSO
++-tcpdump(1), tcpslice(1)
+++tcpdump(8), tcpslice(1)
++ .SH AUTHORS
++ The original authors are:
++ .LP
+--- libpcap0.8-0.8.3.orig/debian/README.Debian
++++ libpcap0.8-0.8.3/debian/README.Debian
+@@ -0,0 +1,13 @@
++libpcap for Debian
++------------------
++
++ If you receive messages telling you the packet type is not supported
++ or is deprecated check that CONFIG_PACKET is set to either `Y' or `M'.
++
++ You should also check that /etc/modules.conf has the line
++
++	alias net-pf-17 af_packet
++
++ Feel free to report bugs.
++
++ -- Anand Kumria <wildfire@progsoc.org>, Tue, 28 Nov 2000 02:04:28 EST
+--- libpcap0.8-0.8.3.orig/debian/libpcap0.8-dev.preinst
++++ libpcap0.8-0.8.3/debian/libpcap0.8-dev.preinst
+@@ -0,0 +1,9 @@
++#!/bin/sh
++set -e
++
++# Remove old symlink, if it exists
++if [ -L /usr/share/doc/libpcap-dev ]; then 
++	rm -f /usr/share/doc/libpcap-dev ; 
++fi
++
++#DEBHELPER#
+--- libpcap0.8-0.8.3.orig/debian/libpcap0.8.postinst
++++ libpcap0.8-0.8.3/debian/libpcap0.8.postinst
+@@ -0,0 +1,8 @@
++#! /bin/sh
++
++if [ "$1" = "configure" ]; then
++	ldconfig
++fi
++
++#DEBHELPER#
++
+--- libpcap0.8-0.8.3.orig/debian/libpcap0.8-dev.dirs
++++ libpcap0.8-0.8.3/debian/libpcap0.8-dev.dirs
+@@ -0,0 +1,3 @@
++usr/lib
++usr/include
++usr/share/man/man3
+--- libpcap0.8-0.8.3.orig/debian/libpcap0.8.docs
++++ libpcap0.8-0.8.3/debian/libpcap0.8.docs
+@@ -0,0 +1,2 @@
++README
++CREDITS
+--- libpcap0.8-0.8.3.orig/debian/libpcap0.8.postrm
++++ libpcap0.8-0.8.3/debian/libpcap0.8.postrm
+@@ -0,0 +1,8 @@
++#! /bin/sh
++
++if [ "$1" = "remove" ]; then
++	ldconfig
++fi
++
++#DEBHELPER#
++
diff --git a/obsolete-buildroot/sources/openwrt/patches/tcpdump/00_debian_tcpdump_3.8.3-3.diff b/obsolete-buildroot/sources/openwrt/patches/tcpdump/00_debian_tcpdump_3.8.3-3.diff
new file mode 100644
index 0000000000..d15724f907
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/patches/tcpdump/00_debian_tcpdump_3.8.3-3.diff
@@ -0,0 +1,746 @@
+--- tcpdump-3.8.3.orig/debian/copyright
++++ tcpdump-3.8.3/debian/copyright
+@@ -0,0 +1,116 @@
++This package was debianized by Anand Kumria <wildfire@progsoc.org> on
++Wed, 22 Nov 2000 13:19:33 +1100.
++It is now maintained by:
++ + Torsten Landschoff <torsten@debian.org>
++ + Romain Francoise <rfrancoise@debian.org>
++
++It was downloaded from http://tcpdump.org/release/tcpdump-3.8.3.tar.gz
++
++Upstream Authors: tcpdump-workers@tcpdump.org
++
++Licensed under the 3-clause BSD license: 
++
++  Redistribution and use in source and binary forms, with or without
++  modification, are permitted provided that the following conditions
++  are met:
++
++    1. Redistributions of source code must retain the above copyright
++       notice, this list of conditions and the following disclaimer.
++    2. Redistributions in binary form must reproduce the above copyright
++       notice, this list of conditions and the following disclaimer in
++       the documentation and/or other materials provided with the
++       distribution.
++    3. The names of the authors may not be used to endorse or promote
++       products derived from this software without specific prior
++       written permission.
++
++  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++Current upstream maintainers:
++	Bill Fenner			<fenner@research.att.com>
++	Fulvio Risso			<risso@polito.it>
++	Guy Harris	 		<guy@alum.mit.edu>
++	Hannes Gredler			<hannes@juniper.net>
++	Jun-ichiro itojun Hagino	<itojun@iijlab.net>
++	Michael Richardson	 	<mcr@sandelman.ottawa.on.ca>
++
++Additional people who have contributed patches:
++
++	Alan Bawden			<Alan@LCS.MIT.EDU>
++	Alexey Kuznetsov		<kuznet@ms2.inr.ac.ru>
++	Albert Chin			<china@thewrittenword.com>
++	Andrew Brown			<atatat@atatdot.net>
++	Antti Kantee			<pooka@netbsd.org>
++	Arkadiusz Miskiewicz		<misiek@pld.org.pl>
++	Armando L. Caro Jr.		<acaro@mail.eecis.udel.edu>
++	Assar Westerlund	 	<assar@sics.se>
++	Brian Ginsbach			<ginsbach@cray.com>
++	Charles M. Hannum		<mycroft@netbsd.org>
++	Chris G. Demetriou		<cgd@netbsd.org>
++	Chris Pepper			<pepper@mail.reppep.com>
++	Darren Reed			<darrenr@reed.wattle.id.au>
++	David Kaelbling			<drk@sgi.com>
++	David Young			<dyoung@ojctech.com>
++	Don Ebright			<Don.Ebright@compuware.com> 
++	Eric Anderson			<anderse@hpl.hp.com>
++	Franz Schaefer			<schaefer@mond.at>
++	Gianluca Varenni		<varenni@netgroup-serv.polito.it>
++	Gisle Vanem			<giva@bgnett.no>
++	Graeme Hewson			<ghewson@cix.compulink.co.uk>
++	Greg Stark			<gsstark@mit.edu>
++	Greg Troxel			<gdt@ir.bbn.com>
++	Guillaume Pelat			<endymion_@users.sourceforge.net>
++	Hyung Sik Yoon			<hsyn@kr.ibm.com>
++	Igor Khristophorov		<igor@atdot.org>
++	Jan-Philip Velders		<jpv@veldersjes.net>
++	Jason R. Thorpe			<thorpej@netbsd.org>
++	Javier Achirica			<achirica@ttd.net>
++	Jean Tourrilhes			<jt@hpl.hp.com>
++	Jefferson Ogata			<jogata@nodc.noaa.gov>
++	Jesper Peterson			<jesper@endace.com>
++	John Bankier			<jbankier@rainfinity.com>
++	Jon Lindgren			<jonl@yubyub.net>
++	Juergen Schoenwaelder		<schoenw@ibr.cs.tu-bs.de>
++	Kazushi Sugyo			<sugyo@pb.jp.nec.com>
++	Klaus Klein			<kleink@netbsd.org>
++	Koryn Grant			<koryn@endace.com>
++	Krzysztof Halasa		<khc@pm.waw.pl>
++	Lorenzo Cavallaro		<sullivan@sikurezza.org>
++	Loris Degioanni			<loris@netgroup-serv.polito.it>
++	Love H�rnquist-�strand		<lha@stacken.kth.se>
++	Maciej W. Rozycki		<macro@ds2.pg.gda.pl>
++	Marcus Felipe Pereira		<marcus@task.com.br>
++	Martin Husemann			<martin@netbsd.org>
++	Mike Wiacek			<mike@iroot.net>
++	Monroe Williams			<monroe@pobox.com>
++	Octavian Cerna			<tavy@ylabs.com>
++	Olaf Kirch			<okir@caldera.de>
++	Onno van der Linden		<onno@simplex.nl>
++	Paul Mundt			<lethal@linux-sh.org>
++	Pavel Kankovsky			<kan@dcit.cz>
++	Peter Fales			<peter@fales-lorenz.net>
++	Peter Jeremy			<peter.jeremy@alcatel.com.au>
++	Phil Wood			<cpw@lanl.gov>
++	Rafal Maszkowski		<rzm@icm.edu.pl>
++	Rick Jones			<raj@cup.hp.com>
++	Scott Barron			<sb125499@ohiou.edu>
++	Scott Gifford			<sgifford@tir.com>
++	Sebastian Krahmer		<krahmer@cs.uni-potsdam.de>
++	Shaun Clowes			<delius@progsoc.uts.edu.au>
++	Solomon Peachy			<pizza@shaftnet.org>
++	Stefan Hudson			<hudson@mbay.net>
++	Takashi Yamamoto		<yamt@mwd.biglobe.ne.jp>
++	Tony Li				<tli@procket.com>
++	Torsten Landschoff	 	<torsten@debian.org>
++	Uns Lider			<unslider@miranda.org>
++	Uwe Girlich			<Uwe.Girlich@philosys.de>
++	Xianjie Zhang			<xzhang@cup.hp.com>
++	Yen Yen Lim
++	Yoann Vandoorselaere		<yoann@prelude-ids.org>
++
++The original LBL crew:
++	Steve McCanne
++	Craig Leres
++	Van Jacobson
+--- tcpdump-3.8.3.orig/debian/tcpdump.docs
++++ tcpdump-3.8.3/debian/tcpdump.docs
+@@ -0,0 +1 @@
++README
+--- tcpdump-3.8.3.orig/debian/changelog
++++ tcpdump-3.8.3/debian/changelog
+@@ -0,0 +1,272 @@
++tcpdump (3.8.3-3) unstable; urgency=low
++
++  * debian/patches/40_ipv6cp.dpatch: New patch, do not try to print IPV6CP
++    ppp packets, the dissector doesn't support it (closes: #255179).
++  * debian/patches/00list: Add 40_ipv6cp.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Sat, 19 Jun 2004 15:01:27 +0200
++
++tcpdump (3.8.3-2) unstable; urgency=low
++
++  * debian/rules: Enable crypto support (closes: #82581, #93428).
++  * debian/control:
++    + Build-Depend on libssl-dev.
++    + Put back URL markers in description.
++    + Switch Maintainer and Uploaders fields to match reality.
++  * debian/patches/30_openssl_des.dpatch: Patch to make upstream's
++    configure script check for DES_cbc_encrypt instead of des_cbc_encrypt,
++    (the function got renamed in OpenSSL 0.9.7), which saves us the hassle
++    of re-running autoconf.  Temporary hack since upstream has fixed this
++    in CVS already.
++  * debian/patches/00list: Add 30_openssl_des.
++
++ -- Romain Francoise <rfrancoise@debian.org>  Fri, 14 May 2004 22:14:08 +0200
++
++tcpdump (3.8.3-1) unstable; urgency=low
++
++  * New upstream release.
++  * debian/rules:
++    + Add -D_FILE_OFFSET_BITS=64 to default CFLAGS to match libpcap 
++      (closes: #154762).
++    + Use dpatch for patch management.
++    + Clean up CFLAGS handling.
++    + Support DEB_BUILD_OPTIONS.
++  * debian/control: 
++    + Build-Depend on libpcap0.8-dev, dpatch.
++    + Add versioned Build-Depends on debhelper.
++    + Remove Emacs-style URL markers from description.
++  * debian/compat: New file.
++  * debian/copyright: Update.
++  * debian/tcpdump.docs: Do not install upstream INSTALL file.
++  * debian/patches: New directory.
++  * debian/patches/10_man_install.dpatch: Patch split off the Debian diff
++    to change man install paths in upstream Makefile.in.
++  * debian/patches/20_man_fixes.dpatch: Patch split off the Debian diff to
++    fix some inconsistencies in the upstream man page.
++  * debian/patches/00list: New file (patch list).
++
++ -- Romain Francoise <rfrancoise@debian.org>  Tue, 11 May 2004 14:02:09 +0200
++
++tcpdump (3.7.2-4) unstable; urgency=high
++
++  * Urgency high due to security fixes.
++  * Backport changes from upstream CVS to fix ISAKMP payload handling
++    denial-of-service vulnerabilities (CAN-2004-0183, CAN-2004-0184).
++    Detailed changes (with corresponding upstream revisions):
++    + Add length checks in isakmp_id_print() (print-isakmp.c, rev. 1.47)
++    + Add data checks all over the place, change rawprint() prototype and
++      add corresponding return value checks (print-isakmp.c, rev. 1.46)
++    + Add missing ntohs() and change length initialization in
++      isakmp_id_print(), not porting prototype changes (print-isakmp.c,
++      rev. 1.45)
++  
++ -- Romain Francoise <rfrancoise@debian.org>  Tue,  6 Apr 2004 19:39:24 +0200
++
++tcpdump (3.7.2-3) unstable; urgency=low
++
++  * Backport changes from upstream CVS to fix several vulnerabilities in
++    ISAKMP, L2TP and Radius parsing (closes: #227844, #227845, #227846).
++
++ -- Romain Francoise <rfrancoise@debian.org>  Sat, 17 Jan 2004 14:12:30 +0100
++
++tcpdump (3.7.2-2) unstable; urgency=low
++
++  * Acknowledge NMU by Romain (closes: #208543).
++  * Apply man page fixes by Romain:
++    + networks(4) changed to networks(5) (closes: #194180).
++    + ethers(3N) changed to ethers(5) (closes: #197888).
++  * debian/control: Added Romain Francoise as co maintainer. Thanks for 
++    your help, Romain!
++
++ -- Torsten Landschoff <torsten@debian.org>  Sun, 19 Oct 2003 04:12:31 +0200
++
++tcpdump (3.7.2-1.1) unstable; urgency=low
++
++  * NMU
++  * Reverse order of #include directives in print-sctp.c so that
++    IPPROTO_SCTP is defined (closes: #208543).
++
++ -- Romain Francoise <rfrancoise@debian.org>  Sun, 12 Oct 2003 17:06:01 +0200
++
++tcpdump (3.7.2-1) unstable; urgency=low
++
++  * New upstream release (closes: #195816).
++
++ -- Torsten Landschoff <torsten@debian.org>  Sun,  8 Jun 2003 00:14:44 +0200
++
++tcpdump (3.7.1-1.2) unstable; urgency=high
++
++  * Non-maintainer upload
++  * Apply security fixes from 3.7.2
++    - Fixed infinite loop when parsing malformed isakmp packets.
++      (CAN-2003-0108)
++    - Fixed infinite loop when parsing malformed BGP packets.
++    - Fixed buffer overflow with certain malformed NFS packets.
++
++ -- Matt Zimmerman <mdz@debian.org>  Thu, 27 Feb 2003 11:00:32 -0500
++
++tcpdump (3.7.1-1.1) unstable; urgency=low
++
++  * NMU
++  * Simple rebuild to deal with libpcap0->libpcap0.7 transition.
++    Sourceful NMU so that every arch rebuilds it.
++ 
++ -- LaMont Jones <lamont@debian.org>  Wed, 14 Aug 2002 21:25:45 -0600
++
++tcpdump (3.7.1-1) unstable; urgency=low
++
++  * New upstream release (closes: #138052).
++
++ -- Torsten Landschoff <torsten@debian.org>  Sat,  3 Aug 2002 23:54:04 +0200
++
++tcpdump (3.6.2-2) unstable; urgency=HIGH
++
++  * print-rx.c: Take the version from current CVS fixing the remote 
++    buffer overflow reported in FreeBSD Security Advisory SA-01:48
++    yesterday. Thanks to Matt Zimmerman for forwarding the report, 
++    I might have missed it.
++  * debian/control: Clean the Build-Depends from build-essential 
++    packages.
++
++ -- Torsten Landschoff <torsten@debian.org>  Thu, 19 Jul 2001 15:03:48 +0200
++
++tcpdump (3.6.2-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Torsten Landschoff <torsten@debian.org>  Tue,  6 Mar 2001 04:18:16 +0100
++
++tcpdump (3.6.1-2) unstable; urgency=low
++
++  * debian/rules: Force support for IPv6 (closes: #82665).
++  * print-icmp6.c: Removed duplicate definition also in icmp6.h to 
++    get the package to compile with IPv6.
++  * Rebuild should fix the missing libpcap0-dependency (closes: #82666).
++    Additional info: The missing dependency was because the configure 
++    script found my libpcap sources in the parent directory. Black magic
++    always works against you :(
++
++ -- Torsten Landschoff <torsten@debian.org>  Thu, 18 Jan 2001 00:44:01 +0100
++
++tcpdump (3.6.1-1) unstable; urgency=high
++
++  * Taking back the package. Kudos to Anand for his help.
++  * New upstream release. This release fixes a security hole in print-rx.c.
++  * debian/rules: Disable crypto support (closes: #81969).
++  * Removed empty README.Debian (closes: #81966).
++
++ -- Torsten Landschoff <torsten@debian.org>  Tue, 16 Jan 2001 16:04:03 +0100
++
++tcpdump (3.5.2-3) unstable; urgency=low
++
++  * Fixup dependancy stuff. Sheesh. (Closes: #78063, #78081, #78082)
++
++ -- Anand Kumria <wildfire@progsoc.org>  Tue, 28 Nov 2000 02:16:01 +1100
++
++tcpdump (3.5.2-2) unstable; urgency=low
++
++  * Update both config.guess and config.sub (Closes: #36692, #53145)
++  * Opps, make the .diff available. 
++  * We require a particular libpcap version to work (Closes: #77877)
++
++ -- Anand Kumria <wildfire@progsoc.org>  Mon, 27 Nov 2000 01:13:55 +1100
++
++tcpdump (3.5.2-1) unstable; urgency=low
++
++  * New Maintainer
++  * New upstream release (Closes: #75889)
++  * Upstream added hex dump (-x) and ascii dump (-X) Closes: #23514, #29418)
++  * Acknowledge and incorporate security fixes (Closes: #63708, #77489)
++  * Appletalk / Ethertalk patches are in (Closes: #67642)
++
++ -- Anand Kumria <wildfire@progsoc.org>  Wed, 22 Nov 2000 13:19:33 +1100
++
++tcpdump (3.4a6-4.1) frozen unstable; urgency=high
++
++  * Non-maintainer upload by security team
++  * Apply patch from tcpdump-workers mailinglist to fix DNS DoS attack
++    against tcpdump. Based on patch from Guy Harris <gharris@flashcom.net> as
++    found on http://www.tcpdump.org/lists/workers/1999/msg00607.html
++  * Fix Build-Depends entry in debian/control
++
++ -- Wichert Akkerman <wakkerma@debian.org>  Sun,  7 May 2000 15:17:33 +0200
++
++tcpdump (3.4a6-4) unstable; urgency=low
++
++  * New maintainer.
++  * tcpdump.c (main): Reestablish priviliges before closing the device
++    (closes: #19959).
++  * It seems the problem with ppp came from the kernel - I can dump 
++    packages on ppp0 just fine... (closes: #25757)
++  * print-tcp.c (tcp_print): Applied patch from David S. Miller submitted 
++    by Andrea Arcangeli to fix tcpdump sack TCP option interpretation 
++    (closes: #28530).
++  * print-bootp.c (rfc1048_print): Interpret timezone offset as signed
++    (closes: #40376). Fixed byte order problem in printing internet 
++    addresses (closes: #40375). Thanks to Roderick Schertler for the patch.
++  * Several files: Applied SMB patch from samba.org (closes: #27653).
++  * print-ip.c (ip_print): Check for ip headers with less than 5 longs. 
++    Patch taken from RedHat's source package.
++  * Redid debian/rules using debhelper.
++  * Makefile.in: Install the manpage into man8 instead of man1. 
++  * tcpdump.1: Moved to section 8 (admin commands).
++  * print-smb.c (print_smb): Disabled anything but printing the command 
++    info by default. Otherwise we would get flooded with smb information.
++    You can get all info using -vvv. Two -v's will give you the SMB headers.
++  * tcpdump.1: Documented the behaviour described above.
++
++ -- Torsten Landschoff <torsten@debian.org>  Mon, 22 Nov 1999 01:31:44 +0100
++
++tcpdump (3.4a6-3) frozen unstable; urgency=low
++
++  * fixed permissions
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Mon, 30 Mar 1998 02:28:39 +0200
++
++
++tcpdump (3.4a6-2) frozen unstable; urgency=low
++
++  * rebuild with latest debmake, fixes #19415
++    (should also fix the lintian warnings)
++  * updated standards-version
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Mon, 30 Mar 1998 00:28:39 +0200
++
++
++tcpdump (3.4a6-1) unstable; urgency=low
++
++  * updated to latest upstream version, fixes: Bug#17163
++  * install changelog.Debian compressed, fixes: Bug#15417
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Sun,  1 Feb 1998 00:08:31 +0100
++
++
++tcpdump (3.4a4-1) unstable; urgency=low
++
++  * updated to latest upstream version
++  * libc6 version
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Wed, 17 Sep 1997 23:22:54 +0200
++
++
++tcpdump (3.3.1a2-1) frozen stable unstable; urgency=medium
++
++  * updated to latest upstream version (works with new libpcap now)
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Sat, 24 May 1997 00:49:17 +0200
++
++
++tcpdump (3.3-2) unstable; urgency=low
++
++  * fixed SLIP support
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Sun, 16 Feb 1997 21:06:51 +0100
++
++
++tcpdump (3.3-1) unstable; urgency=low
++
++  * updated to latest upstream version
++
++ -- Peter Tobias <tobias@et-inf.fho-emden.de>  Thu, 16 Jan 1997 01:34:00 +0100
++
++
+--- tcpdump-3.8.3.orig/debian/control
++++ tcpdump-3.8.3/debian/control
+@@ -0,0 +1,23 @@
++Source: tcpdump
++Section: net
++Priority: optional
++Maintainer: Romain Francoise <rfrancoise@debian.org>
++Uploaders: Torsten Landschoff <torsten@debian.org>
++Build-Depends: debhelper (>= 4), libpcap0.8-dev, dpatch, libssl-dev
++Standards-Version: 3.6.1.0
++
++Package: tcpdump
++Architecture: any
++Depends: ${shlibs:Depends}
++Description: A powerful tool for network monitoring and data acquisition
++ This program allows you to dump the traffic on a network. tcpdump 
++ is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS
++ BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet
++ types.
++ .
++ It can be used to print out the headers of packets on a network 
++ interface, filter packets that match a certain expression. You can 
++ use this tool to track down network problems, to detect "ping attacks" 
++ or to monitor network activities. 
++ .
++ Further information is available at <URL: http://www.tcpdump.org/>
+--- tcpdump-3.8.3.orig/debian/tcpdump.dirs
++++ tcpdump-3.8.3/debian/tcpdump.dirs
+@@ -0,0 +1 @@
++usr/sbin
+--- tcpdump-3.8.3.orig/debian/tcpdump.examples
++++ tcpdump-3.8.3/debian/tcpdump.examples
+@@ -0,0 +1,4 @@
++atime.awk
++packetdat.awk
++send-ack.awk
++stime.awk
+--- tcpdump-3.8.3.orig/debian/rules
++++ tcpdump-3.8.3/debian/rules
+@@ -0,0 +1,70 @@
++#!/usr/bin/make -f
++
++include /usr/share/dpatch/dpatch.make
++
++export DH_VERBOSE=1
++
++dstdir := $(shell pwd)/debian/tcpdump
++
++export CFLAGS=-D_FILE_OFFSET_BITS=64
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++        CFLAGS += -O0
++endif
++
++build: patch build-stamp
++build-stamp:
++	dh_testdir
++
++	./configure --prefix=/usr --mandir=\$${prefix}/share/man 	\
++		--infodir=\$${prefix}/share/info --enable-ipv6
++	$(MAKE)
++
++	touch build-stamp
++
++clean: clean-patched unpatch
++clean-patched:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++
++	-$(MAKE) distclean
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	$(MAKE) install prefix=$(dstdir)/usr
++
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++#	dh_testversion
++	dh_testdir
++	dh_testroot
++	dh_installdocs
++	dh_installexamples
++	dh_installinfo
++	dh_installchangelogs CHANGES
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++#	dh_makeshlibs
++	dh_installdeb
++#	dh_perl
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install
+--- tcpdump-3.8.3.orig/debian/patches/10_man_install.dpatch
++++ tcpdump-3.8.3/debian/patches/10_man_install.dpatch
+@@ -0,0 +1,46 @@
++#! /bin/sh -e
++## 10_man_install.dpatch by Romain Francoise <rfrancoise@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Change man page install paths for Debian.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/Makefile.in tcpdump-3.8.3/Makefile.in
++--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/Makefile.in	2004-05-08 09:12:28.000000000 +0200
+++++ tcpdump-3.8.3/Makefile.in	2004-05-08 09:13:23.000000000 +0200
++@@ -157,13 +157,13 @@
++ 	[ -d $(DESTDIR)$(sbindir) ] || \
++ 	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
++ 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
++-	[ -d $(DESTDIR)$(mandir)/man1 ] || \
++-	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
++-	$(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
+++	[ -d $(DESTDIR)$(mandir)/man8 ] || \
+++	    (mkdir -p $(DESTDIR)$(mandir)/man8; chmod 755 $(DESTDIR)$(mandir)/man8)
+++	$(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man8/$(PROG).8
++ 
++ uninstall:
++ 	rm -f $(DESTDIR)$(sbindir)/$(PROG)
++-	rm -f $(DESTDIR)$(mandir)/man1/$(PROG).1
+++	rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
++ 
++ lint: $(GENSRC)
++ 	lint -hbxn $(SRC) | \
+--- tcpdump-3.8.3.orig/debian/patches/00list
++++ tcpdump-3.8.3/debian/patches/00list
+@@ -0,0 +1,4 @@
++10_man_install
++20_man_fixes
++30_openssl_des
++40_ipv6cp
+--- tcpdump-3.8.3.orig/debian/patches/20_man_fixes.dpatch
++++ tcpdump-3.8.3/debian/patches/20_man_fixes.dpatch
+@@ -0,0 +1,67 @@
++#! /bin/sh -e
++## 20_man_fixes.dpatch by Romain Francoise <rfrancoise@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Misc. fixes to the upstream man page.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/tcpdump.1 tcpdump-3.8.3/tcpdump.1
++--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/tcpdump.1	2004-05-08 09:12:32.000000000 +0200
+++++ tcpdump-3.8.3/tcpdump.1	2004-05-08 09:18:27.000000000 +0200
++@@ -22,7 +22,7 @@
++ .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
++ .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ .\"
++-.TH TCPDUMP 1  "7 January 2004"
+++.TH TCPDUMP 8  "8 May 2004"
++ .SH NAME
++ tcpdump \- dump traffic on a network
++ .SH SYNOPSIS
++@@ -672,7 +672,7 @@
++ True if the ethernet destination address is \fIehost\fP.
++ \fIEhost\fP
++ may be either a name from /etc/ethers or a number (see
++-.IR ethers (3N)
+++.IR ethers (5)
++ for numeric format).
++ .IP "\fBether src \fIehost\fP
++ True if the ethernet source address is \fIehost\fP.
++@@ -699,7 +699,7 @@
++ True if the IPv4/v6 destination address of the packet has a network
++ number of \fInet\fP.
++ \fINet\fP may be either a name from /etc/networks
++-or a network number (see \fInetworks(4)\fP for details).
+++or a network number (see \fInetworks(5)\fP for details).
++ .IP "\fBsrc net \fInet\fR"
++ True if the IPv4/v6 source address of the packet has a network
++ number of \fInet\fP.
++@@ -718,9 +718,9 @@
++ True if the packet is ip/tcp, ip/udp, ip6/tcp or ip6/udp and has a
++ destination port value of \fIport\fP.
++ The \fIport\fP can be a number or a name used in /etc/services (see
++-.IR tcp (4P)
+++.IR tcp (7)
++ and
++-.IR udp (4P)).
+++.IR udp (7)).
++ If a name is used, both the port
++ number and protocol are checked.
++ If a number or ambiguous name is used,
+--- tcpdump-3.8.3.orig/debian/patches/30_openssl_des.dpatch
++++ tcpdump-3.8.3/debian/patches/30_openssl_des.dpatch
+@@ -0,0 +1,57 @@
++#! /bin/sh -e
++## 30_openssl_des.dpatch by Romain Francoise <rfrancoise@debian.org> 
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Change "des_cbc_encrypt" check to "DES_cbc_encrypt" since it
++## DP: got renamed in OpenSSL 0.9.7.  Super-ugly change to configure,
++## DP: but it's simpler this way (changing configure.in too while we're
++## DP: at it).
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure tcpdump-3.8.3/configure
++--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure	2004-03-28 23:06:09.000000000 +0200
+++++ tcpdump-3.8.3/configure	2004-05-14 21:58:56.000000000 +0200
++@@ -9760,11 +9760,11 @@
++ #endif
++ /* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++-char des_cbc_encrypt ();
+++char DES_cbc_encrypt ();
++ int
++ main ()
++ {
++-des_cbc_encrypt ();
+++DES_cbc_encrypt ();
++   ;
++   return 0;
++ }
++diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure.in tcpdump-3.8.3/configure.in
++--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure.in	2004-03-28 23:04:48.000000000 +0200
+++++ tcpdump-3.8.3/configure.in	2004-05-14 21:58:11.000000000 +0200
++@@ -732,7 +732,7 @@
++ 	if test -f $ac_cv_ssleay_path/lib/librsaref.a; then
++ 		LIBS="$LIBS -lrsaref"
++ 	fi
++-	AC_CHECK_LIB(crypto, des_cbc_encrypt)
+++	AC_CHECK_LIB(crypto, DES_cbc_encrypt)
++ 
++ 	CPPFLAGS="$CPPFLAGS $V_INCLS"
++ 	AC_CHECK_HEADERS(openssl/evp.h)
+--- tcpdump-3.8.3.orig/debian/patches/40_ipv6cp.dpatch
++++ tcpdump-3.8.3/debian/patches/40_ipv6cp.dpatch
+@@ -0,0 +1,45 @@
++#! /bin/sh -e
++## 40_ipv6cp.dpatch by Romain Francoise <rfrancoise@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Do not try to grok IPV6CP packets, the dissector doesn't 
++## DP: support it.
++
++if [ $# -lt 1 ]; then
++    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++    exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++    -patch) patch -p1 ${patch_opts} < $0;;
++    -unpatch) patch -R -p1 ${patch_opts} < $0;;
++    *)
++        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++        exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/print-ppp.c tcpdump-3.8.3/print-ppp.c
++--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/print-ppp.c	2004-04-17 00:25:32.000000000 +0200
+++++ tcpdump-3.8.3/print-ppp.c	2004-06-19 14:54:40.000000000 +0200
++@@ -1056,7 +1056,6 @@
++ 	case PPP_IPCP:
++ 	case PPP_OSICP:
++ 	case PPP_MPLSCP:
++-	case PPP_IPV6CP:
++ 	case PPP_CCP:
++ 	case PPP_BACP:
++ 		handle_ctrl_proto(proto, p, length);
++@@ -1077,6 +1076,7 @@
++ #ifdef INET6
++ 	case ETHERTYPE_IPV6:	/*XXX*/
++ 	case PPP_IPV6:
+++	case PPP_IPV6CP:
++ 		ip6_print(p, length);
++ 		break;
++ #endif
+--- tcpdump-3.8.3.orig/debian/compat
++++ tcpdump-3.8.3/debian/compat
+@@ -0,0 +1 @@
++4
author	mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2004-08-27 00:42:33 +0000
committer	mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2004-08-27 00:42:33 +0000
commit	f0c8400658ac5b039bb48dbb74b02f75d52b9723 (patch)
tree	7ef2c062b8733bbd08473f6c2bed78c7ad9708d1
parent	aa210b58909434abaa63a7a6cd898a43ba61c3f3 (diff)