From c126e8c5f0588b1e44e03ff5989571c2c9d75f58 Mon Sep 17 00:00:00 2001
From: timur <timur@FreeBSD.org>
Date: Tue, 26 May 2009 00:35:51 +0000
Subject: Update net/samba32 port to the 3.2.11 version. Major changes are:

    o Fix domain logins for WinXP clients pre SP3 (bug #6263).
    o Fix samr_OpenDomain access checks (bug #6089).
    o Fix smbd crash for close_on_completion.
---
 net/samba32/Makefile | 11 +++--------
 net/samba32/distinfo |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'net')

diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index 3d592a3969bc..8ddbb6374055 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.2.10
+PORTVERSION?=		3.2.11
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -95,10 +95,7 @@ CONFIGURE_ARGS+=	--with-pam --with-readline --with-included-iniparser \
 			--without-libsmbclient \
 			--without-libsmbsharemodes \
 			--without-libaddns
-# Sanity checks
-.if exists(${LOCALBASE}/include/tdb.h)
-#IGNORE=			doesn't compile when tdb is installed. Uninstall databases/tdb port
-.endif
+
 # Let process generate meaningful backtrace on a core dump
 LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
@@ -107,7 +104,7 @@ SAMBA_WANT_LDAP=	yes
 .endif
 
 .if !defined(WITHOUT_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 SUB_LIST+=		CUPS=""
 .else
@@ -454,9 +451,7 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.if defined(WITH_MAX_DEBUG)
 test:
 	(cd ${WRKSRC} && ${MAKE} test_nss_modules test_pam_modules && ${MAKE} test)
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index 8de75ada1363..721dfcfc332f 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.2.10.tar.gz) = 7a83207fb05200e9c2114d995f11396e
-SHA256 (samba-3.2.10.tar.gz) = 9545135c6fde96864f676526361309bd9723727226d234b06ad02d3b672babec
-SIZE (samba-3.2.10.tar.gz) = 24397084
+MD5 (samba-3.2.11.tar.gz) = fc514bc92184b9b64544afa457e4d84e
+SHA256 (samba-3.2.11.tar.gz) = 5db81a9bd2842e7bf5f2fe8eeb0533eb59e6bb75a7d5f79f9e04c13baec32ef5
+SIZE (samba-3.2.11.tar.gz) = 24399021
-- 
cgit