Changes 3.6.16:

* BUG 9881: Link dbwrap_tool and dbwrap_torture against libtevent.
* BUG 9722: Properly handle Oplock breaks in compound requests.
* BUG 9822: Fix crash bug during Win8 sync.
* BUG 9927: errno gets overwritten in call to check_parent_exists().
* BUG 8997: Change libreplace GPL source to LGPL.
* BUG 9900: is_printer_published GUID retrieval.
* BUG 9941: Fix a bug of drvupgrade of smbcontrol.
* BUG 9868: Don't know how to make LIBNDR_PREG_OBJ.
* BUG 9688: Remove "experimental" label on "max protocol=SMB2" parameter.
* BUG 9881: Check for system libtevent.

4 files changed, 19 insertions, 15 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 2e102bc3206..f62df2f932c 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.234 2013/06/12 12:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.235 2013/07/03 20:00:47 adam Exp $
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.6.15
+VERSION=	3.6.16
 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 660f21e372a..185ea232db5 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2013/04/30 20:08:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.54 2013/07/03 20:00:47 adam Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -26,6 +26,8 @@ include/netapi.h
 include/smb_share_modes.h
 include/talloc.h
 ${PLIST.winbind}include/wbclient.h
+include/tevent.h
+include/tevent_internal.h
 lib/libnetapi.${LIBEXT}
 lib/libnetapi.${LIBEXT}.0
 lib/libsmbclient.${LIBEXT}
@@ -39,6 +41,9 @@ ${PLIST.winbind}lib/libwbclient.${LIBEXT}
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0
 ${PLIST.winbind}${NSS_WINBIND}
 ${PLIST.winbind}${NSS_WINS}
+lib/libtevent.${LIBEXT}
+lib/libtevent.${LIBEXT}.0
+lib/libtevent.${LIBEXT}.0.9.11
 lib/samba/auth/script.${LIBEXT}
 lib/samba/charset/CP437.${LIBEXT}
 lib/samba/charset/CP850.${LIBEXT}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 52e1d4cf966..474397e8790 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.90 2013/05/09 07:36:14 adam Exp $
+$NetBSD: distinfo,v 1.91 2013/07/03 20:00:47 adam Exp $
 
-SHA1 (samba-3.6.15.tar.gz) = 59d528427eaf401cf387205f1fb9806dae282e55
-RMD160 (samba-3.6.15.tar.gz) = aa8235076d5ed1142847f464c8f5cfcd5cf94d7e
-Size (samba-3.6.15.tar.gz) = 34111211 bytes
+SHA1 (samba-3.6.16.tar.gz) = 6d17b6b1c5f2d9fe7f6a98786f7d61f65fa7859a
+RMD160 (samba-3.6.16.tar.gz) = e5e26a43d435a1bd2a8b91be762eef3380b3a794
+Size (samba-3.6.16.tar.gz) = 34108738 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
@@ -29,4 +29,4 @@ SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50
 SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
 SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
 SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa
-SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973
+SHA1 (patch-bf) = 19932332d11ce447293b061cd47506fef3d01853
diff --git a/net/samba/patches/patch-bf b/net/samba/patches/patch-bf
index b005d5ef93b..5ebd79b16b4 100644
--- a/net/samba/patches/patch-bf
+++ b/net/samba/patches/patch-bf
@@ -1,13 +1,13 @@
-$NetBSD: patch-bf,v 1.5 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-bf,v 1.6 2013/07/03 20:00:48 adam Exp $
 
---- Makefile.in.orig	2011-08-03 18:24:05.000000000 +0000
+--- Makefile.in.orig	2013-06-19 07:35:24.000000000 +0000
 +++ Makefile.in
-@@ -2552,7 +2552,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B
- bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
+@@ -2864,7 +2864,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B
+ bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT)
  	@echo "Linking shared library $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
--		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
-+		$(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
+-		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
++		$(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
  
  ##########
  # Plugins: