bring up to date with nbd's br2_test20.tar.bz2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73
2024-11-27 16:43:09 +02:00 · 2005-03-06 03:53:29 +00:00 · 2005-03-06 03:53:29 +00:00 · a4d8c8e5ca
commit a4d8c8e5ca
parent f77b88d124
53 changed files with 5243 additions and 8 deletions
--- a/package/Config.in
+++ b/package/Config.in
@ -16,9 +16,11 @@ source "package/ebtables/Config.in"
 source "package/arptables/Config.in"
 source "package/iproute2/Config.in"
 source "package/openvpn/Config.in"
+source "package/pptpd/Config.in"

 comment "Libraries"
 source "package/zlib/Config.in"
+source "package/matrixssl/Config.in"
 source "package/lzo/Config.in"
 source "package/openssl/Config.in"

--- a/package/Makefile
+++ b/package/Makefile
@ -12,8 +12,10 @@ package-$(BR2_PACKAGE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_LZO) += lzo
 package-$(BR2_PACKAGE_ZLIB) += zlib
+package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
+package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_LINKSYS_UTILS) += linksys-utils

--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_DNSMASQ
-	bool "dnsmasq"
+	tristate "dnsmasq"
 	default y
 	help
 	  A lightweight DNS and DHCP server.  It is intended to provide 
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@ -1,9 +1,45 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
 include $(TOPDIR)/rules.mk

-include ./dnsmasq.mk
+PKG_NAME:=dnsmasq
+PKG_VERSION:=2.15
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT:=zcat
+PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg

