Update to 2.2.2 to make room for 3.0 in samba-devel

svn path=/head/; revision=51631

net/samba/Makefile

@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.0.10
+PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
-		ftp://de.samba.org/samba.org/%SUBDIR%/ \
+		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old-versions old
@@ -22,6 +22,11 @@ MAINTAINER=	dwcjr@FreeBSD.org
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups
 .endif
 
+.if defined(WITH_RECYCLE)
+PATCH_SITES+=	http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/
+PATCHFILES+=	proto.h.patch loadparm.c.patch reply.c.patch
+.endif
+
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
@@ -36,26 +41,38 @@ USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock \
+		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
-		--with-privatedir=${SAMBA_PRIVATE}
+		--with-pam
+
+.include <bsd.port.pre.mk>
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
 .endif
 
 .if defined(WITH_CUPS)
+# This enables CUPS printing support in Samba.
 CONFIGURE_ARGS+=	--with-cups=${LOCALBASE}
 .endif
 
+.if defined(WITH_ACL_SUPPORT)
+.if ${OSVERSION} < 500018
+BROKEN=	"Requires a recent FreeBSD 5.0-CURRENT"
+.else
+CONFIGURE_ARGS+=	--with-acl-support
+.endif
+.endif
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+MAN1=		findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \
-		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
+		nmblookup.1 smbcacls.1 smbclient.1 smbcontrol.1 smbrun.1 \
-		make_unicodemap.1
+		smbsh.1 smbstatus.1 smbtar.1 testparm.1 \
-MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
+		testprns.1 wbinfo.1
+MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 \
-		smbmount.8 smbumount.8 smbmnt.8
+		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
@@ -90,33 +107,34 @@ post-install:
 	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
 	${ECHO} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec echo \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
+	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 	for i in ${WRKDIR}/${DISTNAME}/README				\
 			${WRKDIR}/${DISTNAME}/COPYING			\
 			${WRKDIR}/${DISTNAME}/Manifest			\
 			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
 			${WRKDIR}/${DISTNAME}/Roadmap			\
 			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
 			${WRKDIR}/${DISTNAME}/docs/THANKS		\
 			${WRKDIR}/${DISTNAME}/docs/announce		\
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
+	for i in faq htmldocs textdocs Registry ; do			\
 		${MKDIR} ${DOCSDIR}/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
+				if [ $$j != ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated ] ; then \
 					${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\
 				fi; \
+			fi; \
 		done							\
 	done
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

net/samba/distinfo

@@ -1 +1,4 @@
-MD5 (samba-2.0.10.tar.gz) = 54870482fe036b7e69dd48c90661eec6
+MD5 (samba-2.2.2.tar.gz) = d0aba688a1b6189f09f3ba0b44b1da8e
+MD5 (proto.h.patch) = b8b577540c1de5202e70584a402c2d74
+MD5 (loadparm.c.patch) = df642726476af756df8a2e6c0537eb0d
+MD5 (reply.c.patch) = b75a5312ad6c01c501d6e887c3a65357

net/samba/files/README.FreeBSD

@@ -17,3 +17,5 @@ use chinese/samba port).  See smb.conf.sample for details.  If you want to
 use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
 yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
 authentication.
+
+FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>

net/samba/files/patch-aa

@@ -1,46 +1,34 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
+--- Makefile.in.orig	Sat Oct 13 22:09:06 2001
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
++++ Makefile.in	Tue Oct 16 17:15:15 2001
-@@ -25,7 +25,7 @@
+@@ -46,11 +46,11 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-@@ -37,12 +37,13 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
+-LOGFILEBASE = @logfilebase@
--NMBLOGFILE = $(VARDIR)/log.nmb
++LOGFILEBASE = $(VARDIR)/log
-+LOGDIR=$(VARDIR)/log
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
-+SMBLOGFILE = $(LOGDIR)/log.smb
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-+NMBLOGFILE = $(LOGDIR)/log.nmb
+ DRIVERFILE = $(CONFIGDIR)/printers.def
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
 -PASSWD_PROGRAM = /bin/passwd
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -54,6 +55,9 @@
+@@ -63,6 +63,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
 +# the directory where pid files go
 +PIDFILEDIR = $(VARDIR)/run
 +
- # The directory where code page definition files go
+ # libsmbclient support here
- CODEPAGEDIR = $(LIBDIR)/codepages
+ BLDSHARED = @BLDSHARED@
- 
+ LIBSMBCLIENT_MAJOR=0
-@@ -71,7 +75,7 @@
+@@ -78,7 +81,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
+-FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
  FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H

