update some packages, fix some kernel module dependencies

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

1 files changed, 13 insertions, 14 deletions

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