From ddd0f40f2ac4fac22976cdbb63502d45eaa1b353 Mon Sep 17 00:00:00 2001
From: giovanni <giovanni@openbsd.org>
Date: Thu, 14 May 2009 17:05:46 +0000
Subject: [PATCH] Update to 3.0.34 "fine with me to commit it" jasper@

---
 net/samba/Makefile       |  5 ++--
 net/samba/distinfo       | 10 ++++----
 net/samba/pkg/PLIST-docs |  3 ++-
 net/samba/pkg/PLIST-main | 49 ++++++++++++++++++++--------------------
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3caa31d6cc8..8e1dcde983e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.101 2009/04/10 11:59:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.102 2009/05/14 17:05:46 giovanni Exp $
 
 COMMENT-main=	SMB and CIFS client and server for UNIX
 COMMENT-docs=	additional documentation and examples for Samba
 
-DISTNAME=		samba-3.0.33
-PKGNAME-main=		${DISTNAME}p0
+DISTNAME=		samba-3.0.34
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 SHARED_LIBS=		smbclient	1.0 \
 			msrpc		1.0
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 38cc3bd2f40..e2231496eb3 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,5 +1,5 @@
-MD5 (samba-3.0.33.tar.gz) = A6IEmYhCfDzr5pB4zy0UfQ==
-RMD160 (samba-3.0.33.tar.gz) = w5b529BS2Td8p/91VQFzhVyXkuI=
-SHA1 (samba-3.0.33.tar.gz) = I1wV55akn8+AsVTWCIE6+Ofrsyk=
-SHA256 (samba-3.0.33.tar.gz) = KFAEvftFIjWsisINM8CD7LMmoQ9u6BnatAMqtcZWOhY=
-SIZE (samba-3.0.33.tar.gz) = 49393320
+MD5 (samba-3.0.34.tar.gz) = YkBPObs90KN9Y5bFfgTJBw==
+RMD160 (samba-3.0.34.tar.gz) = 15zVRLWrK0pxMLjFLBntz8iQg+o=
+SHA1 (samba-3.0.34.tar.gz) = GBBNG/UJzT/TEHwJ+mIFZm4ErBY=
+SHA256 (samba-3.0.34.tar.gz) = UweT3p9BFPSzkdky4oM7ryWgBJgxdHHNdaBo8zeMKZ4=
+SIZE (samba-3.0.34.tar.gz) = 24835363
diff --git a/net/samba/pkg/PLIST-docs b/net/samba/pkg/PLIST-docs
index 758cad83316..ebb431a8dfd 100644
--- a/net/samba/pkg/PLIST-docs
+++ b/net/samba/pkg/PLIST-docs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-docs,v 1.12 2008/12/07 03:52:56 brad Exp $
+@comment $OpenBSD: PLIST-docs,v 1.13 2009/05/14 17:05:46 giovanni Exp $
 @conflict samba-<=3.0.31p0
 share/doc/samba/
 share/doc/samba/NT4-Locking.reg
@@ -457,6 +457,7 @@ share/swat/help/Samba3-HOWTO/unicode.html
 share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 share/swat/help/Samba3-HOWTO/winbind.html
 share/swat/help/manpages/
+share/swat/help/manpages/cifs.upcall.8.html
 share/swat/help/manpages/eventlogadm.8.html
 share/swat/help/manpages/findsmb.1.html
 share/swat/help/manpages/idmap_ad.8.html
diff --git a/net/samba/pkg/PLIST-main b/net/samba/pkg/PLIST-main
index c6e7fea0c2a..b81f863a48e 100644
--- a/net/samba/pkg/PLIST-main
+++ b/net/samba/pkg/PLIST-main
@@ -1,29 +1,29 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2008/09/12 07:49:11 brad Exp $
+@comment $OpenBSD: PLIST-main,v 1.9 2009/05/14 17:05:46 giovanni Exp $
 @conflict samba-docs-<=3.0.31p1
 @pkgpath ${BASE_PKGPATH}
-@bin bin/eventlogadm
+bin/eventlogadm
 bin/findsmb
 bin/mksmbpasswd
-@bin bin/net
-@bin bin/nmblookup
-@bin bin/ntlm_auth
-@bin bin/pdbedit
-@bin bin/profiles
-@bin bin/rpcclient
-@bin bin/smbcacls
-@bin bin/smbclient
-@bin bin/smbcontrol
-@bin bin/smbcquotas
-@bin bin/smbget
-@bin bin/smbpasswd
-@bin bin/smbspool
-@bin bin/smbstatus
+bin/net
+bin/nmblookup
+bin/ntlm_auth
+bin/pdbedit
+bin/profiles
+bin/rpcclient
+bin/smbcacls
+bin/smbclient
+bin/smbcontrol
+bin/smbcquotas
+bin/smbget
+bin/smbpasswd
+bin/smbspool
+bin/smbstatus
 bin/smbtar
-@bin bin/smbtree
-@bin bin/tdbbackup
-@bin bin/tdbdump
-@bin bin/tdbtool
-@bin bin/testparm
+bin/smbtree
+bin/tdbbackup
+bin/tdbdump
+bin/tdbtool
+bin/testparm
 include/libmsrpc.h
 include/libsmbclient.h
 lib/samba/
@@ -44,9 +44,9 @@ lib/samba/rpc/
 lib/samba/tr.msg
 lib/samba/upcase.dat
 lib/samba/valid.dat
-@bin libexec/nmbd
-@bin libexec/smbd
-@bin libexec/swat
+libexec/nmbd
+libexec/smbd
+libexec/swat
 @man man/man1/findsmb.1
 @man man/man1/log2pcap.1
 @man man/man1/nmblookup.1
@@ -71,6 +71,7 @@ lib/samba/valid.dat
 @man man/man7/libsmbclient.7
 @man man/man7/pam_winbind.7
 @man man/man7/samba.7
+@man man/man8/cifs.upcall.8
 @man man/man8/eventlogadm.8
 @man man/man8/idmap_ad.8
 @man man/man8/idmap_ldap.8