update X11, kerberos, samba, bluez

- fix some ipkg issues with ubuntu
- use grub2 for alix1c, no grub1 dependency on host
- boots up on alix1c
- fix some bcm203x problems

5 files changed, 21 insertions, 45 deletions

diff --git a/package/samba/Makefile b/package/samba/Makefile
index 5a915413a..c964c5e14 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,16 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
-PKG_VERSION:=		3.3.4
+PKG_VERSION:=		3.4.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1443165edb7cb3f56f1e77aec1ee3266
+PKG_MD5SUM:=		322379680c12057f57685652a35a6b05
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net
 PKG_URL:=		http://www.samba.org
 PKG_SITES:=		ftp://se.samba.org/pub/samba/stable/ \
 			ftp://ftp.easynet.be/samba/stable/
 
-WRKSRC=			${WRKDIST}/source
+WRKSRC=			${WRKDIST}/source3
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/samba/patches/patch-source3_client_mtab_c b/package/samba/patches/patch-source3_client_mtab_c
new file mode 100644
index 000000000..d6cac2914
--- /dev/null
+++ b/package/samba/patches/patch-source3_client_mtab_c
@@ -0,0 +1,10 @@
+--- samba-3.4.3.orig/source3/client/mtab.c	2009-10-29 08:47:16.000000000 +0100
++++ samba-3.4.3/source3/client/mtab.c	2009-11-01 15:45:07.303242285 +0100
+@@ -32,6 +32,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <fcntl.h>
+ #include <mntent.h>
diff --git a/package/samba/patches/patch-source_configure b/package/samba/patches/patch-source3_configure
index c41ed21e7..b99b66528 100644
--- a/package/samba/patches/patch-source_configure
+++ b/package/samba/patches/patch-source3_configure
@@ -1,14 +1,14 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.3.orig/source/configure	2009-04-01 14:19:36.000000000 +0200
-+++ samba-3.3.3/source/configure	2009-04-18 22:56:27.047962181 +0200
-@@ -44062,194 +44062,6 @@ fi
+--- samba-3.4.3.orig/source3/configure	2009-10-29 09:18:27.000000000 +0100
++++ samba-3.4.3/source3/configure	2009-11-01 14:23:21.339243541 +0100
+@@ -45625,193 +45625,6 @@ fi
+ 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- #
+-#
 -#
 -#
 -case "$host_os" in
--    *linux*)
+-    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 -       # glibc <= 2.3.2 has a broken getgrouplist
 -       if test "$cross_compiling" = yes; then
 -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -191,8 +191,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -
 -       ;;
 -esac
--
--#
- # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
- #
  
+ #
+ # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
diff --git a/package/samba/patches/patch-source_client_mtab_c b/package/samba/patches/patch-source_client_mtab_c
deleted file mode 100644
index 7dedcd065..000000000
--- a/package/samba/patches/patch-source_client_mtab_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.3.orig/source/client/mtab.c	2009-04-01 13:48:54.000000000 +0200
-+++ samba-3.3.3/source/client/mtab.c	2009-04-18 23:27:50.522604765 +0200
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
diff --git a/package/samba/patches/patch-source_registry_reg_perfcount_c b/package/samba/patches/patch-source_registry_reg_perfcount_c
deleted file mode 100644
index a06b713d4..000000000
--- a/package/samba/patches/patch-source_registry_reg_perfcount_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.4.orig/source/registry/reg_perfcount.c	2009-04-28 08:46:16.000000000 +0200
-+++ samba-3.3.4/source/registry/reg_perfcount.c	2009-05-10 23:52:42.000000000 +0200
-@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P
- 	obj = NULL;
- 	memset(buf, 0, PERFCOUNT_MAX_LEN);
- 	memcpy(buf, data.dptr, data.dsize);
--	begin = index(buf, '[');
--	end = index(buf, ']');
-+	begin = strchr(buf, '[');
-+	end = strchr(buf, ']');
- 	if(begin == NULL || end == NULL)
- 		return False;
- 	start = begin+1;
- 
- 	while(start < end) {
--		stop = index(start, ',');
-+		stop = strchr(start, ',');
- 		if(stop == NULL)
- 			stop = end;
- 		*stop = '\0';