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

19 files changed, 453 insertions, 262 deletions

diff --git a/obsolete-buildroot/make/fprobe.mk b/obsolete-buildroot/make/fprobe.mk
new file mode 100644
index 000000000..409029cbd
--- /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 86608ea4b..94bed41c0 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 cc8e4271c..c3d78b903 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 62c7b274c..ce7959e62 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 000000000..45cc60c1f
--- /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 000000000..3b076ab4f
--- /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 000000000..4dc24bf95
--- /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 000000000..eb09d966b
--- /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 000000000..75a5c540d
--- /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 000000000..c63d08f97
--- /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 000000000..d24733742
--- /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 f00fe7fb9..000000000
--- 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 bdad3076f..000000000
--- 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 ff1a558d2..000000000
--- 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 36481bb75..66b17a69b 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 000000000..5fbddc1a0
--- /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 c04bceea8..000000000
--- 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 000000000..f8d29e2da
--- /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 e78fc8e88..000000000
--- 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)
-