Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.100
diff -N -u -p Makefile
--- Makefile	7 Dec 2008 03:52:56 -0000	1.100
+++ Makefile	27 Jun 2009 09:35:58 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.100 2008/12/07 03:52:56 brad 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}
+DISTNAME=		samba-3.0.34
+PKGNAME=		${DISTNAME}p0
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 SHARED_LIBS=		smbclient	1.0 \
 			msrpc		1.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.14
diff -N -u -p distinfo
--- distinfo	7 Dec 2008 03:52:56 -0000	1.14
+++ distinfo	27 Jun 2009 09:35:58 -0000
@@ -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
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -N -u -p patches/patch-Makefile_in
--- patches/patch-Makefile_in	11 Jul 2008 11:40:33 -0000	1.11
+++ patches/patch-Makefile_in	27 Jun 2009 09:35:58 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile_in,v 1.11 2008/07/11 11:40:33 brad Exp $
---- Makefile.in.orig	Wed May 28 08:41:11 2008
-+++ Makefile.in	Fri Jul  4 00:36:10 2008
+--- Makefile.in.orig	Mon Jan 19 21:40:09 2009
++++ Makefile.in	Sat Jun 27 19:03:14 2009
 @@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
  # the directory where pid files go
  PIDDIR = @piddir@
@@ -32,7 +32,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2008/07/11 11:40:33
  
  PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
  PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
-@@ -1152,11 +1154,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
+@@ -1159,11 +1161,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
  	@echo Linking libaddns non-shared library $@
  	@-$(AR) -rc $@ $(LIBADDNS_OBJ)
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2008/07/11 11:40:33
  
  bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
  	@echo Linking libsmbclient non-shared library $@
-@@ -1172,10 +1173,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
+@@ -1179,10 +1180,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
  	@echo Linking libsmbsharemodes non-shared library $@
  	@-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
  
@@ -59,7 +59,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2008/07/11 11:40:33
  
  bin/libmsrpc.a: proto_exists $(CAC_OBJ)
  	@echo Linking libmsrpc non-shared library $@
-@@ -1623,14 +1623,14 @@ installswat: installdirs installmsg
+@@ -1633,14 +1633,14 @@ installswat: installdirs installmsg
  
  installclientlib: installdirs libsmbclient
  	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)
Index: patches/patch-smbd_posix_acls_c
===================================================================
RCS file: patches/patch-smbd_posix_acls_c
diff -N -u -p patches/patch-smbd_posix_acls_c
--- /dev/null	27 Jun 2009 09:35:59 -0000
+++ patches/patch-smbd_posix_acls_c	27 Jun 2009 09:35:58 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+Fix CVE-2009-1888
+http://us3.samba.org/samba/ftp/patches/security/samba-3.0.34-CVE-2009-1888.patch
+
+--- smbd/posix_acls.c.orig	Sat Jun 27 19:04:12 2009
++++ smbd/posix_acls.c	Sat Jun 27 19:06:19 2009
+@@ -2296,6 +2296,8 @@ static BOOL acl_group_override(connection_struct *conn
+ {
+ 	SMB_STRUCT_STAT sbuf;
+ 
++	ZERO_STRUCT(sbuf);
++
+ 	if ((errno != EPERM) && (errno != EACCES)) {
+ 		return False;
+ 	}
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.12
diff -N -u -p pkg/PLIST-docs
--- pkg/PLIST-docs	7 Dec 2008 03:52:56 -0000	1.12
+++ pkg/PLIST-docs	27 Jun 2009 09:35:58 -0000
@@ -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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.8
diff -N -u -p pkg/PLIST-main
--- pkg/PLIST-main	12 Sep 2008 07:49:11 -0000	1.8
+++ pkg/PLIST-main	27 Jun 2009 09:35:58 -0000
@@ -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