Upgrade port to the 3.0.34 version. Major enhancements included in Samba:

  o Fix update of machine account passwords.
  o Fix SMB signing issue on Windows Vista with MS Hotfix KB955302.
  o Fix Winbind crashes.
  o Correctly detect if the current dc is the closest one.
  o Add saf_join_store() function to memorize the dc used at join time.
    This avoids problems caused by replication delays shortly after domain
    joins.
  o Fix write list in setups using "security = share".

12 files changed, 80 insertions, 118 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 929a0b124cf3..d3dfd26b72cd 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,18 +6,13 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.0.32
-PORTREVISION=	3
+PORTVERSION?=		3.0.34
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
-PATCH_SITES=		http://us1.samba.org/samba/ftp/patches/security/
-PATCHFILES=		samba-3.0.32-CVE-2008-4314.patch
-PATCH_DIST_STRIP=	-p2
-
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
@@ -169,12 +164,10 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-WITH_WINBIND_NSS=	yes
-PLIST_SUB+=		WINBIND_NSS=""
 .else
 CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
-SUB_LIST+=		WINBIND="@comment " WINBIND_NSS="@comment "
+PLIST_SUB+=		WINBIND="@comment "
+SUB_LIST+=		WINBIND="@comment "
 .endif
 
 # Add some shared modules
@@ -348,8 +341,8 @@ MAN8+=		vfs_catia.8
 MAN8+=		vfs_commit.8
 .endif
 
-# Off by now
-PLIST_SUB+=	SAMBA_BOOK="@comment "
+# Book is back!
+PLIST_SUB+=	SAMBA_BOOK=""
 
 PLIST_SUB+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
@@ -370,6 +363,13 @@ SUB_LIST+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
 		SAMBA_PRIVATE="${SAMBA_PRIVATE}"
 
+ALL_TARGET=	all
+.if defined(WITH_SMBTORTURE)
+ALL_TARGET+=	smbtorture
+.endif
+
+INSTALL_TARGET=	installservers installbin installscripts installdat installswat installmodules
+
 pre-everything::
 	@${ECHO_CMD} "===>  NOTICE: This version of port has changed location of Samba password"
 	@${ECHO_CMD} "===>  NOTICE: (smbpasswd) directory. Files in '${SAMBA_PRIVATE}'"
@@ -404,11 +404,6 @@ pre-build:
 	cd ${WRKSRC} && ${MAKE} pch
 .endif
 
-.if defined(WITH_SMBTORTURE)
-post-build:
-	cd ${WRKSRC} && ${MAKE} smbtorture
-.endif
-
 pre-install:
 	-@${FIND} "${SAMBA_MODULEDIR}" -type f 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' >> ${WRKDIR}/.PLIST.exclude
 	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
@@ -432,12 +427,10 @@ post-install:
 	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${PREFIX}/bin/make_smbpasswd"
 # Winbind
 .if !defined(WITHOUT_WINBIND)
