aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Sven Neumann <s.neumann@raumfeld.com>2009-05-04 21:01:25 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2009-05-04 21:01:25 +0200
commita657cf77ead0bc69ea16580fe8da4441db34e4b1 (patch)
tree2d01731112a9aa94ece5bd89a14bf3805d97823c
parent163a062727a7b81ab8e19776f28e780973524332 (diff)
downloadbuildroot-a657cf77ead0bc69ea16580fe8da4441db34e4b1.tar.gz
buildroot-a657cf77ead0bc69ea16580fe8da4441db34e4b1.tar.bz2
samba: bump version
Closes #293. [peter: bump to 3.3.4] Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/samba/samba-add-check-for-__use_bsd.patch8
-rw-r--r--package/samba/samba-do-not-check-glibc-version.patch31
-rw-r--r--package/samba/samba-fix-mount.cifs.patch22
-rw-r--r--package/samba/samba-getgrouplist.patch6
-rw-r--r--package/samba/samba.mk2
5 files changed, 26 insertions, 43 deletions
diff --git a/package/samba/samba-add-check-for-__use_bsd.patch b/package/samba/samba-add-check-for-__use_bsd.patch
index df84a713ec..a4c7109cf0 100644
--- a/package/samba/samba-add-check-for-__use_bsd.patch
+++ b/package/samba/samba-add-check-for-__use_bsd.patch
@@ -1,6 +1,6 @@
---- a/source/client/mount.cifs.c
-+++ b/source/client/mount.cifs.c
-@@ -96,6 +96,7 @@ char * prefixpath = NULL;
+--- a/source/client/mount.cifs.c 2009-04-01 13:48:54.000000000 +0200
++++ b/source/client/mount.cifs.c 2009-04-20 12:59:57.000000000 +0200
+@@ -100,6 +100,7 @@
/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
* don't link to libreplace so need them here. */
@@ -8,7 +8,7 @@
/* like strncpy but does not 0 fill the buffer and always null
* terminates. bufsize is the size of the destination buffer */
-@@ -177,6 +178,7 @@ static void mount_cifs_usage(void)
+@@ -181,6 +182,7 @@
SAFE_FREE(mountpassword);
exit(EX_USAGE);
}
diff --git a/package/samba/samba-do-not-check-glibc-version.patch b/package/samba/samba-do-not-check-glibc-version.patch
index ddb116bcae..c5e3cd4781 100644
--- a/package/samba/samba-do-not-check-glibc-version.patch
+++ b/package/samba/samba-do-not-check-glibc-version.patch
@@ -1,6 +1,6 @@
---- a/source/configure
-+++ b/source/configure
-@@ -41016,85 +41016,8 @@ fi
+--- a/source/configure 2009-04-01 14:19:36.000000000 +0200
++++ b/source/configure 2009-04-20 13:05:12.000000000 +0200
+@@ -44061,90 +44061,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -11,11 +11,13 @@
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+- { { $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
--echo "$as_me: error: cannot run test program while cross compiling
+-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -47,29 +49,32 @@
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- linux_getgrouplist_ok=yes
-else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+- $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
-
@@ -88,7 +93,7 @@
for ac_func in getgrouplist
do
-@@ -41189,8 +41112,6 @@ _ACEOF
+@@ -44246,8 +44164,6 @@
fi
done
diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch
index dcb30ebec6..90bff234c9 100644
--- a/package/samba/samba-fix-mount.cifs.patch
+++ b/package/samba/samba-fix-mount.cifs.patch
@@ -1,27 +1,5 @@
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
-@@ -16,6 +16,10 @@
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-+#ifdef _SAMBA_BUILD_
-+#include "include/config.h"
-+#endif
-+
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-@@ -57,10 +61,6 @@
- #endif /* _SAMBA_BUILD_ */
- #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
-
--#ifdef _SAMBA_BUILD_
--#include "include/config.h"
--#endif
--
- #ifndef MS_MOVE
- #define MS_MOVE 8192
- #endif
@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
return ret;
}
diff --git a/package/samba/samba-getgrouplist.patch b/package/samba/samba-getgrouplist.patch
index 8c1e3afca3..e98d9cdc27 100644
--- a/package/samba/samba-getgrouplist.patch
+++ b/package/samba/samba-getgrouplist.patch
@@ -1,6 +1,6 @@
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -1199,38 +1199,6 @@ AC_TRY_COMPILE([
+--- a/source/configure.in 2009-04-01 13:48:54.000000000 +0200
++++ b/source/configure.in 2009-04-20 13:08:42.000000000 +0200
+@@ -1219,38 +1219,6 @@
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
#
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index beac484f9a..45e9938cf6 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.2.7
+SAMBA_VERSION:=3.3.4
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source