New 3.3.2 version of Samba33 port.

Major enhancements in Samba 3.3.2 include:

     * Fix "force group" (bug #6155).
     * Fix saving of files on Samba share using MS Office 2007 (bug #6160).
     * Fix guest authentication in setups with "security = share" and
      "guest ok = yes" when Winbind is running.
     * Fix corruptions of source path in tar mode of smbclient (bug #6161).

18 files changed, 200 insertions, 96 deletions

diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index d6769551b73d..df64d298320f 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.3.1
+PORTVERSION?=		3.3.2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -15,7 +16,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		*samba-2.* *samba-3.[02].* sharity-light-1.* tdb-1.*
+CONFLICTS?=		*samba-2.* *samba-3.[02].* sharity-light-1.* tdb-1.0.*
 
 USE_GMAKE=		yes
 USE_ICONV=		yes
@@ -27,6 +28,8 @@ AUTOCONF_ARGS=		-I${WRKSRC}/m4 -I${WRKSRC}/lib/replace
 LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}33${PKGNAMESUFFIX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 # directories
+PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
+PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
 VARDIR?=		/var
 SAMBA_SPOOL=		${VARDIR}/spool/samba
 SAMBA_LOGDIR=		${VARDIR}/log/samba
@@ -36,14 +39,13 @@ SAMBA_SWATDIR=		${PREFIX}/share/swat
 SAMBA_CONFDIR?=		${PREFIX}/etc
 SAMBA_PRIVATEDIR?=	${SAMBA_CONFDIR}/samba
 SAMBA_CONFIG?=		smb.conf
-SAMBA_LIB=		lib
-SAMBA_LIBDIR=		${PREFIX}/${SAMBA_LIB}
+SAMBA_LIBDIR=		${PREFIX}/lib
 SAMBA_MODULEDIR=	${SAMBA_LIBDIR}/samba
 
 CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--localstatedir="${VARDIR}" \
-	    		--libdir="${SAMBA_LIBDIR}" \
-		        --with-configdir="${SAMBA_CONFDIR}" \
+			--libdir="${SAMBA_LIBDIR}" \
+			--with-configdir="${SAMBA_CONFDIR}" \
 			--with-pammodulesdir="${SAMBA_LIBDIR}" \
 			--with-modulesdir="${SAMBA_MODULEDIR}" \
 			--with-swatdir="${SAMBA_SWATDIR}" \
@@ -59,17 +61,18 @@ OPTIONS=	LDAP		"With LDAP support" on \
 		ADS		"With Active Directory support" off \
 		CUPS		"With CUPS printing support" on \
 		WINBIND		"With WinBIND support" on \
-		SWAT		"With SWAT" off \
+		SWAT		"With SWAT WebGUI" off \
 		ACL_SUPPORT	"With ACL support" off \
 		AIO_SUPPORT	"With Asyncronous IO support" off \
 		FAM_SUPPORT	"With File Alteration Monitor" off \
 		SYSLOG		"With Syslog support" off \
 		QUOTAS		"With Disk quota support" off \
-		UTMP		"With UTMP accounting support" on \
+		UTMP		"With UTMP accounting support" off \
 		PAM_SMBPASS	"With PAM authentication vs passdb backends" off \
 		DNSUPDATE	"With dynamic DNS update(require ADS)" off \
 		DNSSD		"With DNS service discovery support" off \
 		EXP_MODULES	"With experimental modules" off \
+		SHARED_LIBS	"With shared libraries" off \
 		POPT		"With system-wide POPT library" on \
 		MAX_DEBUG	"With maximum debugging" off \
 		SMBTORTURE	"With smbtorture" off
@@ -82,27 +85,32 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 # Samba server itself
 USE_RC_SUBR=		samba
 SUB_FILES=		pkg-install pkg-message pkg-deinstall smb.conf.sample
+SAMBA_SHARED_LIBS=	talloc tdb netapi smbsharemodes
 
 PLIST=			${WRKDIR}/.PLIST
 # We don't (yet) have clustered FS for cluster support
 CONFIGURE_ARGS+=	--with-pam --with-readline --with-included-iniparser \
 			--with-sendfile-support --enable-largefile \
 			--without-cluster-support \
-			--disable-shared-libs \
-			--with-static-libs=libwbclient \
-			--without-libtalloc \
-			--without-libtdb \
-			--without-libnetapi \
 			--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
 
+.if !defined(WITH_SHARED_LIBS)
+.	for lib in ${SAMBA_SHARED_LIBS}
+CONFIGURE_ARGS+=	--without-lib${lib}
+.	endfor
+PLIST_SUB+=		SHAREDLIBS="@comment "
+.else
+.	for lib in ${SAMBA_SHARED_LIBS}
+CONFIGURE_ARGS+=	--with-lib${lib}
+.	endfor
+USE_LDCONFIG=		yes
+CONFIGURE_ENV+=		BUILD_LIBWBCLIENT_SHARED="yes"
+PLIST_SUB+=		SHAREDLIBS=""
+.endif
+
 .if !defined(WITHOUT_LDAP)
 SAMBA_WANT_LDAP=	yes
 .endif
@@ -166,7 +174,6 @@ PLIST_SUB+=		SWAT=""
 CONFIGURE_ARGS+=	--disable-swat
 PLIST_SUB+=		SWAT="@comment "
 .endif
-
 # Add some shared modules
 .if defined(WITH_EXP_MODULES)
 .	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
@@ -245,14 +252,6 @@ PLIST_SUB+=		SMBTORTURE=""
 PLIST_SUB+=		SMBTORTURE="@comment "
 .endif
 
-.if defined(WITH_SMBTORTURE4_PATH) && exists(${WITH_SMBTORTURE4_PATH})
-CONFIGURE_ARGS+=	--with-smbtorture4-path=${WITH_SMBTORTURE4_PATH}
-.endif
-
-.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
-CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
-.endif
-
 ###
 ### Common part for port and it's subports
 ###
@@ -293,6 +292,14 @@ CONFIGURE_ENV+=		PKG_CONFIG="${PKG_CONFIG}"
 BUILD_DEPENDS+=		pkg-config:${PORTSDIR}/devel/pkg-config
 .endif
 
+.if defined(WITH_SMBTORTURE4_PATH) && exists(${WITH_SMBTORTURE4_PATH})
+CONFIGURE_ARGS+=	--with-smbtorture4-path=${WITH_SMBTORTURE4_PATH}
+.endif
+
+.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
+CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
+.endif
+
 post-patch:
 		@${REINPLACE_CMD} -e 's/%%SAMBA_CONFIG%%/${SAMBA_CONFIG}/g' \
 		    ${WRKSRC}/Makefile.in
@@ -312,6 +319,7 @@ MAN8=		eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
 		vfs_acl_tdb.8 vfs_acl_xattr.8 \
 		vfs_audit.8 vfs_cap.8 vfs_default_quota.8 vfs_extd_audit.8 \
 		vfs_fake_perms.8 vfs_full_audit.8 vfs_netatalk.8 \
+		vfs_preopen.8 \
 		vfs_readahead.8 vfs_readonly.8 vfs_recycle.8 vfs_shadow_copy.8 \
 		vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
 		vfs_streams_xattr.8 vfs_xattr_tdb.8
@@ -373,7 +381,8 @@ PLIST_SUB+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
 		SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
 		SAMBA_SPOOL="${SAMBA_SPOOL}" \
-		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}"
+		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
+		PKGCONFIGDIR="${PKGCONFIGDIR_REL}"
 
 SUB_LIST+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
@@ -382,8 +391,7 @@ SUB_LIST+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
 		SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
 		SAMBA_SPOOL="${SAMBA_SPOOL}" \
-		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
-		SAMBA_PRIVATE="${SAMBA_PRIVATE}"
+		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}"
 
 ALL_TARGET=	all
 .if defined(WITH_SMBTORTURE)
@@ -414,6 +422,12 @@ post-configure:
 	@${RM} -f ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
 	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 
+# This would speedup compilation
+.if !defined(WITHOUT_PCH)
+pre-build:
+	cd ${WRKSRC} && ${MAKE} pch
+.endif
+
 pre-install:
 	-@${FIND} "${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
 	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
@@ -442,18 +456,26 @@ post-install:
 	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
 	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
-	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
-	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
-	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
 .endif
 .if defined(WITH_PAM_SMBPASS)
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_smbpass.so" "${SAMBA_LIBDIR}"
-	@${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
 .endif
 # smbtorture
 .if defined(WITH_SMBTORTURE)
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbtorture" "${PREFIX}/bin"
 .endif
+#
+.if defined(WITH_SHARED_LIBS)
+.	for lib in ${SAMBA_SHARED_LIBS} wbclient
+		@if [ "${lib}" = "talloc" ]; then \
+		    ${INSTALL_DATA} ${WRKSRC}/lib/talloc/${lib}.pc	"${PKGCONFIGDIR}" ;\
+		elif [ "${lib}" = "tdb" ]; then \
+		    ${INSTALL_DATA} ${WRKSRC}/lib/tdb/${lib}.pc		"${PKGCONFIGDIR}" ;\
+		else \
+		    ${INSTALL_DATA} ${WRKSRC}/pkgconfig/${lib}.pc	"${PKGCONFIGDIR}" ;\
+		fi
+.	endfor
+.endif
 # Lib
 	@${FIND} "${SAMBA_MODULEDIR}" -type f -o -type l | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
 	@for d in `${FIND} "${SAMBA_MODULEDIR}" -type d | ${SORT} -r`; do \
@@ -473,7 +495,7 @@ post-install:
 	@${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${DOCSDIR}"
 # !NOPORTDOCS
 .endif
-#
+# Run post-install script
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/samba33/distinfo b/net/samba33/distinfo
index efcb13e4f7c0..e898a998e84e 100644
--- a/net/samba33/distinfo
+++ b/net/samba33/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.3.1.tar.gz) = babe094be14886d265b1caa917d29aa7
-SHA256 (samba-3.3.1.tar.gz) = d2bd8fdd72026d26481827baa35b8311d7531753b87b6086b4d7a3dcdb42e170
-SIZE (samba-3.3.1.tar.gz) = 26057285
+MD5 (samba-3.3.2.tar.gz) = 5c5178ea2c5d9bd5f6569285f2e0e6d7
+SHA256 (samba-3.3.2.tar.gz) = 1b4fa9fbe7ccced6cca449c4b0b9fba65ffd2ad63b1f0bf2507e943281461477
+SIZE (samba-3.3.2.tar.gz) = 26058163
diff --git a/net/samba33/files/patch-Makefile.in b/net/samba33/files/patch-Makefile.in
index ae23c2880b56..a68b4a08b2f6 100644
--- a/net/samba33/files/patch-Makefile.in
+++ b/net/samba33/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2009-02-24 07:38:16.000000000 +0000
-+++ Makefile.in	2009-02-25 03:21:29.000000000 +0000
+--- ./Makefile.in.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./Makefile.in	2009-03-14 05:49:10.000000000 +0000
 @@ -124,7 +124,7 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
@@ -22,3 +22,64 @@
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
  FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
  
+@@ -787,7 +787,8 @@
+ 	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
+ 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
+ 
+-PAM_WINBIND_OBJ = nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
++PAM_WINBIND_OBJ = nsswitch/pam_winbind.o localedir.o \
++		  @LIBTALLOC_STATIC@ @LIBWBCLIENT_STATIC@ \
+ 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
+ 
+ LIBSMBCLIENT_OBJ0 = \
+@@ -1218,6 +1219,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o .lo
++.SUFFIXES: .h .h.gch
+ 
+ SHOWFLAGS::
+ 	@echo "Using FLAGS      = $(FLAGS)"
+@@ -1260,6 +1262,9 @@
+ 		$(COMPILE_CC) >/dev/null 2>&1
+ @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
+ 
++.h.h.gch:
++	@echo Compiling $*.h
++
+ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
+ 
+ # this adds support for precompiled headers. To use it, install a snapshot
+@@ -2208,8 +2213,11 @@
+ 
+ bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
+ 	@echo "Linking shared library $@"
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
+-		$(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) @SONAMEFLAG@`basename $@`
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam $(DYNEXP) \
++		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
++		@INIPARSERLIBS@ $(PAM_WINBIND_EXTRA_LIBS) \
++		$(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
++		@SONAMEFLAG@`basename $@`
+ 
+ bin/builtin.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
+ 	@echo "Building plugin $@"
+@@ -2486,7 +2494,8 @@
+ 	@echo "Linking shared library $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
+ 		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+-		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) \
++		@SONAMEFLAG@`basename $@`
+ 
+ bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+ 	@echo Linking $@
+@@ -2785,7 +2794,7 @@
+ 	@$(LIB_PATH_VAR)=./bin && \
+ 	export $(LIB_PATH_VAR) && \
+ 	for module in $(PAM_MODULES); do \
+-		./script/tests/dlopen.sh -lpam -ldl bin/$${module}.@SHLIBEXT@ \
++		./script/tests/dlopen.sh -lpam bin/$${module}.@SHLIBEXT@ \
+ 			|| exit 1; \
+ 	done
+ 
diff --git a/net/samba33/files/patch-configure.in b/net/samba33/files/patch-configure.in
index b295dc40be4f..e49260fdcb77 100644
--- a/net/samba33/files/patch-configure.in
+++ b/net/samba33/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-02-24 07:38:16.000000000 +0000
-+++ configure.in	2009-02-26 02:11:50.000000000 +0000
+--- ./configure.in.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./configure.in	2009-03-14 14:06:27.000000000 +0000
 @@ -189,16 +189,6 @@
         fi
  fi
@@ -160,7 +160,7 @@
 +AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
 +AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
 +
-+AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-pthread"
++AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="${PTHREAD_LIBS}"
  			AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
  
  AC_SUBST(WINBIND_NSS_PTHREAD)
@@ -201,7 +201,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -6501,6 +6533,16 @@
+@@ -6502,6 +6534,16 @@
  
  fi
  
@@ -218,3 +218,12 @@
  dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
  LIB_REMOVE_USR_LIB(LDFLAGS)
  LIB_REMOVE_USR_LIB(LIBS)
+@@ -6558,6 +6600,8 @@
+ 	  pkgconfig/wbclient.pc
+ 	  pkgconfig/netapi.pc
+ 	  pkgconfig/smbsharemodes.pc
++	  lib/talloc/talloc.pc
++	  lib/tdb/tdb.pc
+ 	  ../examples/libsmbclient/Makefile.internal
+ 	  )
+ 
diff --git a/net/samba33/files/patch-include__includes.h b/net/samba33/files/patch-include__includes.h
index fb3d58d89b49..00e8926eafce 100644
--- a/net/samba33/files/patch-include__includes.h
+++ b/net/samba33/files/patch-include__includes.h
@@ -1,19 +1,5 @@
---- ./include/includes.h.orig	2009-02-24 07:38:16.000000000 +0000
-+++ ./include/includes.h	2009-03-07 03:42:32.000000000 +0000
-@@ -207,10 +207,10 @@
- #undef HAVE_LDAP
- #endif
- 
--#if HAVE_GSSAPI_H
--#include <gssapi.h>
--#elif HAVE_GSSAPI_GSSAPI_H
-+#if HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
-+#elif HAVE_GSSAPI_H
-+#include <gssapi.h>
- #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
- #include <gssapi/gssapi_generic.h>
- #endif
+--- ./include/includes.h.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./include/includes.h	2009-03-14 05:49:10.000000000 +0000
 @@ -870,7 +870,7 @@
  #endif
  
diff --git a/net/samba33/files/patch-lib__replace__libreplace_cc.m4 b/net/samba33/files/patch-lib__replace__libreplace_cc.m4
index 28244a7fe3ed..35d41d8648d3 100644
--- a/net/samba33/files/patch-lib__replace__libreplace_cc.m4
+++ b/net/samba33/files/patch-lib__replace__libreplace_cc.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace_cc.m4.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./lib/replace/libreplace_cc.m4	2009-01-06 17:10:53.000000000 +0000
+--- ./lib/replace/libreplace_cc.m4.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./lib/replace/libreplace_cc.m4	2009-03-14 05:49:10.000000000 +0000
 @@ -145,6 +145,10 @@
  AC_CHECK_TYPE(uintptr_t, unsigned long long)
  AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
diff --git a/net/samba33/files/patch-lib__replace__libnetwork.m4 b/net/samba33/files/patch-lib__replace__libreplace_network.m4
index 19989e07465d..fba88f1b05c5 100644
--- a/net/samba33/files/patch-lib__replace__libnetwork.m4
+++ b/net/samba33/files/patch-lib__replace__libreplace_network.m4
@@ -1,5 +1,5 @@
---- lib/replace/libreplace_network.m4.orig	2009-03-05 02:05:18.000000000 +0000
-+++ lib/replace/libreplace_network.m4	2009-03-05 02:06:42.000000000 +0000
+--- ./lib/replace/libreplace_network.m4.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./lib/replace/libreplace_network.m4	2009-03-14 05:49:10.000000000 +0000
 @@ -8,12 +8,15 @@
  
  AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
diff --git a/net/samba33/files/patch-libaddns__dns.h b/net/samba33/files/patch-libaddns__dns.h
deleted file mode 100644
index c5e3c511bd6b..000000000000
--- a/net/samba33/files/patch-libaddns__dns.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- libaddns/dns.h.orig	2009-02-24 07:38:16.000000000 +0000
-+++ libaddns/dns.h	2009-03-07 03:53:31.000000000 +0000
-@@ -81,10 +81,10 @@
- #include <krb5.h>
- #endif
- 
--#if HAVE_GSSAPI_H
--#include <gssapi.h>
--#elif HAVE_GSSAPI_GSSAPI_H
-+#if HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
-+#elif HAVE_GSSAPI_H
-+#include <gssapi.h>
- #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
- #include <gssapi/gssapi_generic.h>
- #endif
diff --git a/net/samba33/files/patch-m4__aclocal.m4 b/net/samba33/files/patch-m4__aclocal.m4
index fabdba79100e..1e831a9699ee 100644
--- a/net/samba33/files/patch-m4__aclocal.m4
+++ b/net/samba33/files/patch-m4__aclocal.m4
@@ -1,5 +1,22 @@
---- ./m4/aclocal.m4.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./m4/aclocal.m4	2009-01-06 17:10:53.000000000 +0000
+--- ./m4/aclocal.m4.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./m4/aclocal.m4	2009-03-14 05:49:10.000000000 +0000
+@@ -97,14 +97,14 @@
+ 		build_lib=yes
+ 		;;
+ 	*)
+-		AC_MSG_RESULT(yes)
++		AC_MSG_RESULT(no)
+ 		build_lib=no
+ 		;;
+ esac
+ ],
+ [
+ # if unspecified, default is not to build
+-AC_MSG_RESULT(yes)
++AC_MSG_RESULT(no)
+ build_lib=no
+ ]
+ )
 @@ -416,101 +416,79 @@
    dnl those with the standalone portable libiconv installed).
    AC_MSG_CHECKING(for iconv in $1)