-.	if defined(WITH_WINBIND_NSS)
-	    ${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"
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
-.	endif
+	${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"
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
 	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
 .endif
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 02cf60f3679d..ea5cb7c51e3d 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,6 +1,3 @@
-MD5 (samba-3.0.32.tar.gz) = be13b8dbe2785212dba49e7ced352f30
-SHA256 (samba-3.0.32.tar.gz) = 8a7f50e0e85eb0c5c5a9bee7d464367afe09366e66a162cdbb4f13860c0fecd6
-SIZE (samba-3.0.32.tar.gz) = 21679285
-MD5 (samba-3.0.32-CVE-2008-4314.patch) = dc60e0f9d8c3d2447e25240dfb8a5db0
-SHA256 (samba-3.0.32-CVE-2008-4314.patch) = 66b0c6b9c493bc70f6ea7df55bda8d1ffdd4baf844ef3240a2d6b35d1a78ac38
-SIZE (samba-3.0.32-CVE-2008-4314.patch) = 1846
+MD5 (samba-3.0.34.tar.gz) = 62404f39bb3dd0a37d6396c57e04c907
+SHA256 (samba-3.0.34.tar.gz) = 530793de9f4114f4b391d932e2833baf25a00498317471cd75a068f3378c299e
+SIZE (samba-3.0.34.tar.gz) = 24835363
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
index dad1f994b8ce..344206d4a914 100644
--- a/net/samba3/files/patch-Makefile.in
+++ b/net/samba3/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-07-10 21:17:14.000000000 +0200
-+++ Makefile.in	2008-08-05 02:06:03.000000000 +0200
+--- Makefile.in.orig	2009-01-19 10:40:09.000000000 +0000
++++ Makefile.in	2009-01-20 15:50:59.000000000 +0000
 @@ -91,7 +91,7 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
@@ -17,7 +17,7 @@
  VFS_CATIA_OBJ = modules/vfs_catia.o
  VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
  VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
-@@ -746,8 +747,8 @@
+@@ -748,8 +749,8 @@
              $(RPC_NTSVCS_OBJ) $(RPC_INITSHUTDOWN_OBJ) utils/passwd_util.o \
  	    $(LIBGPO_OBJ) $(NSS_INFO_OBJ)
  
@@ -28,7 +28,7 @@
  
  PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
  		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
-@@ -1477,6 +1478,11 @@
+@@ -1484,6 +1485,11 @@
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_TRU64ACL_OBJ) \
  		@SONAMEFLAG@`basename $@`
  
@@ -40,13 +40,3 @@
  bin/catia.@SHLIBEXT@: proto_exists $(VFS_CATIA_OBJ)
  	@echo "Building plugin $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_CATIA_OBJ) \
-@@ -1566,8 +1572,7 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
- 
--install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
--
-+install: installservers installbin installscripts installdat installswat installmodules
- 
- install-everything: install installmodules
- 
diff --git a/net/samba3/files/patch-aclocal.m4 b/net/samba3/files/patch-aclocal.m4
index 030bc17a97bd..01167dea846d 100644
--- a/net/samba3/files/patch-aclocal.m4
+++ b/net/samba3/files/patch-aclocal.m4
@@ -1,5 +1,5 @@
---- aclocal.m4.orig	Thu Aug 30 21:19:57 2007
-+++ aclocal.m4	Thu Aug 30 21:40:52 2007
+--- ./aclocal.m4.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./aclocal.m4	2009-01-20 15:50:59.000000000 +0000
 @@ -307,84 +307,79 @@
    dnl those with the standalone portable libiconv installed).
    AC_MSG_CHECKING(for iconv in $1)
@@ -35,30 +35,27 @@
 +	AC_TRY_LINK([#include <stdlib.h>
  #include <iconv.h>],
 -          [iconv_t cd = iconv_open("","");
+-           iconv(cd,NULL,NULL,NULL,NULL);
+-           iconv_close(cd);],
+-           jm_cv_include="iconv.h"
+-           jm_cv_func_iconv=yes
+-           jm_cv_lib_iconv="")
 +	[iconv_t cd = iconv_open("","");
 +         iconv(cd,NULL,NULL,NULL,NULL);
 +         iconv_close(cd);],
 +	jm_cv_func_iconv=yes
 +	jm_cv_include="iconv.h"
 +	jm_cv_lib_iconv="")
