From 8edb1cd5a6a03b391003a1047e0b3ca6d22acd45 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 13 Jun 2010 18:06:45 +0200
Subject: bulk package update
---
package/samba/Makefile | 4 +-
package/samba/patches/patch-client_mount_cifs_c | 19 ++
package/samba/patches/patch-source3_client_mtab_c | 10 --
package/samba/patches/patch-source3_configure | 196 ---------------------
.../patches/patch-source3_registry_reg_perfcount_c | 6 +-
5 files changed, 24 insertions(+), 211 deletions(-)
create mode 100644 package/samba/patches/patch-client_mount_cifs_c
delete mode 100644 package/samba/patches/patch-source3_client_mtab_c
delete mode 100644 package/samba/patches/patch-source3_configure
(limited to 'package/samba')
diff --git a/package/samba/Makefile b/package/samba/Makefile
index e953e2253..e1e41963c 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= samba
-PKG_VERSION:= 3.4.5
+PKG_VERSION:= 3.5.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8e8a484782f2b7716b6c6bd9a7d2bf71
+PKG_MD5SUM:= 7c8d2a34b649380d5df838c3e030dbec
PKG_DESCR:= NetBIOS/SMB file and print server
PKG_SECTION:= net
PKG_URL:= http://www.samba.org
diff --git a/package/samba/patches/patch-client_mount_cifs_c b/package/samba/patches/patch-client_mount_cifs_c
new file mode 100644
index 000000000..4ddd91f9c
--- /dev/null
+++ b/package/samba/patches/patch-client_mount_cifs_c
@@ -0,0 +1,19 @@
+--- samba-3.5.3.orig/client/mount.cifs.c 2010-05-17 13:51:23.000000000 +0200
++++ samba-3.5.3/client/mount.cifs.c 2010-06-11 12:39:34.501613636 +0200
+@@ -39,7 +39,6 @@
+ #include <mntent.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <fstab.h>
+ #include "mount.h"
+
+ #define MOUNT_CIFS_VERSION_MAJOR "1"
+@@ -112,7 +111,7 @@
+ * The legacy behavior is now disabled by default. To reenable it, set the
+ * following #define to true.
+ */
+-#define CIFS_LEGACY_SETUID_CHECK 0
++#define CIFS_LEGACY_SETUID_CHECK 1
+
+ /*
+ * When an unprivileged user runs a setuid mount.cifs, we set certain mount
diff --git a/package/samba/patches/patch-source3_client_mtab_c b/package/samba/patches/patch-source3_client_mtab_c
deleted file mode 100644
index d6cac2914..000000000
--- a/package/samba/patches/patch-source3_client_mtab_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-source3_configure b/package/samba/patches/patch-source3_configure
deleted file mode 100644
index b99b66528..000000000
--- a/package/samba/patches/patch-source3_configure
+++ /dev/null
@@ -1,196 +0,0 @@
---- 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* | 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
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include <unistd.h>
--#include <sys/utsname.h>
--main() {
-- /* glibc up to 2.3 has a broken getgrouplist */
--#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-- int libc_major = __GLIBC__;
-- int libc_minor = __GLIBC_MINOR__;
--
-- if (libc_major < 2)
-- exit(1);
-- if ((libc_major == 2) && (libc_minor <= 3))
-- exit(1);
--#endif
-- exit(0);
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- linux_getgrouplist_ok=yes
--else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--linux_getgrouplist_ok=no
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
-- if test x"$linux_getgrouplist_ok" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETGROUPLIST 1
--_ACEOF
--
-- fi
-- ;;
-- *)
--
--for ac_func in getgrouplist
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
-- ;;
--esac
-
- #
- # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
diff --git a/package/samba/patches/patch-source3_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c
index 650394f73..684036b5b 100644
--- a/package/samba/patches/patch-source3_registry_reg_perfcount_c
+++ b/package/samba/patches/patch-source3_registry_reg_perfcount_c
@@ -1,6 +1,6 @@
---- samba-3.4.3.orig/source3/registry/reg_perfcount.c 2009-10-29 08:47:16.000000000 +0100
-+++ samba-3.4.3/source3/registry/reg_perfcount.c 2009-11-20 21:11:54.000000000 +0100
-@@ -613,14 +613,14 @@ static bool _reg_perfcount_add_counter(P
+--- samba-3.5.3.orig/source3/registry/reg_perfcount.c 2010-05-17 13:51:23.000000000 +0200
++++ samba-3.5.3/source3/registry/reg_perfcount.c 2010-06-11 12:21:42.911613348 +0200
+@@ -618,14 +618,14 @@ static bool _reg_perfcount_add_counter(s
obj = NULL;
memset(buf, 0, PERFCOUNT_MAX_LEN);
memcpy(buf, data.dptr, data.dsize);
--
cgit v1.2.3