diff --git a/net/samba33/files/patch-nsswitch__pam_winbind.c b/net/samba33/files/patch-nsswitch__pam_winbind.c
index 82dc73b4bd70..184fdcf6248c 100644
--- a/net/samba33/files/patch-nsswitch__pam_winbind.c
+++ b/net/samba33/files/patch-nsswitch__pam_winbind.c
@@ -1,5 +1,5 @@
---- nsswitch/pam_winbind.c.orig	2009-02-24 07:38:16.000000000 +0000
-+++ nsswitch/pam_winbind.c	2009-02-26 02:17:02.000000000 +0000
+--- ./nsswitch/pam_winbind.c.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./nsswitch/pam_winbind.c	2009-03-14 05:49:10.000000000 +0000
 @@ -161,7 +161,6 @@
  }
  #endif
diff --git a/net/samba33/files/patch-nsswitch__wins_freebsd.c b/net/samba33/files/patch-nsswitch__wins_freebsd.c
index b6219da81d5c..f3e3bfd95c0d 100644
--- a/net/samba33/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba33/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- /dev/null	2009-03-07 03:29:28.000000000 +0000
-+++ nsswitch/wins_freebsd.c	2009-03-07 02:50:40.000000000 +0000
+--- ./nsswitch/wins_freebsd.c.orig	2009-03-14 05:49:10.000000000 +0000
++++ ./nsswitch/wins_freebsd.c	2009-03-14 05:49:10.000000000 +0000
 @@ -0,0 +1,108 @@
 +/* 
 +   Unix SMB/CIFS implementation.
diff --git a/net/samba33/files/patch-script__test__dlopen.sh b/net/samba33/files/patch-script__tests__dlopen.sh
index 9382015c4a2b..786b914f89ad 100644
--- a/net/samba33/files/patch-script__test__dlopen.sh
+++ b/net/samba33/files/patch-script__tests__dlopen.sh
@@ -1,5 +1,5 @@
---- script/tests/dlopen.sh.orig	2009-03-07 03:03:34.000000000 +0000
-+++ script/tests/dlopen.sh	2009-03-07 03:04:03.000000000 +0000
+--- ./script/tests/dlopen.sh.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./script/tests/dlopen.sh	2009-03-14 05:49:10.000000000 +0000
 @@ -67,7 +67,7 @@
  	esac
  done
diff --git a/net/samba33/files/patch-smbd__aio.c b/net/samba33/files/patch-smbd__aio.c
index 6ea4e588c3b8..d6b52dbe8e7e 100644
--- a/net/samba33/files/patch-smbd__aio.c
+++ b/net/samba33/files/patch-smbd__aio.c
@@ -1,5 +1,5 @@
---- smbd/aio.c.orig	2009-02-24 07:38:16.000000000 +0000
-+++ smbd/aio.c	2009-03-07 03:44:22.000000000 +0000
+--- ./smbd/aio.c.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./smbd/aio.c	2009-03-14 05:49:10.000000000 +0000
 @@ -24,9 +24,6 @@
  
  /* The signal we'll use to signify aio done. */