net/samba/files/patch-ab

@@ -1,33 +1,33 @@
---- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
+--- param/loadparm.c.orig	Sat Oct 13 22:09:31 2001
-+++ param/loadparm.c	Thu Apr 27 11:12:03 2000
++++ param/loadparm.c	Tue Oct 16 17:16:46 2001
-@@ -105,6 +105,7 @@
+@@ -107,6 +107,7 @@
- {
+ 	char *szDeletePrinterCommand;
-   char *szPrintcapname;
+ 	char *szOs2DriverMap;
  	char *szLockDir;
 +	char *szPidDir;
  	char *szRootdir;
  	char *szDefaultService;
  	char *szDfree;
-@@ -820,6 +821,8 @@
+@@ -986,6 +987,8 @@
-   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
-   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
  	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
 +	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
 +	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
-   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
+ 	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -911,6 +914,7 @@
+@@ -1220,6 +1223,7 @@
+ 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
  	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
  	string_set(&Globals.szLockDir, LOCKDIR);
 +	string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
  #ifdef WITH_UTMP
  	string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
+ 	string_set(&Globals.szWtmpDir, "");
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
+@@ -1469,6 +1473,7 @@
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
+ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
  FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
 +FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  #ifdef WITH_UTMP

net/samba/files/patch-ac

@@ -1,17 +1,17 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
+--- lib/pidfile.c.orig	Sat Oct 13 22:09:24 2001
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
++++ lib/pidfile.c	Tue Oct 16 17:17:51 2001
-@@ -37,7 +37,7 @@
+@@ -39,7 +39,7 @@
  	unsigned ret;
  	pstring pidFile;
  
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
  
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
+ 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
  	if (fd == -1) {
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
  	pstring pidFile;
- 	int pid;
+ 	pid_t pid;
  
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);

net/samba/files/patch-ae

@@ -1,5 +1,5 @@
---- script/convert_smbpasswd.orig	Thu Nov  5 11:50:17 1998
+--- script/convert_smbpasswd.orig	Thu Nov  5 02:50:17 1998
-+++ script/convert_smbpasswd	Wed Feb 10 00:02:01 1999
++++ script/convert_smbpasswd	Tue Oct 16 17:19:10 2001
 @@ -7,7 +7,7 @@
  # with trying to work out how to get the seconds since 1970
  # in awk or the shell. JRA.

net/samba/files/patch-af

@@ -1,9 +0,0 @@
---- script/updatesmbpasswd.sh.orig	Sat May  4 16:50:45 1996
-+++ script/updatesmbpasswd.sh	Wed Feb 10 01:21:05 1999
-@@ -1,5 +1,5 @@
- #!/bin/sh
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0

net/samba/files/patch-ag

@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 

net/samba/files/patch-ah

@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
+--- lib/util_sock.c.orig	Sat Oct 13 22:09:26 2001
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
++++ lib/util_sock.c	Tue Oct 16 17:19:38 2001
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
@@ -9,4 +9,4 @@
 +
  extern int DEBUGLEVEL;
  
- BOOL passive = False;
+ /* the last IP received from */

net/samba/files/patch-aj

@@ -1,6 +1,6 @@
---- include/local.h.orig	Thu Nov 11 03:36:00 1999
+--- include/local.h.orig	Fri Jul  6 03:01:26 2001
-+++ include/local.h	Fri Feb  4 11:33:01 2000
++++ include/local.h	Tue Oct 16 17:20:36 2001
-@@ -178,9 +178,9 @@
+@@ -176,10 +176,10 @@
   * Default passwd chat script.
   */
  
@@ -11,4 +11,5 @@
 -#define MINPASSWDLENGTH 5
 +#define MINPASSWDLENGTH 6
  
- #endif
+ /* maximum ID number used for session control. This cannot be larger
+    than 62*62 for the current code */

net/samba/files/patch-ak

@@ -1,10 +0,0 @@
---- include/proto.h.orig	Sun Feb 25 14:52:21 2001
-+++ include/proto.h	Sun Feb 25 14:52:42 2001
-@@ -1023,6 +1023,7 @@
- char *lp_serverstring(void);
- char *lp_printcapname(void);
- char *lp_lockdir(void);
-+char *lp_piddir(void);
- char *lp_utmpdir(void);
- char *lp_wtmpdir(void);
- char *lp_utmp_hostname(void);

net/samba/files/patch-ba

@@ -1,28 +1,41 @@
---- configure.in.orig	Tue Apr 17 19:00:52 2001
+--- configure.in.orig	Sat Oct 13 22:09:16 2001
-+++ configure.in	Thu Jun  7 13:49:53 2001
++++ configure.in	Tue Oct 16 17:21:21 2001
-@@ -234,9 +234,6 @@
+@@ -406,21 +406,6 @@
- AC_CHECK_TYPE(offset_t,loff_t)
  AC_CHECK_TYPE(ssize_t, int)
+ AC_CHECK_TYPE(wchar_t, unsigned short)
  
--# we need libcups for CUPS support...
+-############################################
+-# for cups support we need libcups, and a handful of header files
+-
 -AC_CHECK_LIB(cups,httpConnect)
 -
- # we need libdl for PAM and the new VFS code
+-# I wonder if there is a nicer way of doing this?
- AC_CHECK_LIB(dl,main)
+-
+-if test x"$ac_cv_lib_cups_httpConnect" = x"yes"; then
+-        AC_CHECK_HEADERS(cups/cups.h cups/language.h)
+-        if test x"$ac_cv_header_cups_cups_h" = x"yes"; then
+-                if test x"$ac_cv_header_cups_language_h" = x"yes"; then
+-                        AC_DEFINE(HAVE_CUPS)
+-                fi
+-        fi
+-fi
  
-@@ -1258,7 +1255,7 @@
+ ############################################
-   --without-krb5          Don't include Kerberos 5 support (default)],
+ # we need libdl for PAM and the new VFS code
- [   AC_MSG_RESULT(yes)
+@@ -1622,7 +1607,7 @@
+   yes)
+     AC_MSG_RESULT(yes)
      AC_DEFINE(KRB5_AUTH)
 -    LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
 +    LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err"
      CFLAGS="$CFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"],
+     LDFLAGS="$LDFLAGS -L$withval/lib"
-   AC_MSG_RESULT(no)
+     ;;
-@@ -1486,6 +1483,21 @@
+@@ -1961,6 +1946,20 @@
+     ;;
    esac ],
    AC_MSG_RESULT(no)
- )
++)
 +
 +#################################################
 +# check for CUPS printing support
@@ -36,8 +49,6 @@
 +   LDFLAGS="$LDFLAGS -L$withval/lib"
 +   AC_CHECK_LIB(cups,httpConnect)],
 + AC_MSG_RESULT(no)
-+)
+ )
-+
+ 
  
- #################################################
- # check for experimental disk-quotas support

net/samba/files/patch-bb

@@ -0,0 +1,10 @@
+--- include/proto.h.orig	Sat Oct 13 22:09:22 2001
++++ include/proto.h	Tue Oct 16 17:21:53 2001
+@@ -1733,6 +1733,7 @@
+ char *lp_deleteprinter_cmd(void);
+ char *lp_os2_driver_map(void);
+ char *lp_lockdir(void);
++char *lp_piddir(void);
+ char *lp_utmpdir(void);
+ char *lp_wtmpdir(void);
+ BOOL lp_utmp(void);

net/samba/pkg-plist

@@ -1,12 +1,12 @@
-bin/addtosmbpass
-bin/convert_smbpasswd
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_smbpasswd
 bin/make_unicodemap
 bin/nmblookup
 bin/rpcclient
+bin/smbcacls
 bin/smbclient
+bin/smbcontrol
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
@@ -19,6 +19,7 @@ etc/codepages/codepage.737
 etc/codepages/codepage.775
 etc/codepages/codepage.850
 etc/codepages/codepage.852
+etc/codepages/codepage.857
 etc/codepages/codepage.861
 etc/codepages/codepage.866
 etc/codepages/codepage.932
@@ -27,8 +28,10 @@ etc/codepages/codepage.949
 etc/codepages/codepage.950
 etc/codepages/unicode_map.437
 etc/codepages/unicode_map.737
+etc/codepages/unicode_map.775
 etc/codepages/unicode_map.850
 etc/codepages/unicode_map.852
+etc/codepages/unicode_map.857
 etc/codepages/unicode_map.861
 etc/codepages/unicode_map.866
 etc/codepages/unicode_map.932
@@ -36,9 +39,12 @@ etc/codepages/unicode_map.936
 etc/codepages/unicode_map.949
 etc/codepages/unicode_map.950
 etc/codepages/unicode_map.ISO8859-1
