update some packages, fix some kernel module dependencies

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

2 files changed, 3 insertions, 36 deletions

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 ) ;