Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Feb 2004 17:08:50 +0500 (YEKT)
From:      Andrew Khlebutin <andreyh@perm.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/62728: update net/samba-devel port to 3.0.2 version
Message-ID:  <200402121208.i1CC8o9K097881@hm.pstu.ac.ru>
Resent-Message-ID: <200402121210.i1CCARXQ067939@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         62728
>Category:       ports
>Synopsis:       update net/samba-devel port to 3.0.2 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 12 04:10:26 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Khlebutin
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD hm.pstu.ac.ru 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Tue Oct 28 21:07:27 YEKT 2003 root@hm.pstu.ac.ru:/usr/obj/usr/src/sys/hm i386


	
>Description:
Please update net/samba-devel port to 3.0.2 version.
Fix port files location according to man hier 
(move samba libs to /usr/local/lib instead of /usr/local/etc)
	
>How-To-Repeat:
	
>Fix:

	

--- diff-ruN begins here ---
diff -ruN samba-devel.orig/Makefile samba-devel/Makefile
--- samba-devel.orig/Makefile	Wed Feb  4 10:08:20 2004
+++ samba-devel/Makefile	Thu Feb 12 00:14:11 2004
@@ -2,15 +2,15 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $FreeBSD: ports/net/samba-devel/Makefile,v 1.101 2004/02/04 05:08:20 marcus Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.1
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	3.0.2
+PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
+MASTER_SITES=	http://us1.samba.org/samba/ftp/%SUBDIR%/ \
+		http://us3.samba.org/samba/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. rc
 #DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
@@ -36,7 +36,7 @@
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
-SAMBA_LOGDIR=	${VARDIR}/log
+SAMBA_LOGDIR=	${VARDIR}/log/samba
 SAMBA_PRIVATE=	${PREFIX}/private
 SAMBA_CONFDIR=	${PREFIX}/etc
 # sample files
@@ -47,12 +47,12 @@
 NO_LATEST_LINK=	yes
 USE_AUTOCONF=	yes
 WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS+=--libdir=${SAMBA_CONFDIR} \
+CONFIGURE_ARGS+=--libdir=${PREFIX}/lib --sysconfdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
 		--exec-prefix=${PREFIX} --with-pam --without-manpages-langs \
-		--with-piddir=${VARDIR}/run --with-logfilebase=${VARDIR}/log
+		--with-piddir=${VARDIR}/run --with-logfilebase=${VARDIR}/log/samba \
 
 .include <bsd.port.pre.mk>
 
@@ -103,15 +103,15 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 nmblookup.1 log2pcap.1 \
-		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
-		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1 \
-		editreg.1 ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
+MAN1=		editreg.1 findsmb.1 log2pcap.1 nmblookup.1 \
+		ntlm_auth.1 profiles.1 rpcclient.1 smbcacls.1  \
+		smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \
+		smbsh.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 \
+		testprns.1 vfstest.1 wbinfo.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 mount.cifs.8 \
-		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 tdbbackup.8
-
+MAN8=		mount.cifs.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbmnt.8 smbmount.8 \
+		smbpasswd.8 smbspool.8 smbumount.8 swat.8 tdbbackup.8 tdbdump.8 winbindd.8
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
 	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
@@ -120,6 +120,7 @@
 		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
 			${STARTUP_SCRIPT} ;				\
 	fi
+	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR}
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
 		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
@@ -158,18 +159,23 @@
 			${WRKDIR}/${DISTNAME}/Roadmap			\
 			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
 			${WRKDIR}/${DISTNAME}/docs/THANKS		\
