Add official patches for 3.0.24.

o security = share and NTLMv2

	Fixes an issues with servers set to "security = share" and Vista
	clients that send NTLMv2 responses by default.

o Vista Point-n-Print

	Fixes several point-n-print bugs with Vista clients.

o BUG 4361

	Fix failure when using the Vista backup utility.

o BUG 4093

	Fix expansion of the %a smb.conf variable for Vista clients.

o BUG 4356

	Fix MS-DFS referrals with Windows Vista clients.

o BUG 4188

	Fix for Vista failing to delete directories on a Samba share.

Bump PKGREVISION.

3 files changed, 36 insertions, 8 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3805f094c51..b5809d47d61 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.169 2007/02/11 18:39:04 tron Exp $
+# $NetBSD: Makefile,v 1.170 2007/03/17 15:43:15 taca Exp $
 
 .include "Makefile.mirrors"
 
-DISTNAME=		samba-3.0.24
+DISTNAME=		samba-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 
@@ -12,6 +13,7 @@ MAINTAINER=		jlam@pkgsrc.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite
 
+VERSION=		3.0.24
 CONFLICTS+=		ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]*	\
 			winbind-[0-9]*
 MAKE_JOBS_SAFE=		NO
@@ -156,14 +158,15 @@ post-install: install-samba-lib-symlinks
 		${RMDIR} ${SAMBA_LIBDIR}/$$d;				\
 	done
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/../docs/registry; for f in *.reg; do		\
+	cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do	\
 		${INSTALL_DATA} $${f} ${DOCDIR}/$${f};			\
 	done
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh
-	cd ${WRKSRC}/../examples; ${INSTALL_DATA} LDAP/samba.schema ${EGDIR}
-	cd ${WRKSRC}/../examples; ${INSTALL_DATA} smb.conf.default ${EGDIR}
+	cd ${WRKDIR}/${DISTNAME}/examples; \
+		${INSTALL_DATA} LDAP/samba.schema ${EGDIR}; \
+		${INSTALL_DATA} smb.conf.default ${EGDIR}
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${EGDIR}
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR}
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR}
diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches
index 7fe60010bc8..23e11cd955c 100644
--- a/net/samba/Makefile.patches
+++ b/net/samba/Makefile.patches
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.2 2006/01/02 22:33:36 jlam Exp $
+# $NetBSD: Makefile.patches,v 1.3 2007/03/17 15:43:15 taca Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -10,4 +10,11 @@
 # The PATCHFILES are listed in chronological order according to the time
 # they are added to ${PATCH_SITES}.
 #
-PATCH_SITES=	http://www.samba.org/samba/patches/
+PATCH_SITES=	http://www.samba.org/samba/patches/patches-${VERSION}/
+PATCHFILES=	share_security_ntlmv2.diff \
+		spoolss.diff \
+		vista_backup_acl.diff \
+		variable_os_expansion.diff \
+		dfs_referral.diff \
+		directory_delete.diff
+PATCH_DIST_STRIP= -p2
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 6083b47a704..15ad90a7601 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,26 @@
-$NetBSD: distinfo,v 1.52 2007/02/11 18:39:04 tron Exp $
+$NetBSD: distinfo,v 1.53 2007/03/17 15:43:15 taca Exp $
 
+SHA1 (dfs_referral.diff) = 26d395028e2f7ae59d115a277864ef791bfc14b9
+RMD160 (dfs_referral.diff) = 4dcc1bf7eaf1452d9fb02884448dc88fb5ddeed3
+Size (dfs_referral.diff) = 615 bytes
+SHA1 (directory_delete.diff) = ace447241ee40e495bb2fd065996d624c0ca615c
+RMD160 (directory_delete.diff) = 0cc49ade7403b22937d858e1fe7e9357d49f6be3
+Size (directory_delete.diff) = 2218 bytes
 SHA1 (samba-3.0.24.tar.gz) = 216020b58abca191b8146f76f98a8bda3508fcd3
 RMD160 (samba-3.0.24.tar.gz) = f208dca645d07a195169e005a50fb4c4879254eb
 Size (samba-3.0.24.tar.gz) = 17708128 bytes
+SHA1 (share_security_ntlmv2.diff) = ca10e9c9afa202483062306768cd11185e80fa89
+RMD160 (share_security_ntlmv2.diff) = ff281f474402076c783a326956611131461367cb
+Size (share_security_ntlmv2.diff) = 3607 bytes
+SHA1 (spoolss.diff) = 7534e62ed28dbce642b2719f9699208228960d8a
+RMD160 (spoolss.diff) = c8c452f5b58b893985074edf264740f63558206a
+Size (spoolss.diff) = 6649 bytes
+SHA1 (variable_os_expansion.diff) = 4ce507e2414bce1ec27f3c68a9d0277b37c22ffe
+RMD160 (variable_os_expansion.diff) = a0e4ab6e0178f109ff525c7f3d5ad277ffa77ec9
+Size (variable_os_expansion.diff) = 5116 bytes
+SHA1 (vista_backup_acl.diff) = 3a872997cfb8f34af401c94b1bb710db0d3e6319
+RMD160 (vista_backup_acl.diff) = 7cfe2626c7f59034f051dd60882441b974201d11
+Size (vista_backup_acl.diff) = 2201 bytes
 SHA1 (patch-ab) = 9597f88f6e7f97da446968562b4d3ab8e9644f0f
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ae) = a220568afcb6ae97e1000296795f852f8e92f624