-+
-+	if test "$jm_cv_func_iconv" != yes; then
-+	  jm_save_LIBS="$LIBS"
-+	  LIBS="$LIBS -lgiconv"
-+          AC_TRY_LINK([#include <stdlib.h>
-+#include <giconv.h>],
-+	  [iconv_t cd = iconv_open("","");
-            iconv(cd,NULL,NULL,NULL,NULL);
-            iconv_close(cd);],
--           jm_cv_include="iconv.h"
--           jm_cv_func_iconv=yes
--           jm_cv_lib_iconv="")
--
+ 
 -          if test "$jm_cv_lib_iconv" != yes; then
 -            jm_save_LIBS="$LIBS"
 -            LIBS="$LIBS -lgiconv"
 -            AC_TRY_LINK([#include <stdlib.h>
--#include <giconv.h>],
++	if test "$jm_cv_func_iconv" != yes; then
++	  jm_save_LIBS="$LIBS"
++	  LIBS="$LIBS -lgiconv"
++          AC_TRY_LINK([#include <stdlib.h>
+ #include <giconv.h>],
 -              [iconv_t cd = iconv_open("","");
 -               iconv(cd,NULL,NULL,NULL,NULL);
 -               iconv_close(cd);],
@@ -67,20 +64,21 @@
 -              jm_cv_include="giconv.h"
 -              jm_cv_giconv=yes
 -              jm_cv_lib_iconv="giconv")
--
--           LIBS="$jm_save_LIBS"
--
--        if test "$jm_cv_func_iconv" != yes; then
--          jm_save_LIBS="$LIBS"
--          LIBS="$LIBS -liconv"
--          AC_TRY_LINK([#include <stdlib.h>
++	  [iconv_t cd = iconv_open("","");
++           iconv(cd,NULL,NULL,NULL,NULL);
++           iconv_close(cd);],
 +          jm_cv_func_iconv=yes
 +          jm_cv_include="giconv.h"
 +          jm_cv_lib_iconv="giconv"
 +          jm_cv_giconv=yes)
-+
+ 
+-           LIBS="$jm_save_LIBS"
 +	  LIBS="$jm_save_LIBS"
-+
+ 
+-        if test "$jm_cv_func_iconv" != yes; then
+-          jm_save_LIBS="$LIBS"
+-          LIBS="$LIBS -liconv"
+-          AC_TRY_LINK([#include <stdlib.h>
 +	  if test "$jm_cv_func_iconv" != yes; then
 +	    jm_save_LIBS="$LIBS"
 +	    LIBS="$LIBS -liconv"
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index 2afe64dd8639..f7bd50f5cb05 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2008-03-08 16:56:26.000000000 +0100
-+++ configure.in	2008-05-01 04:24:05.000000000 +0200
-@@ -1052,6 +1052,21 @@
+--- ./configure.in.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./configure.in	2009-01-20 15:50:59.000000000 +0000
+@@ -1055,6 +1055,21 @@
     AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
  fi
  
@@ -22,7 +22,7 @@
  AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
      AC_TRY_COMPILE([
  #include <sys/types.h>
-@@ -1255,6 +1270,7 @@
+@@ -1258,6 +1273,7 @@
  
  # Find a method of generating a stack trace
  AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
@@ -30,7 +30,7 @@
  AC_CHECK_FUNCS(backtrace_symbols)
  AC_CHECK_LIB(exc, trace_back_stack)
  
-@@ -4091,10 +4107,10 @@
+@@ -4098,10 +4114,10 @@
  
    ################################################################
    # first test for Active Directory support being enabled
@@ -45,7 +45,7 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
-@@ -5165,7 +5181,7 @@
+@@ -5226,7 +5242,7 @@
  #################################################
  # check for ACL support
  
@@ -54,7 +54,7 @@
  AC_ARG_WITH(acl-support,
  [  --with-acl-support      Include ACL support (default=no)],
  [ case "$withval" in
-@@ -5173,43 +5189,37 @@
+@@ -5234,43 +5250,37 @@
  
  	case "$host_os" in
  	*sysv5*)
@@ -105,7 +105,7 @@
  	*linux*)
  		AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
         		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
-@@ -5230,7 +5240,7 @@
+@@ -5291,7 +5301,7 @@
  			LIBS=$acl_LIBS
  		])
  		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
@@ -114,7 +114,7 @@
  			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
  			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
  				acl_LIBS=$LIBS
-@@ -5251,12 +5261,18 @@
+@@ -5312,12 +5322,18 @@
  				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
  			fi
  		fi
@@ -137,7 +137,7 @@
  			AC_TRY_LINK([
  				#include <sys/types.h>
  				#include <sys/acl.h>
-@@ -5269,20 +5285,20 @@
+@@ -5330,20 +5346,20 @@
  			[samba_cv_HAVE_POSIX_ACLS=yes],
  			[samba_cv_HAVE_POSIX_ACLS=no])
  			LIBS=$acl_LIBS
@@ -163,7 +163,7 @@
  				],
  				[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
  				[samba_cv_HAVE_ACL_GET_PERM_NP=no])
-@@ -5291,17 +5307,22 @@
+@@ -5352,17 +5368,22 @@
  			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
  				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
  			fi
@@ -188,7 +188,7 @@
  )
  
  if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
-@@ -5775,6 +5796,7 @@
+@@ -5836,6 +5857,7 @@
  		NSSSONAMEVERSIONSUFFIX=".1"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
@@ -196,16 +196,16 @@
  		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
  		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
  		;;
-@@ -5831,6 +5853,8 @@
+@@ -5893,6 +5915,8 @@
  AC_SUBST(WINBIND_NSS_LDSHFLAGS)
  AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
  AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 +AC_SUBST(WINBIND_WINS_NSS_EXTRA_OBJS)
 +AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
  AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+ AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
  
- AC_SUBST(SMB_KRB5_LOCATOR)
-@@ -6132,6 +6156,7 @@
+@@ -6195,6 +6219,7 @@
  SMB_MODULE(vfs_irixacl, \$(VFS_IRIXACL_OBJ), "bin/irixacl.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_hpuxacl, \$(VFS_HPUXACL_OBJ), "bin/hpuxacl.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_tru64acl, \$(VFS_TRU64ACL_OBJ), "bin/tru64acl.$SHLIBEXT", VFS)
diff --git a/net/samba3/files/patch-lib__replace__libreplace.m4 b/net/samba3/files/patch-lib__replace__libreplace.m4
index 1cdd3d70c2a6..5e1e23089fcd 100644
--- a/net/samba3/files/patch-lib__replace__libreplace.m4
+++ b/net/samba3/files/patch-lib__replace__libreplace.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace.m4.orig	2008-09-05 16:58:51.000000000 +0200
-+++ ./lib/replace/libreplace.m4	2008-09-05 16:59:05.000000000 +0200
+--- ./lib/replace/libreplace.m4.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./lib/replace/libreplace.m4	2009-01-20 15:50:59.000000000 +0000
 @@ -332,7 +332,6 @@
  m4_include(strptime.m4)
  m4_include(win32.m4)
diff --git a/net/samba3/files/patch-lib__system.c b/net/samba3/files/patch-lib__system.c
index 340be871c1f7..f0b9b8eec87f 100644
--- a/net/samba3/files/patch-lib__system.c
+++ b/net/samba3/files/patch-lib__system.c
@@ -1,5 +1,5 @@
---- lib/system.c.orig	Mon Aug 20 15:04:50 2007
-+++ lib/system.c	Sun Sep 16 04:25:55 2007
+--- ./lib/system.c.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./lib/system.c	2009-01-20 15:50:59.000000000 +0000
 @@ -574,7 +574,11 @@
  {
  	char *wd;
@@ -38,7 +38,7 @@
  os/2 also doesn't have chroot
  ********************************************************************/
  int sys_chroot(const char *dname)
-@@ -871,15 +894,13 @@
+@@ -876,15 +899,13 @@
  }
  
  /**************************************************************************
@@ -58,7 +58,7 @@
  	GID_T gid;
  	GID_T *group_list;
  	int i, ngroups;
-@@ -901,7 +922,7 @@
+@@ -906,7 +927,7 @@
  	if (setlen == 0)
  		setlen = groups_max();
  
@@ -67,7 +67,7 @@
  		DEBUG(0,("sys_getgroups: Malloc fail.\n"));
  		return -1;
  	}
-@@ -918,26 +939,10 @@
+@@ -923,26 +944,10 @@
  
  	SAFE_FREE(group_list);
  	return ngroups;
@@ -95,7 +95,7 @@
  	GID_T *group_list;
  	int i ; 
  
-@@ -954,7 +959,7 @@
+@@ -959,7 +964,7 @@
  	 * GID_T array of size setlen.
  	 */
  
@@ -104,7 +104,7 @@
  		DEBUG(0,("sys_setgroups: Malloc fail.\n"));
  		return -1;    
  	}
-@@ -971,7 +976,105 @@
+@@ -976,7 +981,105 @@
   
  	SAFE_FREE(group_list);
  	return 0 ;
diff --git a/net/samba3/files/patch-lib__system_smbd.c b/net/samba3/files/patch-lib__system_smbd.c
index edc1c797251d..702b276343ee 100644
--- a/net/samba3/files/patch-lib__system_smbd.c
+++ b/net/samba3/files/patch-lib__system_smbd.c
@@ -1,5 +1,5 @@
---- lib/system_smbd.c.orig	Sun Sep 16 04:29:55 2007
-+++ lib/system_smbd.c	Sun Sep 16 04:31:21 2007
+--- ./lib/system_smbd.c.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./lib/system_smbd.c	2009-01-20 15:50:59.000000000 +0000
 @@ -104,12 +104,10 @@
  
  	restore_re_gid();
diff --git a/net/samba3/files/patch-lib_replace_autoconf-2.60.m4 b/net/samba3/files/patch-lib_replace_autoconf-2.60.m4
deleted file mode 100644
index 54fbfdc699de..000000000000
--- a/net/samba3/files/patch-lib_replace_autoconf-2.60.m4
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/replace/autoconf-2.60.m4.orig	2007-11-15 03:15:03.000000000 +0000
-+++ lib/replace/autoconf-2.60.m4	2008-06-12 17:56:42.000000000 +0000
-@@ -179,6 +179,7 @@
- # ------------------------
- # Enable extensions on systems that normally disable them,
- # typically due to standards-conformance issues.
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
- AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- [
-   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-@@ -208,3 +209,4 @@
-     AC_DEFINE([__EXTENSIONS__])
-   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
- ])
-+])
diff --git a/net/samba3/files/patch-libaddns__dnsgss.c b/net/samba3/files/patch-libaddns__dnsgss.c
index 7d0bae94fc7e..c10d4ca34559 100644
--- a/net/samba3/files/patch-libaddns__dnsgss.c
+++ b/net/samba3/files/patch-libaddns__dnsgss.c
@@ -1,8 +1,6 @@
-Index: libaddns/dnsgss.c
-===================================================================
---- libaddns/dnsgss.c	(revision 25080)
-+++ libaddns/dnsgss.c	(working copy)
-@@ -219,11 +219,8 @@ DNS_ERROR dns_negotiate_sec_ctx( const c
+--- ./libaddns/dnsgss.c.orig	2009-01-19 10:40:09.000000000 +0000
++++ ./libaddns/dnsgss.c	2009-01-20 15:50:59.000000000 +0000
+@@ -221,11 +221,8 @@
  
  	gss_name_t targ_name;
  
@@ -15,7 +13,7 @@ Index: libaddns/dnsgss.c
  
  	TALLOC_CTX *mem_ctx;
  
-@@ -247,23 +244,13 @@ DNS_ERROR dns_negotiate_sec_ctx( const c
+@@ -249,23 +246,13 @@
  		goto error;
  	}
  
@@ -41,7 +39,7 @@ Index: libaddns/dnsgss.c
  		err = ERROR_DNS_GSS_ERROR;
  		goto error;
  	}
-@@ -273,11 +260,6 @@ DNS_ERROR dns_negotiate_sec_ctx( const c
+@@ -275,11 +262,6 @@
  	
  	gss_release_name( &minor, &targ_name );
  
diff --git a/net/samba3/files/patch-nsswitch__wins_freebsd.c b/net/samba3/files/patch-nsswitch__wins_freebsd.c
index 0c52fad92a28..73a84bce5c85 100644
--- a/net/samba3/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba3/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- /dev/null	Mon Oct 15 03:11:01 2007
-+++ nsswitch/wins_freebsd.c	Mon Oct 15 03:18:44 2007
+--- ./nsswitch/wins_freebsd.c.orig	2009-01-20 15:50:59.000000000 +0000
++++ ./nsswitch/wins_freebsd.c	2009-01-20 15:50:59.000000000 +0000
 @@ -0,0 +1,113 @@
 +/* 
 +   Unix SMB/CIFS implementation.
diff --git a/net/samba3/pkg-plist.swat b/net/samba3/pkg-plist.swat
index c50471c9dba5..fb425d52b771 100644
--- a/net/samba3/pkg-plist.swat
+++ b/net/samba3/pkg-plist.swat
@@ -203,6 +203,7 @@ share/swat/help/Samba3-HOWTO/type.html
 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/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