update some packages, fix some kernel module dependencies

- update tinc, openssl and xinetd
- fix openssh and dropbear coexistence
- fix some kernel module load orders

10 files changed, 32 insertions, 82 deletions

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 1c4c33745..4a7d7a875 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -10,7 +10,7 @@ bothlog() {
 case $1 in
 autostop) ;;
 autostart)
-	[[ "$dropbear_flags" = "NO" ]] && exit 0
+	test x"${dropbear:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
index b09c34147..11c7923bb 100644
--- a/package/dropbear/files/dropbear.postinst
+++ b/package/dropbear/files/dropbear.postinst
@@ -1,3 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf '"NO" to disable' dropbear_flags " "
+add_rcconf dropbear dropbear YES
diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init
index 81f073b88..149da9dc4 100644
--- a/package/openssh/files/sshd.init
+++ b/package/openssh/files/sshd.init
@@ -8,8 +8,8 @@ case $1 in
 autostop) ;;
 autostart)
 	[[ $openssh = NO ]] && exit 0
-	grep dropbear_flags /etc/rc.conf >/dev/null 2>&1 || dropbear_flags=NO
-	if [[ $openssh = AUTO && $dropbear_flags != NO ]]; then
+	grep dropbear /etc/rc.conf >/dev/null 2>&1 || dropbear=NO
+	if [[ $openssh = AUTO && $dropbear != NO ]]; then
 		echo openssh not starting: set to AUTO and dropbear is enabled
 		exit 0
 	fi
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 70816f944..698f96ddf 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
-PKG_VERSION:=		0.9.8j
+PKG_VERSION:=		0.9.8l
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a5cb5f6c3d11affb387ecf7a997cac0c
+PKG_MD5SUM:=		05a0ece1372392a2cf310ebb96333025
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
@@ -32,7 +32,10 @@ INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
-OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast no-bf
+OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+
+post-extract:
+	@find ${WRKBUILD} -name *.rej -delete
 
 do-configure:
 	(cd $(WRKBUILD); \
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 4fd60ccb8..fb07479f9 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -1,7 +1,7 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openssl-0.9.8i.orig/Configure	2008-09-12 16:47:00.000000000 +0200
-+++ openssl-0.9.8i/Configure	2008-10-22 11:02:46.000000000 +0200
-@@ -357,6 +357,7 @@ my %table=(
+diff -Nur openssl-0.9.8l.orig/Configure openssl-0.9.8l/Configure
+--- openssl-0.9.8l.orig/Configure	2009-11-05 13:07:06.000000000 +0100
++++ openssl-0.9.8l/Configure	2009-12-06 02:14:45.000000000 +0100
+@@ -364,6 +364,7 @@
  "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 27f61a2ca..efa122a5e 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tinc
-PKG_VERSION:=		1.0.9
+PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f907acebada53512e01235bea6b4cdf1
+PKG_MD5SUM:=		ee0b1a3366c6e379cae34be6fa5dcb15
 PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib liblzo libopenssl kmod-tun
diff --git a/package/tinc/patches/patch-src_linux_device_c b/package/tinc/patches/patch-src_linux_device_c
index 6a5b66e3c..9a5c09059 100644
--- a/package/tinc/patches/patch-src_linux_device_c
+++ b/package/tinc/patches/patch-src_linux_device_c
@@ -1,21 +1,20 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- tinc-1.0.9.orig/src/linux/device.c	2006-12-16 17:54:05.000000000 +0100
-+++ tinc-1.0.9/src/linux/device.c	2009-05-11 23:55:39.000000000 +0200
-@@ -64,7 +64,7 @@ bool setup_device(void)
- #ifdef HAVE_LINUX_IF_TUN_H
- 		iface = netname;
+--- tinc-1.0.11.orig/src/linux/device.c	2009-09-27 12:27:54.000000000 +0200
++++ tinc-1.0.11/src/linux/device.c	2009-12-06 02:30:32.000000000 +0100
+@@ -61,7 +61,7 @@ bool setup_device(void) {
+ 		if (netname != NULL)
+ 			iface = xstrdup(netname);
  #else
--		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-+		iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device;
+-		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
++		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
  #endif
  	device_fd = open(device, O_RDWR | O_NONBLOCK);
  
-@@ -104,7 +104,7 @@ bool setup_device(void)
- 			overwrite_mac = true;
- 		device_info = _("Linux ethertap device");
+@@ -105,7 +105,7 @@ bool setup_device(void) {
  		device_type = DEVICE_TYPE_ETHERTAP;
--		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-+		iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device;
+ 		if(iface)
+ 			free(iface);
+-		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
++		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
  	}
  
- 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
+ 	logger(LOG_INFO, "%s is a %s", device, device_info);
diff --git a/package/tinc/patches/patch-src_net_setup_c b/package/tinc/patches/patch-src_net_setup_c
deleted file mode 100644
index dd4d7b495..000000000
--- a/package/tinc/patches/patch-src_net_setup_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- tinc-1.0.9.orig/src/net_setup.c	2008-12-22 21:35:45.000000000 +0100
-+++ tinc-1.0.9/src/net_setup.c	2009-05-11 23:52:07.000000000 +0200
-@@ -358,14 +358,14 @@ bool setup_myself(void)
- 			}
- 		}
- 	} else
--		myself->cipher = EVP_bf_cbc();
-+		myself->cipher = EVP_des_cbc();
- 
- 	if(myself->cipher)
- 		myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
- 	else
- 		myself->keylength = 1;
- 
--	myself->connection->outcipher = EVP_bf_ofb();
-+	myself->connection->outcipher = EVP_des_ofb();
- 
- 	myself->key = xmalloc(myself->keylength);
- 	RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 7f43eb508..b210a8c76 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinetd
-PKG_VERSION:=		2.3.13
-PKG_RELEASE:=		9
-PKG_MD5SUM:=		4295b5fe12350f09b5892b363348ac8b
+PKG_VERSION:=		2.3.14
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		567382d7972613090215c6c54f9b82d9
 PKG_DESCR:=		a powerful and secure superserver
 PKG_SECTION:=		net
 PKG_URL:=		http://www.xinetd.org
diff --git a/package/xinetd/patches/xinetd-2.3.13-gcc4-1.patch b/package/xinetd/patches/xinetd-2.3.13-gcc4-1.patch
deleted file mode 100644
index 49ac327bc..000000000
--- a/package/xinetd/patches/xinetd-2.3.13-gcc4-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2005-08-07
-Initial Package Version: 2.3.13
-Upstream Status:         Not submitted
-Origin:                  Fedora Development CVS
-Description:             Fixes compilation error if using GCC-4.x
-
-
-diff -Naur xinetd-2.3.13-orig/xinetd/service.c xinetd-2.3.13/xinetd/service.c
---- xinetd-2.3.13-orig/xinetd/service.c	2003-11-16 12:44:10.000000000 +0000
-+++ xinetd-2.3.13/xinetd/service.c	2005-08-07 18:37:33.395942648 +0000
-@@ -764,8 +764,8 @@
-                return FAILED;
- 
-             if ( last == NULL ) {
--               last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = 
--		  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
-+               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
-+	       last = SAIN(SVC_LAST_DGRAM_ADDR(sp));
-             }
- 
-             (void) time( &current_time ) ;
-@@ -791,8 +791,8 @@
-                return FAILED;
- 
- 	    if( last == NULL ) {
--               last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = 
--		  SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
-+               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
-+               last = SAIN6( SVC_LAST_DGRAM_ADDR(sp) );
-             }
- 
-             (void) time( &current_time ) ;