summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/samba/patches/patch-client_mount_cifs_c19
-rw-r--r--package/samba/patches/patch-source3_registry_reg_perfcount_c20
3 files changed, 2 insertions, 41 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile
index f083e0ac4..0485febc2 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= samba
-PKG_VERSION:= 3.5.3
+PKG_VERSION:= 3.6.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7c8d2a34b649380d5df838c3e030dbec
+PKG_MD5SUM:= e297e0ea7923c7de8d7c1d8fd0ec0a05
PKG_DESCR:= NetBIOS/SMB file and print server
PKG_SECTION:= net/fs
PKG_BUILDDEP:= gettext
diff --git a/package/samba/patches/patch-client_mount_cifs_c b/package/samba/patches/patch-client_mount_cifs_c
deleted file mode 100644
index 4ddd91f9c..000000000
--- a/package/samba/patches/patch-client_mount_cifs_c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c
deleted file mode 100644
index 684036b5b..000000000
--- a/package/samba/patches/patch-source3_registry_reg_perfcount_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);
-- 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';