Major enhancements in Samba 3.6.10 include:

o  Respond correctly to FILE_STREAM_INFO requests.
o  Fix segfault when "default devmode" is disabled.
o  Fix segfaults in "log level = 10" on Solaris.

4 files changed, 20 insertions, 37 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 617df90bff4..81e93808e13 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.224 2012/10/30 13:24:32 drochner Exp $
+# $NetBSD: Makefile,v 1.225 2012/12/14 07:39:34 adam Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -12,7 +11,7 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.6.6
+VERSION=	3.6.10
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
 FILESDIR=		${PKGDIR}/../../net/samba/files
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 91925af6261..c03dc9e5e26 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2012/10/30 13:24:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.52 2012/12/14 07:39:34 adam Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -64,6 +64,7 @@ lib/samba/vfs/cap.${LIBEXT}
 lib/samba/vfs/catia.${LIBEXT}
 lib/samba/vfs/crossrename.${LIBEXT}
 lib/samba/vfs/default_quota.${LIBEXT}
+${PLIST.macosx}lib/samba/vfs/dirsort.${LIBEXT}
 lib/samba/vfs/expand_msdfs.${LIBEXT}
 lib/samba/vfs/extd_audit.${LIBEXT}
 lib/samba/vfs/fake_perms.${LIBEXT}
@@ -81,6 +82,7 @@ lib/samba/vfs/shadow_copy2.${LIBEXT}
 lib/samba/vfs/smb_traffic_analyzer.${LIBEXT}
 lib/samba/vfs/streams_depot.${LIBEXT}
 lib/samba/vfs/streams_xattr.${LIBEXT}
+${PLIST.macosx}lib/samba/vfs/syncops.${LIBEXT}
 lib/samba/vfs/time_audit.${LIBEXT}
 lib/samba/vfs/xattr_tdb.${LIBEXT}
 ${PLIST.pam}lib/security/pam_smbpass.${LIBEXT}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 4edae6dfda4..3527a5bc857 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.86 2012/07/06 23:32:59 asau Exp $
+$NetBSD: distinfo,v 1.87 2012/12/14 07:39:34 adam Exp $
 
-SHA1 (samba-3.6.6.tar.gz) = f1516ce332fe11c68a052855edd745368ac4d8e9
-RMD160 (samba-3.6.6.tar.gz) = 70a520012a1c02085f0d6209c2acac84512d9f8b
-Size (samba-3.6.6.tar.gz) = 34061741 bytes
+SHA1 (samba-3.6.10.tar.gz) = da22200c30bf156843db121e8ee323fac3fafc10
+RMD160 (samba-3.6.10.tar.gz) = 072d56d4b72dda40492614df4766796792971fb2
+Size (samba-3.6.10.tar.gz) = 34076720 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
-SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7
+SHA1 (patch-af) = c76fa31b80d2a0686fe2c42ab6e860d794b4f111
 SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
 SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2
 SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 011b5071587..850c00d97a3 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2011/12/16 22:32:06 asau Exp $
+$NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
 
---- configure.orig	2011-08-09 15:35:40.000000000 +0400
-+++ configure	2011-08-23 16:12:22.000000000 +0400
-@@ -19397,6 +19397,7 @@
+--- configure.orig	2012-12-06 10:40:30.000000000 +0000
++++ configure
+@@ -19487,6 +19487,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.10 2011/12/16 22:32:06 asau Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -19446,7 +19447,7 @@
+@@ -19536,7 +19537,7 @@ fi
  
  if test "x$enable_as_needed" != xno; then
      saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,38 +19,20 @@ $NetBSD: patch-af,v 1.10 2011/12/16 22:32:06 asau Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -20152,7 +20153,7 @@
- 
- fi
- 
--	if test x"$USESHARED" == x"no" ; then
-+	if test x"$USESHARED" = x"no" ; then
- 		LINK_LIBTALLOC=STATIC
- 	fi
- 	LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
-@@ -20489,7 +20490,7 @@
- 
- fi
- 
--	if test x"$USESHARED" == x"no" ; then
-+	if test x"$USESHARED" = x"no" ; then
- 		LINK_LIBTDB=STATIC
- 	fi
- 	LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
-@@ -26219,9 +26220,9 @@
+@@ -26337,9 +26338,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_set_key in -lcrypto" >&5
 -$as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
--if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then :
+-if ${ac_cv_lib_ext_crypto_des_set_key+:} false; then :
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_des_cbc in -lcrypto" >&5
 +$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; }
-+if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then :
++if ${ac_cv_lib_ext_crypto_EVP_des_cbc+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -26233,31 +26234,31 @@
+@@ -26351,31 +26352,31 @@ else
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -90,7 +72,7 @@ $NetBSD: patch-af,v 1.10 2011/12/16 22:32:06 asau Exp $
  _ACEOF
  
  fi
-@@ -35632,31 +35633,39 @@
+@@ -35742,31 +35743,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;