From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 27 Aug 2004 23:20:34 +0000 (+0000)
Subject: buildroot-20040827-matrixssl.patch.txt
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/fe6af23ad45e116649d8e2f219146980eacf593f

buildroot-20040827-matrixssl.patch.txt
buildroot-20040827-ntpclient.patch.txt
buildroot-20040827-radvd.patch.txt
buildroot-20040827-strace.patch.txt


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@152 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index f557d80ca..a8ea374c3 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 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 vsftpd
+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 vsftpd matrixssl ntpclient radvd strace
 
 #############################################################
 #
diff --git a/obsolete-buildroot/make/matrixssl.mk b/obsolete-buildroot/make/matrixssl.mk
new file mode 100644
index 000000000..c71d22415
--- /dev/null
+++ b/obsolete-buildroot/make/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*
diff --git a/obsolete-buildroot/make/ntpclient.mk b/obsolete-buildroot/make/ntpclient.mk
new file mode 100644
index 000000000..131f5e4ac
--- /dev/null
+++ b/obsolete-buildroot/make/ntpclient.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# ntpclient
+#
+#############################################################
+NTPCLIENT_VERSION:=2003_194
+NTPCLIENT_SOURCE:=ntpclient_$(NTPCLIENT_VERSION).tar.gz
+NTPCLIENT_SITE:=http://doolittle.faludi.com/ntpclient
+NTPCLIENT_DIR:=$(BUILD_DIR)/ntpclient
+NTPCLIENT_IPK=$(BUILD_DIR)/ntpclient_$(NTPCLIENT_VERSION)-1_mipsel.ipk
+NTPCLIENT_IPK_DIR:=$(BUILD_DIR)/ntpclient-$(NTPCLIENT_VERSION)-ipk
+
+$(DL_DIR)/$(NTPCLIENT_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(NTPCLIENT_SITE)/$(NTPCLIENT_SOURCE)
+
+ntpclient-source: $(DL_DIR)/$(NTPCLIENT_SOURCE)
+
+$(NTPCLIENT_DIR)/.unpacked: $(DL_DIR)/$(NTPCLIENT_SOURCE)
+	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(NTPCLIENT_SOURCE)
+	touch $(NTPCLIENT_DIR)/.unpacked
+
+$(NTPCLIENT_DIR)/ntpclient: $(NTPCLIENT_DIR)/.unpacked
+	CFLAGS="$(TARGET_CFLAGS)" $(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) -C $(NTPCLIENT_DIR)
+
+$(NTPCLIENT_IPK): $(NTPCLIENT_DIR)/ntpclient
+	mkdir -p $(NTPCLIENT_IPK_DIR)/CONTROL $(NTPCLIENT_IPK_DIR)/usr/sbin
+	install -m 644 $(OPENWRT_IPK_DIR)/ntpclient/CONTROL/control $(NTPCLIENT_IPK_DIR)/CONTROL
+	install -m 755 $(NTPCLIENT_DIR)/ntpclient $(NTPCLIENT_IPK_DIR)/usr/sbin/
+	$(STRIP) $(NTPCLIENT_IPK_DIR)/usr/sbin/ntpclient
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(NTPCLIENT_IPK_DIR)
+
+ntpclient-ipk : uclibc $(NTPCLIENT_IPK)
+
+ntpclient-clean:
+	-$(MAKE) -C $(NTPCLIENT_DIR) clean
+
+ntpclient-dirclean:
+	rm -rf $(NTPCLIENT_DIR) $(NTPCLIENT_IPK_DIR)
diff --git a/obsolete-buildroot/make/radvd.mk b/obsolete-buildroot/make/radvd.mk
new file mode 100644
index 000000000..1602bbb61
--- /dev/null
+++ b/obsolete-buildroot/make/radvd.mk
@@ -0,0 +1,59 @@
+#############################################################
+#
+# radvd
+#
+#############################################################
+RADVD_VERSION:=0.7.2
+RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
+RADVD_SITE:=http://v6web.litech.org/radvd/dist
+RADVD_DIR:=$(BUILD_DIR)/radvd-$(RADVD_VERSION)
+RADVD_IPK=$(BUILD_DIR)/radvd_0.7.2-1_mipsel.ipk
+RADVD_IPK_DIR:=$(BUILD_DIR)/radvd-0.7.2-ipk
+
+$(DL_DIR)/$(RADVD_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(RADVD_SITE)/$(RADVD_SOURCE)
+
+radvd-source: $(DL_DIR)/$(RADVD_SOURCE)
+
+$(RADVD_DIR)/.unpacked: $(DL_DIR)/$(RADVD_SOURCE)
+	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(RADVD_SOURCE)
+	touch $(RADVD_DIR)/.unpacked
+
+$(RADVD_DIR)/.configured: $(RADVD_DIR)/.unpacked
+	(cd $(RADVD_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 \
+		--with-logfile=/tmp/radvd.log \
+		--with-pidfile=/tmp/run/radvd.pid \
+		--with-configfile=/etc/radvd.conf \
+	);
+	touch  $(RADVD_DIR)/.configured
+
+$(RADVD_DIR)/radvd: $(RADVD_DIR)/.configured
+	cp $(FLEX_DIR)/libfl.a $(RADVD_DIR)/libfl.a
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) LDFLAGS=-L. -C $(RADVD_DIR)
+
+$(RADVD_IPK):  $(RADVD_DIR)/radvd
+	mkdir -p $(RADVD_IPK_DIR)/CONTROL $(RADVD_IPK_DIR)/etc $(RADVD_IPK_DIR)/usr/sbin
+	install -m 644 $(OPENWRT_IPK_DIR)/radvd/CONTROL/control $(RADVD_IPK_DIR)/CONTROL/control
+	install -m 755 $(OPENWRT_IPK_DIR)/radvd/CONTROL/postinst $(RADVD_IPK_DIR)/CONTROL/postinst
+	install -m 644 $(OPENWRT_IPK_DIR)/radvd/radvd.conf.example $(RADVD_IPK_DIR)/etc/radvd.conf.example
+	install -m 755 $(RADVD_DIR)/radvd $(RADVD_IPK_DIR)/usr/sbin/
+	install -m 755 $(RADVD_DIR)/radvdump $(RADVD_IPK_DIR)/usr/sbin/
+	$(STRIP) $(RADVD_IPK_DIR)/usr/sbin/radvd
+	$(STRIP) $(RADVD_IPK_DIR)/usr/sbin/radvdump
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(RADVD_IPK_DIR)
+
+radvd-ipk : uclibc $(FLEX_DIR)/$(FLEX_BINARY) $(RADVD_IPK)
+
+radvd-clean:
+	-$(MAKE) -C $(RADVD_DIR) clean
+
+radvd-dirclean:
+	rm -rf $(RADVD_DIR) $(RADVD_IPK_DIR)
+
diff --git a/obsolete-buildroot/make/strace.mk b/obsolete-buildroot/make/strace.mk
index 546584d80..8de293523 100644
--- a/obsolete-buildroot/make/strace.mk
+++ b/obsolete-buildroot/make/strace.mk
@@ -3,10 +3,12 @@
 # strace
 #
 #############################################################
-STRACE_SOURCE:=strace-4.5.3.tar.bz2
+STRACE_SOURCE:=strace-4.5.6.tar.bz2
 STRACE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/strace
 STRACE_CAT:=bzcat
-STRACE_DIR:=$(BUILD_DIR)/strace-4.5.3
+STRACE_DIR:=$(BUILD_DIR)/strace-4.5.6
+STRACE_IPK=$(BUILD_DIR)/strace_4.5.6-1_mipsel.ipk
+STRACE_IPK_DIR:=$(BUILD_DIR)/strace-4.5.6-ipk
 
 
 $(DL_DIR)/$(STRACE_SOURCE):
@@ -50,10 +52,16 @@ $(TARGET_DIR)/usr/bin/strace: $(STRACE_DIR)/strace
 
 strace: uclibc $(TARGET_DIR)/usr/bin/strace 
 
+strace-ipk: $(STRACE_DIR)/strace
+	mkdir -p $(STRACE_IPK_DIR)/CONTROL
+	mkdir -p $(STRACE_IPK_DIR)/usr/bin
+	install -m 644 $(OPENWRT_IPK_DIR)/strace/CONTROL/control $(STRACE_IPK_DIR)/CONTROL/control
+	install -m 755 $(STRACE_DIR)/strace $(STRACE_IPK_DIR)/usr/bin/
+	$(STRIP) $(STRACE_IPK_DIR)/usr/bin/strace 
+	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(STRACE_IPK_DIR)
+
 strace-clean: 
 	$(MAKE) -C $(STRACE_DIR) clean
 
 strace-dirclean: 
-	rm -rf $(STRACE_DIR) 
-
-
+	rm -rf $(STRACE_DIR) $(STRACE_IPK_DIR)
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/libmatrixssl/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/libmatrixssl/CONTROL/control
new file mode 100644
index 000000000..a417b429b
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/libmatrixssl/CONTROL/control
@@ -0,0 +1,9 @@
+Package: libmatrixssl
+Priority: optional
+Section: libs
+Version: TBDL
+Architecture: TBDL
+Maintainer: Nico
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/buildroot/
+Description: an embedded SSL implementation
+Depends: libpthread
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/ntpclient/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/ntpclient/CONTROL/control
new file mode 100644
index 000000000..30194d139
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/ntpclient/CONTROL/control
@@ -0,0 +1,9 @@
+Package: ntpclient
+Architecture: mipsel
+Version: 2003.194-1
+Section: utils
+Priority: optional
+Maintainer: Sebastien NOEL <me@twolife.org>
+Source: http://doolittle.faludi.com/ntpclient/
+Depends:
+Description: utility to setting system time from NTP server
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/control
new file mode 100644
index 000000000..0c7066a8b
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/control
@@ -0,0 +1,9 @@
+Package: radvd
+Architecture: mipsel
+Version: 0.7.2-1
+Section: net
+Priority: optional
+Maintainer: twolife 
+Source: http://v6web.litech.org/radvd/
+Depends: kmod-ipv6
+Description: Routing Advertisement Daemon for IPv6
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/postinst b/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/postinst
new file mode 100644
index 000000000..d3274a203
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/radvd/CONTROL/postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# This code is from radvd package found on:
+# http://openwrt.org/ipkg/
+
+if [ ! -f /etc/radvd.conf ] ; then
+	echo
+	echo
+	echo See /etc/radvd.conf for configuration.
+	echo
+	cp /etc/radvd.conf.example /etc/radvd.conf
+fi
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/radvd/radvd.conf.example b/obsolete-buildroot/sources/openwrt/ipkg/radvd/radvd.conf.example
new file mode 100644
index 000000000..dae402c3c
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/radvd/radvd.conf.example
@@ -0,0 +1,33 @@
+# This conffile is from radvd package found on:
+# http://openwrt.org/ipkg/
+# For more examples, see the radvd documentation.
+
+interface br0
+{
+	AdvSendAdvert off;
+
+#
+# These settings cause advertisements to be sent every 3-10 seconds.  This
+# range is good for 6to4 with a dynamic IPv4 address, but can be greatly
+# increased when not using 6to4 prefixes.
+#
+
+	MinRtrAdvInterval 3;
+	MaxRtrAdvInterval 10;
+
+#
+# Disable Mobile IPv6 support
+#
+	AdvHomeAgentFlag off;
+
+#
+# example of a standard prefix
+#
+	prefix fec0:0:0:1::/64
+	{
+		AdvOnLink on;
+		AdvAutonomous on;
+		AdvRouterAddr off;
+	};
+
+};
diff --git a/obsolete-buildroot/sources/openwrt/ipkg/strace/CONTROL/control b/obsolete-buildroot/sources/openwrt/ipkg/strace/CONTROL/control
new file mode 100644
index 000000000..edbbc581b
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/ipkg/strace/CONTROL/control
@@ -0,0 +1,9 @@
+Package: strace
+Architecture: mipsel
+Version: 4.5.6-1
+Section: utils
+Priority: optional
+Maintainer: Sebastien NOEL <me@twolife.org>
+Source: http://sourceforge.net/projects/strace/
+Depends:
+Description: A system call tracer
diff --git a/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.1.2-openwrt.patch b/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.1.2-openwrt.patch
new file mode 100644
index 000000000..dfd8b5d95
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.1.2-openwrt.patch
@@ -0,0 +1,14 @@
+diff -ruN matrixssl-1.1.2-old/src/Makefile matrixssl-1.1.2-new/src/Makefile
+--- matrixssl-1.1.2-old/src/Makefile	2004-06-10 21:03:25.000000000 +0200
++++ matrixssl-1.1.2-new/src/Makefile	2004-07-09 22:58:06.000000000 +0200
+@@ -46,8 +46,8 @@
+ #	Compile options
+ #
+ SHARED	= -shared
+-CFLAGS  = $(DFLAGS) -DLINUX
+-LDFLAGS = -nostdlib -lc -lpthread
++CFLAGS  = $(DFLAGS) -DLINUX -fPIC
++LDFLAGS = -lc -lpthread -Wl,-soname,libmatrixssl.so.1.2
+ 
+ #
+ #	Override variables for compilation on Mac OS X (Darwin)
diff --git a/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.2.1-examples_fix.patch b/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.2.1-examples_fix.patch
new file mode 100644
index 000000000..e9980d66a
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/patches/matrixssl/matrixssl-1.2.1-examples_fix.patch
@@ -0,0 +1,12 @@
+diff -ruN matrixssl-1.2.1-old/examples/Makefile matrixssl-1.2.1-new/examples/Makefile
+--- matrixssl-1.2.1-old/examples/Makefile	2004-06-05 00:45:21.000000000 +0200
++++ matrixssl-1.2.1-new/examples/Makefile	2004-08-19 04:01:29.000000000 +0200
+@@ -34,7 +34,7 @@
+ #	Compile options
+ #
+ CFLAGS  = $(DFLAGS) -DLINUX
+-LDFLAGS = -lc
++LDFLAGS = -lc -lpthread
+ 
+ #
+ #   Override variables for compilation on Mac OS X (Darwin)