From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 2 23:50:31 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF6D616A4DA for ; Sat, 2 Sep 2006 23:50:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0652E43D76 for ; Sat, 2 Sep 2006 23:50:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k82NoFAa097926 for ; Sat, 2 Sep 2006 23:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k82NoFBF097925; Sat, 2 Sep 2006 23:50:15 GMT (envelope-from gnats) Resent-Date: Sat, 2 Sep 2006 23:50:15 GMT Resent-Message-Id: <200609022350.k82NoFBF097925@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Timur I. Bakeyev" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AB3F16A4DA for ; Sat, 2 Sep 2006 23:48:14 +0000 (UTC) (envelope-from root@com.bat.ru) Received: from mail.bat.ru (dzokonda.xs4all.nl [194.109.164.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 987A743D64 for ; Sat, 2 Sep 2006 23:48:12 +0000 (GMT) (envelope-from root@com.bat.ru) Received: from timur.home.bat.ru ([192.168.0.4] verified) by mail.bat.ru (CommuniGate Pro SMTP 4.2.7) with ESMTP-TLS id 1162449 for FreeBSD-gnats-submit@freebsd.org; Sun, 03 Sep 2006 01:48:35 +0200 Received: (from root@localhost) by timur.home.bat.ru (8.13.6/8.13.6/Submit) id k82NmAep009876; Sun, 3 Sep 2006 01:48:10 +0200 (CEST) (envelope-from root) Message-Id: <200609022348.k82NmAep009876@timur.home.bat.ru> Date: Sun, 3 Sep 2006 01:48:10 +0200 (CEST) From: "Timur I. Bakeyev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102805: [MAINTAINER-UPDATE] net/samba: update to 3.0.23c X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Sep 2006 23:50:31 -0000 >Number: 102805 >Category: ports >Synopsis: [MAINTAINER-UPDATE] net/samba: update to 3.0.23c >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Sep 02 23:50:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Timur I. Bakeyev >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD timur.home.bat.ru 6.1-STABLE FreeBSD 6.1-STABLE #0: Sun Jul 2 02:36:16 CEST >Description: - Update to 3.0.23c Common bugs fixed in 3.0.23c include: o Authentication failures in pam_winbind when the AD domain policy is set to not expire passwords. o Authorization failures when using smb.conf options such as "valid users" with the smbpasswd passdb backend. Added file(s): - pkg-plist.swat - files/patch-pam_smbpass_pam_smb_auth.c - files/patch-pam_smbpass_pam_smb_passwd.c - files/patch-pam_smbpass_support.c - files/pkg-deinstall.in - files/pkg-install.in - files/pkg-message.in Removed file(s): - pkg-message - files/patch-pam_smbpass Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: UPDATING: 20060904: AFFECTS: users of net/samba3 AUTHOR: timur@gnu.org Reviosion of Samba 3.0.23c port had changed location of the directory, where Samba stores it's smbpasswd files from $PREFIX/private to a more common $PREFIX/etc/samba. You need to move *.tdb files from an old to new location and remove old directory if you use tdbsam backend for Samba user authentication. Starting with the 3.0.23c release, the officially supported passdb backends (smbpasswd, tdbsam, and ldapsam) now operate identically with regards to the historical RID algorithm for unmapped users and groups (i.e. accounts not in the passdb or group mapping table). The resulting behavior is that all unmapped users are resolved to a SID in the S-1-22-1 domain and all unmapped groups resolve to a SID in the S-1-22-2 domain. Previously, when using the smbpasswd passdb, such users and groups would resolve to an algorithmic SID in the machine's own domain (S-1-5-XX-XX-XX). However, the smbpasswd backend still utilizes the RID algorithm when creating new user accounts or allocating a RID for a new group mapping entry. With the changes in the 3.0.23c release, it is now possible to resolve a uid/gid, name, or SID in any direction and always obtain a symmetric mapping. This is important so that values for smb.conf parameters such as "valid users" resolve to the same SIDs as those included in the local user's initial token. >Fix: --- samba-3.0.23c,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/samba3/Makefile,v retrieving revision 1.151 diff -u -r1.151 Makefile --- Makefile 15 Aug 2006 15:25:02 -0000 1.151 +++ Makefile 2 Sep 2006 21:29:33 -0000 @@ -1,12 +1,12 @@ # New ports collection makefile for: samba # Date created: 11th Feb 1995 -# Whom: gpalmer +# Whom: Gary Palmer # # $FreeBSD: ports/net/samba3/Makefile,v 1.151 2006/08/15 15:25:02 sem Exp $ # PORTNAME= samba -PORTVERSION?= 3.0.23b +PORTVERSION?= 3.0.23c PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= net @@ -20,27 +20,28 @@ CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.* USE_ICONV= yes -USE_FAM= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:259 autoheader:259 LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/${DISTNAME}/source - +PLIST= ${WRKDIR}/.PLIST # directories -VARDIR= ${DESTDIR}/var -SAMBA_SPOOL?= ${VARDIR}/spool/samba +VARDIR?= ${DESTDIR}/var +SAMBA_SPOOL= ${VARDIR}/spool/samba SAMBA_LOGDIR= ${VARDIR}/log/samba SAMBA_RUNDIR= ${VARDIR}/run -SAMBA_LOCKDIR?= ${VARDIR}/db/samba +SAMBA_LOCKDIR= ${VARDIR}/db/samba +SAMBA_SWATDIR= ${PREFIX}/share/swat +# DEPRECATED: This is an old location of the private dir SAMBA_PRIVATE?= ${PREFIX}/private SAMBA_CONFDIR?= ${PREFIX}/etc -SAMBA_SWATDIR= ${PREFIX}/share/swat +SAMBA_PRIVATEDIR= ${SAMBA_CONFDIR}/samba +SAMBA_CONFIG= smb.conf SAMBA_LIB= lib SAMBA_LIBDIR= ${PREFIX}/${SAMBA_LIB} -RC_DIR= ${PREFIX}/etc/rc.d -SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf +SAMBA_MODULEDIR= ${SAMBA_LIBDIR}/samba CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -48,11 +49,11 @@ --localstatedir=${VARDIR} \ --with-configdir=${SAMBA_CONFDIR} \ --with-pammodulesdir=${SAMBA_LIBDIR} \ - --with-libdir=${SAMBA_LIBDIR}/samba \ + --with-libdir=${SAMBA_MODULEDIR} \ --with-swatdir=${SAMBA_SWATDIR} \ --with-piddir=${SAMBA_RUNDIR} \ --with-lockdir=${SAMBA_LOCKDIR} \ - --with-privatedir=${SAMBA_PRIVATE} \ + --with-privatedir=${SAMBA_PRIVATEDIR} \ --with-logfilebase=${SAMBA_LOGDIR} CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE} @@ -65,12 +66,13 @@ WINBIND "With WinBIND support" on \ ACL_SUPPORT "With ACL support" off \ AIO_SUPPORT "With experimental AIO support" off \ + FAM_SUPPORT "With File Alteration Monitor" off \ SYSLOG "With Syslog support" off \ - QUOTAS "With Quota support" off \ - UTMP "With UTMP support" on \ + QUOTAS "With Disk quota support" off \ + UTMP "With UTMP accounting support" on \ MSDFS "With MSDFS support" off \ SMBSH "With SMBSH wrapper for UNIX commands" off \ - PAM_SMBPASS "With PAM authentication against passdb backends" off \ + PAM_SMBPASS "With PAM authentication against passdb backend(s)" off \ EXP_MODULES "With experimental module(s)" off \ POPT "With system-wide POPT library" on .endif @@ -80,32 +82,35 @@ .if defined(SAMBA_SUBPORT) # Switch off all extra functionality CONFIGURE_ARGS+= --disable-cups --without-winbind --without-syslog \ - --without-quotas --without-utmp --without-ldapsam \ - --without-pam --without-pam_smbpass \ - --without-aio-support + --without-quotas --without-utmp --without-pam \ + --without-pam_smbpass --without-aio-support # Dirty hack to work around usage of OPTIONS in slave ports -.if exists(${.CURDIR}/Makefile.inc) -.include "${.CURDIR}/Makefile.inc" -.endif +. if exists(${.CURDIR}/Makefile.inc) +. include "${.CURDIR}/Makefile.inc" +. endif .else # Samba server itself USE_RC_SUBR= samba -SUB_FILES= smb.conf.sample +SUB_FILES= pkg-install pkg-message pkg-deinstall smb.conf.sample CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \ --without-libsmbclient --without-libmsrpc \ --without-libsmbsharemodes --without-python \ --with-included-iniparser +.if !defined(WITHOUT_LDAP) +SAMBA_WANT_LDAP= yes +.endif + .if !defined(WITHOUT_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base CONFIGURE_ARGS+= --enable-cups -CUPSD= cupsd +SUB_LIST+= CUPSD="" .else CONFIGURE_ARGS+= --disable-cups -CUPSD= "" +SUB_LIST+= CUPSD="@comment " .endif .if defined(WITH_SYSLOG) @@ -120,35 +125,47 @@ CONFIGURE_ARGS+= --without-quotas .endif -.if defined(WITHOUT_UTMP) +.if !defined(WITHOUT_UTMP) +CONFIGURE_ARGS+= --with-utmp +.else CONFIGURE_ARGS+= --without-utmp .endif .if defined(WITH_MSDFS) CONFIGURE_ARGS+= --with-msdfs +.else +CONFIGURE_ARGS+= --without-msdfs .endif .if !defined(WITHOUT_WINBIND) CONFIGURE_ARGS+= --with-winbind PLIST_SUB+= WINBIND="" SUB_LIST+= WINBIND="" -.if ${OSVERSION} >= 500112 +. if ${OSVERSION} >= 500112 WITH_WINBIND_NSS= yes -.endif +PLIST_SUB+= WINBIND_NSS="" +. else +PLIST_SUB+= WINBIND_NSS="@comment " +. endif .else CONFIGURE_ARGS+= --without-winbind PLIST_SUB+= WINBIND="@comment " SUB_LIST+= WINBIND="@comment " .endif -.if defined(WITH_WINBIND_NSS) -PLIST_SUB+= WINBIND_NSS="" -.else -PLIST_SUB+= WINBIND_NSS="@comment " +# Taken from bsd.port.mk +.if exists(${LOCALBASE}/libexec/gam_server) +WANT_FAM_SYSTEM= gamin +WITH_FAM_SUPPORT= on +. undef WITHOUT_FAM_SUPPORT +.elif exists(${LOCALBASE}/bin/fam) +WANT_FAM_SYSTEM= fam +WITH_FAM_SUPPORT= on +. undef WITHOUT_FAM_SUPPORT .endif -.if !defined(WITHOUT_LDAP) -WANT_LDAP= yes +.if defined(WITH_FAM_SUPPORT) || defined(WANT_FAM_SYSTEM) +USE_FAM= yes .endif .if defined(WITH_EXP_MODULES) @@ -169,27 +186,32 @@ .if defined(WITH_ACL_SUPPORT) .if ${OSVERSION} < 500018 -BROKEN= ACL support requires FreeBSD 5.x at least after 20010326 -.else -CONFIGURE_ARGS+= --with-acl-support +BROKEN= "ACL support requires FreeBSD 5.x at least after 20010326" .endif +CONFIGURE_ARGS+= --with-acl-support +.else +CONFIGURE_ARGS+= --without-acl-support .endif .if defined(WITH_SMBSH) IGNORE= broken IPC and code -CONFIGURE_ARGS+= --with-smbwrapper +CONFIGURE_ARGS+= --with-smbwrapper PLIST_SUB+= SMBSH="" .else +CONFIGURE_ARGS+= --without-smbwrapper PLIST_SUB+= SMBSH="@comment " .endif .if defined(WITH_AIO_SUPPORT) IGNORE= broken kernel API until now (7-CURRENT) CONFIGURE_ARGS+= --with-aio-support +.else +CONFIGURE_ARGS+= --without-aio-support .endif .if !defined(WITHOUT_POPT) LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt +CONFIGURE_ARGS+= --without-included-popt .else CONFIGURE_ARGS+= --with-included-popt .endif @@ -202,21 +224,22 @@ # For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken # due the conflict between system and OpenSSL port libcrypto libraries .if ${OSVERSION} > 470103 && ${OSVERSION} < 500000 -.if defined(WITH_ADS) +. if defined(WITH_ADS) IGNORE= broken dependency between OpenSSL, OpenLDAP and Heimdal for FreeBSD 4.x. Disable ADS support -.endif +. endif +. undef WITH_ADS WITHOUT_ADS= on .endif -.if !defined(WITHOUT_ADS) -WANT_LDAP= yes -WANT_KRB5= yes +.if defined(WITH_ADS) +SAMBA_WANT_LDAP= yes +SAMBA_WANT_KRB5= yes CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif # Kerberos5 is necessary for ADS -.if defined(WANT_KRB5) +.if defined(SAMBA_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) @@ -231,7 +254,7 @@ CONFIGURE_ARGS+= --without-krb5 .endif -.if defined(WANT_LDAP) +.if defined(SAMBA_WANT_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap .else @@ -256,20 +279,36 @@ MAN8+= winbindd.8 .endif -PLIST_SUB+= RC_DIR=${RC_DIR} \ - SAMBA_LOGDIR=${SAMBA_LOGDIR} \ - SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ - SAMBA_CONFIG=${SAMBA_CONFIG} - -SUB_LIST+= CUPSD=${CUPSD} \ - SAMBA_CONFDIR=${SAMBA_CONFDIR} \ - SAMBA_CONFIG=${SAMBA_CONFIG} \ - SAMBA_LOGDIR=${SAMBA_LOGDIR} \ - SAMBA_RUNDIR=${SAMBA_RUNDIR} \ - SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ - SAMBA_SPOOL=${SAMBA_SPOOL} +PLIST_SUB+= SAMBA_LOGDIR=${SAMBA_LOGDIR} \ + SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ + SAMBA_CONFDIR=${SAMBA_CONFDIR} \ + SAMBA_CONFIG=${SAMBA_CONFIG} \ + SAMBA_RUNDIR=${SAMBA_RUNDIR} \ + SAMBA_SWATDIR=${SAMBA_SWATDIR} \ + SAMBA_SPOOL=${SAMBA_SPOOL} \ + SAMBA_PRIVATEDIR=${SAMBA_PRIVATEDIR} + +SUB_LIST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} \ + SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ + SAMBA_CONFDIR=${SAMBA_CONFDIR} \ + SAMBA_CONFIG=${SAMBA_CONFIG} \ + SAMBA_RUNDIR=${SAMBA_RUNDIR} \ + SAMBA_SWATDIR=${SAMBA_SWATDIR} \ + SAMBA_SPOOL=${SAMBA_SPOOL} \ + SAMBA_PRIVATEDIR=${SAMBA_PRIVATEDIR} \ + SAMBA_PRIVATE=${SAMBA_PRIVATE} + +pre-everything:: + @${ECHO_CMD} "===> NOTICE: This version of port has changed location of Samba password" + @${ECHO_CMD} "===> NOTICE: (smbpasswd) directory. Files in '${SAMBA_PRIVATE}'" + @${ECHO_CMD} "===> NOTICE: have moved to '${SAMBA_PRIVATEDIR}'." + @if [ -d ${SAMBA_PRIVATE} -a -n "`${LS} ${SAMBA_PRIVATE}/*.tdb 2>/dev/null`" ]; then \ + ${ECHO_CMD} ""; \ + ${ECHO_CMD} "===> The directory '${SAMBA_PRIVATE}' is not empty. You possibly need"; \ + ${ECHO_CMD} "===> to move its files to '${SAMBA_PRIVATEDIR}' and remove directory."; \ + ${ECHO_CMD} ""; \ + fi -PLIST_SUB+= SMBSH="@comment " pre-fetch: @${ECHO_MSG} "===> -------------------------------------------" @${ECHO_MSG} "===> Run 'make config' to (re)configure the port" @@ -286,14 +325,16 @@ @${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r pre-install: - -@${FIND} ${SAMBA_LIBDIR}/samba -type f 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' >> ${WRKDIR}/.PLIST.exclude + -@${FIND} ${SAMBA_MODULEDIR} -type f 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' >> ${WRKDIR}/.PLIST.exclude + @${CAT} ${PKGDIR}/pkg-plist > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST} 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 +. 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} @@ -301,18 +342,19 @@ @${MKDIR} ${EXAMPLESDIR}/pam_smbpass @${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass .endif - ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMBA_CONFDIR} - @if [ ! -f ${SAMBA_CONFIG} ]; then \ - ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMBA_CONFIG} ; \ + ${INSTALL_DATA} ${WRKDIR}/${SAMBA_CONFIG}.sample ${SAMBA_CONFDIR} + @if [ ! -f ${SAMBA_CONFDIR}/${SAMBA_CONFIG} ]; then \ + ${INSTALL_DATA} ${WRKDIR}/${SAMBA_CONFIG}.sample ${SAMBA_CONFDIR}/${SAMBA_CONFIG} ; \ fi ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd +# Winbind .if !defined(WITHOUT_WINBIND) -.if defined(WITH_WINBIND_NSS) - ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1 - ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1 - @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST}; - @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST}; -.endif +. if defined(WITH_WINBIND_NSS) + ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1 + ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1 + @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST}; + @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST}; +. endif ${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_winbind.so ${SAMBA_LIBDIR} @${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST}; .endif @@ -323,58 +365,38 @@ # smbwrapper.so .if defined(WITH_SMBSH) ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbsh ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbwrapper.so ${SAMBA_LIBDIR}/samba + ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbwrapper.so ${SAMBA_MODULEDIR} .endif # Lib - @${FIND} ${SAMBA_LIBDIR}/samba -type f | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST} - @for d in `${FIND} ${SAMBA_LIBDIR}/samba -type d | ${SORT} -r`; do \ + @${FIND} ${SAMBA_MODULEDIR} -type f | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST} + @for d in `${FIND} ${SAMBA_MODULEDIR} -type d | ${SORT} -r`; do \ ${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null || true" >> ${TMPPLIST}; \ done -# 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 for f in connections.tdb locking.tdb messages.tdb sessionid.tdb unexpected.tdb brlock.tdb namelist.debug; do ${RM} -f ${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} +# Taken from bsd.port.mk +.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 )) + @for i in ${USE_RC_SUBR}; do \ + ${ECHO_CMD} "@unexec %D/etc/rc.d/$${i%.sh} forcestop 2>/dev/null || true" >> ${TMPPLIST}; \ + done +.else + @for i in ${USE_RC_SUBR}; do \ + ${ECHO_CMD} "@unexec %D/etc/rc.d/$${i%.sh}.sh forcestop 2>/dev/null || true" >> ${TMPPLIST}; \ + done +.endif +# Documentation .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR} -.for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf - @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${f} ${DOCSDIR} -.endfor +. for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf + @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${f} ${DOCSDIR} +. endfor @${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR} -.for f in README COPYING Manifest Read-Manifest-Now Roadmap \ +. for f in README COPYING Manifest Read-Manifest-Now Roadmap \ WHATSNEW.txt docs/THANKS docs/history - @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR} -.endfor + @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR} +. endfor # !NOPORTDOCS .endif + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} # !SAMBA_SUBPORT .endif Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/samba3/distinfo,v retrieving revision 1.71 diff -u -r1.71 distinfo --- distinfo 15 Aug 2006 15:25:02 -0000 1.71 +++ distinfo 1 Sep 2006 19:51:34 -0000 @@ -1,3 +1,3 @@ -MD5 (samba-3.0.23b.tar.gz) = f2d1a513fd7138fd1515d3bdf702f7c7 -SHA256 (samba-3.0.23b.tar.gz) = d5a0f2a907a11b0776601225a6fcf3d680cba32e2eee9829277bd391cdf84941 -SIZE (samba-3.0.23b.tar.gz) = 17686227 +MD5 (samba-3.0.23c.tar.gz) = 9e06d5e10f4ae84f7fafad75d1b4184c +SHA256 (samba-3.0.23c.tar.gz) = f333051eadf6ae88c30bd3d62eb94e9d6cf4a21912c4923d6ffddb029a42631c +SIZE (samba-3.0.23c.tar.gz) = 17690045 Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 11 Sep 2005 19:42:34 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -=============================================================================== -Samba3 *package* now doesn't include ADS support due the portability problems -with Kerberos5 libraries on different installations. You need to compile port -yourself to get this functionality. - -For additional hints and directions, please, look into the README.FreeBSD file. -=============================================================================== Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/samba3/pkg-plist,v retrieving revision 1.65 diff -u -r1.65 pkg-plist --- pkg-plist 12 Jul 2006 00:16:32 -0000 1.65 +++ pkg-plist 1 Sep 2006 21:45:41 -0000 @@ -23,9 +23,8 @@ bin/testparm %%SMBSH%%bin/smbsh %%WINBIND%%bin/wbinfo -@unexec %D/etc/rc.d/samba forcestop 2>/dev/null || true -@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.sample; then rm -f %%SAMBA_CONFIG%%; fi -@unexec rm -f %%SAMBA_CONFIG%%.sample +@unexec if cmp -s %%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%% %%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample; then rm -f %%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%; fi +@unexec rm -f %%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample sbin/smbd sbin/nmbd sbin/swat @@ -184,436 +183,3 @@ %%PORTDOCS%%%%DOCSDIR%%/registry/WindowsTerminalServer.reg %%PORTDOCS%%@dirrm %%DOCSDIR%%/registry %%PORTDOCS%%@dirrm %%DOCSDIR%% -share/swat/help/Samba3-ByExample/2000users.html -share/swat/help/Samba3-ByExample/Big500users.html -share/swat/help/Samba3-ByExample/DMSMig.html -share/swat/help/Samba3-ByExample/DomApps.html -share/swat/help/Samba3-ByExample/ExNetworks.html -share/swat/help/Samba3-ByExample/HA.html -share/swat/help/Samba3-ByExample/RefSection.html -share/swat/help/Samba3-ByExample/appendix.html -share/swat/help/Samba3-ByExample/ch14.html -share/swat/help/Samba3-ByExample/go01.html -share/swat/help/Samba3-ByExample/gpl.html -share/swat/help/Samba3-ByExample/happy.html -share/swat/help/Samba3-ByExample/images/AccountingNetwork.png -share/swat/help/Samba3-ByExample/images/Charity-Network.png -share/swat/help/Samba3-ByExample/images/HostAnnouncment.png -share/swat/help/Samba3-ByExample/images/NullConnect.png -share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png -share/swat/help/Samba3-ByExample/images/UserConnect.png -share/swat/help/Samba3-ByExample/images/UserMgrNT4.png -share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png -share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png -share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png -share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png -share/swat/help/Samba3-ByExample/images/XP-screen001.png -share/swat/help/Samba3-ByExample/images/acct2net.png -share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png -share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png -share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png -share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png -share/swat/help/Samba3-ByExample/images/ch8-migration.png -share/swat/help/Samba3-ByExample/images/chap4-net.png -share/swat/help/Samba3-ByExample/images/chap5-net.png -share/swat/help/Samba3-ByExample/images/chap6-net.png -share/swat/help/Samba3-ByExample/images/chap7-idresol.png -share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png -share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png -share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png -share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png -share/swat/help/Samba3-ByExample/images/imc-usermanager2.png -share/swat/help/Samba3-ByExample/images/lam-config.png -share/swat/help/Samba3-ByExample/images/lam-group-members.png -share/swat/help/Samba3-ByExample/images/lam-groups.png -share/swat/help/Samba3-ByExample/images/lam-hosts.png -share/swat/help/Samba3-ByExample/images/lam-login.png -share/swat/help/Samba3-ByExample/images/lam-users.png -share/swat/help/Samba3-ByExample/images/openmag.png -share/swat/help/Samba3-ByExample/images/wxpp001.png -share/swat/help/Samba3-ByExample/images/wxpp004.png -share/swat/help/Samba3-ByExample/images/wxpp006.png -share/swat/help/Samba3-ByExample/images/wxpp007.png -share/swat/help/Samba3-ByExample/images/wxpp008.png -share/swat/help/Samba3-ByExample/index.html -share/swat/help/Samba3-ByExample/ix01.html -share/swat/help/Samba3-ByExample/kerberos.html -share/swat/help/Samba3-ByExample/ntmigration.html -share/swat/help/Samba3-ByExample/nw4migration.html -share/swat/help/Samba3-ByExample/pr01.html -share/swat/help/Samba3-ByExample/pr02.html -share/swat/help/Samba3-ByExample/pr03.html -share/swat/help/Samba3-ByExample/preface.html -share/swat/help/Samba3-ByExample/primer.html -share/swat/help/Samba3-ByExample/secure.html -share/swat/help/Samba3-ByExample/simple.html -share/swat/help/Samba3-ByExample/small.html -share/swat/help/Samba3-ByExample/unixclients.html -share/swat/help/Samba3-ByExample/upgrades.html -share/swat/help/Samba3-Developers-Guide/CodingSuggestions.html -share/swat/help/Samba3-Developers-Guide/Packaging.html -share/swat/help/Samba3-Developers-Guide/architecture.html -share/swat/help/Samba3-Developers-Guide/contributing.html -share/swat/help/Samba3-Developers-Guide/debug.html -share/swat/help/Samba3-Developers-Guide/devprinting.html -share/swat/help/Samba3-Developers-Guide/index.html -share/swat/help/Samba3-Developers-Guide/internals.html -share/swat/help/Samba3-Developers-Guide/modules.html -share/swat/help/Samba3-Developers-Guide/ntdomain.html -share/swat/help/Samba3-Developers-Guide/parsing.html -share/swat/help/Samba3-Developers-Guide/pt01.html -share/swat/help/Samba3-Developers-Guide/pt02.html -share/swat/help/Samba3-Developers-Guide/pt03.html -share/swat/help/Samba3-Developers-Guide/pt04.html -share/swat/help/Samba3-Developers-Guide/pt05.html -share/swat/help/Samba3-Developers-Guide/pwencrypt.html -share/swat/help/Samba3-Developers-Guide/rpc-plugin.html -share/swat/help/Samba3-Developers-Guide/tracing.html -share/swat/help/Samba3-Developers-Guide/unix-smb.html -share/swat/help/Samba3-Developers-Guide/vfs.html -share/swat/help/Samba3-Developers-Guide/wins.html -share/swat/help/Samba3-HOWTO/AccessControls.html -share/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html -share/swat/help/Samba3-HOWTO/Appendix.html -share/swat/help/Samba3-HOWTO/Backup.html -share/swat/help/Samba3-HOWTO/CUPS-printing.html -share/swat/help/Samba3-HOWTO/ChangeNotes.html -share/swat/help/Samba3-HOWTO/ClientConfig.html -share/swat/help/Samba3-HOWTO/DNSDHCP.html -share/swat/help/Samba3-HOWTO/FastStart.html -share/swat/help/Samba3-HOWTO/InterdomainTrusts.html -share/swat/help/Samba3-HOWTO/IntroSMB.html -share/swat/help/Samba3-HOWTO/NT4Migration.html -share/swat/help/Samba3-HOWTO/NetCommand.html -share/swat/help/Samba3-HOWTO/NetworkBrowsing.html -share/swat/help/Samba3-HOWTO/Other-Clients.html -share/swat/help/Samba3-HOWTO/PolicyMgmt.html -share/swat/help/Samba3-HOWTO/Portability.html -share/swat/help/Samba3-HOWTO/ProfileMgmt.html -share/swat/help/Samba3-HOWTO/SWAT.html -share/swat/help/Samba3-HOWTO/SambaHA.html -share/swat/help/Samba3-HOWTO/ServerType.html -share/swat/help/Samba3-HOWTO/StandAloneServer.html -share/swat/help/Samba3-HOWTO/TOSHpreface.html -share/swat/help/Samba3-HOWTO/VFS.html -share/swat/help/Samba3-HOWTO/bugreport.html -share/swat/help/Samba3-HOWTO/cfgsmarts.html -share/swat/help/Samba3-HOWTO/ch-ldap-tls.html -share/swat/help/Samba3-HOWTO/ch46.html -share/swat/help/Samba3-HOWTO/classicalprinting.html -share/swat/help/Samba3-HOWTO/compiling.html -share/swat/help/Samba3-HOWTO/diagnosis.html -share/swat/help/Samba3-HOWTO/domain-member.html -share/swat/help/Samba3-HOWTO/go01.html -share/swat/help/Samba3-HOWTO/gpl.html -share/swat/help/Samba3-HOWTO/groupmapping.html -share/swat/help/Samba3-HOWTO/idmapper.html -share/swat/help/Samba3-HOWTO/images/10small.png -share/swat/help/Samba3-HOWTO/images/11small.png -share/swat/help/Samba3-HOWTO/images/12small.png -share/swat/help/Samba3-HOWTO/images/13small.png -share/swat/help/Samba3-HOWTO/images/14small.png -share/swat/help/Samba3-HOWTO/images/1small.png -share/swat/help/Samba3-HOWTO/images/2small.png -share/swat/help/Samba3-HOWTO/images/3small.png -share/swat/help/Samba3-HOWTO/images/4small.png -share/swat/help/Samba3-HOWTO/images/5small.png -share/swat/help/Samba3-HOWTO/images/6small.png -share/swat/help/Samba3-HOWTO/images/7small.png -share/swat/help/Samba3-HOWTO/images/8small.png -share/swat/help/Samba3-HOWTO/images/9small.png -share/swat/help/Samba3-HOWTO/images/WME001.png -share/swat/help/Samba3-HOWTO/images/WME002.png -share/swat/help/Samba3-HOWTO/images/WME003.png -share/swat/help/Samba3-HOWTO/images/WME005.png -share/swat/help/Samba3-HOWTO/images/WME009.png -share/swat/help/Samba3-HOWTO/images/WME010.png -share/swat/help/Samba3-HOWTO/images/WME013.png -share/swat/help/Samba3-HOWTO/images/WME014.png -share/swat/help/Samba3-HOWTO/images/WXPP002.png -share/swat/help/Samba3-HOWTO/images/WXPP003.png -share/swat/help/Samba3-HOWTO/images/WXPP005.png -share/swat/help/Samba3-HOWTO/images/WXPP009.png -share/swat/help/Samba3-HOWTO/images/WXPP014.png -share/swat/help/Samba3-HOWTO/images/a_small.png -share/swat/help/Samba3-HOWTO/images/access1.png -share/swat/help/Samba3-HOWTO/images/browsing1.png -share/swat/help/Samba3-HOWTO/images/cups1.png -share/swat/help/Samba3-HOWTO/images/cups2.png -share/swat/help/Samba3-HOWTO/images/domain.png -share/swat/help/Samba3-HOWTO/images/ethereal1.png -share/swat/help/Samba3-HOWTO/images/ethereal2.png -share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png -share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png -share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png -share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png -share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png -share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png -share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png -share/swat/help/Samba3-HOWTO/images/pdftosocket.png -share/swat/help/Samba3-HOWTO/images/trusts1.png -share/swat/help/Samba3-HOWTO/images/w2kp001.png -share/swat/help/Samba3-HOWTO/images/w2kp002.png -share/swat/help/Samba3-HOWTO/images/w2kp003.png -share/swat/help/Samba3-HOWTO/images/w2kp004.png -share/swat/help/Samba3-HOWTO/images/w2kp005.png -share/swat/help/Samba3-HOWTO/images/wxpp001.png -share/swat/help/Samba3-HOWTO/images/wxpp004.png -share/swat/help/Samba3-HOWTO/images/wxpp006.png -share/swat/help/Samba3-HOWTO/images/wxpp007.png -share/swat/help/Samba3-HOWTO/images/wxpp008.png -share/swat/help/Samba3-HOWTO/index.html -share/swat/help/Samba3-HOWTO/install.html -share/swat/help/Samba3-HOWTO/integrate-ms-networks.html -share/swat/help/Samba3-HOWTO/introduction.html -share/swat/help/Samba3-HOWTO/ix01.html -share/swat/help/Samba3-HOWTO/largefile.html -share/swat/help/Samba3-HOWTO/locking.html -share/swat/help/Samba3-HOWTO/migration.html -share/swat/help/Samba3-HOWTO/msdfs.html -share/swat/help/Samba3-HOWTO/optional.html -share/swat/help/Samba3-HOWTO/pam.html -share/swat/help/Samba3-HOWTO/passdb.html -share/swat/help/Samba3-HOWTO/pr01.html -share/swat/help/Samba3-HOWTO/pr02.html -share/swat/help/Samba3-HOWTO/pr03.html -share/swat/help/Samba3-HOWTO/problems.html -share/swat/help/Samba3-HOWTO/rights.html -share/swat/help/Samba3-HOWTO/samba-bdc.html -share/swat/help/Samba3-HOWTO/samba-pdc.html -share/swat/help/Samba3-HOWTO/securing-samba.html -share/swat/help/Samba3-HOWTO/speed.html -share/swat/help/Samba3-HOWTO/troubleshooting.html -share/swat/help/Samba3-HOWTO/type.html -share/swat/help/Samba3-HOWTO/unicode.html -share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html -share/swat/help/Samba3-HOWTO/winbind.html -share/swat/help/manpages/findsmb.1.html -share/swat/help/manpages/index.html -share/swat/help/manpages/lmhosts.5.html -share/swat/help/manpages/log2pcap.1.html -share/swat/help/manpages/mount.cifs.8.html -share/swat/help/manpages/net.8.html -share/swat/help/manpages/nmbd.8.html -share/swat/help/manpages/nmblookup.1.html -share/swat/help/manpages/ntlm_auth.1.html -share/swat/help/manpages/pam_winbind.7.html -share/swat/help/manpages/pdbedit.8.html -share/swat/help/manpages/profiles.1.html -share/swat/help/manpages/rpcclient.1.html -share/swat/help/manpages/samba.7.html -share/swat/help/manpages/smb.conf.5.html -share/swat/help/manpages/smbcacls.1.html -share/swat/help/manpages/smbclient.1.html -share/swat/help/manpages/smbcontrol.1.html -share/swat/help/manpages/smbcquotas.1.html -share/swat/help/manpages/smbd.8.html -share/swat/help/manpages/smbget.1.html -share/swat/help/manpages/smbgetrc.5.html -share/swat/help/manpages/smbmnt.8.html -share/swat/help/manpages/smbmount.8.html -share/swat/help/manpages/smbpasswd.5.html -share/swat/help/manpages/smbpasswd.8.html -share/swat/help/manpages/smbsh.1.html -share/swat/help/manpages/smbspool.8.html -share/swat/help/manpages/smbstatus.1.html -share/swat/help/manpages/smbtar.1.html -share/swat/help/manpages/smbtree.1.html -share/swat/help/manpages/smbumount.8.html -share/swat/help/manpages/swat.8.html -share/swat/help/manpages/tdbbackup.8.html -share/swat/help/manpages/tdbdump.8.html -share/swat/help/manpages/testparm.1.html -share/swat/help/manpages/umount.cifs.8.html -share/swat/help/manpages/vfstest.1.html -share/swat/help/manpages/wbinfo.1.html -share/swat/help/manpages/winbindd.8.html -share/swat/help/welcome-no-samba-doc.html -share/swat/help/welcome.html -share/swat/images/globals.gif -share/swat/images/home.gif -share/swat/images/passwd.gif -share/swat/images/printers.gif -share/swat/images/samba.gif -share/swat/images/shares.gif -share/swat/images/status.gif -share/swat/images/viewconfig.gif -share/swat/images/wizard.gif -share/swat/include/footer.html -share/swat/include/header.html -share/swat/using_samba/appa.html -share/swat/using_samba/appb.html -share/swat/using_samba/appc.html -share/swat/using_samba/appd.html -share/swat/using_samba/appe.html -share/swat/using_samba/appf.html -share/swat/using_samba/appg.html -share/swat/using_samba/ch00.html -share/swat/using_samba/ch01.html -share/swat/using_samba/ch02.html -share/swat/using_samba/ch03.html -share/swat/using_samba/ch04.html -share/swat/using_samba/ch05.html -share/swat/using_samba/ch06.html -share/swat/using_samba/ch07.html -share/swat/using_samba/ch08.html -share/swat/using_samba/ch09.html -share/swat/using_samba/ch10.html -share/swat/using_samba/ch11.html -share/swat/using_samba/ch12.html -share/swat/using_samba/figs/sam2_0101.gif -share/swat/using_samba/figs/sam2_0102.gif -share/swat/using_samba/figs/sam2_0103.gif -share/swat/using_samba/figs/sam2_0104.gif -share/swat/using_samba/figs/sam2_0105.gif -share/swat/using_samba/figs/sam2_0106.gif -share/swat/using_samba/figs/sam2_0107.gif -share/swat/using_samba/figs/sam2_0108.gif -share/swat/using_samba/figs/sam2_0109.gif -share/swat/using_samba/figs/sam2_0110.gif -share/swat/using_samba/figs/sam2_0111.gif -share/swat/using_samba/figs/sam2_0112.gif -share/swat/using_samba/figs/sam2_0113.gif -share/swat/using_samba/figs/sam2_0114.gif -share/swat/using_samba/figs/sam2_0201.gif -share/swat/using_samba/figs/sam2_0202.gif -share/swat/using_samba/figs/sam2_0203.gif -share/swat/using_samba/figs/sam2_0204.gif -share/swat/using_samba/figs/sam2_0301.gif -share/swat/using_samba/figs/sam2_0302.gif -share/swat/using_samba/figs/sam2_0303.gif -share/swat/using_samba/figs/sam2_0304.gif -share/swat/using_samba/figs/sam2_0305.gif -share/swat/using_samba/figs/sam2_0306.gif -share/swat/using_samba/figs/sam2_0307.gif -share/swat/using_samba/figs/sam2_0308.gif -share/swat/using_samba/figs/sam2_0309.gif -share/swat/using_samba/figs/sam2_0310.gif -share/swat/using_samba/figs/sam2_0311.gif -share/swat/using_samba/figs/sam2_0312.gif -share/swat/using_samba/figs/sam2_0313.gif -share/swat/using_samba/figs/sam2_0314.gif -share/swat/using_samba/figs/sam2_0315.gif -share/swat/using_samba/figs/sam2_0316.gif -share/swat/using_samba/figs/sam2_0317.gif -share/swat/using_samba/figs/sam2_0318.gif -share/swat/using_samba/figs/sam2_0319.gif -share/swat/using_samba/figs/sam2_0320.gif -share/swat/using_samba/figs/sam2_0321.gif -share/swat/using_samba/figs/sam2_0322.gif -share/swat/using_samba/figs/sam2_0323.gif -share/swat/using_samba/figs/sam2_0324.gif -share/swat/using_samba/figs/sam2_0325.gif -share/swat/using_samba/figs/sam2_0326.gif -share/swat/using_samba/figs/sam2_0327.gif -share/swat/using_samba/figs/sam2_0328.gif -share/swat/using_samba/figs/sam2_0329.gif -share/swat/using_samba/figs/sam2_0330.gif -share/swat/using_samba/figs/sam2_0331.gif -share/swat/using_samba/figs/sam2_0332.gif -share/swat/using_samba/figs/sam2_0333.gif -share/swat/using_samba/figs/sam2_0334.gif -share/swat/using_samba/figs/sam2_0335.gif -share/swat/using_samba/figs/sam2_0336.gif -share/swat/using_samba/figs/sam2_0337.gif -share/swat/using_samba/figs/sam2_0338.gif -share/swat/using_samba/figs/sam2_0339.gif -share/swat/using_samba/figs/sam2_0340.gif -share/swat/using_samba/figs/sam2_0341.gif -share/swat/using_samba/figs/sam2_0342.gif -share/swat/using_samba/figs/sam2_0343.gif -share/swat/using_samba/figs/sam2_0344.gif -share/swat/using_samba/figs/sam2_0345.gif -share/swat/using_samba/figs/sam2_0346.gif -share/swat/using_samba/figs/sam2_0347.gif -share/swat/using_samba/figs/sam2_0348.gif -share/swat/using_samba/figs/sam2_0349.gif -share/swat/using_samba/figs/sam2_0350.gif -share/swat/using_samba/figs/sam2_0351.gif -share/swat/using_samba/figs/sam2_0352.gif -share/swat/using_samba/figs/sam2_0353.gif -share/swat/using_samba/figs/sam2_0354.gif -share/swat/using_samba/figs/sam2_0355.gif -share/swat/using_samba/figs/sam2_0356.gif -share/swat/using_samba/figs/sam2_0357.gif -share/swat/using_samba/figs/sam2_0358.gif -share/swat/using_samba/figs/sam2_0359.gif -share/swat/using_samba/figs/sam2_0360.gif -share/swat/using_samba/figs/sam2_0361.gif -share/swat/using_samba/figs/sam2_0401.gif -share/swat/using_samba/figs/sam2_0402.gif -share/swat/using_samba/figs/sam2_0403.gif -share/swat/using_samba/figs/sam2_0404.gif -share/swat/using_samba/figs/sam2_0405.gif -share/swat/using_samba/figs/sam2_0406.gif -share/swat/using_samba/figs/sam2_0407.gif -share/swat/using_samba/figs/sam2_0408.gif -share/swat/using_samba/figs/sam2_0409.gif -share/swat/using_samba/figs/sam2_0410.gif -share/swat/using_samba/figs/sam2_0411.gif -share/swat/using_samba/figs/sam2_0412.gif -share/swat/using_samba/figs/sam2_0413.gif -share/swat/using_samba/figs/sam2_0414.gif -share/swat/using_samba/figs/sam2_0415.gif -share/swat/using_samba/figs/sam2_0416.gif -share/swat/using_samba/figs/sam2_0417.gif -share/swat/using_samba/figs/sam2_0501.gif -share/swat/using_samba/figs/sam2_0502.gif -share/swat/using_samba/figs/sam2_0503.gif -share/swat/using_samba/figs/sam2_0504.gif -share/swat/using_samba/figs/sam2_0505.gif -share/swat/using_samba/figs/sam2_0506.gif -share/swat/using_samba/figs/sam2_0507.gif -share/swat/using_samba/figs/sam2_0508.gif -share/swat/using_samba/figs/sam2_0601.gif -share/swat/using_samba/figs/sam2_0602.gif -share/swat/using_samba/figs/sam2_0603.gif -share/swat/using_samba/figs/sam2_0604.gif -share/swat/using_samba/figs/sam2_0605.gif -share/swat/using_samba/figs/sam2_0701.gif -share/swat/using_samba/figs/sam2_0801.gif -share/swat/using_samba/figs/sam2_0802.gif -share/swat/using_samba/figs/sam2_0803.gif -share/swat/using_samba/figs/sam2_0804.gif -share/swat/using_samba/figs/sam2_0805.gif -share/swat/using_samba/figs/sam2_0806.gif -share/swat/using_samba/figs/sam2_0807.gif -share/swat/using_samba/figs/sam2_0808.gif -share/swat/using_samba/figs/sam2_0809.gif -share/swat/using_samba/figs/sam2_0810.gif -share/swat/using_samba/figs/sam2_0811.gif -share/swat/using_samba/figs/sam2_0901.gif -share/swat/using_samba/figs/sam2_0902.gif -share/swat/using_samba/figs/sam2_0903.gif -share/swat/using_samba/figs/sam2_1001.gif -share/swat/using_samba/figs/sam2_1002.gif -share/swat/using_samba/figs/sam2_1003.gif -share/swat/using_samba/figs/sam2_1004.gif -share/swat/using_samba/figs/sam2_1005.gif -share/swat/using_samba/figs/sam2_1006.gif -share/swat/using_samba/figs/sam2_1101.gif -share/swat/using_samba/figs/sam2_1102.gif -share/swat/using_samba/figs/sam2_af01.gif -share/swat/using_samba/figs/sam2_af02.gif -share/swat/using_samba/figs/sam2_af03.gif -share/swat/using_samba/figs/sam2_af04.gif -share/swat/using_samba/figs/sam2_af05.gif -share/swat/using_samba/figs/sam2_af06.gif -share/swat/using_samba/figs/sam2_af07.gif -share/swat/using_samba/inx.html -share/swat/using_samba/samba2_s.gif -share/swat/using_samba/samba2_xs.gif -share/swat/using_samba/toc.html -@dirrm share/swat/using_samba/figs -@dirrm share/swat/using_samba -@dirrm share/swat/js -@dirrm share/swat/include -@dirrm share/swat/images -@dirrm share/swat/help/manpages -@dirrm share/swat/help/Samba3-HOWTO/images -@dirrm share/swat/help/Samba3-HOWTO -@dirrm share/swat/help/Samba3-Developers-Guide -@dirrm share/swat/help/Samba3-ByExample/images -@dirrm share/swat/help/Samba3-ByExample -@dirrm share/swat/help -@dirrm share/swat Index: pkg-plist.swat =================================================================== RCS file: pkg-plist.swat diff -N pkg-plist.swat --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-plist.swat 23 Aug 2006 00:48:03 -0000 @@ -0,0 +1,433 @@ +share/swat/help/Samba3-ByExample/2000users.html +share/swat/help/Samba3-ByExample/Big500users.html +share/swat/help/Samba3-ByExample/DMSMig.html +share/swat/help/Samba3-ByExample/DomApps.html +share/swat/help/Samba3-ByExample/ExNetworks.html +share/swat/help/Samba3-ByExample/HA.html +share/swat/help/Samba3-ByExample/RefSection.html +share/swat/help/Samba3-ByExample/appendix.html +share/swat/help/Samba3-ByExample/ch14.html +share/swat/help/Samba3-ByExample/go01.html +share/swat/help/Samba3-ByExample/gpl.html +share/swat/help/Samba3-ByExample/happy.html +share/swat/help/Samba3-ByExample/images/AccountingNetwork.png +share/swat/help/Samba3-ByExample/images/Charity-Network.png +share/swat/help/Samba3-ByExample/images/HostAnnouncment.png +share/swat/help/Samba3-ByExample/images/NullConnect.png +share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png +share/swat/help/Samba3-ByExample/images/UserConnect.png +share/swat/help/Samba3-ByExample/images/UserMgrNT4.png +share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png +share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png +share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png +share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png +share/swat/help/Samba3-ByExample/images/XP-screen001.png +share/swat/help/Samba3-ByExample/images/acct2net.png +share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png +share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png +share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png +share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png +share/swat/help/Samba3-ByExample/images/ch8-migration.png +share/swat/help/Samba3-ByExample/images/chap4-net.png +share/swat/help/Samba3-ByExample/images/chap5-net.png +share/swat/help/Samba3-ByExample/images/chap6-net.png +share/swat/help/Samba3-ByExample/images/chap7-idresol.png +share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png +share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png +share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png +share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png +share/swat/help/Samba3-ByExample/images/imc-usermanager2.png +share/swat/help/Samba3-ByExample/images/lam-config.png +share/swat/help/Samba3-ByExample/images/lam-group-members.png +share/swat/help/Samba3-ByExample/images/lam-groups.png +share/swat/help/Samba3-ByExample/images/lam-hosts.png +share/swat/help/Samba3-ByExample/images/lam-login.png +share/swat/help/Samba3-ByExample/images/lam-users.png +share/swat/help/Samba3-ByExample/images/openmag.png +share/swat/help/Samba3-ByExample/images/wxpp001.png +share/swat/help/Samba3-ByExample/images/wxpp004.png +share/swat/help/Samba3-ByExample/images/wxpp006.png +share/swat/help/Samba3-ByExample/images/wxpp007.png +share/swat/help/Samba3-ByExample/images/wxpp008.png +share/swat/help/Samba3-ByExample/index.html +share/swat/help/Samba3-ByExample/ix01.html +share/swat/help/Samba3-ByExample/kerberos.html +share/swat/help/Samba3-ByExample/ntmigration.html +share/swat/help/Samba3-ByExample/nw4migration.html +share/swat/help/Samba3-ByExample/pr01.html +share/swat/help/Samba3-ByExample/pr02.html +share/swat/help/Samba3-ByExample/pr03.html +share/swat/help/Samba3-ByExample/preface.html +share/swat/help/Samba3-ByExample/primer.html +share/swat/help/Samba3-ByExample/secure.html +share/swat/help/Samba3-ByExample/simple.html +share/swat/help/Samba3-ByExample/small.html +share/swat/help/Samba3-ByExample/unixclients.html +share/swat/help/Samba3-ByExample/upgrades.html +share/swat/help/Samba3-Developers-Guide/CodingSuggestions.html +share/swat/help/Samba3-Developers-Guide/Packaging.html +share/swat/help/Samba3-Developers-Guide/architecture.html +share/swat/help/Samba3-Developers-Guide/contributing.html +share/swat/help/Samba3-Developers-Guide/debug.html +share/swat/help/Samba3-Developers-Guide/devprinting.html +share/swat/help/Samba3-Developers-Guide/index.html +share/swat/help/Samba3-Developers-Guide/internals.html +share/swat/help/Samba3-Developers-Guide/modules.html +share/swat/help/Samba3-Developers-Guide/ntdomain.html +share/swat/help/Samba3-Developers-Guide/parsing.html +share/swat/help/Samba3-Developers-Guide/pt01.html +share/swat/help/Samba3-Developers-Guide/pt02.html +share/swat/help/Samba3-Developers-Guide/pt03.html +share/swat/help/Samba3-Developers-Guide/pt04.html +share/swat/help/Samba3-Developers-Guide/pt05.html +share/swat/help/Samba3-Developers-Guide/pwencrypt.html +share/swat/help/Samba3-Developers-Guide/rpc-plugin.html +share/swat/help/Samba3-Developers-Guide/tracing.html +share/swat/help/Samba3-Developers-Guide/unix-smb.html +share/swat/help/Samba3-Developers-Guide/vfs.html +share/swat/help/Samba3-Developers-Guide/wins.html +share/swat/help/Samba3-HOWTO/AccessControls.html +share/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html +share/swat/help/Samba3-HOWTO/Appendix.html +share/swat/help/Samba3-HOWTO/Backup.html +share/swat/help/Samba3-HOWTO/CUPS-printing.html +share/swat/help/Samba3-HOWTO/ChangeNotes.html +share/swat/help/Samba3-HOWTO/ClientConfig.html +share/swat/help/Samba3-HOWTO/DNSDHCP.html +share/swat/help/Samba3-HOWTO/FastStart.html +share/swat/help/Samba3-HOWTO/InterdomainTrusts.html +share/swat/help/Samba3-HOWTO/IntroSMB.html +share/swat/help/Samba3-HOWTO/NT4Migration.html +share/swat/help/Samba3-HOWTO/NetCommand.html +share/swat/help/Samba3-HOWTO/NetworkBrowsing.html +share/swat/help/Samba3-HOWTO/Other-Clients.html +share/swat/help/Samba3-HOWTO/PolicyMgmt.html +share/swat/help/Samba3-HOWTO/Portability.html +share/swat/help/Samba3-HOWTO/ProfileMgmt.html +share/swat/help/Samba3-HOWTO/SWAT.html +share/swat/help/Samba3-HOWTO/SambaHA.html +share/swat/help/Samba3-HOWTO/ServerType.html +share/swat/help/Samba3-HOWTO/StandAloneServer.html +share/swat/help/Samba3-HOWTO/TOSHpreface.html +share/swat/help/Samba3-HOWTO/VFS.html +share/swat/help/Samba3-HOWTO/bugreport.html +share/swat/help/Samba3-HOWTO/cfgsmarts.html +share/swat/help/Samba3-HOWTO/ch-ldap-tls.html +share/swat/help/Samba3-HOWTO/ch46.html +share/swat/help/Samba3-HOWTO/classicalprinting.html +share/swat/help/Samba3-HOWTO/compiling.html +share/swat/help/Samba3-HOWTO/diagnosis.html +share/swat/help/Samba3-HOWTO/domain-member.html +share/swat/help/Samba3-HOWTO/go01.html +share/swat/help/Samba3-HOWTO/gpl.html +share/swat/help/Samba3-HOWTO/groupmapping.html +share/swat/help/Samba3-HOWTO/idmapper.html +share/swat/help/Samba3-HOWTO/images/10small.png +share/swat/help/Samba3-HOWTO/images/11small.png +share/swat/help/Samba3-HOWTO/images/12small.png +share/swat/help/Samba3-HOWTO/images/13small.png +share/swat/help/Samba3-HOWTO/images/14small.png +share/swat/help/Samba3-HOWTO/images/1small.png +share/swat/help/Samba3-HOWTO/images/2small.png +share/swat/help/Samba3-HOWTO/images/3small.png +share/swat/help/Samba3-HOWTO/images/4small.png +share/swat/help/Samba3-HOWTO/images/5small.png +share/swat/help/Samba3-HOWTO/images/6small.png +share/swat/help/Samba3-HOWTO/images/7small.png +share/swat/help/Samba3-HOWTO/images/8small.png +share/swat/help/Samba3-HOWTO/images/9small.png +share/swat/help/Samba3-HOWTO/images/WME001.png +share/swat/help/Samba3-HOWTO/images/WME002.png +share/swat/help/Samba3-HOWTO/images/WME003.png +share/swat/help/Samba3-HOWTO/images/WME005.png +share/swat/help/Samba3-HOWTO/images/WME009.png +share/swat/help/Samba3-HOWTO/images/WME010.png +share/swat/help/Samba3-HOWTO/images/WME013.png +share/swat/help/Samba3-HOWTO/images/WME014.png +share/swat/help/Samba3-HOWTO/images/WXPP002.png +share/swat/help/Samba3-HOWTO/images/WXPP003.png +share/swat/help/Samba3-HOWTO/images/WXPP005.png +share/swat/help/Samba3-HOWTO/images/WXPP009.png +share/swat/help/Samba3-HOWTO/images/WXPP014.png +share/swat/help/Samba3-HOWTO/images/a_small.png +share/swat/help/Samba3-HOWTO/images/access1.png +share/swat/help/Samba3-HOWTO/images/browsing1.png +share/swat/help/Samba3-HOWTO/images/cups1.png +share/swat/help/Samba3-HOWTO/images/cups2.png +share/swat/help/Samba3-HOWTO/images/domain.png +share/swat/help/Samba3-HOWTO/images/ethereal1.png +share/swat/help/Samba3-HOWTO/images/ethereal2.png +share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png +share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png +share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png +share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png +share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png +share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png +share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png +share/swat/help/Samba3-HOWTO/images/pdftosocket.png +share/swat/help/Samba3-HOWTO/images/trusts1.png +share/swat/help/Samba3-HOWTO/images/w2kp001.png +share/swat/help/Samba3-HOWTO/images/w2kp002.png +share/swat/help/Samba3-HOWTO/images/w2kp003.png +share/swat/help/Samba3-HOWTO/images/w2kp004.png +share/swat/help/Samba3-HOWTO/images/w2kp005.png +share/swat/help/Samba3-HOWTO/images/wxpp001.png +share/swat/help/Samba3-HOWTO/images/wxpp004.png +share/swat/help/Samba3-HOWTO/images/wxpp006.png +share/swat/help/Samba3-HOWTO/images/wxpp007.png +share/swat/help/Samba3-HOWTO/images/wxpp008.png +share/swat/help/Samba3-HOWTO/index.html +share/swat/help/Samba3-HOWTO/install.html +share/swat/help/Samba3-HOWTO/integrate-ms-networks.html +share/swat/help/Samba3-HOWTO/introduction.html +share/swat/help/Samba3-HOWTO/ix01.html +share/swat/help/Samba3-HOWTO/largefile.html +share/swat/help/Samba3-HOWTO/locking.html +share/swat/help/Samba3-HOWTO/migration.html +share/swat/help/Samba3-HOWTO/msdfs.html +share/swat/help/Samba3-HOWTO/optional.html +share/swat/help/Samba3-HOWTO/pam.html +share/swat/help/Samba3-HOWTO/passdb.html +share/swat/help/Samba3-HOWTO/pr01.html +share/swat/help/Samba3-HOWTO/pr02.html +share/swat/help/Samba3-HOWTO/pr03.html +share/swat/help/Samba3-HOWTO/problems.html +share/swat/help/Samba3-HOWTO/rights.html +share/swat/help/Samba3-HOWTO/samba-bdc.html +share/swat/help/Samba3-HOWTO/samba-pdc.html +share/swat/help/Samba3-HOWTO/securing-samba.html +share/swat/help/Samba3-HOWTO/speed.html +share/swat/help/Samba3-HOWTO/troubleshooting.html +share/swat/help/Samba3-HOWTO/type.html +share/swat/help/Samba3-HOWTO/unicode.html +share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html +share/swat/help/Samba3-HOWTO/winbind.html +share/swat/help/manpages/findsmb.1.html +share/swat/help/manpages/index.html +share/swat/help/manpages/lmhosts.5.html +share/swat/help/manpages/log2pcap.1.html +share/swat/help/manpages/mount.cifs.8.html +share/swat/help/manpages/net.8.html +share/swat/help/manpages/nmbd.8.html +share/swat/help/manpages/nmblookup.1.html +share/swat/help/manpages/ntlm_auth.1.html +share/swat/help/manpages/pam_winbind.7.html +share/swat/help/manpages/pdbedit.8.html +share/swat/help/manpages/profiles.1.html +share/swat/help/manpages/rpcclient.1.html +share/swat/help/manpages/samba.7.html +share/swat/help/manpages/smb.conf.5.html +share/swat/help/manpages/smbcacls.1.html +share/swat/help/manpages/smbclient.1.html +share/swat/help/manpages/smbcontrol.1.html +share/swat/help/manpages/smbcquotas.1.html +share/swat/help/manpages/smbd.8.html +share/swat/help/manpages/smbget.1.html +share/swat/help/manpages/smbgetrc.5.html +share/swat/help/manpages/smbmnt.8.html +share/swat/help/manpages/smbmount.8.html +share/swat/help/manpages/smbpasswd.5.html +share/swat/help/manpages/smbpasswd.8.html +share/swat/help/manpages/smbsh.1.html +share/swat/help/manpages/smbspool.8.html +share/swat/help/manpages/smbstatus.1.html +share/swat/help/manpages/smbtar.1.html +share/swat/help/manpages/smbtree.1.html +share/swat/help/manpages/smbumount.8.html +share/swat/help/manpages/swat.8.html +share/swat/help/manpages/tdbbackup.8.html +share/swat/help/manpages/tdbdump.8.html +share/swat/help/manpages/testparm.1.html +share/swat/help/manpages/umount.cifs.8.html +share/swat/help/manpages/vfstest.1.html +share/swat/help/manpages/wbinfo.1.html +share/swat/help/manpages/winbindd.8.html +share/swat/help/welcome-no-samba-doc.html +share/swat/help/welcome.html +share/swat/images/globals.gif +share/swat/images/home.gif +share/swat/images/passwd.gif +share/swat/images/printers.gif +share/swat/images/samba.gif +share/swat/images/shares.gif +share/swat/images/status.gif +share/swat/images/viewconfig.gif +share/swat/images/wizard.gif +share/swat/include/footer.html +share/swat/include/header.html +share/swat/using_samba/appa.html +share/swat/using_samba/appb.html +share/swat/using_samba/appc.html +share/swat/using_samba/appd.html +share/swat/using_samba/appe.html +share/swat/using_samba/appf.html +share/swat/using_samba/appg.html +share/swat/using_samba/ch00.html +share/swat/using_samba/ch01.html +share/swat/using_samba/ch02.html +share/swat/using_samba/ch03.html +share/swat/using_samba/ch04.html +share/swat/using_samba/ch05.html +share/swat/using_samba/ch06.html +share/swat/using_samba/ch07.html +share/swat/using_samba/ch08.html +share/swat/using_samba/ch09.html +share/swat/using_samba/ch10.html +share/swat/using_samba/ch11.html +share/swat/using_samba/ch12.html +share/swat/using_samba/figs/sam2_0101.gif +share/swat/using_samba/figs/sam2_0102.gif +share/swat/using_samba/figs/sam2_0103.gif +share/swat/using_samba/figs/sam2_0104.gif +share/swat/using_samba/figs/sam2_0105.gif +share/swat/using_samba/figs/sam2_0106.gif +share/swat/using_samba/figs/sam2_0107.gif +share/swat/using_samba/figs/sam2_0108.gif +share/swat/using_samba/figs/sam2_0109.gif +share/swat/using_samba/figs/sam2_0110.gif +share/swat/using_samba/figs/sam2_0111.gif +share/swat/using_samba/figs/sam2_0112.gif +share/swat/using_samba/figs/sam2_0113.gif +share/swat/using_samba/figs/sam2_0114.gif +share/swat/using_samba/figs/sam2_0201.gif +share/swat/using_samba/figs/sam2_0202.gif +share/swat/using_samba/figs/sam2_0203.gif +share/swat/using_samba/figs/sam2_0204.gif +share/swat/using_samba/figs/sam2_0301.gif +share/swat/using_samba/figs/sam2_0302.gif +share/swat/using_samba/figs/sam2_0303.gif +share/swat/using_samba/figs/sam2_0304.gif +share/swat/using_samba/figs/sam2_0305.gif +share/swat/using_samba/figs/sam2_0306.gif +share/swat/using_samba/figs/sam2_0307.gif +share/swat/using_samba/figs/sam2_0308.gif +share/swat/using_samba/figs/sam2_0309.gif +share/swat/using_samba/figs/sam2_0310.gif +share/swat/using_samba/figs/sam2_0311.gif +share/swat/using_samba/figs/sam2_0312.gif +share/swat/using_samba/figs/sam2_0313.gif +share/swat/using_samba/figs/sam2_0314.gif +share/swat/using_samba/figs/sam2_0315.gif +share/swat/using_samba/figs/sam2_0316.gif +share/swat/using_samba/figs/sam2_0317.gif +share/swat/using_samba/figs/sam2_0318.gif +share/swat/using_samba/figs/sam2_0319.gif +share/swat/using_samba/figs/sam2_0320.gif +share/swat/using_samba/figs/sam2_0321.gif +share/swat/using_samba/figs/sam2_0322.gif +share/swat/using_samba/figs/sam2_0323.gif +share/swat/using_samba/figs/sam2_0324.gif +share/swat/using_samba/figs/sam2_0325.gif +share/swat/using_samba/figs/sam2_0326.gif +share/swat/using_samba/figs/sam2_0327.gif +share/swat/using_samba/figs/sam2_0328.gif +share/swat/using_samba/figs/sam2_0329.gif +share/swat/using_samba/figs/sam2_0330.gif +share/swat/using_samba/figs/sam2_0331.gif +share/swat/using_samba/figs/sam2_0332.gif +share/swat/using_samba/figs/sam2_0333.gif +share/swat/using_samba/figs/sam2_0334.gif +share/swat/using_samba/figs/sam2_0335.gif +share/swat/using_samba/figs/sam2_0336.gif +share/swat/using_samba/figs/sam2_0337.gif +share/swat/using_samba/figs/sam2_0338.gif +share/swat/using_samba/figs/sam2_0339.gif +share/swat/using_samba/figs/sam2_0340.gif +share/swat/using_samba/figs/sam2_0341.gif +share/swat/using_samba/figs/sam2_0342.gif +share/swat/using_samba/figs/sam2_0343.gif +share/swat/using_samba/figs/sam2_0344.gif +share/swat/using_samba/figs/sam2_0345.gif +share/swat/using_samba/figs/sam2_0346.gif +share/swat/using_samba/figs/sam2_0347.gif +share/swat/using_samba/figs/sam2_0348.gif +share/swat/using_samba/figs/sam2_0349.gif +share/swat/using_samba/figs/sam2_0350.gif +share/swat/using_samba/figs/sam2_0351.gif +share/swat/using_samba/figs/sam2_0352.gif +share/swat/using_samba/figs/sam2_0353.gif +share/swat/using_samba/figs/sam2_0354.gif +share/swat/using_samba/figs/sam2_0355.gif +share/swat/using_samba/figs/sam2_0356.gif +share/swat/using_samba/figs/sam2_0357.gif +share/swat/using_samba/figs/sam2_0358.gif +share/swat/using_samba/figs/sam2_0359.gif +share/swat/using_samba/figs/sam2_0360.gif +share/swat/using_samba/figs/sam2_0361.gif +share/swat/using_samba/figs/sam2_0401.gif +share/swat/using_samba/figs/sam2_0402.gif +share/swat/using_samba/figs/sam2_0403.gif +share/swat/using_samba/figs/sam2_0404.gif +share/swat/using_samba/figs/sam2_0405.gif +share/swat/using_samba/figs/sam2_0406.gif +share/swat/using_samba/figs/sam2_0407.gif +share/swat/using_samba/figs/sam2_0408.gif +share/swat/using_samba/figs/sam2_0409.gif +share/swat/using_samba/figs/sam2_0410.gif +share/swat/using_samba/figs/sam2_0411.gif +share/swat/using_samba/figs/sam2_0412.gif +share/swat/using_samba/figs/sam2_0413.gif +share/swat/using_samba/figs/sam2_0414.gif +share/swat/using_samba/figs/sam2_0415.gif +share/swat/using_samba/figs/sam2_0416.gif +share/swat/using_samba/figs/sam2_0417.gif +share/swat/using_samba/figs/sam2_0501.gif +share/swat/using_samba/figs/sam2_0502.gif +share/swat/using_samba/figs/sam2_0503.gif +share/swat/using_samba/figs/sam2_0504.gif +share/swat/using_samba/figs/sam2_0505.gif +share/swat/using_samba/figs/sam2_0506.gif +share/swat/using_samba/figs/sam2_0507.gif +share/swat/using_samba/figs/sam2_0508.gif +share/swat/using_samba/figs/sam2_0601.gif +share/swat/using_samba/figs/sam2_0602.gif +share/swat/using_samba/figs/sam2_0603.gif +share/swat/using_samba/figs/sam2_0604.gif +share/swat/using_samba/figs/sam2_0605.gif +share/swat/using_samba/figs/sam2_0701.gif +share/swat/using_samba/figs/sam2_0801.gif +share/swat/using_samba/figs/sam2_0802.gif +share/swat/using_samba/figs/sam2_0803.gif +share/swat/using_samba/figs/sam2_0804.gif +share/swat/using_samba/figs/sam2_0805.gif +share/swat/using_samba/figs/sam2_0806.gif +share/swat/using_samba/figs/sam2_0807.gif +share/swat/using_samba/figs/sam2_0808.gif +share/swat/using_samba/figs/sam2_0809.gif +share/swat/using_samba/figs/sam2_0810.gif +share/swat/using_samba/figs/sam2_0811.gif +share/swat/using_samba/figs/sam2_0901.gif +share/swat/using_samba/figs/sam2_0902.gif +share/swat/using_samba/figs/sam2_0903.gif +share/swat/using_samba/figs/sam2_1001.gif +share/swat/using_samba/figs/sam2_1002.gif +share/swat/using_samba/figs/sam2_1003.gif +share/swat/using_samba/figs/sam2_1004.gif +share/swat/using_samba/figs/sam2_1005.gif +share/swat/using_samba/figs/sam2_1006.gif +share/swat/using_samba/figs/sam2_1101.gif +share/swat/using_samba/figs/sam2_1102.gif +share/swat/using_samba/figs/sam2_af01.gif +share/swat/using_samba/figs/sam2_af02.gif +share/swat/using_samba/figs/sam2_af03.gif +share/swat/using_samba/figs/sam2_af04.gif +share/swat/using_samba/figs/sam2_af05.gif +share/swat/using_samba/figs/sam2_af06.gif +share/swat/using_samba/figs/sam2_af07.gif +share/swat/using_samba/inx.html +share/swat/using_samba/samba2_s.gif +share/swat/using_samba/samba2_xs.gif +share/swat/using_samba/toc.html +@dirrm share/swat/using_samba/figs +@dirrm share/swat/using_samba +@dirrm share/swat/js +@dirrm share/swat/include +@dirrm share/swat/images +@dirrm share/swat/help/manpages +@dirrm share/swat/help/Samba3-HOWTO/images +@dirrm share/swat/help/Samba3-HOWTO +@dirrm share/swat/help/Samba3-Developers-Guide +@dirrm share/swat/help/Samba3-ByExample/images +@dirrm share/swat/help/Samba3-ByExample +@dirrm share/swat/help +@dirrm share/swat Index: files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-configure.in,v retrieving revision 1.17 diff -u -r1.17 patch-configure.in --- files/patch-configure.in 12 Jul 2006 00:16:32 -0000 1.17 +++ files/patch-configure.in 23 Aug 2006 23:31:02 -0000 @@ -1,5 +1,5 @@ ---- configure.in.orig Fri Jun 23 15:16:53 2006 -+++ configure.in Tue Jun 27 01:17:29 2006 +--- configure.in.orig Fri Jul 21 18:22:57 2006 ++++ configure.in Thu Aug 24 01:30:57 2006 @@ -242,7 +242,6 @@ AC_SUBST(SHELL) AC_SUBST(LDSHFLAGS) @@ -54,7 +54,7 @@ if test "${ac_cv_prog_gnu_ld}" = "yes"; then DYNEXP="-Wl,-E" fi -@@ -4868,6 +4879,7 @@ +@@ -4882,6 +4893,7 @@ AC_MSG_RESULT(yes) case "$host_os" in *) @@ -62,7 +62,7 @@ AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"]) AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"]) AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[ -@@ -5268,14 +5280,17 @@ +@@ -5282,14 +5294,17 @@ WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT" WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT" WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS @@ -80,7 +80,7 @@ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ nsswitch/winbind_nss_linux.o" WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" -@@ -5290,6 +5305,7 @@ +@@ -5304,6 +5319,7 @@ *solaris*) # Solaris winbind client is implemented as a wrapper around # the Linux version. @@ -88,7 +88,7 @@ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \ nsswitch/winbind_nss_linux.o" WINBIND_NSS_EXTRA_LIBS="-lsocket" -@@ -5316,6 +5332,7 @@ +@@ -5330,6 +5346,7 @@ AC_SUBST(WINBIND_NSS_LDSHFLAGS) AC_SUBST(WINBIND_NSS_EXTRA_OBJS) AC_SUBST(WINBIND_NSS_EXTRA_LIBS) Index: files/patch-nsswitch_pam_winbind.c =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-nsswitch_pam_winbind.c,v retrieving revision 1.2 diff -u -r1.2 patch-nsswitch_pam_winbind.c --- files/patch-nsswitch_pam_winbind.c 12 Jul 2006 00:16:32 -0000 1.2 +++ files/patch-nsswitch_pam_winbind.c 23 Aug 2006 23:31:01 -0000 @@ -1,6 +1,6 @@ ---- nsswitch/pam_winbind.c.orig Sun May 28 02:21:10 2006 -+++ nsswitch/pam_winbind.c Sun May 28 02:22:16 2006 -@@ -997,7 +997,7 @@ +--- nsswitch/pam_winbind.c.orig Mon Aug 7 18:46:33 2006 ++++ nsswitch/pam_winbind.c Thu Aug 24 01:30:57 2006 +@@ -1016,7 +1016,7 @@ } return PAM_USER_UNKNOWN; case 0: @@ -9,7 +9,7 @@ if (tmp != NULL) { retval = atoi(tmp); switch (retval) { -@@ -1300,7 +1300,7 @@ +@@ -1319,7 +1319,7 @@ * By reaching here we have approved the passwords and must now * rebuild the password database file. */ Index: files/patch-pam_smbpass =================================================================== RCS file: files/patch-pam_smbpass diff -N files/patch-pam_smbpass --- files/patch-pam_smbpass 12 Jul 2006 00:16:32 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ ---- pam_smbpass/pam_smb_auth.c.orig Thu Apr 20 04:29:22 2006 -+++ pam_smbpass/pam_smb_auth.c Sat May 27 01:57:31 2006 -@@ -164,7 +164,7 @@ - - retval = PAM_SUCCESS; - -- pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval); -+ pam_get_data(pamh, "smb_setcred_return", (void **) &pretval); - if(pretval) { - retval = *pretval; - SAFE_FREE(pretval); ---- pam_smbpass/pam_smb_passwd.c.orig Thu Apr 20 04:29:22 2006 -+++ pam_smbpass/pam_smb_passwd.c Sat May 27 01:57:31 2006 -@@ -226,7 +226,7 @@ - (const void **)&pass_old ); - } else { - retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK, -- (const void **)&pass_old ); -+ (void **)&pass_old ); - if (retval == PAM_NO_MODULE_DATA) { - pass_old = NULL; - retval = PAM_SUCCESS; ---- pam_smbpass/support.c.orig Sun May 28 02:23:20 2006 -+++ pam_smbpass/support.c Sun May 28 02:24:07 2006 -@@ -384,7 +384,7 @@ - if (newauth != NULL) { - - /* any previous failures for this user ? */ -- pam_get_data(pamh, data_name, (const void **) &old); -+ pam_get_data(pamh, data_name, (void **) &old); - - if (old != NULL) { - newauth->count = old->count + 1; -@@ -594,7 +594,7 @@ - - retval = pam_set_data( pamh, data_name, (void *) token, _cleanup ); - if (retval != PAM_SUCCESS -- || (retval = pam_get_data( pamh, data_name, (const void **)&item )) -+ || (retval = pam_get_data( pamh, data_name, (void **)&item )) - != PAM_SUCCESS) - { - _log_err( LOG_CRIT, "error manipulating password data [%s]" Index: files/patch-pam_smbpass_pam_smb_auth.c =================================================================== RCS file: files/patch-pam_smbpass_pam_smb_auth.c diff -N files/patch-pam_smbpass_pam_smb_auth.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-pam_smbpass_pam_smb_auth.c 23 Aug 2006 23:37:57 -0000 @@ -0,0 +1,11 @@ +--- pam_smbpass/pam_smb_auth.c.orig Fri Jun 23 15:16:50 2006 ++++ pam_smbpass/pam_smb_auth.c Thu Aug 24 01:30:57 2006 +@@ -167,7 +167,7 @@ + + retval = PAM_SUCCESS; + +- pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval); ++ pam_get_data(pamh, "smb_setcred_return", (void **) &pretval); + if(pretval) { + retval = *pretval; + SAFE_FREE(pretval); Index: files/patch-pam_smbpass_pam_smb_passwd.c =================================================================== RCS file: files/patch-pam_smbpass_pam_smb_passwd.c diff -N files/patch-pam_smbpass_pam_smb_passwd.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-pam_smbpass_pam_smb_passwd.c 23 Aug 2006 23:37:57 -0000 @@ -0,0 +1,11 @@ +--- pam_smbpass/pam_smb_passwd.c.orig Thu Apr 20 04:29:22 2006 ++++ pam_smbpass/pam_smb_passwd.c Thu Aug 24 01:30:57 2006 +@@ -226,7 +226,7 @@ + (const void **)&pass_old ); + } else { + retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK, +- (const void **)&pass_old ); ++ (void **)&pass_old ); + if (retval == PAM_NO_MODULE_DATA) { + pass_old = NULL; + retval = PAM_SUCCESS; Index: files/patch-pam_smbpass_support.c =================================================================== RCS file: files/patch-pam_smbpass_support.c diff -N files/patch-pam_smbpass_support.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-pam_smbpass_support.c 23 Aug 2006 23:37:57 -0000 @@ -0,0 +1,20 @@ +--- pam_smbpass/support.c.orig Tue May 23 20:54:32 2006 ++++ pam_smbpass/support.c Thu Aug 24 01:30:57 2006 +@@ -384,7 +384,7 @@ + if (newauth != NULL) { + + /* any previous failures for this user ? */ +- pam_get_data(pamh, data_name, (const void **) &old); ++ pam_get_data(pamh, data_name, (void **) &old); + + if (old != NULL) { + newauth->count = old->count + 1; +@@ -594,7 +594,7 @@ + + retval = pam_set_data( pamh, data_name, (void *) token, _cleanup ); + if (retval != PAM_SUCCESS +- || (retval = pam_get_data( pamh, data_name, (const void **)&item )) ++ || (retval = pam_get_data( pamh, data_name, (void **)&item )) + != PAM_SUCCESS) + { + _log_err( LOG_CRIT, "error manipulating password data [%s]" Index: files/patch-utils_net_time.c =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-utils_net_time.c,v retrieving revision 1.1 diff -u -r1.1 patch-utils_net_time.c --- files/patch-utils_net_time.c 20 Mar 2005 09:29:05 -0000 1.1 +++ files/patch-utils_net_time.c 23 Aug 2006 23:31:02 -0000 @@ -1,8 +1,8 @@ ---- utils/net_time.c.orig Fri Feb 25 18:59:42 2005 -+++ utils/net_time.c Sun Mar 20 01:41:20 2005 -@@ -76,9 +76,16 @@ - - tm = localtime(&t); +--- utils/net_time.c.orig Fri Jun 23 15:16:53 2006 ++++ utils/net_time.c Thu Aug 24 01:30:57 2006 +@@ -79,9 +79,16 @@ + return "unknown"; + } +#if defined(FREEBSD) + fstr_sprintf(s, "%02d%02d%02d%02d%02d.%02d", Index: files/pkg-deinstall.in =================================================================== RCS file: files/pkg-deinstall.in diff -N files/pkg-deinstall.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-deinstall.in 2 Sep 2006 21:14:52 -0000 @@ -0,0 +1,34 @@ +#! /bin/sh + +PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin + +SAMBA_SPOOL="%%SAMBA_SPOOL%%" +SAMBA_LOGDIR="%%SAMBA_LOGDIR%%" +SAMBA_LOCKDIR="%%SAMBA_LOCKDIR%%" +SAMBA_PRIVATEDIR="%%SAMBA_PRIVATEDIR%%" +SAMBA_OWNER=root +SAMBA_GROUP=wheel + +post-deinstall() { + rm -rf ${SAMBA_SPOOL} + rmdir ${SAMBA_LOGDIR} 2>/dev/null || true + for f in connections.tdb locking.tdb messages.tdb sessionid.tdb \ + unexpected.tdb brlock.tdb namelist.debug + do + rm -f "${SAMBA_LOCKDIR}/${f}" + done + rmdir ${SAMBA_LOCKDIR} 2>/dev/null || true + rmdir ${SAMBA_PRIVATEDIR} 2>/dev/null || true + echo "WARNING: If you will *NOT* use this package anymore, please remove the" + echo " following directories manually:" + echo " ${SAMBA_PRIVATEDIR}" + echo " ${SAMBA_LOGDIR}" + echo " ${SAMBA_LOCKDIR}" + echo +} + +case $2 in + POST-DEINSTALL) + post-deinstall + ;; +esac Index: files/pkg-install.in =================================================================== RCS file: files/pkg-install.in diff -N files/pkg-install.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-install.in 2 Sep 2006 16:49:05 -0000 @@ -0,0 +1,29 @@ +#! /bin/sh + +PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin + +SAMBA_SPOOL="%%SAMBA_SPOOL%%" +SAMBA_LOGDIR="%%SAMBA_LOGDIR%%" +SAMBA_LOCKDIR="%%SAMBA_LOCKDIR%%" +SAMBA_PRIVATEDIR="%%SAMBA_PRIVATEDIR%%" +SAMBA_OWNER=root +SAMBA_GROUP=wheel + +post-install() { + mkdir -p ${SAMBA_SPOOL} && chmod 1777 ${SAMBA_SPOOL} + mkdir -p ${SAMBA_LOGDIR} && chmod 0755 ${SAMBA_LOGDIR} + mkdir -p ${SAMBA_LOCKDIR} && chmod 0755 ${SAMBA_LOCKDIR} + mkdir -p ${SAMBA_PRIVATEDIR} && chmod 0700 ${SAMBA_PRIVATEDIR} + if [ $(id -u) -eq 0 ]; then + chown ${SAMBA_OWNER}:${SAMBA_GROUP} ${SAMBA_SPOOL} + chown ${SAMBA_OWNER}:${SAMBA_GROUP} ${SAMBA_LOGDIR} + chown ${SAMBA_OWNER}:${SAMBA_GROUP} ${SAMBA_LOCKDIR} + chown ${SAMBA_OWNER}:${SAMBA_GROUP} ${SAMBA_PRIVATEDIR} + fi +} + +case $2 in + POST-INSTALL) + post-install + ;; +esac Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 2 Sep 2006 14:38:34 -0000 @@ -0,0 +1,11 @@ +=============================================================================== +NOTICE: This version of port has changed location of Samba password +NOTICE: (smbpasswd) directory. Files in '%%SAMBA_PRIVATE%%' +NOTICE: have moved to '%%SAMBA_PRIVATEDIR%%'. +=============================================================================== +Samba3 *package* now doesn't include ADS support due the portability problems +with Kerberos5 libraries on different installations. You need to compile port +yourself to get this functionality. + +For additional hints and directions, please, look into the README.FreeBSD file. +=============================================================================== Index: files/samba.in =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/samba.in,v retrieving revision 1.1 diff -u -r1.1 samba.in --- files/samba.in 12 Jul 2006 00:16:32 -0000 1.1 +++ files/samba.in 2 Sep 2006 21:51:21 -0000 @@ -5,7 +5,8 @@ # PROVIDE: nmbd smbd %%WINBIND%%# PROVIDE: winbindd -# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv %%CUPSD%% +# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv +%%CUPSD%%# REQUIRE: cupsd # BEFORE: LOGIN # KEYWORD: shutdown @@ -26,10 +27,13 @@ name=samba rcvar=`set_rcvar` +samba_enable=${samba_enable="NO"} +testparm_command="%%PREFIX%%/bin/testparm" +samba_parm="${testparm_command} -s -v --parameter-name" load_rc_config $name # Set defaults -samba_config=${samba_config="%%SAMBA_CONFIG%%"} +samba_config=${samba_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"} # Config file is required if [ ! -r ${samba_config} ]; then warn "${samba_config} is not readable." @@ -39,33 +43,38 @@ esac fi -if test -n ${samba_enable=""} && checkyesno samba_enable; then +samba_idmap=`${samba_parm} 'idmap uid' ${samba_config} 2>/dev/null` +samba_lockdir=`${samba_parm} 'lock directory' ${samba_config} 2>/dev/null` + +if test -n ${samba_enable="NO"} && checkyesno samba_enable; then nmbd_enable=${nmbd_enable="YES"} smbd_enable=${smbd_enable="YES"} %%WINBIND%% # Check that winbind is actually configured -%%WINBIND%% if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then +%%WINBIND%% if [ -n ${samba_idmap} ]; then %%WINBIND%% winbindd_enable="YES" %%WINBIND%% fi fi nmbd_precmd() { # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping - if [ -d "%%SAMBA_LOCKDIR%%" ]; then - echo "Starting SAMBA: removing stale tdbs :" + echo -n "Starting Samba " + if [ -d ${samba_lockdir} ]; then + echo -n "- removing stale tdbs: " for file in connections.tdb messages.tdb sessionid.tdb \ unexpected.tdb brlock.tdb locking.tdb namelist.debug do - rm -vf "%%SAMBA_LOCKDIR%%/$file" + rm -vf "${samba_lockdir}/${file}" done fi + echo '.' } # nmbd name=nmbd rcvar=`set_rcvar` command="%%PREFIX%%/sbin/${name}" -required_dirs="%%SAMBA_LOCKDIR%%" -pidfile=%%SAMBA_RUNDIR%%/${name}.pid +required_dirs="${samba_lockdir}" +pidfile="%%SAMBA_RUNDIR%%/${name}.pid" start_precmd="nmbd_precmd" # Defaults nmbd_enable=${nmbd_enable="NO"} @@ -80,7 +89,8 @@ name=smbd rcvar=`set_rcvar` command="%%PREFIX%%/sbin/${name}" -pidfile=%%SAMBA_RUNDIR%%/${name}.pid +required_dirs="${samba_lockdir}" +pidfile="%%SAMBA_RUNDIR%%/${name}.pid" start_precmd=":" # Defaults smbd_enable=${smbd_enable="NO"} @@ -95,8 +105,8 @@ %%WINBIND%%name=winbindd %%WINBIND%%rcvar=`set_rcvar` %%WINBIND%%command="%%PREFIX%%/sbin/${name}" -%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%" -%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid +%%WINBIND%%required_dirs="${samba_lockdir}" +%%WINBIND%%pidfile="%%SAMBA_RUNDIR%%/${name}.pid" %%WINBIND%%start_precmd=":" %%WINBIND%%# Defaults %%WINBIND%%winbindd_enable=${winbindd_enable="NO"} Index: files/smb.conf.sample.in =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/smb.conf.sample.in,v retrieving revision 1.1 diff -u -r1.1 smb.conf.sample.in --- files/smb.conf.sample.in 12 Jul 2006 00:16:32 -0000 1.1 +++ files/smb.conf.sample.in 27 Aug 2006 01:25:38 -0000 @@ -95,8 +95,7 @@ # 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 +; socket options = SO_RCVBUF=8192 SO_SNDBUF=8192 # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them @@ -290,5 +289,3 @@ ; writable = yes ; printable = no ; create mask = 0765 - - --- samba-3.0.23c,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: