Updaet samba35 to 3.5.20.

* 3.5.20

  Changes since 3.5.19:
  ---------------------

  o   Jeremy Allison <jra@samba.org>
      * BUG 7781: Samba transforms ShareName to lowercase (sharename) when
      	adding new share via MMC.
      * BUG 9236: Apply ACL masks correctly when setting ACLs.
      * BUG 9455: munmap called for an address location not mapped by Samba.

  o   Bj�«Órn Baumbach <bb@sernet.de>
      * BUG 9345: Fix usage of <smbconfoption> tag.

  o   Stefan Metzmacher <metze@samba.org>
      * BUG 9390: Fix segfaults in log level = 10 on Solaris.
      * BUG 9402: Fix dns updates against BIND9 (used in a Samba4 domain).


* 3.5.19

  Changes since 3.5.18:
  ---------------------

  o   Jeremy Allison <jra@samba.org>
      * BUG 9016: Connection to outbound trusted domain goes offline.
      * BUG 9117: smbclient can't connect to a Windows 7 server using NTLMv2.
      * BUG 9213: Bad ASN.1 NegTokenInit packet can cause invalid free.
      * BUG 9236: ACL masks incorrectly applied when setting ACLs.

  o   Andrew Bartlett <abartlet@samba.org>
      * BUG 8788: libsmb: Initialise ticket to ensure we do not free invalid
      	memory.

  o   Bj�«Órn Jacke <bj@sernet.de>
      * BUG 8344: autoconf: Fix --with(out)-sendfile-support option handling.
      * BUG 8732: Fix compile of krb5 locator on Solaris.
      * BUG 9172: Add quota support for gfs2.

  o   Matthieu Patou <mat@matws.net>
      * BUG 9259: lib-addns: Ensure that allocated buffer are pre set to 0.

  o   Andreas Schneider <asn@samba.org>
      * BUG 9218: Samba panics if a user specifies an invalid port number.


* 3.5.18

  Changes since 3.5.17:
  ---------------------

  o   Michael Adam <obnox@samba.org>
      * BUG 7788: Clarify the idmap_rid manpage.

  o   Jeremy Allison <jra@samba.org>
      * BUG 9098: Winbind does not refresh Kerberos tickets.
      * BUG 9147: Winbind can't fetch user or group info from AD via LDAP.
      * BUG 9150: Valid open requests can cause smbd assert due to incorrect
	oplock handling on delete requests.

  o   Neil R. Goldberg <ngoldber@mitre.org>
      * BUG 9100: Winbind doesn't return "Domain Local" groups from own domain.

  o   Hargagan <shargagan@novell.com>
      * BUG 9085: NMB registration for a duplicate workstation fails with
	registration refuse.

  o   Bj�«Órn Jacke <bj@sernet.de>
      * BUG 7814: Fix build of sysquote_xfs.
      * BUG 8402: Winbind log spammed with idmap messages.

  o   Volker Lendecke <vl@samba.org>
      * BUG 9084: Fix a smbd crash in reply_lockingX_error.

  o   Herb Lewis <hlewis@panasas.com>
      * BUG 9104: Fix Winbind crashes caused by mis-identified idle clients.

  o   Luca Lorenzetto <lorenzetto-luca@ubuntu-it.org>
      * BUG 9013: Desktop Managers (xdm, gdm, lightdm...) crash with SIGSEGV in
	_pam_winbind_change_pwd() when password is expiring.

* 3.5.17

  Changes since 3.5.16:
  ---------------------

  o   Jeremy Allison <jra@samba.org>
      * BUG 9034: Fix typo in set_re_uid() call when USE_SETRESUID selected in
	configure.

  o   Bj�«Órn Jacke <bj@sernet.de>
      * BUG 8996: Fix build without ads support.
      * BUG 9011: Second part of a fix for bug #9011 (Build on HP-UX broken).

  o   Stefan Metzmacher <metze@samba.org>
      * BUG 9022: Make vfs_gpfs less verbose in get/set_xattr functions.

3 files changed, 19 insertions, 17 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 10072701f60..90e8ca5219a 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2012/10/23 17:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.25 2012/12/17 12:01:34 taca Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	2
 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.5.16
+VERSION=	3.5.20
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 FILESDIR=		${PKGDIR}/../../net/samba/files
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index 02568d0150e..5600e49a00d 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2012/07/07 12:35:53 asau Exp $
+$NetBSD: distinfo,v 1.14 2012/12/17 12:01:35 taca Exp $
 
-SHA1 (samba-3.5.16.tar.gz) = ba25360232a8006c9a00384c9588e8a51709edab
-RMD160 (samba-3.5.16.tar.gz) = 5372ea79286787e410c2f8985180bf856e064283
-Size (samba-3.5.16.tar.gz) = 35367569 bytes
+SHA1 (samba-3.5.20.tar.gz) = 1b554f34fa05b1befef2f8ac0c9e0ecb8b90a902
+RMD160 (samba-3.5.20.tar.gz) = 5a7ab370d3b6acaa2a1e06877b7005cab901f2ba
+Size (samba-3.5.20.tar.gz) = 35377976 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
-SHA1 (patch-af) = 275cb3b20d6fe9f000ba3c51bc9450a428e782cb
+SHA1 (patch-af) = 247c745717eb6eeadec258b88aa5df9f09d6769c
 SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf
 SHA1 (patch-ah) = 6142078efec4263124aa793108c43eef0ce61da4
 SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
diff --git a/net/samba35/patches/patch-af b/net/samba35/patches/patch-af
index 813196457ed..ee1f49f8602 100644
--- a/net/samba35/patches/patch-af
+++ b/net/samba35/patches/patch-af
@@ -1,8 +1,11 @@
-$NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
+$NetBSD: patch-af,v 1.5 2012/12/17 12:01:35 taca Exp $
 
---- configure.orig	2011-08-03 18:25:14.000000000 +0000
+Patch to join an Active Directory from
+http://www.ogris.de/samba/unix-active-directory.html.
+
+--- configure.orig	2012-09-21 08:32:29.000000000 +0000
 +++ configure
-@@ -18345,6 +18345,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
+@@ -18255,6 +18255,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +13,7 @@ $NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -18381,7 +18382,7 @@ fi
+@@ -18291,7 +18292,7 @@ fi
  $as_echo "$BLDSHARED" >&6; }
  
  saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,20 +22,20 @@ $NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -25355,9 +25356,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -25255,9 +25256,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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -25369,31 +25370,31 @@ else
+@@ -25269,31 +25270,31 @@ else
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -72,7 +75,7 @@ $NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
  _ACEOF
  
  fi
-@@ -34506,31 +34507,39 @@ case "$host_os" in
+@@ -34400,31 +34401,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
@@ -134,7 +137,7 @@ $NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
-@@ -34728,6 +34737,16 @@ $as_echo "#define HAVE_PASSWD_PW_AGE 1" 
+@@ -34622,6 +34631,16 @@ $as_echo "#define HAVE_PASSWD_PW_AGE 1" 
  
  fi