diff --git a/net/samba33/files/patch-smbd__quotas.c b/net/samba33/files/patch-smbd__quotas.c
index 9e8bb2375b9d..55409ebf68ab 100644
--- a/net/samba33/files/patch-smbd__quotas.c
+++ b/net/samba33/files/patch-smbd__quotas.c
@@ -1,5 +1,5 @@
---- ./smbd/quotas.c.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./smbd/quotas.c	2009-01-06 17:10:53.000000000 +0000
+--- ./smbd/quotas.c.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./smbd/quotas.c	2009-03-14 05:49:10.000000000 +0000
 @@ -1023,6 +1023,8 @@
  	enum clnt_stat clnt_stat;
  	bool ret = True;
diff --git a/net/samba33/files/patch-smbd__statvfs.c b/net/samba33/files/patch-smbd__statvfs.c
index d15c4bcfa2d9..44cdda7a1eaa 100644
--- a/net/samba33/files/patch-smbd__statvfs.c
+++ b/net/samba33/files/patch-smbd__statvfs.c
@@ -1,5 +1,5 @@
---- ./smbd/statvfs.c.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./smbd/statvfs.c	2009-01-06 17:10:53.000000000 +0000
+--- ./smbd/statvfs.c.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./smbd/statvfs.c	2009-03-14 05:49:10.000000000 +0000
 @@ -3,6 +3,7 @@
     VFS API's statvfs abstraction
     Copyright (C) Alexander Bokovoy			2005