+etc/codepages/unicode_map.ISO8859-13
+etc/codepages/unicode_map.ISO8859-15
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.ISO8859-9
 etc/codepages/unicode_map.KOI8-R
 etc/rc.d/samba.sh.sample
 etc/smb.conf.default
@@ -47,20 +53,22 @@ sbin/smbd
 sbin/swat
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
-%%PORTDOCS%%share/doc/samba/NT4-Locking.reg
-%%PORTDOCS%%share/doc/samba/NT4_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README.swat
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
+%%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win2000_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win95_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win98_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/Roadmap
 %%PORTDOCS%%share/doc/samba/THANKS
 %%PORTDOCS%%share/doc/samba/WHATSNEW.txt
-%%PORTDOCS%%share/doc/samba/Win2000_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win95_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win98_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win9X-CacheHandling.reg
-%%PORTDOCS%%share/doc/samba/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/announce
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
@@ -84,16 +92,32 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/faq/sambafaq.sgml
 %%PORTDOCS%%share/doc/samba/faq/sambafaq.txt
 %%PORTDOCS%%share/doc/samba/history
+%%PORTDOCS%%share/doc/samba/htmldocs/CVS-Access.html
 %%PORTDOCS%%share/doc/samba/htmldocs/DOMAIN_MEMBER.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ENCRYPTION.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Integrating-with-Windows.html
 %%PORTDOCS%%share/doc/samba/htmldocs/NT_Security.html
+%%PORTDOCS%%share/doc/samba/htmldocs/OS2-Client-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
+%%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_unicodemap.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
+%%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc-faq.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc-howto.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
@@ -104,38 +128,29 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbspool.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbumount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/swat.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/wfw_slip.htm
+%%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
+%%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
 %%PORTDOCS%%share/doc/samba/textdocs/Application_Serving.txt
 %%PORTDOCS%%share/doc/samba/textdocs/BROWSING-Config.txt
 %%PORTDOCS%%share/doc/samba/textdocs/BROWSING.txt
 %%PORTDOCS%%share/doc/samba/textdocs/BUGS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/CRLF-LF-Conversions.txt
-%%PORTDOCS%%share/doc/samba/textdocs/CVS_ACCESS.txt
 %%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt
 %%PORTDOCS%%share/doc/samba/textdocs/DIAGNOSIS.txt
 %%PORTDOCS%%share/doc/samba/textdocs/DNIX.txt
-%%PORTDOCS%%share/doc/samba/textdocs/DOMAIN.txt
-%%PORTDOCS%%share/doc/samba/textdocs/DOMAIN_CONTROL.txt
-%%PORTDOCS%%share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-%%PORTDOCS%%share/doc/samba/textdocs/ENCRYPTION.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Faxing.txt
-%%PORTDOCS%%share/doc/samba/textdocs/File-Cacheing.txt
 %%PORTDOCS%%share/doc/samba/textdocs/GOTCHAS.txt
 %%PORTDOCS%%share/doc/samba/textdocs/HINTS.txt
 %%PORTDOCS%%share/doc/samba/textdocs/INSTALL.sambatar
-%%PORTDOCS%%share/doc/samba/textdocs/MIRRORS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Imprints.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Macintosh_Clients.txt
-%%PORTDOCS%%share/doc/samba/textdocs/NT-Guest-Access.txt
-%%PORTDOCS%%share/doc/samba/textdocs/NTDOMAIN.txt
-%%PORTDOCS%%share/doc/samba/textdocs/NT_Security.txt
 %%PORTDOCS%%share/doc/samba/textdocs/NetBIOS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/OS2-Client-HOWTO.txt
-%%PORTDOCS%%share/doc/samba/textdocs/PRINTER_DRIVER.txt
 %%PORTDOCS%%share/doc/samba/textdocs/PROFILES.txt
-%%PORTDOCS%%share/doc/samba/textdocs/PROJECTS
 %%PORTDOCS%%share/doc/samba/textdocs/Passwords.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Printing.txt
 %%PORTDOCS%%share/doc/samba/textdocs/README.DCEDFS
@@ -145,48 +160,50 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
 %%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
 %%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
-%%PORTDOCS%%share/doc/samba/textdocs/SSLeay.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Samba-OpenSSL.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
-%%PORTDOCS%%share/doc/samba/textdocs/Support.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
 %%PORTDOCS%%share/doc/samba/textdocs/UNIX-SMB.txt