-			${WRKDIR}/${DISTNAME}/docs/history ; do		\
+			${WRKDIR}/${DISTNAME}/docs/history		\
+			${WRKDIR}/${DISTNAME}/docs/Samba-HOWTO-Collection.pdf; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
-	for i in faq htmldocs Registry ; do			\
+	for i in faq 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
+	${MKDIR} ${DOCSDIR}/htmldocs
+	${MKDIR} ${DOCSDIR}/htmldocs/images
+	for i in ${WRKDIR}/${DISTNAME}/docs/htmldocs/images/* ; do \
+		${INSTALL_DATA} $$i ${DOCSDIR}/htmldocs/images ; \
+	done
+	for i in ${WRKDIR}/${DISTNAME}/docs/htmldocs/*.* ; do \
+		${INSTALL_DATA} $$i ${DOCSDIR}/htmldocs ; \
 	done
 .endif
 
diff -ruN samba-devel.orig/distinfo samba-devel/distinfo
--- samba-devel.orig/distinfo	Mon Feb  2 23:18:44 2004
+++ samba-devel/distinfo	Tue Feb 10 17:06:54 2004
@@ -1 +1 @@
-MD5 (samba-3.0.1.tar.bz2) = 2a3d494f139ab7402d8902b0e68c463f
+MD5 (samba-3.0.2.tar.bz2) = 20d4bd08cfdc627d68a7112285caa1b2
diff -ruN samba-devel.orig/files/patch-aa samba-devel/files/patch-aa
--- samba-devel.orig/files/patch-aa	Thu Jan  1 05:00:00 1970
+++ samba-devel/files/patch-aa	Thu Feb 12 11:05:11 2004
@@ -0,0 +1,34 @@
+--- configure.in.orig	Sat Jan 31 20:45:56 2004
++++ configure.in	Thu Feb 12 11:04:50 2004
+@@ -16,20 +16,21 @@
+ 
+ AC_ARG_WITH(fhs, 
+ [  --with-fhs              Use FHS-compliant paths (default=no)],
+-    configdir="${sysconfdir}/samba"
+-    lockdir="\${VARDIR}/lib/samba"
++    configdir="${prefix}/etc"
++    lockdir="\${VARDIR}/lock"
+     piddir="\${VARDIR}/run"
+-    mandir="\${prefix}/share/man"
++    mandir="\${prefix}/man"
+     logfilebase="\${VARDIR}/log/samba"
+-    privatedir="\${CONFIGDIR}/private"
++    privatedir="\${prefix}/private"
+     libdir="\${prefix}/lib/samba"
+-    swatdir="\${DATADIR}/samba/swat",
+-    configdir="\${LIBDIR}"
+-    logfilebase="\${VARDIR}"
+-    lockdir="\${VARDIR}/locks"
+-    piddir="\${VARDIR}/locks"
++    swatdir="\${prefix}/share/swat",
++    configdir="\${prefix}/etc"
++    logfilebase="\${VARDIR}/log/samba"
++    lockdir="\${VARDIR}/lock"
++    piddir="\${VARDIR}/run"
+     privatedir="\${prefix}/private"
+-    swatdir="\${prefix}/swat")
++    libdir="\${prefix}/lib/samba"
++    swatdir="\${prefix}/share/swat")
+ 
+ #################################################
+ # set private directory location
diff -ruN samba-devel.orig/files/samba.sh.sample samba-devel/files/samba.sh.sample
--- samba-devel.orig/files/samba.sh.sample	Mon Jan 18 07:34:05 1999
+++ samba-devel/files/samba.sh.sample	Thu Feb 12 16:20:55 2004
@@ -1,22 +1,29 @@
 #!/bin/sh
+
 smbspool=/var/spool/samba
 pidfiledir=/var/run
-smbd=/usr/local/sbin/smbd
-nmbd=/usr/local/sbin/nmbd
+PREFIX=/usr/local
+smbd=${PREFIX}/sbin/smbd
+nmbd=${PREFIX}/sbin/nmbd
 
-# start
-if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
-	if [ -f $smbd ]; then
-		if [ -d $smbspool ]; then
-			rm -f $smbspool/*
-		fi
-		echo -n ' Samba'
-		$smbd -D
-		$nmbd -D
+case "$1" in
+start)
+    if [ -x $smbd -a -x $nmbd ]; then
+	if [ -d $smbspool ]; then
+            rm -f $smbspool/*
 	fi
+        echo -n ' Samba '
+        $smbd -D
+        $nmbd -D
+    fi
+    ;;
+stop)
+    kill `cat $pidfiledir/smbd.pid`
+    kill `cat $pidfiledir/nmbd.pid`
+    ;;
+*)
+    echo "Usage: `basename $0` {start|stop}" >&2
+    ;;
+esac
 
-# stop
-elif [ "x$1" = "xstop" ]; then
-	kill `cat $pidfiledir/smbd.pid`
-	kill `cat $pidfiledir/nmbd.pid`
-fi
+exit 0
diff -ruN samba-devel.orig/files/smb.conf.default samba-devel/files/smb.conf.default
--- samba-devel.orig/files/smb.conf.default	Tue Mar 25 00:02:35 2003
+++ samba-devel/files/smb.conf.default	Wed Feb 11 15:12:58 2004
@@ -3,13 +3,16 @@
 # here. Samba has a huge number of configurable options (perhaps too
 # many!) most of which are not shown in this example
 #
+# For a step to step guide on installing, configuring and using samba, 
+# read the Samba HOWTO Collection.
+#
 # Any line which starts with a ; (semi-colon) or a # (hash) 
 # is a comment and is ignored. In this example we will use a #
 # for commentry and a ; for parts of the config file that you
 # may wish to enable
 #
 # NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not many any basic syntactic errors. 
+# to check that you have not made any basic syntactic errors. 
 #
 #======================= Global Settings =====================================
 [global]
@@ -20,6 +23,11 @@
 # server string is the equivalent of the NT Description field
    server string = Samba Server
 
+# Security mode. Defines in which mode Samba will operate. Possible 
+# values are share, user, server, domain and ads. Most people will want 
+# user level security. See the HOWTO Collection for details.
+   security = user
+
 # This option is important for security. It allows you to restrict
 # connections to machines which are on your local network. The
 # following example restricts access to two C class networks and
@@ -41,8 +49,8 @@
 
 # It should not be necessary to specify the print system type unless
 # it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
-;   printing = bsd
+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
+;   printing = cups
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
 # otherwise the user "nobody" is used
@@ -55,24 +63,34 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
 
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
-   security = user
 # Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
 ;   password server = <NT-Server-Name>
 
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-;  encrypt passwords = yes
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+;   realm = MY_REALM
+
+# Backend to store user information in. New installations should 
+# use either tdbsam or ldapsam. smbpasswd is available for backwards 
+# compatibility. tdbsam requires no further configuration.
+;   passdb backend = tdbsam
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+#       this line.  The included file is read at that point.
 ;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
 
 # Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
+# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
+# and the manual pages for details.
+# You may want to add the following on a Linux system:
+#         SO_RCVBUF=8192 SO_SNDBUF=8192
    socket options = TCP_NODELAY 
 
 # Configure Samba to use multiple interfaces
@@ -98,10 +116,6 @@
 # and gives it a slightly higher chance of winning the election
 ;   preferred master = yes
 
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
 ;   domain logons = yes
@@ -132,28 +146,31 @@
 ;   wins proxy = yes
 
 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
+# via DNS nslookups. The default is NO.
    dns proxy = no 
 
-# charset settings
-;   display charset = ASCII
-;   unix charset = ASCII
-;   dos charset = ASCII
+# These scripts are used on a domain controller or stand-alone 
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdel %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
 
-# 
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
    browseable = no
-   writeable = yes
+   writable = yes
 
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Network Logon Service
 ;   path = /usr/local/samba/lib/netlogon
 ;   guest ok = yes
-;   writeable = no
+;   writable = no
 ;   share modes = no
 
 
@@ -173,7 +190,7 @@
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no
-   writeable = no
+   writable = no
    printable = yes
 
 # This one is useful for people to share files
@@ -189,7 +206,7 @@
 ;   comment = Public Stuff
 ;   path = /home/samba
 ;   public = yes
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 ;   write list = @staff
 
@@ -204,7 +221,7 @@
 ;   path = /homes/fred
 ;   printer = freds_printer
 ;   public = no
-;   writeable = no
+;   writable = no
 ;   printable = yes
 
 # A private directory, usable only by fred. Note that fred requires write
@@ -214,7 +231,7 @@
 ;   path = /usr/somewhere/private
 ;   valid users = fred
 ;   public = no
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 
 # a service which has a different directory for each machine that connects
@@ -225,23 +242,23 @@
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
-;  writeable = yes
+;  writable = yes
 
 # A publicly accessible directory, read/write to all users. Note that all files
 # created in the directory by users will be owned by the default user, so
 # any user with access can delete any other user's files. Obviously this
-# directory must be writeable by the default user. Another user could of course
+# directory must be writable by the default user. Another user could of course
 # be specified, in which case all files would be owned by that user instead.
 ;[public]
 ;   path = /usr/somewhere/else/public
 ;   public = yes
 ;   only guest = yes
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 
 # The following two entries demonstrate how to share a directory so that two
 # users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writeable by both users and should have the
+# setup, the directory should be writable by both users and should have the
 # sticky bit set on it to prevent abuse. Obviously this could be extended to
 # as many users as required.
 ;[myshare]
@@ -249,7 +266,7 @@
 ;   path = /usr/somewhere/shared
 ;   valid users = mary fred
 ;   public = no
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 ;   create mask = 0765
 
diff -ruN samba-devel.orig/pkg-plist samba-devel/pkg-plist
--- samba-devel.orig/pkg-plist	Mon Feb  2 23:18:44 2004
+++ samba-devel/pkg-plist	Thu Feb 12 10:00:57 2004
@@ -20,29 +20,29 @@
 bin/testparm
 bin/testprns
 bin/wbinfo
-etc/charset/CP437.so
-etc/charset/CP850.so
-etc/de.msg
-etc/en.msg
-etc/fr.msg
-etc/it.msg
-etc/ja.msg
-etc/lowcase.dat
-etc/nl.msg
-etc/pl.msg
 etc/rc.d/samba.sh.sample
 etc/smb.conf.default
-etc/tr.msg
-etc/upcase.dat
-etc/valid.dat
-etc/vfs/audit.so
-etc/vfs/cap.so
-etc/vfs/default_quota.so
-etc/vfs/extd_audit.so
-etc/vfs/fake_perms.so
-etc/vfs/netatalk.so
-etc/vfs/readonly.so
-etc/vfs/recycle.so
+lib/samba/charset/CP437.so
+lib/samba/charset/CP850.so
+lib/samba/de.msg
+lib/samba/en.msg
+lib/samba/fr.msg
+lib/samba/it.msg
+lib/samba/ja.msg
+lib/samba/nl.msg
+lib/samba/pl.msg
+lib/samba/tr.msg
+lib/samba/upcase.dat
+lib/samba/lowcase.dat
+lib/samba/valid.dat
+lib/samba/vfs/audit.so
+lib/samba/vfs/cap.so
+lib/samba/vfs/default_quota.so
+lib/samba/vfs/extd_audit.so
+lib/samba/vfs/fake_perms.so
+lib/samba/vfs/netatalk.so
+lib/samba/vfs/readonly.so
+lib/samba/vfs/recycle.so
 sbin/nmbd
 sbin/smbd
 sbin/swat
@@ -52,11 +52,16 @@
 %%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Roadmap
+%%PORTDOCS%%share/doc/samba/Samba-HOWTO-Collection.pdf
+%%PORTDOCS%%share/doc/samba/THANKS
+%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
 %%PORTDOCS%%share/doc/samba/Registry/FolderRedir.adm
-%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Registry/Win-NT-2K-XP-DeleteRoamingProfile.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-2Kx-XPP-DeleteCachedProfiles.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-2Kx-XPP-ForceLocalProfile.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-DeleteRoamingProfile.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
@@ -65,9 +70,6 @@
 %%PORTDOCS%%share/doc/samba/Registry/WinXP_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/faq/FAQ-ClientApp.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
@@ -142,6 +144,7 @@
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcquotas.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbget.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -155,6 +158,7 @@
 %%PORTDOCS%%share/doc/samba/htmldocs/speed.html
 %%PORTDOCS%%share/doc/samba/htmldocs/swat.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/tdbbackup.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/tdbdump.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/troubleshooting.html
@@ -165,6 +169,39 @@
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/images/10small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/11small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/12small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/13small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/14small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/1small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/2small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/3small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/4small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/5small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/6small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/7small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/8small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/9small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/a_small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/access1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/browsing1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/cups1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/cups2.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/domain.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/ethereal1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/ethereal2.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-gid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-groups.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-sid2gid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-sid2uid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-store-gid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-uid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap_winbind_no_loop.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/pdftoepsonusb.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/pdftosocket.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/trusts1.png
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/convertSambaAccount
 share/examples/samba/LDAP/ldapsync.pl
@@ -238,6 +275,8 @@
 share/examples/samba/misc/modify_samba_config.pl
 share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
+share/examples/samba/nss/nss_winbind.c
+share/examples/samba/nss/nss_winbind.h
 share/examples/samba/nss/wbtest.c
 share/examples/samba/ntlogon/README
 share/examples/samba/ntlogon/ntlogon.conf
@@ -344,6 +383,7 @@
 share/swat/help/smbcontrol.1.html
 share/swat/help/smbcquotas.1.html
 share/swat/help/smbd.8.html
+share/swat/help/smbget.1.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -357,6 +397,7 @@
 share/swat/help/speed.html
 share/swat/help/swat.8.html
 share/swat/help/tdbbackup.8.html
+share/swat/help/tdbdump.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
 share/swat/help/troubleshooting.html
@@ -557,12 +598,13 @@
 share/swat/using_samba/samba2_s.gif
 share/swat/using_samba/samba2_xs.gif
 share/swat/using_samba/toc.html
-@dirrm etc/auth
-@dirrm etc/charset
-@dirrm etc/idmap
-@dirrm etc/pdb
-@dirrm etc/rpc
-@dirrm etc/vfs
+@dirrm lib/samba/auth
+@dirrm lib/samba/charset
+@dirrm lib/samba/idmap
+@dirrm lib/samba/pdb
+@dirrm lib/samba/rpc
+@dirrm lib/samba/vfs
+@dirrm lib/samba
 @dirrm share/swat/using_samba/figs
 @dirrm share/swat/using_samba
 @dirrm share/swat/include
@@ -578,8 +620,8 @@
 @dirrm share/swat/lang/tr
 @dirrm share/swat/lang
 @dirrm share/swat
-@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
 @dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
 @dirrm share/examples/samba/LDAP/smbldap-tools
 @dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba/validchars
@@ -604,6 +646,7 @@
 @dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba
 %%PORTDOCS%%@dirrm share/doc/samba/Registry
+%%PORTDOCS%%@dirrm share/doc/samba/htmldocs/images
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq
 %%PORTDOCS%%@dirrm share/doc/samba
--- diff-ruN ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402121208.i1CC8o9K097881>