summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-09-25 13:35:45 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-10-04 21:08:30 (GMT)
commit437a4446f25232cba6c385f26063ce61a1ffd08f (patch)
treec7da0f722b63281adb87e0a16c56268bb712faa0
parentfcc4f789235a77537736bd5dbe8c938de51c9e70 (diff)
downloadbuildroot-437a4446f25232cba6c385f26063ce61a1ffd08f.tar.gz
buildroot-437a4446f25232cba6c385f26063ce61a1ffd08f.tar.bz2
samba: bump to version 3.6.8
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/samba/samba-getaddrinfo.patch13
-rw-r--r--package/samba/samba.mk2
2 files changed, 8 insertions, 7 deletions
diff --git a/package/samba/samba-getaddrinfo.patch b/package/samba/samba-getaddrinfo.patch
index af01299..df3570c 100644
--- a/package/samba/samba-getaddrinfo.patch
+++ b/package/samba/samba-getaddrinfo.patch
@@ -1,18 +1,19 @@
-Patch from OpenWRT.
+Patch forward-ported from OpenWRT.
Don't check for buggy getaddrinfo() assume it's safe if it's present.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---- a/source3/configure
-+++ b/source3/configure
-@@ -13285,10 +13285,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+diff -Nura samba-3.6.8.orig/source3/configure samba-3.6.8/source3/configure
+--- samba-3.6.8.orig/source3/configure 2012-09-14 05:19:52.000000000 -0300
++++ samba-3.6.8/source3/configure 2012-09-25 20:31:57.861743235 -0300
+@@ -13269,10 +13269,7 @@
# see bug 5910, use our replacements if we detect
# a broken system.
if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+ $as_echo "assuming valid getaddrinfo without bug 5910" >&2
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 75e3173..7c06e14 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
#
#############################################################
-SAMBA_VERSION = 3.6.7
+SAMBA_VERSION = 3.6.8
SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
SAMBA_SUBDIR = source3
SAMBA_INSTALL_STAGING = YES