Index: head/net/samba-devel/Makefile
===================================================================
--- head/net/samba-devel/Makefile	(revision 109448)
+++ head/net/samba-devel/Makefile	(revision 109449)
@@ -1,354 +1,352 @@
 # New ports collection makefile for:	samba
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=		samba
 PORTVERSION=		3.0.4
-PORTREVISION?=		0
+PORTREVISION?=		1
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. rc pre
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
 MAINTAINER?=		timur@gnu.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
 CONFLICTS?=		ja-samba-2.* samba-2.* sharity-light-1.*
 
 USE_ICONV=		yes
-GNU_CONFIGURE=		yes
-#USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 
 LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
 EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 
 # directories
 VARDIR=			${DESTDIR}/var
 SAMBA_SPOOL?=		${VARDIR}/spool/samba
 SAMBA_LOGDIR=		${VARDIR}/log/samba
 SAMBA_RUNDIR=		${VARDIR}/run
-SAMBA_LOCKDIR=		${SAMBA_RUNDIR}/samba
+SAMBA_LOCKDIR?=		${VARDIR}/db/samba
 SAMBA_PRIVATE?=		${PREFIX}/private
 SAMBA_CONFDIR?=		${PREFIX}/etc
 SAMBA_SWATDIR=		${PREFIX}/share/swat
 SAMBA_LIBDIR=		${PREFIX}/lib
 RC_DIR?=		${SAMBA_CONFDIR}/rc.d
 SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf
 
 CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
 			--localstatedir=${VARDIR} \
 		        --with-configdir=${SAMBA_CONFDIR} \
 	    		--with-libdir=${SAMBA_LIBDIR}/samba \
 			--with-swatdir=${SAMBA_SWATDIR} \
 			--with-piddir=${SAMBA_RUNDIR} \
 			--with-lockdir=${SAMBA_LOCKDIR} \
 			--with-privatedir=${SAMBA_PRIVATE} \
 			--with-logfilebase=${SAMBA_LOGDIR} \
 			--with-manpages-langs=en
 
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
 
-OPTIONS=	LDAP		"With LDAP support" on \
-		ADS		"With Active Directory support" on
-
 .if !defined(SAMBA_SUBPORT)