diff --git a/net/samba33/files/patch-utils__net_time.c b/net/samba33/files/patch-utils__net_time.c
index 155780336feb..84623bb9fe2c 100644
--- a/net/samba33/files/patch-utils__net_time.c
+++ b/net/samba33/files/patch-utils__net_time.c
@@ -1,5 +1,5 @@
---- ./utils/net_time.c.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./utils/net_time.c	2009-01-06 17:10:53.000000000 +0000
+--- ./utils/net_time.c.orig	2009-03-12 09:47:20.000000000 +0000
++++ ./utils/net_time.c	2009-03-14 05:49:10.000000000 +0000
 @@ -84,9 +84,15 @@
  		return "unknown";
  	}
diff --git a/net/samba33/pkg-plist b/net/samba33/pkg-plist
index 7279624d0b40..bd611b8404cd 100644
--- a/net/samba33/pkg-plist
+++ b/net/samba33/pkg-plist
@@ -34,6 +34,30 @@ sbin/smbd
 sbin/nmbd
 %%SWAT%%sbin/swat
 %%WINBIND%%sbin/winbindd
+%%SHAREDLIBS%%include/netapi.h
+%%SHAREDLIBS%%include/smb_share_modes.h
+%%SHAREDLIBS%%include/talloc.h
+%%SHAREDLIBS%%include/tdb.h
+%%SHAREDLIBS%%include/wbclient.h
+%%SHAREDLIBS%%lib/libnetapi.so
+%%SHAREDLIBS%%lib/libnetapi.so.0
+%%SHAREDLIBS%%lib/libsmbsharemodes.so
+%%SHAREDLIBS%%lib/libsmbsharemodes.so.0
+%%SHAREDLIBS%%lib/libtalloc.so
+%%SHAREDLIBS%%lib/libtalloc.so.1
+%%SHAREDLIBS%%lib/libtdb.so
+%%SHAREDLIBS%%lib/libtdb.so.1
+%%SHAREDLIBS%%lib/libwbclient.so
+%%SHAREDLIBS%%lib/libwbclient.so.0
+%%SHAREDLIBS%%%%PKGCONFIGDIR%%/netapi.pc
+%%SHAREDLIBS%%%%PKGCONFIGDIR%%/smbsharemodes.pc
+%%SHAREDLIBS%%%%PKGCONFIGDIR%%/talloc.pc
+%%SHAREDLIBS%%%%PKGCONFIGDIR%%/tdb.pc
+%%SHAREDLIBS%%%%PKGCONFIGDIR%%/wbclient.pc
+%%WINBIND%%lib/nss_winbind.so.1
+%%WINBIND%%lib/nss_wins.so.1
+%%WINBIND%%lib/pam_winbind.so
+%%SMBPASS%%lib/pam_smbpass.so
 %%EXAMPLESDIR%%/%%SAMBA_CONFIG%%.sample
 %%EXAMPLESDIR%%/LDAP/README
 %%EXAMPLESDIR%%/LDAP/convertSambaAccount
diff --git a/net/samba33/pkg-plist.swat b/net/samba33/pkg-plist.swat
index e85d817fc5a5..cd48f5d1d408 100644
--- a/net/samba33/pkg-plist.swat
+++ b/net/samba33/pkg-plist.swat
@@ -272,6 +272,7 @@ share/swat/help/manpages/vfs_gpfs.8.html
 share/swat/help/manpages/vfs_netatalk.8.html
 share/swat/help/manpages/vfs_notify_fam.8.html
 share/swat/help/manpages/vfs_prealloc.8.html
+share/swat/help/manpages/vfs_preopen.8.html
 share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html