-%%PORTDOCS%%share/doc/samba/textdocs/UNIX_INSTALL.txt
 %%PORTDOCS%%share/doc/samba/textdocs/UNIX_SECURITY.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Win95.txt
 %%PORTDOCS%%share/doc/samba/textdocs/WinNT.txt
 %%PORTDOCS%%share/doc/samba/textdocs/cifsntdomain.txt
+%%PORTDOCS%%share/doc/samba/textdocs/kurs.pdf
+%%PORTDOCS%%share/doc/samba/textdocs/kurs.tex
+%%PORTDOCS%%share/doc/samba/textdocs/logo.ps
 %%PORTDOCS%%share/doc/samba/textdocs/security_level.txt
-%%PORTDOCS%%share/doc/samba/textdocs/smbmount.txt
+share/examples/samba/LDAP/README
-%%PORTDOCS%%share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
+share/examples/samba/LDAP/export2_smbpasswd.pl
-%%PORTDOCS%%share/doc/samba/yodldocs/NT_Security.yo
+share/examples/samba/LDAP/export_smbpasswd.pl
-%%PORTDOCS%%share/doc/samba/yodldocs/lmhosts.5.yo
+share/examples/samba/LDAP/import2_smbpasswd.pl
-%%PORTDOCS%%share/doc/samba/yodldocs/make_smbcodepage.1.yo
+share/examples/samba/LDAP/import_smbpasswd.pl
-%%PORTDOCS%%share/doc/samba/yodldocs/make_unicodemap.1.yo
+share/examples/samba/LDAP/ldapchpasswd
-%%PORTDOCS%%share/doc/samba/yodldocs/nmbd.8.yo
+share/examples/samba/LDAP/ldapsync.pl
-%%PORTDOCS%%share/doc/samba/yodldocs/nmblookup.1.yo
+share/examples/samba/LDAP/samba.schema
-%%PORTDOCS%%share/doc/samba/yodldocs/samba.7.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smb.conf.5.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbclient.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbd.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbmnt.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbmount.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbpasswd.5.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbpasswd.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbrun.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbsh.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbspool.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbstatus.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/smbtar.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/swat.8.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/testparm.1.yo
-%%PORTDOCS%%share/doc/samba/yodldocs/testprns.1.yo
 share/examples/samba/README
-share/examples/samba/autofs/README
+share/examples/samba/VFS/.cvsignore
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/README
+share/examples/samba/VFS/block/Makefile
+share/examples/samba/VFS/block/block.c
+share/examples/samba/VFS/block/samba-block.conf
+share/examples/samba/VFS/block/smb.conf
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/skel.c
+share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/README
+share/examples/samba/appliance/appliance.spec
+share/examples/samba/appliance/build.sh
+share/examples/samba/appliance/smb.conf-appliance
 share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/libsmbclient/testsmbc.c
+share/examples/samba/libsmbclient/tree.c
 share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/modify_samba_config.pl
+share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
@@ -195,6 +212,7 @@ share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -213,18 +231,32 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
+share/swat/help/CVS-Access.html
-share/examples/samba/wins_hook/dns_update
 share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
+share/swat/help/Integrating-with-Windows.html
 share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
+share/swat/help/PAM-Authentication-And-Samba.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-PDC-HOWTO.html
+share/swat/help/UNIX_INSTALL.html
+share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
 share/swat/help/make_unicodemap.1.html
+share/swat/help/msdfs_setup.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
+share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
+share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
@@ -235,11 +267,14 @@ share/swat/help/smbsh.1.html
 share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
+share/swat/help/smbumount.8.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
-share/swat/help/welcome.ja_JP.ujis.html
+share/swat/help/winbind.html
+share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
 share/swat/images/passwd.gif
@@ -416,7 +451,6 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/images
 @dirrm share/swat/help
 @dirrm share/swat
-@dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
@@ -425,16 +459,17 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/printing
 @dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/misc
+@dirrm share/examples/samba/libsmbclient
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/LDAP
+@dirrm share/examples/samba/VFS/block
+@dirrm share/examples/samba/VFS
 @dirrm share/examples/samba
-%%PORTDOCS%%@dirrm share/doc/samba/yodldocs
+%%PORTDOCS%%@dirrm share/doc/samba/Registry
 %%PORTDOCS%%@dirrm share/doc/samba/textdocs
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq
 %%PORTDOCS%%@dirrm share/doc/samba
 @dirrm etc/codepages
-@exec cat %D/share/doc/samba/README.FreeBSD
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | grep -v "^#" | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
-@unexec rm -rf /var/spool/samba