Attachment #75311 for bug #108803

View | Details | Raw Unified | Return to bug 108803
Collapse All | Expand All




#

PORTNAME=		samba
PORTVERSION?=		3.0.24
PORTREVISION?=		0
PORTEPOCH?=		1
CATEGORIES?=		net

SAMBA_LIBDIR=		${PREFIX}/${SAMBA_LIB}
SAMBA_MODULEDIR=	${SAMBA_LIBDIR}/samba

CONFIGURE_TARGET=	--build="${MACHINE_ARCH}-portbld-freebsd${OSREL}"

CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
			--localstatedir="${VARDIR}" \
		        --with-configdir="${SAMBA_CONFDIR}" \
			--with-pammodulesdir="${SAMBA_LIBDIR}" \
	    		--with-libdir="${SAMBA_MODULEDIR}" \
			--with-swatdir="${SAMBA_SWATDIR}" \
			--with-piddir="${SAMBA_RUNDIR}" \
			--with-lockdir="${SAMBA_LOCKDIR}" \
			--with-privatedir="${SAMBA_PRIVATEDIR}" \
			--with-logfilebase="${SAMBA_LOGDIR}"

CONFIGURE_ARGS+=	--with-libiconv="${LOCALBASE}"

.if !defined(SAMBA_SUBPORT)
# Samba server itself


.if defined(WITH_MAX_DEBUG)
LIB_DEPENDS+=		dmalloc.1:${PORTSDIR}/devel/dmalloc
CPPFLAGS+=		"-I${LOCALBASE}/include"
LDFLAGS+=		"-L${LOCALBASE}/lib"
CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=	--enable-debug --enable-developer --enable-krb5developer --enable-dmalloc --with-profiling-data
.else

.		endif
.	endif
WANT_EXP_MODULES!=	${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -E 's/ +/,/g'
CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES}"
.endif

.if defined(WITH_PAM_SMBPASS)

# Kerberos5 is necessary for ADS
.if defined(SAMBA_WANT_KRB5)
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
CONFIGURE_ARGS+=	--with-krb5="${KRB5_HOME}"
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
CONFIGURE_ARGS+=	--with-krb5="${HEIMDAL_HOME}"
.elif exists(${DESTDIR}/usr/lib/libkrb5.so) && exists(${DESTDIR}/usr/bin/krb5-config)
CONFIGURE_ARGS+=	--with-krb5="${DESTDIR}/usr"
.else
LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=	--with-krb5="${LOCALBASE}"
.endif
.else
CONFIGURE_ARGS+=	--without-krb5

MAN8+=		winbindd.8
.endif

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."; \

	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r

pre-install:
	-@${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}


