Upgraded port to the latest 3.6.16 revision.

6 files changed, 78 insertions, 44 deletions

diff --git a/UPDATING b/UPDATING
index 0550fae6ab7a..6154375dd4a4 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,35 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130627:
+  AFFECTS: users of net/samba36
+  AUTHOR: timur@FreeBSD.org
+
+  Samba has updated format of it's printing tdbs (ntprinting.tdb, ntforms.tdb,
+  ntdrivers.tdb) to include character encoding. When updating from Samba 3.5
+  or earlier to Samba 3.6 or 4.0 these tdbs need to be migrated to new registry
+  based printing management. This implies also character conversion.
+
+  You have to specify the correct code page for the conversion, see iconv -l.
+  The mostly used one is Windows Latin1 which is CP1252.
+
+  You can correctly view the tdb with:
+
+  # net printing dump encoding=CP1252 /path/to/ntprinters.tdb
+
+  or migrate it with e.g.:
+
+  # net printing migrate encoding=CP1252 /path/to/ntprinters.tdb
+
+  If you migrate printers it is suggest to do it in the following order:
+
+  ntforms.tdb
+  ntdrivers.tdb
+  ntprinting.tdb
+
+  Don't forget to rename, move or delete these files in /var/db/samba after
+  the migration.
+
 20130623:
   AFFECTS: users of net-im/mikutter003
   AUTHOR: tota@FreeBSD.org
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index fc1883d41d5f..aa21e5c3a25a 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.13
+PORTVERSION=		3.6.16
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
diff --git a/net/samba36/distinfo b/net/samba36/distinfo
index 3cf71c8a64ac..1862d9db660a 100644
--- a/net/samba36/distinfo
+++ b/net/samba36/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.13.tar.gz) = 992f8ad56717bf551b00ad1d31170588a087fb5c2d4d9cd38fd11544f2b8a596
-SIZE (samba-3.6.13.tar.gz) = 34101849
+SHA256 (samba-3.6.16.tar.gz) = 347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4
+SIZE (samba-3.6.16.tar.gz) = 34108738
diff --git a/net/samba36/files/patch-source3__Makefile.in b/net/samba36/files/patch-source3__Makefile.in
index 8f150979c8a9..4bef015a5772 100644
--- a/net/samba36/files/patch-source3__Makefile.in
+++ b/net/samba36/files/patch-source3__Makefile.in
@@ -1,6 +1,6 @@
---- ./source3/Makefile.in.orig	2011-08-09 13:17:47.000000000 +0200
-+++ ./source3/Makefile.in	2011-09-06 23:35:41.000000000 +0200
-@@ -149,7 +149,7 @@
+--- ./source3/Makefile.in.orig	2013-06-19 07:35:24.000000000 +0000
++++ ./source3/Makefile.in	2013-06-27 02:34:58.169873859 +0000
+@@ -151,7 +151,7 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
  LOGFILEBASE = @logfilebase@
@@ -9,7 +9,7 @@
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  NCALRPCDIR = @ncalrpcdir@
  
-@@ -1303,8 +1303,8 @@
+@@ -1305,8 +1305,8 @@
                   $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
  		 $(LIBNDR_GEN_OBJ0)
  
@@ -20,7 +20,7 @@
  
  PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
  		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
-@@ -1621,6 +1621,7 @@
+@@ -1623,6 +1623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .o .lo
@@ -28,7 +28,7 @@
  
  .PHONY: showflags SHOWFLAGS
  
-@@ -1682,6 +1683,9 @@
+@@ -1684,6 +1685,9 @@
  		$(COMPILE_CC) >/dev/null 2>&1
  @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
  
@@ -38,30 +38,24 @@
  PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
  
  # this adds support for precompiled headers. To use it, install a snapshot
-@@ -2763,14 +2767,15 @@
- 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
+@@ -2856,9 +2860,10 @@
+ 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
  		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
  
 -bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
 +bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
  	@echo "Linking $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
 +	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
  		$(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
  
- bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
- 	@echo "Linking shared library $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
-+		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
- 		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
- 
- ##########
-@@ -3122,7 +3127,8 @@
+ bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT)
+@@ -3215,7 +3220,8 @@
  	@echo "Linking shared library $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
  		$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
--		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
-+		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
+-		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
++		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
 +		@SONAMEFLAG@`basename $@`
  
  bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDB)
diff --git a/net/samba36/files/patch-source3__auth__user_util.c b/net/samba36/files/patch-source3__auth__user_util.c
deleted file mode 100644
index 430fea398ffb..000000000000
--- a/net/samba36/files/patch-source3__auth__user_util.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./source3/auth/user_util.c.orig	2012-09-14 08:12:09.000000000 +0000
-+++ ./source3/auth/user_util.c	2012-10-18 20:58:57.065810414 +0000
-@@ -425,12 +425,14 @@
- 	x_fclose(f);
- 
- 	/*
--	 * Setup the last_from and last_to as an optimization so
--	 * that we don't scan the file again for the same user.
-+	 * If mapping failed setup the last_from and last_to as
-+	 * an optimization so that we don't scan the file again
-+	 * for the same user.
- 	 */
--
--	set_last_from_to(user_in, user_in);
--	store_map_in_gencache(ctx, user_in, user_in);
-+	if(!mapped_user) {
-+		set_last_from_to(user_in, user_in);
-+		store_map_in_gencache(ctx, user_in, user_in);
-+	}
- 
- 	return mapped_user;
- }
diff --git a/net/samba36/files/sernet.patch b/net/samba36/files/sernet.patch
index 6922f88cf6c3..566315409a5a 100644
--- a/net/samba36/files/sernet.patch
+++ b/net/samba36/files/sernet.patch
@@ -1,4 +1,5 @@
 samba3-3.4-honor-all-loopback-ips.patch
+samba3.6-veto-speedup.patch
 
 commit b6afe7ef236a454d8a6abf104b8846f817378f73
 Author: Björn Jacke <bj@sernet.de>
@@ -32,3 +33,35 @@ index 0ce495e..0511a28 100644
  }
  
  /**
+From 944f10760f1bd0e839e08f1204b68e9c06617cf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
+Date: Thu, 19 Apr 2012 13:33:50 +0200
+Subject: [PATCH] s3: speed up reply when vetoed files are being accessed
+
+one usecase of this fast-path is when non-existing files are being tried to be
+opened that are vetoed anyway. With this modification we look if the pattern is
+vetoed first and immediately tell the client that the file doesn't exist
+instead of searching for it in the first place and later on say we don't have
+it regardless.
+---
+ source3/smbd/filename.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
+index b2ed239..67138e7 100644
+--- a/source3/smbd/filename.c
++++ b/source3/smbd/filename.c
+@@ -1284,6 +1284,13 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
+ 
+ 	*pp_smb_fname = NULL;
+ 
++	status = check_veto_path(conn, name_in);
++	if (!NT_STATUS_IS_OK(status)) {
++		DEBUG(10,("file %s matches veto path - fast path returning %s\n",
++			name_in, nt_errstr(status)));
++		return status;
++	}
++
+ 	status = resolve_dfspath_wcard(ctx, conn,
+ 				dfs_path,
+ 				name_in,