-source: dnsmasq-source
-prepare: $(DNSMASQ_DIR)/.unpacked
-compile: $(DNSMASQ_DIR)/src/dnsmasq
-install: dnsmasq
-clean: dnsmasq-dirclean
+$(DL_DIR)/$(PKG_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+
+$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	touch $(PKG_BUILD_DIR)/.patched
+
+$(PKG_BUILD_DIR)/src/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
+	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR)
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(PKG_IPK_DIR)/usr/sbin
+	cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.patched
+compile: $(PKG_IPK)
+install:
+	$(IPKG) install $(PKG_IPK)
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
--- a/package/dnsmasq/dnsmasq.control
+++ b/package/dnsmasq/dnsmasq.control
@ -0,0 +1,8 @@
+Package: dnsmasq
+Priority: essential
+Section: net
+Version: 2.15-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: A lightweight DNS and DHCP server
--- a/package/dnsmasq/patches/100-config.patch
+++ b/package/dnsmasq/patches/100-config.patch
@ -0,0 +1,49 @@
+diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h
+--- dnsmasq-2.15.orig/src/config.h	2004-10-08 11:41:34.757371880 -0400
+++ dnsmasq-2.15/src/config.h	2004-10-08 11:43:49.074952504 -0400
+@@ -78,6 +78,11 @@
+ /* We assume that systems which don't have IPv6
+    headers don't have ntop and pton either */
+ 
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
+#  undef NO_IPV6
+#  define NO_IPV6
+#endif
+
+ #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
+ #  define HAVE_IPV6
+ #  define ADDRSTRLEN INET6_ADDRSTRLEN
+@@ -194,7 +199,7 @@
+ /* platform dependent options. */
+ 
+ /* Must preceed __linux__ since uClinux defines __linux__ too. */
+-#if defined(__uClinux__) || defined(__UCLIBC__)
+#if defined(__uClinux__)
+ #undef HAVE_LINUX_IPV6_PROC
+ #define HAVE_GETOPT_LONG
+ #undef HAVE_ARC4RANDOM
+@@ -208,6 +213,24 @@
+ #  define NO_FORK
+ #endif
+ 
+#elif defined(__linux__) && defined(__UCLIBC__)
+#  define HAVE_LINUX_IPV6_PROC
+#  if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
+   ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
+#    define HAVE_GETOPT_LONG
+#  else
+#    undef HAVE_GETOPT_LONG
+#  endif
+#undef HAVE_ARC4RANDOM
+#define HAVE_RANDOM
+#define HAVE_DEV_URANDOM
+#define HAVE_DEV_RANDOM
+#undef HAVE_SOCKADDR_SA_LEN
+#undef HAVE_PSELECT
+#if !defined(__ARCH_HAS_MMU__)
+#  define NO_FORK
+#endif
+
+ /* libc5 - must precede __linux__ too */
+ /* Note to build a libc5 binary on a modern Debian system:
+    install the packages altgcc libc5 and libc5-altdev 
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@ -0,0 +1,10 @@
+config BR2_PACKAGE_DROPBEAR
+	tristate "SSH Server/Client"
+	default y
+	select BR2_PACKAGE_ZLIB
+	help
+	  dropbear
+	  
+	  A small SSH 2 server/client designed for small memory environments.
+
+	  http://matt.ucc.asn.au/dropbear/
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@ -0,0 +1,80 @@
+#############################################################
+#
+# dropbear
+#
+#############################################################
+include $(TOPDIR)/rules.mk
+
+DROPBEAR_VERSION:=0.44
+DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2
+DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/
+DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION)
+DROPBEAR_CAT:=bzcat
+DROPBEAR_BINARY:=dropbearmulti
+DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear
+DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(ARCH).ipk
+DROPBEAR_IPK_DIR:=$(DROPBEAR_DIR)/ipkg
+
+$(DL_DIR)/$(DROPBEAR_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
+
+$(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE)
+	$(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(DROPBEAR_DIR) ./patches \*.patch
+	$(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_DIR)/options.h
+	touch $(DROPBEAR_DIR)/.patched
+
+$(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.patched
+	(cd $(DROPBEAR_DIR); rm -rf config.cache; \
+		autoconf; \
+		$(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 \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		$(DISABLE_NLS) \
+		--with-shared \
+	);
+	touch  $(DROPBEAR_DIR)/.configured
+
+$(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) \
+		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+		MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_DIR)
+
+$(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(DROPBEAR_IPK_DIR) dropbear.control $(DROPBEAR_VERSION)-1 $(ARCH)
+	mkdir -p $(DROPBEAR_IPK_DIR)/usr/bin
+	mkdir -p $(DROPBEAR_IPK_DIR)/usr/sbin
+	install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
+		$(DROPBEAR_IPK_DIR)/$(DROPBEAR_TARGET_BINARY)
+	$(STRIP) $(DROPBEAR_IPK_DIR)/usr/sbin/dropbear
+	ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/scp
+	ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/ssh
+	ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearkey
+	ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearconvert
+	mkdir -p $(DROPBEAR_IPK_DIR)/etc/init.d
+	cp ./files/S50dropbear $(DROPBEAR_IPK_DIR)/etc/init.d/
+	chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear
+	$(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR)
+
+source: $(DL_DIR)/$(DROPBEAR_SOURCE)
+prepare: $(DROPBEAR_DIR)/.patched
+compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+install: compile
+	$(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+clean:
+	rm -rf $(DROPBEAR_DIR)
+	rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+
--- a/package/dropbear/dropbear.control
+++ b/package/dropbear/dropbear.control
@ -0,0 +1,9 @@
+Package: dropbear
+Priority: optional
+Depends: zlib
+Section: net
+Version: 0.44-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a small SSH 2 server/client designed for small memory environments.
--- a/package/dropbear/files/S50dropbear
+++ b/package/dropbear/files/S50dropbear
@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Starts dropbear sshd.
+#
+
+# Make sure the dropbearkey progam exists
+[ -f /usr/bin/dropbearkey ] || exit 0
+
+# Check for the Dropbear RSA key
+if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
+	(
+		echo Generating RSA Key...
+		mkdir -p /etc/dropbear
+		/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+		[ -f /etc/dropbear/dropbear_rsa_host_key ] && exec $0 $*
+	) > /dev/null 2> /dev/null &
+	exit 0
+fi
+
+# Check for the Dropbear DSS key
+if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
+	(
+		echo Generating DSS Key...
+		mkdir -p /etc/dropbear
+		/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
+		[ -f /etc/dropbear/dropbear_dss_host_key ] && exec $0 $*
+	) > /dev/null 2> /dev/null &
+	exit 0
+fi
+
+umask 077
+
+start() {
+ 	echo -n "Starting dropbear sshd: "
+	start-stop-daemon --start --quiet --pidfile /var/run/dropbear.pid --exec /usr/sbin/dropbear
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping dropbear sshd: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/dropbear.pid
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart|reload)
+  	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
+
--- a/package/dropbear/patches/change-user.patch
+++ b/package/dropbear/patches/change-user.patch
@ -0,0 +1,15 @@
+--- dropbear-0.44.old/svr-chansession.c	2005-02-03 02:29:44.000000000 +0100
+++ dropbear-0.44/svr-chansession.c	2005-02-03 02:31:05.000000000 +0100
+@@ -859,10 +859,10 @@
+ 	/* We can only change uid/gid as root ... */
+ 	if (getuid() == 0) {
+ 
+-		if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
+		if ((ses.authstate.pw->pw_uid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
+ 			(initgroups(ses.authstate.pw->pw_name, 
+ 						ses.authstate.pw->pw_gid) < 0) ||
+-			(setuid(ses.authstate.pw->pw_uid) < 0)) {
+			(setuid(ses.authstate.pw->pw_uid) < 0))) {
+ 			dropbear_exit("error changing user");
+ 		}
+ 	} else {
--- a/package/dropbear/patches/use-dev-urandom.patch
+++ b/package/dropbear/patches/use-dev-urandom.patch
@ -0,0 +1,12 @@
+diff -urN dropbear-0.44.old/options.h dropbear-0.44/options.h
+--- dropbear-0.44.old/options.h	2005-03-02 23:08:07.000000000 +0100
+++ dropbear-0.44/options.h	2005-03-03 01:12:21.000000000 +0100
+@@ -139,7 +139,7 @@
+  * will prevent Dropbear from blocking on the device. This could
+  * however significantly reduce the security of your ssh connections
+  * if the PRNG state becomes simpler. */
+-#define DROPBEAR_RANDOM_DEV "/dev/random"
+#define DROPBEAR_RANDOM_DEV "/dev/urandom"
+ 
+ /* prngd must be manually set up to produce output */
+ /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
--- a/package/linux/Config.in
+++ b/package/linux/Config.in
@ -55,6 +55,12 @@ config BR2_PACKAGE_KMOD_TUN
 	help
 	  Kernel support for the TUN/TAP tunneling device

+config BR2_PACKAGE_KMOD_GRE
+	tristate "GRE tunneling driver"
+	default m
+	help
+	  Kernel support for GRE tunnels
+
 config BR2_PACKAGE_KMOD_SCHED
 	tristate "Traffic schedulers"
 	default m
--- a/package/linux/Makefile
+++ b/package/linux/Makefile
@ -54,6 +54,9 @@ $(eval $(call KMOD_template,MPPE,mppe,\
 $(eval $(call KMOD_template,TUN,tun,\
 	$(MODULES_DIR)/kernel/drivers/net/tun.o \
 ))
+$(eval $(call KMOD_template,GRE,gre,\
+	$(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \
+))
 $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.o \
 ))
--- a/package/linux/control/kmod-gre.control
+++ b/package/linux/control/kmod-gre.control
@ -0,0 +1,8 @@
+Package: kmod-gre
+Priority: optional
+Section: sys
+Version: 2.4.29-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Kernel GRE tunneling support
--- a/package/matrixssl/Config.in
+++ b/package/matrixssl/Config.in
@ -0,0 +1,7 @@
+config BR2_PACKAGE_MATRIXSSL
+	tristate "matrixssl"
+	default m
+	help
+	  an embedded SSL implementation
+	  
+	  http://www.matrixssl.org/
--- a/package/matrixssl/Makefile
+++ b/package/matrixssl/Makefile
@ -0,0 +1,54 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := matrixssl
+PKG_VERSION := 1.2.4
+PKG_RELEASE := 1
+
+PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+
+$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	touch $(PKG_BUILD_DIR)/.patched
+
+$(PKG_BUILD_DIR)/src/libmatrixssl.so: $(PKG_BUILD_DIR)/.patched
+	$(MAKE) -C $(PKG_BUILD_DIR)/src \
+	  $(TARGET_CONFIGURE_OPTS) \
+	  DFLAGS="$(TARGET_CFLAGS) -Wall"
+
+$(STAGING_DIR)/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/src/libmatrixssl.so
+	cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/lib
+	mkdir -p $(STAGING_DIR)/include/matrixSsl
+	cp $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl
+	ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/include/matrixSsl.h
+
+$(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so
+	mkdir -p $(PACKAGE_DIR)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/matrixssl matrixssl.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
+	cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
+	$(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/*
+	$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR)
+
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+prepare: $(PKG_BUILD_DIR)/.patched
+compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK)
+install: $(PKG_ZLIB)
+	$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl*
+	rm -f $(PACKAGE_DIR)/matrixssl\*.ipk
+
--- a/package/matrixssl/matrixssl.control
+++ b/package/matrixssl/matrixssl.control
@ -0,0 +1,8 @@
+Package: libmatrixssl
+Priority: optional
+Section: libs
+Version: 1.2.4-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: an embedded SSL implementation
--- a/package/matrixssl/matrixssl.mk
+++ b/package/matrixssl/matrixssl.mk
@ -0,0 +1,80 @@
+## matrixssl
+
+MATRIXSSL_VERSION := 1.2.1
+MATRIXSSL_RELEASE := 1
+
+MATRIXSSL_SOURCE := matrixssl-1-2-1.tar.gz
+#MATRIXSSL_SITE := http://www.matrixssl.org/
+MATRIXSSL_SITE := http://nthill.free.fr/openwrt/sources/
+MATRIXSSL_DIR := $(BUILD_DIR)/matrixssl
+MATRIXSSL_CAT := zcat
+
+MATRIXSSL_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/matrixssl
+
+MATRIXSSL_BUILD_DIR := $(BUILD_DIR)/libmatrixssl_$(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE)
+MATRIXSSL_IPK_DIR := $(OPENWRT_IPK_DIR)/libmatrixssl
+MATRIXSSL_IPK := $(MATRIXSSL_BUILD_DIR)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(MATRIXSSL_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(MATRIXSSL_SITE)/$(MATRIXSSL_SOURCE)
+
+
+$(MATRIXSSL_DIR)/.stamp-unpacked: $(DL_DIR)/$(MATRIXSSL_SOURCE)
+	$(MATRIXSSL_CAT) $(DL_DIR)/$(MATRIXSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+	touch $(MATRIXSSL_DIR)/.stamp-unpacked
+
+
+$(MATRIXSSL_DIR)/.stamp-patched: $(MATRIXSSL_DIR)/.stamp-unpacked
+	$(SOURCE_DIR)/patch-kernel.sh $(MATRIXSSL_DIR) $(MATRIXSSL_PATCH_DIR)
+
+	touch $(MATRIXSSL_DIR)/.stamp-patched
+
+
+$(MATRIXSSL_DIR)/.stamp-built: $(MATRIXSSL_DIR)/.stamp-patched
+	cd  $(MATRIXSSL_DIR) ; \
+	$(MAKE) -C src \
+	  CC=$(TARGET_CC) \
+	  DFLAGS="$(TARGET_CFLAGS)" \
+	  STRIP=/bin/true \
+	 all
+
+	touch $(MATRIXSSL_DIR)/.stamp-built
+
+
+$(MATRIXSSL_BUILD_DIR): $(MATRIXSSL_DIR)/.stamp-built
+	mkdir -p $(MATRIXSSL_BUILD_DIR)
+	 
+	install -m0755 -d $(STAGING_DIR)/include/matrixSsl
+	install -m0644 $(MATRIXSSL_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl/
+	ln -fs matrixSsl/matrixSsl.h $(STAGING_DIR)/include/
+	install -m0755 $(MATRIXSSL_DIR)/src/libmatrixssl.so $(STAGING_DIR)/lib/libmatrixssl.so.$(MATRIXSSL_VERSION)
+	ln -fs libmatrixssl.so.$(MATRIXSSL_VERSION) $(STAGING_DIR)/lib/libmatrixssl.so.1.2
+	ln -fs libmatrixssl.so.1.2 $(STAGING_DIR)/lib/libmatrixssl.so
+
+	mkdir -p $(MATRIXSSL_BUILD_DIR)/usr/lib
+	cp -a $(STAGING_DIR)/lib/libmatrixssl.so.* $(MATRIXSSL_BUILD_DIR)/usr/lib/
+
+	$(STRIP) $(MATRIXSSL_BUILD_DIR)/usr/lib/libmatrixssl.so.*
+
+
+$(MATRIXSSL_IPK): $(MATRIXSSL_BUILD_DIR)
+	cp -a $(MATRIXSSL_IPK_DIR)/CONTROL $(MATRIXSSL_BUILD_DIR)/
+	perl -pi -e "s/^Vers.*:.*$$/Version: $(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control
+	perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(MATRIXSSL_BUILD_DIR)
+
+
+matrixssl-ipk: ipkg-utils libpthread-ipk $(MATRIXSSL_IPK)
+
+matrixssl-clean:
+	$(MAKE) -C $(MATRIXSSL_DIR) clean
+
+matrixssl-clean-all:
+	rm -rf $(MATRIXSSL_DIR)
+	rm -rf $(MATRIXSSL_BUILD_DIR)
+	rm -rf $(MATRIXSSL_IPK)
+	rm -rf $(STAGING_DIR)/include/pcap*.h
+	rm -rf $(STAGING_DIR)/lib/libpcap.a
+	rm -rf $(STAGING_DIR)/lib/libpcap.so*
--- a/package/matrixssl/patches/matrixssl-1.2.4.diff
+++ b/package/matrixssl/patches/matrixssl-1.2.4.diff
--- a/package/matrixssl/patches/matrixssl-typefix.patch
+++ b/package/matrixssl/patches/matrixssl-typefix.patch
@ -0,0 +1,12 @@
+diff -urN matrixssl.old/src/os/linux/linux.c matrixssl/src/os/linux/linux.c
+--- matrixssl.old/src/os/linux/linux.c	2005-02-23 22:43:10.000000000 +0100
+++ matrixssl/src/os/linux/linux.c	2005-03-06 01:52:51.000000000 +0100
+@@ -51,7 +51,7 @@
+ static sslTime_t	hiresStart; 	/* zero-time */
+ static sslTime_t	hiresFreq; 		/* tics per second */
+ #else /* __i386__ */
+-static unsigned	int32 prevTicks; 		/* Check wrap */
+static uint32		prevTicks; 		/* Check wrap */
+ static sslTime_t	elapsedTime; 	/* Last elapsed time */
+ #endif
+ 
--- a/package/ppp/Config.in
+++ b/package/ppp/Config.in
@ -0,0 +1,37 @@
+config BR2_PACKAGE_PPP
+	tristate
+	prompt "PPP daemon"
+	default y
+
+config BR2_PACKAGE_PPP_PPPOE
+	tristate
+	prompt "PPP over Ethernet plugin"
+	default y
+	depends on BR2_PACKAGE_PPP
+
+config BR2_PACKAGE_PPP_RADIUS
+	tristate
+	prompt "PPP RADIUS plugin"
+	default m
+	depends on BR2_PACKAGE_PPP
+
+config BR2_PACKAGE_PPP_CHAT
+	tristate
+	prompt "chat utility"
+	default m
+	depends on BR2_PACKAGE_PPP
+
+config BR2_PACKAGE_PPPDUMP
+	tristate
+	prompt "pppdump utility"
+	default m
+	depends on BR2_PACKAGE_PPP
+
+config BR2_PACKAGE_PPPSTATS
+	tristate
+	prompt "pppstats utility"
+	default m
+	depends on BR2_PACKAGE_PPP
+
+
+
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@ -0,0 +1,147 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := ppp
+PKG_VERSION := 2.4.3
+PKG_RELEASE := 3
+
+PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+
+PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_PPP_PPPOE_PLUGIN := $(PACKAGE_DIR)/ppp-pppoe-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_PPP_RADIUS_PLUGIN := $(PACKAGE_DIR)/ppp-radius-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_PPPSTATS := $(PACKAGE_DIR)/pppstats_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_PPPDUMP := $(PACKAGE_DIR)/pppdump_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+I_PPP := $(PKG_BUILD_DIR)/ipkg/ppp
+I_PPP_PPPOE_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-pppoe-plugin
+I_PPP_RADIUS_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-radius-plugin
+I_PPPDUMP := $(PKG_BUILD_DIR)/ipkg/pppdump
+I_PPPSTATS := $(PKG_BUILD_DIR)/ipkg/pppstats
+
+TARGETS := $(PKG_PPP)
+ifneq ($(BR2_PACKAGE_PPP_PPPOE),)
+TARGETS += $(PKG_PPP_PPPOE_PLUGIN)
+endif
+ifneq ($(BR2_PACKAGE_PPP_RADIUS),)
+TARGETS += $(PKG_PPP_RADIUS_PLUGIN)
+endif
+ifneq ($(BR2_PACKAGE_PPPDUMP),)
+TARGETS += $(PKG_PPPDUMP)
+endif
+ifneq ($(BR2_PACKAGE_PPPSTATS),)
+TARGETS += $(PKG_PPPSTATS)
+endif
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+
+$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
+	touch $(PKG_BUILD_DIR)/.patched
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+	(cd $(PKG_BUILD_DIR); \
+	rm -f 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 \
+	 --datadir=/usr/share \
+	 --infodir=/usr/share/info \
+	 --libexecdir=/usr/lib \
+	 --localstatedir=/var \
+	 --mandir=/usr/share/man \
+	 --sbindir=/usr/sbin \
+	 --sysconfdir=/etc \
+	 $(DISABLE_NLS))
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/pppd/pppd $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so: $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  CC=$(TARGET_CC) \
+	  COPTS="$(TARGET_CFLAGS)" \
+	 all
+
+$(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
+	mkdir -p $(I_PPP)
+	cp -af ./ipkg/ppp/* $(I_PPP)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
+	mkdir -p $(I_PPP)/usr/sbin
+	cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/
+	$(STRIP) $(I_PPP)/usr/sbin/*
+	mkdir -p $(I_PPP)/usr/lib/pppd
+	cp $(PKG_BUILD_DIR)/pppd/plugins/*.so $(I_PPP)/usr/lib/pppd/
+	$(STRIP) $(I_PPP)/usr/lib/pppd/*.so
+	mkdir -p $(I_PPP)/$(MODULES_SUBDIR)
+	cp $(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(I_PPP)/$(MODULES_SUBDIR)
+	cp $(MODULES_DIR)/kernel/drivers/net/ppp_deflate.o $(I_PPP)/$(MODULES_SUBDIR)
+	cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR)
+	$(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR)
+	
+$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
+	cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \
+		$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
+	$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so
+	mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
+	cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
+	$(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR)
+
+$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
+	cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \
+	  $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/
+	$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
+	$(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)
+
+$(PKG_PPPDUMP): $(PKG_PPP)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(I_PPPDUMP)/usr/sbin
+	cp -af $(PKG_BUILD_DIR)/pppdump/pppdump $(I_PPPDUMP)/usr/sbin/
+	$(STRIP) $(I_PPPDUMP)/usr/sbin/*
+	$(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR)
+
+$(PKG_PPPSTATS): $(PKG_PPP)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(I_PPPSTATS)/usr/sbin
+	cp -af $(PKG_BUILD_DIR)/pppstats/pppstats $(I_PPPSTATS)/usr/sbin/
+	$(STRIP) $(I_PPPSTATS)/usr/sbin/*
+	$(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR)
+
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+prepare: $(PKG_BUILD_DIR)/.patched
+compile: $(TARGETS)
+install: compile
+	$(IPKG) install $(PKG_PPP)
+ifeq ($(BR2_PACKAGE_PPP_PPPOE),y)
+	$(IPKG) install $(PKG_PPP_PPPOE_PLUGIN)
+endif
+ifeq ($(BR2_PACKAGE_PPP_RADIUS),y)
+	$(IPKG) install $(PKG_PPP_RADIUS_PLUGIN)
+endif
+ifeq ($(BR2_PACKAGE_PPPDUMP),y)
+	$(IPKG) install $(PKG_PPPDUMP)
+endif
+ifeq ($(BR2_PACKAGE_PPPSTATS),y)
+	$(IPKG) install $(PKG_PPPSTATS)
+endif
+
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_PPP) $(PKG_PPP_PPPOE_PLUGIN) $(PKG_PPP_RADIUS_PLUGIN) $(PKG_PPPSTATS) $(PKG_PPPDUMP)
--- a/package/ppp/control/chat.control
+++ b/package/ppp/control/chat.control
@ -0,0 +1,9 @@
+Package: chat
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Utility for establishing a connection with the ISP's PPP server (e.g. via Modem)
+Depends: ppp
--- a/package/ppp/control/ppp-pppoe-plugin.control
+++ b/package/ppp/control/ppp-pppoe-plugin.control
@ -0,0 +1,9 @@
+Package: ppp-pppoe-plugin
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a PPPoE (PPP over Ethernet) plugin for PPP
+Depends: ppp
--- a/package/ppp/control/ppp-radius-plugin.control
+++ b/package/ppp/control/ppp-radius-plugin.control
@ -0,0 +1,9 @@
+Package: ppp-radius-plugin
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a RADIUS plugin for PPP
+Depends: ppp
--- a/package/ppp/control/ppp.control
+++ b/package/ppp/control/ppp.control
@ -0,0 +1,8 @@
+Package: ppp
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)
--- a/package/ppp/control/pppdump.control
+++ b/package/ppp/control/pppdump.control
@ -0,0 +1,9 @@
+Package: pppdump
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: an utility to read PPP record file
+Depends: ppp
--- a/package/ppp/control/pppstats.control
+++ b/package/ppp/control/pppstats.control
@ -0,0 +1,9 @@
+Package: pppstats
+Priority: optional
+Section: net
+Version: 2.4.3-3
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: an utility to report PPP statistics
+Depends: ppp
--- a/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles
+++ b/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles
@ -0,0 +1,2 @@
+/etc/ppp/radius.conf
+/etc/ppp/radius/servers
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options
@ -0,0 +1,2 @@
+plugin radius.so
+radius-config-file /etc/ppp/radius.conf
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf
@ -0,0 +1,8 @@
+authserver localhost:1812
+acctserver localhost:1813
+dictionary /etc/ppp/radius/dictionary
+servers /etc/ppp/radius/servers
+mapfile /dev/null
+seqfile /tmp/radius.seq
+radius_timeout 5
+radius_retries 3
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary
@ -0,0 +1,253 @@
+#
+# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl
+#
+#	This file contains dictionary translations for parsing
+#	requests and generating responses.  All transactions are
+#	composed of Attribute/Value Pairs.  The value of each attribute
+#	is specified as one of 4 data types.  Valid data types are:
+#
+#	string - 0-253 octets
+#	ipaddr - 4 octets in network byte order
+#	integer - 32 bit value in big endian order (high byte first)
+#	date - 32 bit value in big endian order - seconds since
+#					00:00:00 GMT,  Jan.  1,  1970
+#
+#	Enumerated values are stored in the user file with dictionary
+#	VALUE translations for easy administration.
+#
+#	Example:
+#
+#	ATTRIBUTE	  VALUE
+#	---------------   -----
+#	Framed-Protocol = PPP
+#	7		= 1	(integer encoding)
+#
+
+# The dictionary format now supports vendor-specific attributes.
+# Vendors are introduced like this:
+#
+#	VENDOR vendor_name vendor_number
+#
+# For example:
+#
+#	VENDOR RoaringPenguin 10055
+#
+# Vendor-specific attributes have a fifth field with the name of the
+# vendor.  For example:
+#
+#       ATTRIBUTE RP-Upstream-Speed-Limit 1 integer RoaringPenguin
+#
+# introduces a Roaring Penguin vendor-specific attribbute with name
+# RP-Upstream-Speed-Limit, number 1, type integer and vendor RoaringPenguin.
+
+#
+#	Following are the proper new names. Use these.
+#
+ATTRIBUTE	User-Name		1	string
+ATTRIBUTE	Password		2	string
+ATTRIBUTE	CHAP-Password		3	string
+ATTRIBUTE	NAS-IP-Address		4	ipaddr
+ATTRIBUTE	NAS-Port-Id		5	integer
+ATTRIBUTE	Service-Type		6	integer
+ATTRIBUTE	Framed-Protocol		7	integer
+ATTRIBUTE	Framed-IP-Address	8	ipaddr
+ATTRIBUTE	Framed-IP-Netmask	9	ipaddr
+ATTRIBUTE	Framed-Routing		10	integer
+ATTRIBUTE	Filter-Id		11	string
+ATTRIBUTE	Framed-MTU		12	integer
+ATTRIBUTE	Framed-Compression	13	integer
+ATTRIBUTE	Login-IP-Host		14	ipaddr
+ATTRIBUTE	Login-Service		15	integer
+ATTRIBUTE	Login-TCP-Port		16	integer
+ATTRIBUTE	Reply-Message		18	string
+ATTRIBUTE	Callback-Number		19	string
+ATTRIBUTE	Callback-Id		20	string
+ATTRIBUTE	Framed-Route		22	string
+ATTRIBUTE	Framed-IPX-Network	23	ipaddr
+ATTRIBUTE	State			24	string
+ATTRIBUTE	Class			25	string
+ATTRIBUTE	Session-Timeout		27	integer
+ATTRIBUTE	Idle-Timeout		28	integer
+ATTRIBUTE	Termination-Action	29	integer
+ATTRIBUTE	Called-Station-Id	30	string
+ATTRIBUTE	Calling-Station-Id	31	string
+ATTRIBUTE	NAS-Identifier		32	string
+ATTRIBUTE	Acct-Status-Type	40	integer
+ATTRIBUTE	Acct-Delay-Time		41	integer
+ATTRIBUTE	Acct-Input-Octets	42	integer
+ATTRIBUTE	Acct-Output-Octets	43	integer
+ATTRIBUTE	Acct-Session-Id		44	string
+ATTRIBUTE	Acct-Authentic		45	integer
+ATTRIBUTE	Acct-Session-Time	46	integer
+ATTRIBUTE	Acct-Input-Packets	47	integer
+ATTRIBUTE	Acct-Output-Packets	48	integer
+ATTRIBUTE	Acct-Terminate-Cause	49	integer
+ATTRIBUTE	Chap-Challenge		60	string
+ATTRIBUTE	NAS-Port-Type		61	integer
+ATTRIBUTE	Port-Limit		62	integer
+ATTRIBUTE	Connect-Info		77	string
+
+# RFC 2869
+ATTRIBUTE	Acct-Interim-Interval	85	integer
+
+#
+#	Experimental Non Protocol Attributes used by Cistron-Radiusd
+#
+ATTRIBUTE	Huntgroup-Name		221	string
+ATTRIBUTE	User-Category		1029	string
+ATTRIBUTE	Group-Name		1030	string
+ATTRIBUTE	Simultaneous-Use	1034	integer
+ATTRIBUTE	Strip-User-Name		1035	integer
+ATTRIBUTE	Fall-Through		1036	integer
+ATTRIBUTE	Add-Port-To-IP-Address	1037	integer
+ATTRIBUTE	Exec-Program		1038	string
+ATTRIBUTE	Exec-Program-Wait	1039	string
+ATTRIBUTE	Hint			1040	string
+
+#
+#	Non-Protocol Attributes
+#	These attributes are used internally by the server
+#
+ATTRIBUTE	Expiration		  21	date
+ATTRIBUTE	Auth-Type		1000	integer
+ATTRIBUTE	Menu			1001	string
+ATTRIBUTE	Termination-Menu	1002	string
+ATTRIBUTE	Prefix			1003	string
+ATTRIBUTE	Suffix			1004	string
+ATTRIBUTE	Group			1005	string
+ATTRIBUTE	Crypt-Password		1006	string
+ATTRIBUTE	Connect-Rate		1007	integer
+
+#
+#       Experimental, implementation specific attributes
+#
+# Limit session traffic
+ATTRIBUTE	Session-Octets-Limit	227	integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE	Octets-Direction	228	integer
+
+#
+#	Integer Translations
+#
+
+#	User Types
+
+VALUE		Service-Type		Login-User		1
+VALUE		Service-Type		Framed-User		2
+VALUE		Service-Type		Callback-Login-User	3
+VALUE		Service-Type		Callback-Framed-User	4
+VALUE		Service-Type		Outbound-User		5
+VALUE		Service-Type		Administrative-User	6
+VALUE		Service-Type		NAS-Prompt-User		7
+
+#	Framed Protocols
+
+VALUE		Framed-Protocol		PPP			1
+VALUE		Framed-Protocol		SLIP			2
+
+#	Framed Routing Values
+
+VALUE		Framed-Routing		None			0
+VALUE		Framed-Routing		Broadcast		1
+VALUE		Framed-Routing		Listen			2
+VALUE		Framed-Routing		Broadcast-Listen	3
+
+#	Framed Compression Types
+
+VALUE		Framed-Compression	None			0
+VALUE		Framed-Compression	Van-Jacobson-TCP-IP	1
+
+#	Login Services
+
+VALUE		Login-Service		Telnet			0
+VALUE		Login-Service		Rlogin			1
+VALUE		Login-Service		TCP-Clear		2
+VALUE		Login-Service		PortMaster		3
+
+#	Status Types
+
+VALUE		Acct-Status-Type	Start			1
+VALUE		Acct-Status-Type	Stop			2
+VALUE		Acct-Status-Type	Accounting-On		7
+VALUE		Acct-Status-Type	Accounting-Off		8
+
+#	Authentication Types
+
+VALUE		Acct-Authentic		RADIUS			1
+VALUE		Acct-Authentic		Local			2
+VALUE		Acct-Authentic		PowerLink128		100
+
+#	Termination Options
+
+VALUE		Termination-Action	Default			0
+VALUE		Termination-Action	RADIUS-Request		1
+
+#	NAS Port Types, available in 3.3.1 and later
+
+VALUE		NAS-Port-Type		Async			0
+VALUE		NAS-Port-Type		Sync			1
+VALUE		NAS-Port-Type		ISDN			2
+VALUE		NAS-Port-Type		ISDN-V120		3
+VALUE		NAS-Port-Type		ISDN-V110		4
+
+#	Acct Terminate Causes, available in 3.3.2 and later
+
+VALUE           Acct-Terminate-Cause    User-Request            1
+VALUE           Acct-Terminate-Cause    Lost-Carrier            2
+VALUE           Acct-Terminate-Cause    Lost-Service            3
+VALUE           Acct-Terminate-Cause    Idle-Timeout            4
+VALUE           Acct-Terminate-Cause    Session-Timeout         5
+VALUE           Acct-Terminate-Cause    Admin-Reset             6
+VALUE           Acct-Terminate-Cause    Admin-Reboot            7
+VALUE           Acct-Terminate-Cause    Port-Error              8
+VALUE           Acct-Terminate-Cause    NAS-Error               9
+VALUE           Acct-Terminate-Cause    NAS-Request             10
+VALUE           Acct-Terminate-Cause    NAS-Reboot              11
+VALUE           Acct-Terminate-Cause    Port-Unneeded           12
+VALUE           Acct-Terminate-Cause    Port-Preempted          13
+VALUE           Acct-Terminate-Cause    Port-Suspended          14
+VALUE           Acct-Terminate-Cause    Service-Unavailable     15
+VALUE           Acct-Terminate-Cause    Callback                16
+VALUE           Acct-Terminate-Cause    User-Error              17
+VALUE           Acct-Terminate-Cause    Host-Request            18
+
+#
+#	Non-Protocol Integer Translations
+#
+
+VALUE		Auth-Type		Local			0
+VALUE		Auth-Type		System			1
+VALUE		Auth-Type		SecurID			2
+VALUE		Auth-Type		Crypt-Local		3
+VALUE		Auth-Type		Reject			4
+
+#
+#	Cistron extensions
+#
+VALUE		Auth-Type		Pam			253
+VALUE		Auth-Type		None			254
+
+#
+#	Experimental Non-Protocol Integer Translations for Cistron-Radiusd
+#
+VALUE		Fall-Through		No			0
+VALUE		Fall-Through		Yes			1
+VALUE		Add-Port-To-IP-Address	No			0
+VALUE		Add-Port-To-IP-Address	Yes			1
+
+#
+#	Configuration Values
+#	uncomment these two lines to turn account expiration on
+#
+
+#VALUE		Server-Config		Password-Expiration	30
+#VALUE		Server-Config		Password-Warning	5
+
+#       Octets-Direction
+VALUE		Octets-Direction        Sum			0
+VALUE		Octets-Direction        Input			1
+VALUE		Octets-Direction        Output			2
+VALUE		Octets-Direction        MaxOveral		3
+VALUE		Octets-Direction        MaxSession		4
+
+INCLUDE /etc/ppp/radius/dictionary.microsoft
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet
@ -0,0 +1,3 @@
+VENDOR		ASNET		50000
+ATTRIBUTE	Speed-Down		1	string	ASNET
+ATTRIBUTE	Speed-Up		2	string	ASNET
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft
@ -0,0 +1,81 @@
+#
+#	Microsoft's VSA's, from RFC 2548
+#
+#	$Id$
+#
+
+VENDOR		Microsoft	311	Microsoft
+
+ATTRIBUTE	MS-CHAP-Response	1	string	Microsoft
+ATTRIBUTE	MS-CHAP-Error		2	string	Microsoft
+ATTRIBUTE	MS-CHAP-CPW-1		3	string	Microsoft
+ATTRIBUTE	MS-CHAP-CPW-2		4	string	Microsoft
+ATTRIBUTE	MS-CHAP-LM-Enc-PW	5	string	Microsoft
+ATTRIBUTE	MS-CHAP-NT-Enc-PW	6	string	Microsoft
+ATTRIBUTE	MS-MPPE-Encryption-Policy 7	string	Microsoft
+# This is referred to as both singular and plural in the RFC.
+# Plural seems to make more sense.
+ATTRIBUTE	MS-MPPE-Encryption-Type 8	string	Microsoft
+ATTRIBUTE	MS-MPPE-Encryption-Types  8	string	Microsoft
+ATTRIBUTE	MS-RAS-Vendor		9	integer	Microsoft
+ATTRIBUTE	MS-CHAP-Domain		10	string	Microsoft
+ATTRIBUTE	MS-CHAP-Challenge	11	string	Microsoft
+ATTRIBUTE	MS-CHAP-MPPE-Keys	12	string	Microsoft
+ATTRIBUTE	MS-BAP-Usage		13	integer	Microsoft
+ATTRIBUTE	MS-Link-Utilization-Threshold 14 integer	Microsoft
+ATTRIBUTE	MS-Link-Drop-Time-Limit	15	integer	Microsoft
+ATTRIBUTE	MS-MPPE-Send-Key	16	string	Microsoft
+ATTRIBUTE	MS-MPPE-Recv-Key	17	string	Microsoft
+ATTRIBUTE	MS-RAS-Version		18	string	Microsoft
+ATTRIBUTE	MS-Old-ARAP-Password	19	string	Microsoft
+ATTRIBUTE	MS-New-ARAP-Password	20	string	Microsoft
+ATTRIBUTE	MS-ARAP-PW-Change-Reason 21	integer	Microsoft
+
+ATTRIBUTE	MS-Filter		22	string	Microsoft
+ATTRIBUTE	MS-Acct-Auth-Type	23	integer	Microsoft
+ATTRIBUTE	MS-Acct-EAP-Type	24	integer	Microsoft
+
+ATTRIBUTE	MS-CHAP2-Response	25	string	Microsoft
+ATTRIBUTE	MS-CHAP2-Success	26	string	Microsoft
+ATTRIBUTE	MS-CHAP2-CPW		27	string	Microsoft
+
+ATTRIBUTE	MS-Primary-DNS-Server	28	ipaddr	Microsoft
+ATTRIBUTE	MS-Secondary-DNS-Server	29	ipaddr	Microsoft
+ATTRIBUTE	MS-Primary-NBNS-Server	30	ipaddr	Microsoft
+ATTRIBUTE	MS-Secondary-NBNS-Server 31	ipaddr	Microsoft
+
+#ATTRIBUTE	MS-ARAP-Challenge	33	string	Microsoft
+
+
+#
+#	Integer Translations
+#
+
+#	MS-BAP-Usage Values
+
+VALUE		MS-BAP-Usage		Not-Allowed	0
+VALUE		MS-BAP-Usage		Allowed		1
+VALUE		MS-BAP-Usage		Required	2
+
+#	MS-ARAP-Password-Change-Reason Values
+
+VALUE	MS-ARAP-PW-Change-Reason	Just-Change-Password		1
+VALUE	MS-ARAP-PW-Change-Reason	Expired-Password		2
+VALUE	MS-ARAP-PW-Change-Reason	Admin-Requires-Password-Change	3
+VALUE	MS-ARAP-PW-Change-Reason	Password-Too-Short		4
+
+#	MS-Acct-Auth-Type Values
+
+VALUE		MS-Acct-Auth-Type	PAP		1
+VALUE		MS-Acct-Auth-Type	CHAP		2
+VALUE		MS-Acct-Auth-Type	MS-CHAP-1	3
+VALUE		MS-Acct-Auth-Type	MS-CHAP-2	4
+VALUE		MS-Acct-Auth-Type	EAP		5
+
+#	MS-Acct-EAP-Type Values
+
+VALUE		MS-Acct-EAP-Type	MD5		4
+VALUE		MS-Acct-EAP-Type	OTP		5
+VALUE		MS-Acct-EAP-Type	Generic-Token-Card	6
+VALUE		MS-Acct-EAP-Type	TLS		13
+
--- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers
+++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers
@ -0,0 +1 @@
+localhost secret
--- a/package/ppp/ipkg/ppp/CONTROL/conffiles
+++ b/package/ppp/ipkg/ppp/CONTROL/conffiles
@ -0,0 +1,2 @@
+/etc/ppp/chap-secrets
+/etc/ppp/options
--- a/package/ppp/ipkg/ppp/etc/ppp/chap-secrets
+++ b/package/ppp/ipkg/ppp/etc/ppp/chap-secrets
@ -0,0 +1 @@
+#USERNAME  PROVIDER  PASSWORD  IPADDRESS
--- a/package/ppp/ipkg/ppp/etc/ppp/options
+++ b/package/ppp/ipkg/ppp/etc/ppp/options
@ -0,0 +1 @@
+#debug
--- a/package/ppp/ipkg/ppp/etc/ppp/peers/sample
+++ b/package/ppp/ipkg/ppp/etc/ppp/peers/sample
@ -0,0 +1,3 @@
+#name USERNAME
+#remotename PROVIDER
+#file /etc/ppp/sample-options
--- a/package/ppp/ppp.patch
+++ b/package/ppp/ppp.patch
--- a/package/pptpd/Config.in
+++ b/package/pptpd/Config.in
@ -0,0 +1,7 @@
+config BR2_PACKAGE_PPTPD
+	tristate "PPTP Server"
+	default m
+	select BR2_PACKAGE_KMOD_GRE
+	select BR2_PACKAGE_PPP
+	help
+	  A Point-to-Point Tunneling Protocol Server 
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@ -0,0 +1,70 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pptpd
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/poptop
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT:=zcat
+PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+
+$(DL_DIR)/$(PKG_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PKG_BUILD_DIR)/.unpacked
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+	(cd $(PKG_BUILD_DIR) ; \
+	$(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 \
+	  --datadir=/usr/share \
+	  --infodir=/usr/share/info \
+	  --mandir=/usr/share/man \
+	  --localstatedir=/var \
+	  --sysconfdir=/etc \
+	  $(DISABLE_NLS) \
+	  --with-pppd-ip-alloc)
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	 CC=$(TARGET_CC) \
+	 CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
+	 all
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
+	mkdir -p $(PKG_IPK_DIR)/usr/sbin
+	cp -a ./ipkg/* $(PKG_IPK_DIR)/
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	cp $(PKG_BUILD_DIR)/pptpd $(PKG_IPK_DIR)/usr/sbin/
+	cp $(PKG_BUILD_DIR)/pptpctrl $(PKG_IPK_DIR)/usr/sbin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked
+compile: $(PKG_IPK)
+install:
+	$(IPKG) install $(PKG_IPK)
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
--- a/package/pptpd/ipkg/CONTROL/conffiles
+++ b/package/pptpd/ipkg/CONTROL/conffiles
@ -0,0 +1,2 @@
+/etc/ppp/pptp-server-options
+/etc/pptpd.conf
--- a/package/pptpd/ipkg/etc/ppp/pptp-server-options
+++ b/package/pptpd/ipkg/etc/ppp/pptp-server-options
@ -0,0 +1,27 @@
+#debug
+#logfile /tmp/pptp-server.log
+172.16.1.1:
+auth
+name "pptp-server"
+lcp-echo-failure 3
+lcp-echo-interval 60
+default-asyncmap
+mtu 1482
+mru 1482
+nobsdcomp
+nodeflate
+#noproxyarp
+#nomppc
+nomppe-40
+nomppe-56
+nomppe-stateful
+require-mppe
+require-mppe-128
+require-mschap-v2
+refuse-chap
+refuse-mschap
+refuse-eap
+refuse-pap
+#ms-dns 172.16.1.1
+#plugin radius.so
+#radius-config-file /etc/radius.conf
--- a/package/pptpd/ipkg/etc/pptpd.conf
+++ b/package/pptpd/ipkg/etc/pptpd.conf
@ -0,0 +1,5 @@
+#debug
+option /etc/ppp/pptp-server-options
+speed 115200
+stimeout 10
+#localip & remoteip are not needed, ip management is done by pppd
--- a/package/pptpd/pptpd.control
+++ b/package/pptpd/pptpd.control
@ -0,0 +1,9 @@
+Package: pptpd
+Priority: optional
+Section: net
+Version: 1.2.3-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a Point-to-Point Tunneling Protocol (PPTP) server
+Depends: ppp, kmod-gre
--- a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
+++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
@ -0,0 +1,36 @@
+diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build
+--- ipkg-utils-1.7-old/ipkg-build	2004-08-24 04:56:12.000000000 +0200
+++ ipkg-utils-1.7-new/ipkg-build	2004-08-24 04:55:49.000000000 +0200
+@@ -47,6 +47,19 @@
+ 
+ 	PKG_ERROR=0
+ 
+	cvs_dirs=`find . -name 'CVS'`
+	if [ -n "$cvs_dirs" ]; then
+	    if [ "$noclean" = "1" ]; then
+		echo "*** Warning: The following CVS directories where found.
+You probably want to remove them: " >&2
+		ls -ld $cvs_dirs
+		echo >&2
+	    else
+		echo "*** Removing the following files: $cvs_dirs"
+		rm -rf "$cvs_dirs"
+	    fi
+	fi
+
+ 	tilde_files=`find . -name '*~'`
+ 	if [ -n "$tilde_files" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+@@ -134,8 +147,12 @@
+ 
+ 	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
+ 		if [ -f $script -a ! -x $script ]; then
+		    if [ "$noclean" = "1" ]; then
+ 			echo "*** Error: package script $script is not executable" >&2
+ 			PKG_ERROR=1
+		    else
+			chmod a+x $script
+		    fi
+ 		fi
+ 	done
+ 
--- a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
+++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
@ -0,0 +1,24 @@
+diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage
+--- ipkg-utils-1.7-old/ipkg-buildpackage	2001-07-26 17:36:36.000000000 +0200
+++ ipkg-utils-1.7-new/ipkg-buildpackage	2004-07-05 19:46:24.000000000 +0200
+@@ -30,8 +30,9 @@
+ 
+ set -e
+ 
+-#SCRIPTDIR=/usr/local/bin
+-SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/
+SCRIPTDIR=/usr/local/bin
+
+IPKG_BUILD_OPTIONS=$*
+ 
+ SCRIPTNAME=`basename $0`
+ 
+@@ -212,7 +213,7 @@
+ # build the ipk package
+ owd=`pwd`
+ cd ..
+-ipkg-build /tmp/${pkg} || exit 1
+ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1
+ 
+ rm -rf /tmp/${pkg}
+ 
--- a/toolchain/ipkg-utils/Makefile
+++ b/toolchain/ipkg-utils/Makefile
@ -0,0 +1,55 @@
+# ipkg-utils
+#
+# http://handhelds.org/packages/ipkg-utils
+#
+
+PKG_NAME := ipkg-utils
+PKG_VERSION := 1.7
+
+PKG_SOURCE_SITE := http://handhelds.org/packages/ipkg-utils/
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+
+include $(TOPDIR)/rules.mk
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PKG_BUILD_DIR)/.unpacked
+
+$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
+	$(PATCH) $(PKG_BUILD_DIR) $(PKG_VERSION)/ \*.patch
+	touch $(PKG_BUILD_DIR)/.patched
+
+$(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched
+	mkdir -p $(STAGING_DIR)/etc
+	echo "dest root $(TARGET_DIR)" > $(STAGING_DIR)/etc/ipkg.conf
+	mkdir -p $(STAGING_DIR)/usr/bin
+	install -m0755 $(TARGET_DIR)/bin/ipkg $(STAGING_DIR)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+
+prepare: $(PKG_BUILD_DIR)/.patched
+
+compile:
+
+install: $(STAGING_DIR)/usr/bin/ipkg-build
+
+clean:
+	rm -f $(STAGING_DIR)/etc/ipkg.conf
+	rm -f $(STAGING_DIR)/usr/bin/ipkg*
+	rm -rf $(PKG_BUILD_DIR)
+
+
--- a/toolchain/sed/Makefile
+++ b/toolchain/sed/Makefile
@ -0,0 +1,9 @@
+include $(TOPDIR)/rules.mk
+
+include ./sed.mk
+
+source: 
+prepare: 
+compile: 
+install: host-sed
+clean: host-sed-toolclean
--- a/toolchain/sed/sed.mk
+++ b/toolchain/sed/sed.mk
@ -0,0 +1,75 @@
+#############################################################
+#
+# sed
+#
+#############################################################
+SED_VER:=4.1.2
+SED_SOURCE:=sed-$(SED_VER).tar.gz
+SED_SITE:=ftp://ftp.gnu.org/gnu/sed
+SED_CAT:=zcat
+SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER)
+SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER)
+SED_BINARY:=sed/sed
+SED_TARGET_BINARY:=bin/sed
+ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
+endif
+HOST_SED_TARGET=$(shell ./sedcheck.sh)
+
+$(DL_DIR)/$(SED_SOURCE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
+
+sed-source: $(DL_DIR)/$(SED_SOURCE)
+
+
+#############################################################
+#
+# build sed for use on the host system
+#
+#############################################################
+$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	mkdir -p $(STAGING_DIR)/bin;
+	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(SED_DIR1)/.unpacked
+
+$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
+	(cd $(SED_DIR1); rm -rf config.cache; \
+		./configure \
+		--prefix=$(STAGING_DIR) \
+		--prefix=/usr \
+	);
+	touch  $(SED_DIR1)/.configured
+
+$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
+	$(MAKE) -C $(SED_DIR1)
+
+# This stuff is needed to work around GNU make deficiencies
+build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
+	@if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \
+		rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi;
+	@if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \
+	-ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+	    set -x; \
+	    mkdir -p $(STAGING_DIR)/bin; \
+	    $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \
+	    mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
+	    rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
+		    $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
+
+use-sed-host-binary:
+	@if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \
+	    if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \
+	    mkdir -p $(STAGING_DIR)/bin; \
+	    rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); \
+	    ln -s $$SED $(STAGING_DIR)/$(SED_TARGET_BINARY)
+
+host-sed: $(HOST_SED_TARGET)
+
+host-sed-clean:
+	-$(MAKE) -C $(SED_DIR1) clean
+
+host-sed-toolclean:
+	rm -rf $(SED_DIR1)
+	rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY)
--- a/toolchain/sed/sedcheck.sh
+++ b/toolchain/sed/sedcheck.sh
@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ -x /usr/bin/sed ]; then 
+    SED="/usr/bin/sed";
+else
+    if [ -x /bin/sed ]; then 
+	SED="/bin/sed";
+    fi;
+fi;
+
+echo "HELLO" > .sedtest
+$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
+
+if [ $? != 0 ] ; then
+	echo build-sed-host-binary
+else
+	echo use-sed-host-binary
+fi;
+rm -f .sedtest
+
+