.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
# Put examples in place
	@${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
	${CP} -p "${WRKDIR}/${SAMBA_CONFIG}.sample" "${EXAMPLESDIR}"
	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${PREFIX}/bin/make_smbpasswd"
# Winbind
.if !defined(WITHOUT_WINBIND)
.	if defined(WITH_WINBIND_NSS)
	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
	    @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
	    @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
.	endif
	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
.endif
.if defined(WITH_PAM_SMBPASS)
	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_smbpass.so" "${SAMBA_LIBDIR}"
	@${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
.endif
# smbwrapper.so
.if defined(WITH_SMBSH)
	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbsh" "${PREFIX}/bin"
	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbwrapper.so" "${SAMBA_MODULEDIR}"
.endif
# Lib
	@${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
# 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
	@${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
# !NOPORTDOCS
.endif

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (samba-3.0.23d.tar.gz) = afe6923d05fed5b5ccab593c7a407cd1	1	MD5 (samba-3.0.24.tar.gz) = 89273f67a6d8067cbbecefaa13747153
2	SHA256 (samba-3.0.23d.tar.gz) = 0af21d6cfeb8186987cc5b59e41034f663124859ce30b5b98f3abed501f2cd46	2	SHA256 (samba-3.0.24.tar.gz) = c4e8de3426fbbcee7f338f5cf09052cbdf9a36ae638aeeeca10498ef8d5343e2
3	SIZE (samba-3.0.23d.tar.gz) = 17704221	3	SIZE (samba-3.0.24.tar.gz) = 17708128




reload_cmd="samba_reload_cmd"
rcvar_cmd="samba_rcvar_cmd"
# Defaults
samba_enable="${samba_enable:=NO}"
samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
samba_config="${samba_config=${samba_config_default}}"
command_args="${samba_config:+-s "${samba_config}"}"			#"
samba_daemons="nmbd smbd"
%%WINBIND%%samba_daemons="${samba_daemons} winbindd"
testparm_command="%%PREFIX%%/bin/testparm"
smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
# Fetch parameters from configuration file
samba_parm="${testparm_command} -s -v --parameter-name"
%%WINBIND%%samba_idmap=$(${samba_parm} 'idmap uid' ${samba_config:+"${samba_config}"} 2>/dev/null)
samba_lockdir=$(${samba_parm} 'lock directory' ${samba_config:+"${samba_config}"} 2>/dev/null)
# Setup dependent variables
if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
    nmbd_enable="${nmbd_enable=YES}"
    smbd_enable="${smbd_enable=YES}"
%%WINBIND%%    # Check that winbindd is actually configured
%%WINBIND%%    if [ -n "${samba_idmap}" ]; then
%%WINBIND%%	winbindd_enable="${winbindd_enable=YES}"
%%WINBIND%%    fi
fi
# Hack to work around name change of pid file with non-default config
pid_extra=
if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
    pid_extra="-$(basename "${samba_config}")"
fi
# Hack to enable check of dependent variables
eval real_${rcvar}="\${${rcvar}:=NO}"	${rcvar}="YES"
# Defaults for dependent variables
nmbd_enable="${nmbd_enable:=NO}"
nmbd_flags="${nmbd_flags=\"-D\"}"
smbd_enable="${smbd_enable:=NO}"
smbd_flags="${smbd_flags=\"-D\"}"
%%WINBIND%%winbindd_enable="${winbindd_enable:=NO}"
%%WINBIND%%winbindd_flags="${winbindd_flags=''}"
# Requirements
required_files="${samba_config}"
required_dirs="${samba_lockdir}"
command_args="${samba_config:+"-s ${samba_config}"}"
#"
samba_checkconfig() {
    echo -n "Performing sanity check on Samba configuration: "
    if "${testparm_command}" -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then
	echo "OK"
    else
	echo "FAILED"


samba_start_precmd() {
    # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
    if [ -n "${samba_lockdir}" -a -d "${samba_lockdir}" ]; then
	echo -n "Removing stale Samba tdb files: "
	for file in brlock.tdb browse.dat connections.tdb gencache.tdb \
		    locking.tdb messages.tdb namelist.debug sessionid.tdb \


samba_rcvar_cmd() {
    # Prevent recursive calling
    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
    # Check master variable
    echo "# ${name}"
    if [ -n "${rcvar}" ]; then

}

samba_reload_cmd() {
    local name rcvar command pidfile
    # Prevent recursive calling
    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
    # Apply to all the daemons
    for name in ${samba_daemons}; do
    	rcvar=$(set_rcvar)
	command="%%PREFIX%%/sbin/${name}"
	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
	# Daemon should be enabled and running
	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
	    if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then
		debug "reloading ${name} configuration"
		echo "Reloading ${name}."
		# XXX: Hack with pid_extra
		"${smbcontrol_command}" "${name}${pid_extra}" 'reload-config' ${command_args}
	    fi
	fi
    done
}

samba_cmd() {
    local name rcvar command pidfile samba_daemons
    # Prevent recursive calling
    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
    # Stop processes in the reverse to order
    if [ "${rc_arg}" = "stop" ] ; then
	samba_daemons=$(reverse_list ${samba_daemons})

    for name in ${samba_daemons}; do
	rcvar=$(set_rcvar)
	command="%%PREFIX%%/sbin/${name}"
	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
	
	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
    done

Return to bug 108803

Lines 6-12 Link Here

(-)Makefile (-58 / +58 lines)
6	#	6	#
7		7
8	PORTNAME= samba	8	PORTNAME= samba
9	PORTVERSION?= 3.0.23d	9	PORTVERSION?= 3.0.24
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	PORTEPOCH?= 1	11	PORTEPOCH?= 1
12	CATEGORIES?= net	12	CATEGORIES?= net
Lines 42-61 Link Here
42	SAMBA_LIBDIR= ${PREFIX}/${SAMBA_LIB}	42	SAMBA_LIBDIR= ${PREFIX}/${SAMBA_LIB}
43	SAMBA_MODULEDIR= ${SAMBA_LIBDIR}/samba	43	SAMBA_MODULEDIR= ${SAMBA_LIBDIR}/samba
44		44
45	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	45	CONFIGURE_TARGET= --build="${MACHINE_ARCH}-portbld-freebsd${OSREL}"
46		46
47	CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \	47	CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \
48	--localstatedir=${VARDIR} \	48	--localstatedir="${VARDIR}" \
49	--with-configdir=${SAMBA_CONFDIR} \	49	--with-configdir="${SAMBA_CONFDIR}" \
50	--with-pammodulesdir=${SAMBA_LIBDIR} \	50	--with-pammodulesdir="${SAMBA_LIBDIR}" \
51	--with-libdir=${SAMBA_MODULEDIR} \	51	--with-libdir="${SAMBA_MODULEDIR}" \
52	--with-swatdir=${SAMBA_SWATDIR} \	52	--with-swatdir="${SAMBA_SWATDIR}" \
53	--with-piddir=${SAMBA_RUNDIR} \	53	--with-piddir="${SAMBA_RUNDIR}" \
54	--with-lockdir=${SAMBA_LOCKDIR} \	54	--with-lockdir="${SAMBA_LOCKDIR}" \
55	--with-privatedir=${SAMBA_PRIVATEDIR} \	55	--with-privatedir="${SAMBA_PRIVATEDIR}" \
56	--with-logfilebase=${SAMBA_LOGDIR}	56	--with-logfilebase="${SAMBA_LOGDIR}"
57		57
58	CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}	58	CONFIGURE_ARGS+= --with-libiconv="${LOCALBASE}"
59		59
60	.if !defined(SAMBA_SUBPORT)	60	.if !defined(SAMBA_SUBPORT)
61	# Samba server itself	61	# Samba server itself
Lines 115-122 Link Here
115		115
116	.if defined(WITH_MAX_DEBUG)	116	.if defined(WITH_MAX_DEBUG)
117	LIB_DEPENDS+= dmalloc.1:${PORTSDIR}/devel/dmalloc	117	LIB_DEPENDS+= dmalloc.1:${PORTSDIR}/devel/dmalloc
118	CPPFLAGS+= -I${LOCALBASE}/include	118	CPPFLAGS+= "-I${LOCALBASE}/include"
119	LDFLAGS+= -L${LOCALBASE}/lib	119	LDFLAGS+= "-L${LOCALBASE}/lib"
120	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	120	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
121	CONFIGURE_ARGS+= --enable-debug --enable-developer --enable-krb5developer --enable-dmalloc --with-profiling-data	121	CONFIGURE_ARGS+= --enable-debug --enable-developer --enable-krb5developer --enable-dmalloc --with-profiling-data
122	.else	122	.else
Lines 178-184 Link Here
178	. endif	178	. endif
179	. endif	179	. endif
180	WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} \| ${SED} -E 's/ +/,/g'	180	WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} \| ${SED} -E 's/ +/,/g'
181	CONFIGURE_ARGS+= --with-shared-modules=${WANT_EXP_MODULES}	181	CONFIGURE_ARGS+= --with-shared-modules="${WANT_EXP_MODULES}"
182	.endif	182	.endif
183		183
184	.if defined(WITH_PAM_SMBPASS)	184	.if defined(WITH_PAM_SMBPASS)
Lines 252-265 Link Here
252	# Kerberos5 is necessary for ADS	252	# Kerberos5 is necessary for ADS
253	.if defined(SAMBA_WANT_KRB5)	253	.if defined(SAMBA_WANT_KRB5)
254	.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)	254	.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
255	CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}	255	CONFIGURE_ARGS+= --with-krb5="${KRB5_HOME}"
256	.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)	256	.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
257	CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}	257	CONFIGURE_ARGS+= --with-krb5="${HEIMDAL_HOME}"
258	.elif exists(${DESTDIR}/usr/lib/libkrb5.so) && exists(${DESTDIR}/usr/bin/krb5-config)	258	.elif exists(${DESTDIR}/usr/lib/libkrb5.so) && exists(${DESTDIR}/usr/bin/krb5-config)
259	CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr	259	CONFIGURE_ARGS+= --with-krb5="${DESTDIR}/usr"
260	.else	260	.else
261	LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal	261	LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
262	CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}	262	CONFIGURE_ARGS+= --with-krb5="${LOCALBASE}"
263	.endif	263	.endif
264	.else	264	.else
265	CONFIGURE_ARGS+= --without-krb5	265	CONFIGURE_ARGS+= --without-krb5
Lines 290-319 Link Here
290	MAN8+= winbindd.8	290	MAN8+= winbindd.8
291	.endif	291	.endif
292		292
293	PLIST_SUB+= SAMBA_LOGDIR=${SAMBA_LOGDIR} \	293	PLIST_SUB+= SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
294	SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \	294	SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
295	SAMBA_CONFDIR=${SAMBA_CONFDIR} \	295	SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
296	SAMBA_CONFIG=${SAMBA_CONFIG} \	296	SAMBA_CONFIG="${SAMBA_CONFIG}" \
297	SAMBA_RUNDIR=${SAMBA_RUNDIR} \	297	SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
298	SAMBA_SWATDIR=${SAMBA_SWATDIR} \	298	SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
299	SAMBA_SPOOL=${SAMBA_SPOOL} \	299	SAMBA_SPOOL="${SAMBA_SPOOL}" \
300	SAMBA_PRIVATEDIR=${SAMBA_PRIVATEDIR}	300	SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}"
301		301
302	SUB_LIST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} \	302	SUB_LIST+= SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
303	SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \	303	SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
304	SAMBA_CONFDIR=${SAMBA_CONFDIR} \	304	SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
305	SAMBA_CONFIG=${SAMBA_CONFIG} \	305	SAMBA_CONFIG="${SAMBA_CONFIG}" \
306	SAMBA_RUNDIR=${SAMBA_RUNDIR} \	306	SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
307	SAMBA_SWATDIR=${SAMBA_SWATDIR} \	307	SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
308	SAMBA_SPOOL=${SAMBA_SPOOL} \	308	SAMBA_SPOOL="${SAMBA_SPOOL}" \
309	SAMBA_PRIVATEDIR=${SAMBA_PRIVATEDIR} \	309	SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
310	SAMBA_PRIVATE=${SAMBA_PRIVATE}	310	SAMBA_PRIVATE="${SAMBA_PRIVATE}"
311		311
312	pre-everything::	312	pre-everything::
313	@${ECHO_CMD} "===> NOTICE: This version of port has changed location of Samba password"	313	@${ECHO_CMD} "===> NOTICE: This version of port has changed location of Samba password"
314	@${ECHO_CMD} "===> NOTICE: (smbpasswd) directory. Files in '${SAMBA_PRIVATE}'"	314	@${ECHO_CMD} "===> NOTICE: (smbpasswd) directory. Files in '${SAMBA_PRIVATE}'"
315	@${ECHO_CMD} "===> NOTICE: have moved to '${SAMBA_PRIVATEDIR}'."	315	@${ECHO_CMD} "===> NOTICE: have moved to '${SAMBA_PRIVATEDIR}'."
316	@if [ -d ${SAMBA_PRIVATE} -a -n "`${LS} ${SAMBA_PRIVATE}/*.tdb 2>/dev/null`" ]; then \	316	@if [ -d "${SAMBA_PRIVATE}" -a -n "`${LS} ${SAMBA_PRIVATE}/*.tdb 2>/dev/null`" ]; then \
317	${ECHO_CMD} ""; \	317	${ECHO_CMD} ""; \
318	${ECHO_CMD} "===> The directory '${SAMBA_PRIVATE}' is not empty. You possibly need"; \	318	${ECHO_CMD} "===> The directory '${SAMBA_PRIVATE}' is not empty. You possibly need"; \
319	${ECHO_CMD} "===> to move its files to '${SAMBA_PRIVATEDIR}' and remove directory."; \	319	${ECHO_CMD} "===> to move its files to '${SAMBA_PRIVATEDIR}' and remove directory."; \
Lines 336-342 Link Here
336	@${FIND} ${WRKDIR}/${DISTNAME} -type f \| ${XARGS} ${CHMOD} u+w,a+r	336	@${FIND} ${WRKDIR}/${DISTNAME} -type f \| ${XARGS} ${CHMOD} u+w,a+r
337		337
338	pre-install:	338	pre-install:
339	-@${FIND} ${SAMBA_MODULEDIR} -type f 2>/dev/null \| ${SORT} \| ${SED} -E 's\|^${PREFIX}/?\|\|;' >> ${WRKDIR}/.PLIST.exclude	339	-@${FIND} "${SAMBA_MODULEDIR}" -type f 2>/dev/null \| ${SORT} \| ${SED} -E 's\|^${PREFIX}/?\|\|;' >> ${WRKDIR}/.PLIST.exclude
340	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}	340	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
341	@${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST}	341	@${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST}
342		342
Lines 344-397 Link Here
344	.for sect in 1 5 7 8	344	.for sect in 1 5 7 8
345	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}	345	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
346	. for man in ${MAN${sect}}	346	. for man in ${MAN${sect}}
347	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}	347	@${INSTALL_MAN} "${WRKDIR}/${DISTNAME}/docs/manpages/${man}" "${MAN${sect}PREFIX}/man/man${sect}"
348	. endfor	348	. endfor
349	.endfor	349	.endfor
350	# Put examples in place	350	# Put examples in place
351	@${MKDIR} ${EXAMPLESDIR}	351	@${MKDIR} ${EXAMPLESDIR}
352	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}	352	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* "${EXAMPLESDIR}"
353	.if defined(WITH_PAM_SMBPASS)	353	.if defined(WITH_PAM_SMBPASS)
354	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass	354	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
355	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass	355	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* "${EXAMPLESDIR}/pam_smbpass"
356	.endif	356	.endif
357	${CP} -p ${WRKDIR}/${SAMBA_CONFIG}.sample ${EXAMPLESDIR}	357	${CP} -p "${WRKDIR}/${SAMBA_CONFIG}.sample" "${EXAMPLESDIR}"
358	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd	358	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${PREFIX}/bin/make_smbpasswd"
359	# Winbind	359	# Winbind
360	.if !defined(WITHOUT_WINBIND)	360	.if !defined(WITHOUT_WINBIND)
361	. if defined(WITH_WINBIND_NSS)	361	. if defined(WITH_WINBIND_NSS)
362	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1	362	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
363	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1	363	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
364	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};	364	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
365	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};	365	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
366	. endif	366	. endif
367	${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_winbind.so ${SAMBA_LIBDIR}	367	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
368	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};	368	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
369	.endif	369	.endif
370	.if defined(WITH_PAM_SMBPASS)	370	.if defined(WITH_PAM_SMBPASS)
371	${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}	371	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_smbpass.so" "${SAMBA_LIBDIR}"
372	@${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};	372	@${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
373	.endif	373	.endif
374	# smbwrapper.so	374	# smbwrapper.so
375	.if defined(WITH_SMBSH)	375	.if defined(WITH_SMBSH)
376	${INSTALL_PROGRAM} ${WRKSRC}/bin/smbsh ${PREFIX}/bin	376	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbsh" "${PREFIX}/bin"
377	${INSTALL_PROGRAM} ${WRKSRC}/bin/smbwrapper.so ${SAMBA_MODULEDIR}	377	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbwrapper.so" "${SAMBA_MODULEDIR}"
378	.endif	378	.endif
379	# Lib	379	# Lib
380	@${FIND} ${SAMBA_MODULEDIR} -type f \| ${SED} -E 's\|^${PREFIX}/?\|\|;' \| ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude \| ${SORT} >> ${TMPPLIST}	380	@${FIND} "${SAMBA_MODULEDIR}" -type f \| ${SED} -E 's\|^${PREFIX}/?\|\|;' \| ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude \| ${SORT} >> ${TMPPLIST}
381	@for d in `${FIND} ${SAMBA_MODULEDIR} -type d \| ${SORT} -r`; do \	381	@for d in $(${FIND} "${SAMBA_MODULEDIR}" -type d \| ${SORT} -r); do \
382	${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null \|\| true" >> ${TMPPLIST}; \	382	${ECHO_CMD} "@unexec ${RMDIR} \"$$d\" 2>/dev/null \|\| true" >> ${TMPPLIST}; \
383	done	383	done
384	# Documentation	384	# Documentation
385	.if !defined(NOPORTDOCS)	385	.if !defined(NOPORTDOCS)
386	@${MKDIR} ${DOCSDIR}	386	@${MKDIR} ${DOCSDIR}
387	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}	387	@${CP} -Rp "${WRKDIR}/${DISTNAME}/docs/registry" "${DOCSDIR}"
388	. for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf	388	. for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf
389	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${f} ${DOCSDIR}	389	@${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/docs/${f}" "${DOCSDIR}"
390	. endfor	390	. endfor
391	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}	391	@${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${DOCSDIR}"
392	. for f in README COPYING Manifest Read-Manifest-Now Roadmap \	392	. for f in README COPYING Manifest Read-Manifest-Now Roadmap \
393	WHATSNEW.txt docs/THANKS docs/history	393	WHATSNEW.txt docs/THANKS docs/history
394	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR}	394	@${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/${f}" "${DOCSDIR}"
395	. endfor	395	. endfor
396	# !NOPORTDOCS	396	# !NOPORTDOCS
397	.endif	397	.endif

Lines 41-82 Link Here

(-)files/samba.in (-28 / +34 lines)
41	reload_cmd="samba_reload_cmd"	41	reload_cmd="samba_reload_cmd"
42	rcvar_cmd="samba_rcvar_cmd"	42	rcvar_cmd="samba_rcvar_cmd"
43	# Defaults	43	# Defaults
44	samba_enable=${samba_enable:="NO"}	44	samba_enable="${samba_enable:=NO}"
45	samba_config=${samba_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"}	45	samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
		46	samba_config="${samba_config=${samba_config_default}}"
		47	command_args="${samba_config:+-s "${samba_config}"}" #"
46	samba_daemons="nmbd smbd"	48	samba_daemons="nmbd smbd"
47	%%WINBIND%%samba_daemons="${samba_daemons} winbindd"	49	%%WINBIND%%samba_daemons="${samba_daemons} winbindd"
48	testparm_command="%%PREFIX%%/bin/testparm"	50	testparm_command="%%PREFIX%%/bin/testparm"
49	smbcontrol_command="%%PREFIX%%/bin/smbcontrol"	51	smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
50	# Fetch parameters from configuration file	52	# Fetch parameters from configuration file
51	samba_parm="${testparm_command} -s -v --parameter-name"	53	samba_parm="${testparm_command} -s -v --parameter-name"
52	%%WINBIND%%samba_idmap=$(${samba_parm} 'idmap uid' ${samba_config} 2>/dev/null)	54	%%WINBIND%%samba_idmap=$(${samba_parm} 'idmap uid' ${samba_config:+"${samba_config}"} 2>/dev/null)
53	samba_lockdir=$(${samba_parm} 'lock directory' ${samba_config} 2>/dev/null)	55	samba_lockdir=$(${samba_parm} 'lock directory' ${samba_config:+"${samba_config}"} 2>/dev/null)
54	# Setup dependent variables	56	# Setup dependent variables
55	if [ -n "${rcvar}" ] && checkyesno ${rcvar}; then	57	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
56	nmbd_enable=${nmbd_enable="YES"}	58	nmbd_enable="${nmbd_enable=YES}"
57	smbd_enable=${smbd_enable="YES"}	59	smbd_enable="${smbd_enable=YES}"
58	%%WINBIND%% # Check that winbindd is actually configured	60	%%WINBIND%% # Check that winbindd is actually configured
59	%%WINBIND%% if [ -n "${samba_idmap}" ]; then	61	%%WINBIND%% if [ -n "${samba_idmap}" ]; then
60	%%WINBIND%% winbindd_enable=${winbindd_enable="YES"}	62	%%WINBIND%% winbindd_enable="${winbindd_enable=YES}"
61	%%WINBIND%% fi	63	%%WINBIND%% fi
62	fi	64	fi
		65	# Hack to work around name change of pid file with non-default config
		66	pid_extra=
		67	if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
		68	pid_extra="-$(basename "${samba_config}")"
		69	fi
63	# Hack to enable check of dependent variables	70	# Hack to enable check of dependent variables
64	eval real_${rcvar}=\${${rcvar}:="NO"} ${rcvar}="YES"	71	eval real_${rcvar}="\${${rcvar}:=NO}" ${rcvar}="YES"
65	# Defaults for dependent variables	72	# Defaults for dependent variables
66	nmbd_enable=${nmbd_enable:="NO"}	73	nmbd_enable="${nmbd_enable:=NO}"
67	nmbd_flags=${nmbd_flags="-D"}	74	nmbd_flags="${nmbd_flags=\"-D\"}"
68	smbd_enable=${smbd_enable:="NO"}	75	smbd_enable="${smbd_enable:=NO}"
69	smbd_flags=${smbd_flags="-D"}	76	smbd_flags="${smbd_flags=\"-D\"}"
70	%%WINBIND%%winbindd_enable=${winbindd_enable:="NO"}	77	%%WINBIND%%winbindd_enable="${winbindd_enable:=NO}"
71	%%WINBIND%%winbindd_flags=${winbindd_flags=""}	78	%%WINBIND%%winbindd_flags="${winbindd_flags=''}"
72	# Requirements	79	# Requirements
73	required_files="${samba_config}"	80	required_files="${samba_config}"
74	required_dirs="${samba_lockdir}"	81	required_dirs="${samba_lockdir}"
75	command_args="${samba_config:+"-s ${samba_config}"}"
76	#"
77	samba_checkconfig() {	82	samba_checkconfig() {
78	echo -n "Performing sanity check on Samba configuration: "	83	echo -n "Performing sanity check on Samba configuration: "
79	if ${testparm_command} -s ${samba_config} >/dev/null 2>&1; then	84	if "${testparm_command}" -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then
80	echo "OK"	85	echo "OK"
81	else	86	else
82	echo "FAILED"	87	echo "FAILED"
Lines 86-92 Link Here
86		91
87	samba_start_precmd() {	92	samba_start_precmd() {
88	# XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping	93	# XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
89	if [ -d "${samba_lockdir}" ]; then	94	if [ -n "${samba_lockdir}" -a -d "${samba_lockdir}" ]; then
90	echo -n "Removing stale Samba tdb files: "	95	echo -n "Removing stale Samba tdb files: "
91	for file in brlock.tdb browse.dat connections.tdb gencache.tdb \	96	for file in brlock.tdb browse.dat connections.tdb gencache.tdb \
92	locking.tdb messages.tdb namelist.debug sessionid.tdb \	97	locking.tdb messages.tdb namelist.debug sessionid.tdb \
Lines 100-106 Link Here
100		105
101	samba_rcvar_cmd() {	106	samba_rcvar_cmd() {
102	# Prevent recursive calling	107	# Prevent recursive calling
103	unset ${rc_arg}_cmd ${rc_arg}_precmd ${rc_arg}_postcmd	108	unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
104	# Check master variable	109	# Check master variable
105	echo "# ${name}"	110	echo "# ${name}"
106	if [ -n "${rcvar}" ]; then	111	if [ -n "${rcvar}" ]; then
Lines 116-144 Link Here
116	}	121	}
117		122
118	samba_reload_cmd() {	123	samba_reload_cmd() {
119	local name rcvar	124	local name rcvar command pidfile
120	# Prevent recursive calling	125	# Prevent recursive calling
121	unset ${rc_arg}_cmd ${rc_arg}_precmd ${rc_arg}_postcmd	126	unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
122	# Apply to all the daemons	127	# Apply to all the daemons
123	for name in ${samba_daemons}; do	128	for name in ${samba_daemons}; do
124	rcvar=$(set_rcvar)	129	rcvar=$(set_rcvar)
125	command="%%PREFIX%%/sbin/${name}"	130	command="%%PREFIX%%/sbin/${name}"
126	pidfile="%%SAMBA_RUNDIR%%/${name}.pid"	131	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
127	# Daemon should be enabled and running	132	# Daemon should be enabled and running
128	if [ -n "${rcvar}" ] && checkyesno ${rcvar}; then	133	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
129	if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then	134	if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then
130	debug "reloading ${name} configuration"	135	debug "reloading ${name} configuration"
131	echo "Reloading ${name}."	136	echo "Reloading ${name}."
132	${smbcontrol_command} "${name}" 'reload-config' ${command_args}	137	# XXX: Hack with pid_extra
		138	"${smbcontrol_command}" "${name}${pid_extra}" 'reload-config' ${command_args}
133	fi	139	fi
134	fi	140	fi
135	done	141	done
136	}	142	}
137		143
138	samba_cmd() {	144	samba_cmd() {
139	local name rcvar	145	local name rcvar command pidfile samba_daemons
140	# Prevent recursive calling	146	# Prevent recursive calling
141	unset ${rc_arg}_cmd ${rc_arg}_precmd ${rc_arg}_postcmd	147	unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
142	# Stop processes in the reverse to order	148	# Stop processes in the reverse to order
143	if [ "${rc_arg}" = "stop" ] ; then	149	if [ "${rc_arg}" = "stop" ] ; then
144	samba_daemons=$(reverse_list ${samba_daemons})	150	samba_daemons=$(reverse_list ${samba_daemons})
Lines 147-153 Link Here
147	for name in ${samba_daemons}; do	153	for name in ${samba_daemons}; do
148	rcvar=$(set_rcvar)	154	rcvar=$(set_rcvar)
149	command="%%PREFIX%%/sbin/${name}"	155	command="%%PREFIX%%/sbin/${name}"
150	pidfile="%%SAMBA_RUNDIR%%/${name}.pid"	156	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
151		157
152	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}	158	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
153	done	159	done