-OPTIONS+=	CUPS		"With CUPS printing support" on \
+OPTIONS=	LDAP		"With LDAP support" on \
+		ADS		"With Active Directory support" on \
+		CUPS		"With CUPS printing support" on \
 		WINBIND		"With WinBIND support" on \
 		ACL_SUPPORT	"With ACL support" off \
 		SYSLOG		"With Syslog support" off \
 		QUOTAS		"With Quota support" off \
 		UTMP		"With UTMP support" on \
 		MSDFS		"With MSDFS support" off \
 		SAM_XML		"With XML smbpasswd backend" off \
 		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
 		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
 		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
 		PAM_SMBPASS	"With SMB PAM module" off \
 		POPT		"With installed POPT library" on
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(SAMBA_SUBPORT)
 
 USE_RC_SUBR=		yes
 
 CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
 			--without-libsmbclient --without-python
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups
 CUPS=			cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
 CUPS=			""
 .endif
 
 .if defined(WITH_SYSLOG)
 CONFIGURE_ARGS+=	--with-syslog
 .else
 CONFIGURE_ARGS+=	--without-syslog
 .endif
 
 .if defined(WITH_QUOTAS)
 CONFIGURE_ARGS+=	--with-quotas
 .else
 CONFIGURE_ARGS+=	--without-quotas
 .endif
 
 .if defined(WITHOUT_UTMP)
 CONFIGURE_ARGS+=	--without-utmp
 .endif
 
 .if defined(WITH_MSDFS)
 CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if !defined(WITHOUT_WINBIND)
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 .if ${OSVERSION} >= 500112
 WITH_WINBIND_NSS=	yes
 .endif
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUB+=		WINBIND="@comment "
 .endif
 
 .if defined(WITH_WINBIND_NSS)
 PLIST_SUB+=		WINBIND_NSS=""
 .else
 PLIST_SUB+=		WINBIND_NSS="@comment "
 .endif
 
 .if !defined(WITHOUT_LDAP)
 WANT_LDAP=		yes
 .endif
 # SAM
 .if defined(WITH_SAM_XML)
 LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	xml
 PLIST_SUB+=		SAMXML=""
 .else
 PLIST_SUB+=		SAMXML="@comment "
 .endif
 
 .if defined(WITH_SAM_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	mysql
 PLIST_SUB+=		SAMMYSQL=""
 .else
 PLIST_SUB+=		SAMMYSQL="@comment "
 .endif
 
 .if defined(WITH_SAM_PGSQL)
 LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=	--with-pgsql-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	pgsql
 PLIST_SUB+=		SAMPGSQL=""
 .else
 PLIST_SUB+=		SAMPGSQL="@comment "
 .endif
 
 .if defined(WITH_SAM_OLD_LDAP)
 WANT_LDAP=		yes
 CONFIGURE_ARGS+=	--with-ldapsam
 .else
 CONFIGURE_ARGS+=	--without-ldapsam
 .endif
 
 .if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
 WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
 CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
 .endif
 # SAM
 .if defined(WITH_PAM_SMBPASS)
 CONFIGURE_ARGS+=	--with-pam_smbpass
 PLIST_SUB+=		SMBPASS=""
 .else
 CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
 BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
 .else
 CONFIGURE_ARGS+=	--with-acl-support
 .endif
 .endif
 
 .if !defined(WITHOUT_POPT)
 LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 .else
 CONFIGURE_ARGS+=	--with-included-popt
 .endif
 # !SAMBA_SUBPORT
 .endif
 
 # Common part
-.if !defined(WITHOUT_ADS)
+.if defined(WITH_ADS)
 WANT_LDAP=		yes
 WANT_KRB5=		yes
 CONFIGURE_ARGS+=	--with-ads
 .else
 CONFIGURE_ARGS+=	--without-ads
 .endif
 # Kerberos5 is necessary for ADS
 .if defined(WANT_KRB5)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
 .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
-.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
+.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .endif
 .else
 CONFIGURE_ARGS+=	--without-krb5
 .endif
 
 .if defined(WANT_LDAP)
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !defined(SAMBA_SUBPORT)
 
 MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
 		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
 		ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
 MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
 		swat.8 tdbdump.8 tdbbackup.8
 .if !defined(WITHOUT_WINBIND)
 MAN1+=		wbinfo.1
 MAN8+=		winbindd.8
 .endif
 
 .if !defined(WITHOUT_WINBIND)
 WINBIND_FILTER=		${SED} -e 's|%%WINBIND%%||g'
 .else
 WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
 .endif
 
 PLIST_SUB+=		RC_DIR=${RC_DIR} \
 			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
 			SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
 
 RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
 			CUPS=${CUPS} \
 			RC_SUBR=${RC_SUBR} \
 			SAMBA_CONFDIR=${SAMBA_CONFDIR} \
 			SAMBA_CONFIG=${SAMBA_CONFIG} \
 			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
 			SAMBA_RUNDIR=${SAMBA_RUNDIR} \
 			SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
 			SAMBA_SPOOL=${SAMBA_SPOOL}
 
 pre-fetch:
 	@${ECHO_MSG} "===>  -------------------------------------------"
 	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
 	@${ECHO_MSG} "===>  -------------------------------------------"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
 	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 
 post-install:
 .for sect in 1 5 7 8
 	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
 .for man in ${MAN${sect}}
 	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}
 .endfor
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
 .if defined(WITH_PAM_SMBPASS)
 	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
 	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
 .endif
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
 	    ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} 	\
 		${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 # Spool
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} &&		\
 	    ${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_SPOOL} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 1777 ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" >> ${TMPPLIST}
 # Logdir
 	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR} &&		\
 	    ${CHMOD} 0755 ${SAMBA_LOGDIR} && ${CHOWN} root:wheel ${SAMBA_LOGDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOGDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOGDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOGDIR}/* manually.\"" >> ${TMPPLIST}
 # Lockdir
 	@test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} &&	\
 	    ${CHMOD} 0755 ${SAMBA_LOCKDIR} && ${CHOWN} root:wheel ${SAMBA_LOCKDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -rf ${SAMBA_LOCKDIR}/${f}; done" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
 # Private
 	@test -d ${SAMBA_PRIVATE} || ${MKDIR} ${SAMBA_PRIVATE} &&	\
 	    ${CHMOD} 700 ${SAMBA_PRIVATE} && ${CHOWN} root:wheel ${SAMBA_PRIVATE}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 700 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
 .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
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
 .endif
 .if defined(WITH_PAM_SMBPASS)
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}
 .for d in devel guide howto
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/htmldocs/${d} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .for f in README COPYING Manifest Read-Manifest-Now Roadmap \
 		WHATSNEW.txt docs/THANKS docs/history
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 # !SAMBA_SUBPORT
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net/samba-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.120
\ No newline at end of property
+1.121
\ No newline at end of property
Index: head/net/samba-devel/files/patch-lib_util_str.c
===================================================================
--- head/net/samba-devel/files/patch-lib_util_str.c	(nonexistent)
+++ head/net/samba-devel/files/patch-lib_util_str.c	(revision 109449)
@@ -0,0 +1,23 @@
+--- lib/util_str.c.orig	Tue Apr 20 22:42:55 2004
++++ lib/util_str.c	Fri May 14 02:02:30 2004
+@@ -1980,10 +1980,16 @@
+ {
+ 	int bits = 0;
+ 	int char_count = 0;
+-	size_t out_cnt = 0;
+-	size_t len = data.length;
+-	size_t output_len = data.length * 2;
+-	char *result = malloc(output_len); /* get us plenty of space */
++	size_t out_cnt, len, output_len;
++	char *result;
++
++        if (!data.length || !data.data)
++		return NULL;
++
++	out_cnt = 0;
++	len = data.length;
++	output_len = data.length * 2;
++	result = malloc(output_len); /* get us plenty of space */
+ 
+ 	while (len-- && out_cnt < (data.length * 2) - 5) {
+ 		int c = (unsigned char) *(data.data++);

Property changes on: head/net/samba-devel/files/patch-lib_util_str.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/samba-devel/files/samba.sh.sample
===================================================================
--- head/net/samba-devel/files/samba.sh.sample	(revision 109448)
+++ head/net/samba-devel/files/samba.sh.sample	(revision 109449)
@@ -1,123 +1,123 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: nmbd smbd
 %%WINBIND%%# PROVIDE: winbindd
 # REQUIRE: NETWORKING SERVERS named %%CUPS%%
 # BEFORE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable samba:
 #
 #samba_enable="YES"
 #
 # or, for fine grain control
 #
 #nmbd_enable="YES"
 #smbd_enable="YES"
 %%WINBIND%%#winbindd_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=samba
 rcvar=`set_rcvar`
 
 load_rc_config $name
 # Set defaults
 samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
 # Config file is required
 if [ ! -r ${samba_config} ]; then
     warn "${samba_config} is not readable."
     case $1 in
 	force*) : ;;
 	*) exit 1 ;;
     esac
 fi
 
 if test -n ${samba_enable:-""} && checkyesno samba_enable; then
     nmbd_enable=${nmbd_enable:-"YES"}
     smbd_enable=${smbd_enable:-"YES"}
 %%WINBIND%%    winbindd_enable=${winbindd_enable:-"YES"}
 %%WINBIND%%    # Check, that winbind is actally configured
 %%WINBIND%%    if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
 %%WINBIND%%    	#warn "Winbind support is not configured"
 %%WINBIND%%	winbindd_enable="NO"
 %%WINBIND%%    fi
 fi
 
 # Hack until run_rc_command() get rid of exit()
 samba_stop() {
     pid=$(check_pidfile ${pidfile} ${command})
     if [ -z ${pid} ]; then
 	echo "${name} not running? (check ${pidfile})."
 	return 1
     fi
     echo "Stopping ${command}."
     kill -${sig_stop:-TERM} ${pid}
     [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
     wait_for_pids ${pid}
 }
 
 nmbd_precmd() {
-    # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
+    # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
     if [ -d "%%SAMBA_LOCKDIR%%" ]; then
 	echo "Starting SAMBA: removing stale tdbs :"
 	for file in connections.tdb locking.tdb messages.tdb \
 		    sessionid.tdb unexpected.tdb brlock.tdb \
 		    namelist.debug
 	do
 	    rm -vf "%%SAMBA_LOCKDIR%%/$file"
 	done
     fi
 }
 
 # nmbd
 name=nmbd
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 required_dirs="%%SAMBA_LOCKDIR%%"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd="nmbd_precmd"
 stop_cmd="samba_stop"
 # Defaults
 nmbd_enable=${nmbd_enable:-"NO"}
 nmbd_flags=${nmbd_flags:-"-D"}
 command_args="${nmbd_flags} -s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
 
 # smbd
 name=smbd
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd=":"
 stop_cmd="samba_stop"
 # Defaults
 smbd_enable=${smbd_enable:-"NO"}
 smbd_flags=${smbd_flags:-"-D"}
 command_args="${smbd_flags} -s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
 %%WINBIND%%
 %%WINBIND%%# winbindd
 %%WINBIND%%name=winbindd
 %%WINBIND%%rcvar=`set_rcvar`
 %%WINBIND%%command="%%PREFIX%%/sbin/${name}"
 %%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
 %%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 %%WINBIND%%start_precmd=":"
 %%WINBIND%%stop_cmd="samba_stop"
 %%WINBIND%%# Defaults
 %%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
 %%WINBIND%%winbindd_flags=${winbindd_flags:-""}
 %%WINBIND%%command_args="${winbindd_flags} -s ${samba_config}"
 %%WINBIND%%
 %%WINBIND%%load_rc_config $name
 %%WINBIND%%run_rc_command "$1"

Property changes on: head/net/samba-devel/files/samba.sh.sample
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/net/samba-devel/pkg-message
===================================================================
--- head/net/samba-devel/pkg-message	(revision 109448)
+++ head/net/samba-devel/pkg-message	(revision 109449)
@@ -1,18 +1,21 @@
 ******************************************************************************
 Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
 automatically. Users are encouraged to use 'tdbsam' backend instead:
 
   [global]
     passdb backend = tdbsam, smbpasswd
 
 You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
 see the Samba-HOWTO-Collection.
 
 You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
 script:
 
   cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
   chmod 600 smbpasswd
 
 But the usage of it is deprecated.
+------------------------------------------------------------------------------
+NOTICE: *.tdb files have been moved from /var/run/samba/ to /var/db/samba/!
+NOTICE: Please, move them manually, if necessary, at least winbind_*.tdb.
 ******************************************************************************

Property changes on: head/net/samba-devel/pkg-message
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/net/samba-libsmbclient/Makefile
===================================================================
--- head/net/samba-libsmbclient/Makefile	(revision 109448)
+++ head/net/samba-libsmbclient/Makefile	(revision 109449)
@@ -1,50 +1,50 @@
 # New ports collection makefile for:	samba-libsmbclient
 # Date created:				23 Juli 2003
 # Whom:					Koop Mast <einekoai@chello.nl>
 #
 # $FreeBSD$
 #
 
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 PKGNAMESUFFIX=		-libsmbclient
 
 COMMENT=		The shared lib from the samba packages
 
 CONFLICTS=
 
 SAMBA_PORT=		samba-devel
 SAMBA_SUBPORT=		yes
 
 MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
 PKGDIR=			${.CURDIR}
 
 INSTALLS_SHLIB=		yes
 
 # We WANT libsmbclient support :)
 CONFIGURE_ARGS+=	--with-libsmbclient
 # This is taken from SAMBA_PORT(grep without)
 CONFIGURE_ARGS+=	--disable-cups
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-syslog
 CONFIGURE_ARGS+=	--without-quotas
 CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--without-winbind
 CONFIGURE_ARGS+=	--without-ldapsam
 CONFIGURE_ARGS+=	--without-pam_smbpass
 
 do-build:
 	cd ${WRKSRC} && ${MAKE} proto
 	cd ${WRKSRC} && ${MAKE} libsmbclient
 
 do-install:
 	-@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
 	-@${MKDIR} ${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so.0 ${PREFIX}/lib
 	${LN} -snf libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
 	-@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/* ${EXAMPLESDIR}
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/net/samba-libsmbclient/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/net/samba3/Makefile
===================================================================
--- head/net/samba3/Makefile	(revision 109448)
+++ head/net/samba3/Makefile	(revision 109449)
@@ -1,354 +1,352 @@
 # New ports collection makefile for:	samba
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=		samba
 PORTVERSION=		3.0.4
-PORTREVISION?=		0
+PORTREVISION?=		1
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. rc pre
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
 MAINTAINER?=		timur@gnu.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
 CONFLICTS?=		ja-samba-2.* samba-2.* sharity-light-1.*
 
 USE_ICONV=		yes
-GNU_CONFIGURE=		yes
-#USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 
 LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
 EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 
 # directories
 VARDIR=			${DESTDIR}/var
 SAMBA_SPOOL?=		${VARDIR}/spool/samba
 SAMBA_LOGDIR=		${VARDIR}/log/samba
 SAMBA_RUNDIR=		${VARDIR}/run
-SAMBA_LOCKDIR=		${SAMBA_RUNDIR}/samba
+SAMBA_LOCKDIR?=		${VARDIR}/db/samba
 SAMBA_PRIVATE?=		${PREFIX}/private
 SAMBA_CONFDIR?=		${PREFIX}/etc
 SAMBA_SWATDIR=		${PREFIX}/share/swat
 SAMBA_LIBDIR=		${PREFIX}/lib
 RC_DIR?=		${SAMBA_CONFDIR}/rc.d
 SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf
 
 CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
 			--localstatedir=${VARDIR} \
 		        --with-configdir=${SAMBA_CONFDIR} \
 	    		--with-libdir=${SAMBA_LIBDIR}/samba \
 			--with-swatdir=${SAMBA_SWATDIR} \
 			--with-piddir=${SAMBA_RUNDIR} \
 			--with-lockdir=${SAMBA_LOCKDIR} \
 			--with-privatedir=${SAMBA_PRIVATE} \
 			--with-logfilebase=${SAMBA_LOGDIR} \
 			--with-manpages-langs=en
 
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
 
-OPTIONS=	LDAP		"With LDAP support" on \
-		ADS		"With Active Directory support" on
-
 .if !defined(SAMBA_SUBPORT)
-OPTIONS+=	CUPS		"With CUPS printing support" on \
+OPTIONS=	LDAP		"With LDAP support" on \
+		ADS		"With Active Directory support" on \
+		CUPS		"With CUPS printing support" on \
 		WINBIND		"With WinBIND support" on \
 		ACL_SUPPORT	"With ACL support" off \
 		SYSLOG		"With Syslog support" off \
 		QUOTAS		"With Quota support" off \
 		UTMP		"With UTMP support" on \
 		MSDFS		"With MSDFS support" off \
 		SAM_XML		"With XML smbpasswd backend" off \
 		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
 		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
 		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
 		PAM_SMBPASS	"With SMB PAM module" off \
 		POPT		"With installed POPT library" on
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(SAMBA_SUBPORT)
 
 USE_RC_SUBR=		yes
 
 CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
 			--without-libsmbclient --without-python
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups
 CUPS=			cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
 CUPS=			""
 .endif
 
 .if defined(WITH_SYSLOG)
 CONFIGURE_ARGS+=	--with-syslog
 .else
 CONFIGURE_ARGS+=	--without-syslog
 .endif
 
 .if defined(WITH_QUOTAS)
 CONFIGURE_ARGS+=	--with-quotas
 .else
 CONFIGURE_ARGS+=	--without-quotas
 .endif
 
 .if defined(WITHOUT_UTMP)
 CONFIGURE_ARGS+=	--without-utmp
 .endif
 
 .if defined(WITH_MSDFS)
 CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if !defined(WITHOUT_WINBIND)
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 .if ${OSVERSION} >= 500112
 WITH_WINBIND_NSS=	yes
 .endif
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUB+=		WINBIND="@comment "
 .endif
 
 .if defined(WITH_WINBIND_NSS)
 PLIST_SUB+=		WINBIND_NSS=""
 .else
 PLIST_SUB+=		WINBIND_NSS="@comment "
 .endif
 
 .if !defined(WITHOUT_LDAP)
 WANT_LDAP=		yes
 .endif
 # SAM
 .if defined(WITH_SAM_XML)
 LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	xml
 PLIST_SUB+=		SAMXML=""
 .else
 PLIST_SUB+=		SAMXML="@comment "
 .endif
 
 .if defined(WITH_SAM_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	mysql
 PLIST_SUB+=		SAMMYSQL=""
 .else
 PLIST_SUB+=		SAMMYSQL="@comment "
 .endif
 
 .if defined(WITH_SAM_PGSQL)
 LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=	--with-pgsql-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	pgsql
 PLIST_SUB+=		SAMPGSQL=""
 .else
 PLIST_SUB+=		SAMPGSQL="@comment "
 .endif
 
 .if defined(WITH_SAM_OLD_LDAP)
 WANT_LDAP=		yes
 CONFIGURE_ARGS+=	--with-ldapsam
 .else
 CONFIGURE_ARGS+=	--without-ldapsam
 .endif
 
 .if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
 WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
 CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
 .endif
 # SAM
 .if defined(WITH_PAM_SMBPASS)
 CONFIGURE_ARGS+=	--with-pam_smbpass
 PLIST_SUB+=		SMBPASS=""
 .else
 CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
 BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
 .else
 CONFIGURE_ARGS+=	--with-acl-support
 .endif
 .endif
 
 .if !defined(WITHOUT_POPT)
 LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 .else
 CONFIGURE_ARGS+=	--with-included-popt
 .endif
 # !SAMBA_SUBPORT
 .endif
 
 # Common part
-.if !defined(WITHOUT_ADS)
+.if defined(WITH_ADS)
 WANT_LDAP=		yes
 WANT_KRB5=		yes
 CONFIGURE_ARGS+=	--with-ads
 .else
 CONFIGURE_ARGS+=	--without-ads
 .endif
 # Kerberos5 is necessary for ADS
 .if defined(WANT_KRB5)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
 .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
-.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
+.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .endif
 .else
 CONFIGURE_ARGS+=	--without-krb5
 .endif
 
 .if defined(WANT_LDAP)
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !defined(SAMBA_SUBPORT)
 
 MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
 		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
 		ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
 MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
 		swat.8 tdbdump.8 tdbbackup.8
 .if !defined(WITHOUT_WINBIND)
 MAN1+=		wbinfo.1
 MAN8+=		winbindd.8
 .endif
 
 .if !defined(WITHOUT_WINBIND)
 WINBIND_FILTER=		${SED} -e 's|%%WINBIND%%||g'
 .else
 WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
 .endif
 
 PLIST_SUB+=		RC_DIR=${RC_DIR} \
 			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
 			SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
 
 RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
 			CUPS=${CUPS} \
 			RC_SUBR=${RC_SUBR} \
 			SAMBA_CONFDIR=${SAMBA_CONFDIR} \
 			SAMBA_CONFIG=${SAMBA_CONFIG} \
 			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
 			SAMBA_RUNDIR=${SAMBA_RUNDIR} \
 			SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
 			SAMBA_SPOOL=${SAMBA_SPOOL}
 
 pre-fetch:
 	@${ECHO_MSG} "===>  -------------------------------------------"
 	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
 	@${ECHO_MSG} "===>  -------------------------------------------"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
 	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 
 post-install:
 .for sect in 1 5 7 8
 	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
 .for man in ${MAN${sect}}
 	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}
 .endfor
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
 .if defined(WITH_PAM_SMBPASS)
 	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
 	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
 .endif
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
 	    ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} 	\
 		${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 # Spool
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} &&		\
 	    ${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_SPOOL} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 1777 ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" >> ${TMPPLIST}
 # Logdir
 	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR} &&		\
 	    ${CHMOD} 0755 ${SAMBA_LOGDIR} && ${CHOWN} root:wheel ${SAMBA_LOGDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOGDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOGDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOGDIR}/* manually.\"" >> ${TMPPLIST}
 # Lockdir
 	@test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} &&	\
 	    ${CHMOD} 0755 ${SAMBA_LOCKDIR} && ${CHOWN} root:wheel ${SAMBA_LOCKDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -rf ${SAMBA_LOCKDIR}/${f}; done" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
 # Private
 	@test -d ${SAMBA_PRIVATE} || ${MKDIR} ${SAMBA_PRIVATE} &&	\
 	    ${CHMOD} 700 ${SAMBA_PRIVATE} && ${CHOWN} root:wheel ${SAMBA_PRIVATE}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 700 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
 .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
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
 .endif
 .if defined(WITH_PAM_SMBPASS)
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}
 .for d in devel guide howto
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/htmldocs/${d} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .for f in README COPYING Manifest Read-Manifest-Now Roadmap \
 		WHATSNEW.txt docs/THANKS docs/history
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 # !SAMBA_SUBPORT
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net/samba3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.120
\ No newline at end of property
+1.121
\ No newline at end of property
Index: head/net/samba3/files/patch-lib_util_str.c
===================================================================
--- head/net/samba3/files/patch-lib_util_str.c	(nonexistent)
+++ head/net/samba3/files/patch-lib_util_str.c	(revision 109449)
@@ -0,0 +1,23 @@
+--- lib/util_str.c.orig	Tue Apr 20 22:42:55 2004
++++ lib/util_str.c	Fri May 14 02:02:30 2004
+@@ -1980,10 +1980,16 @@
+ {
+ 	int bits = 0;
+ 	int char_count = 0;
+-	size_t out_cnt = 0;
+-	size_t len = data.length;
+-	size_t output_len = data.length * 2;
+-	char *result = malloc(output_len); /* get us plenty of space */
++	size_t out_cnt, len, output_len;
++	char *result;
++
++        if (!data.length || !data.data)
++		return NULL;
++
++	out_cnt = 0;
++	len = data.length;
++	output_len = data.length * 2;
++	result = malloc(output_len); /* get us plenty of space */
+ 
+ 	while (len-- && out_cnt < (data.length * 2) - 5) {
+ 		int c = (unsigned char) *(data.data++);

Property changes on: head/net/samba3/files/patch-lib_util_str.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/samba3/files/samba.sh.sample
===================================================================
--- head/net/samba3/files/samba.sh.sample	(revision 109448)
+++ head/net/samba3/files/samba.sh.sample	(revision 109449)
@@ -1,123 +1,123 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: nmbd smbd
 %%WINBIND%%# PROVIDE: winbindd
 # REQUIRE: NETWORKING SERVERS named %%CUPS%%
 # BEFORE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable samba:
 #
 #samba_enable="YES"
 #
 # or, for fine grain control
 #
 #nmbd_enable="YES"
 #smbd_enable="YES"
 %%WINBIND%%#winbindd_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=samba
 rcvar=`set_rcvar`
 
 load_rc_config $name
 # Set defaults
 samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
 # Config file is required
 if [ ! -r ${samba_config} ]; then
     warn "${samba_config} is not readable."
     case $1 in
 	force*) : ;;
 	*) exit 1 ;;
     esac
 fi
 
 if test -n ${samba_enable:-""} && checkyesno samba_enable; then
     nmbd_enable=${nmbd_enable:-"YES"}
     smbd_enable=${smbd_enable:-"YES"}
 %%WINBIND%%    winbindd_enable=${winbindd_enable:-"YES"}
 %%WINBIND%%    # Check, that winbind is actally configured
 %%WINBIND%%    if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
 %%WINBIND%%    	#warn "Winbind support is not configured"
 %%WINBIND%%	winbindd_enable="NO"
 %%WINBIND%%    fi
 fi
 
 # Hack until run_rc_command() get rid of exit()
 samba_stop() {
     pid=$(check_pidfile ${pidfile} ${command})
     if [ -z ${pid} ]; then
 	echo "${name} not running? (check ${pidfile})."
 	return 1
     fi
     echo "Stopping ${command}."
     kill -${sig_stop:-TERM} ${pid}
     [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
     wait_for_pids ${pid}
 }
 
 nmbd_precmd() {
-    # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
+    # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
     if [ -d "%%SAMBA_LOCKDIR%%" ]; then
 	echo "Starting SAMBA: removing stale tdbs :"
 	for file in connections.tdb locking.tdb messages.tdb \
 		    sessionid.tdb unexpected.tdb brlock.tdb \
 		    namelist.debug
 	do
 	    rm -vf "%%SAMBA_LOCKDIR%%/$file"
 	done
     fi
 }
 
 # nmbd
 name=nmbd
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 required_dirs="%%SAMBA_LOCKDIR%%"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd="nmbd_precmd"
 stop_cmd="samba_stop"
 # Defaults
 nmbd_enable=${nmbd_enable:-"NO"}
 nmbd_flags=${nmbd_flags:-"-D"}
 command_args="${nmbd_flags} -s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
 
 # smbd
 name=smbd
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd=":"
 stop_cmd="samba_stop"
 # Defaults
 smbd_enable=${smbd_enable:-"NO"}
 smbd_flags=${smbd_flags:-"-D"}
 command_args="${smbd_flags} -s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
 %%WINBIND%%
 %%WINBIND%%# winbindd
 %%WINBIND%%name=winbindd
 %%WINBIND%%rcvar=`set_rcvar`
 %%WINBIND%%command="%%PREFIX%%/sbin/${name}"
 %%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
 %%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 %%WINBIND%%start_precmd=":"
 %%WINBIND%%stop_cmd="samba_stop"
 %%WINBIND%%# Defaults
 %%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
 %%WINBIND%%winbindd_flags=${winbindd_flags:-""}
 %%WINBIND%%command_args="${winbindd_flags} -s ${samba_config}"
 %%WINBIND%%
 %%WINBIND%%load_rc_config $name
 %%WINBIND%%run_rc_command "$1"

Property changes on: head/net/samba3/files/samba.sh.sample
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/net/samba3/pkg-message
===================================================================
--- head/net/samba3/pkg-message	(revision 109448)
+++ head/net/samba3/pkg-message	(revision 109449)
@@ -1,18 +1,21 @@
 ******************************************************************************
 Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
 automatically. Users are encouraged to use 'tdbsam' backend instead:
 
   [global]
     passdb backend = tdbsam, smbpasswd
 
 You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
 see the Samba-HOWTO-Collection.
 
 You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
 script:
 
   cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
   chmod 600 smbpasswd
 
 But the usage of it is deprecated.
+------------------------------------------------------------------------------
+NOTICE: *.tdb files have been moved from /var/run/samba/ to /var/db/samba/!
+NOTICE: Please, move them manually, if necessary, at least winbind_*.tdb.
 ******************************************************************************

Property changes on: head/net/samba3/pkg-message
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property