Date: Tue, 20 Apr 2004 08:01:32 -0700 (PDT) From: Timur Bakeyev <timur@gnu.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/65818: [MAINTAINER] Fix broken location of lockdir foe net/samba-devel Message-ID: <200404201501.i3KF1WCs076585@www.freebsd.org> Resent-Message-ID: <200404201510.i3KFAWeC005336@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65818
>Category: ports
>Synopsis: [MAINTAINER] Fix broken location of lockdir foe net/samba-devel
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 20 08:10:32 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Timur Bakeyev
>Release: 5.2.1
>Organization:
RIPE NCC
>Environment:
FreeBSD timur.home.bat.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Apr 6 20:29:11 CEST 2004 root@timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON i386
>Description:
It appeared, that in the Makefile 1.104 lockdir was mistakenly mixed with spool dir, which broke printing through Samba dramatically. This patch is moving lock directory to /var/run/samba. Thanks to Mike Harding for spotting this!
>How-To-Repeat:
-
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# samba-devel.diff
#
echo x - samba-devel.diff
sed 's/^X//' >samba-devel.diff << 'END-of-samba-devel.diff'
XIndex: Makefile
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/Makefile,v
Xretrieving revision 1.116
Xdiff -u -r1.116 Makefile
X--- Makefile 12 Apr 2004 16:45:41 -0000 1.116
X+++ Makefile 20 Apr 2004 14:35:11 -0000
X@@ -7,7 +7,7 @@
X
X PORTNAME= samba
X PORTVERSION= 3.0.3.p2
X-PORTREVISION?= 0
X+PORTREVISION?= 1
X PORTEPOCH?= 1
X CATEGORIES?= net
X MASTER_SITES= ${MASTER_SITE_SAMBA}
X@@ -26,6 +26,7 @@
X SAMBA_SPOOL?= ${VARDIR}/spool/samba
X SAMBA_LOGDIR= ${VARDIR}/log/samba
X SAMBA_RUNDIR= ${VARDIR}/run
X+SAMBA_LOCKDIR= ${SAMBA_RUNDIR}/samba
X SAMBA_PRIVATE?= ${PREFIX}/private
X SAMBA_CONFDIR?= ${PREFIX}/etc
X SAMBA_SWATDIR= ${PREFIX}/share/swat
X@@ -41,7 +42,7 @@
X --with-configdir=${SAMBA_CONFDIR} \
X --with-libdir=${SAMBA_LIBDIR}/samba \
X --with-swatdir=${SAMBA_SWATDIR} \
X- --with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
X+ --with-piddir=${SAMBA_RUNDIR} --with-lockdir=${SAMBA_LOCKDIR} \
X --with-privatedir=${SAMBA_PRIVATE} \
X --with-logfilebase=${SAMBA_LOGDIR} \
X --with-manpages-langs=en
X@@ -271,22 +272,27 @@
X .endif
X
X PLIST_SUB+= RC_DIR=${RC_DIR} \
X- SAMBA_SPOOL=${SAMBA_SPOOL} \
X- SAMBA_LOGDIR=${SAMBA_LOGDIR}
X+ SAMBA_LOGDIR=${SAMBA_LOGDIR} \
X+ SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
X
X RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
X- RC_SUBR=${RC_SUBR} \
X- RC_DIR=${RC_DIR} \
X CUPS=${CUPS} \
X+ RC_SUBR=${RC_SUBR} \
X+ SAMBA_CONFDIR=${SAMBA_CONFDIR} \
X SAMBA_CONFIG=${SAMBA_CONFIG} \
X- SAMBA_SPOOL=${SAMBA_SPOOL} \
X- SAMBA_RUNDIR=${SAMBA_RUNDIR}
X+ SAMBA_LOGDIR=${SAMBA_LOGDIR} \
X+ SAMBA_RUNDIR=${SAMBA_RUNDIR} \
X+ SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
X+ SAMBA_SPOOL=${SAMBA_SPOOL}
X
X pre-fetch:
X @${ECHO_MSG} "===> -------------------------------------------"
X @${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
X @${ECHO_MSG} "===> -------------------------------------------"
X
X+post-patch:
X+ @${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
X+
X post-install:
X .for sect in 1 5 7 8
X @${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
X@@ -306,29 +312,46 @@
X @${MKDIR} ${EXAMPLESDIR}/python
X @${CP} -Rp ${WRKSRC}/python/examples/* ${EXAMPLESDIR}/python
X .endif
X- @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
X+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
X ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
X ${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
X- @test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 0755 ${SAMBA_SPOOL}
X- @test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR}
X- ${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!' \
X- -e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!' \
X- -e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!' \
X- ${FILESDIR}/smb.conf.default \
X- > ${SAMBA_CONFIG}.default ; \
X+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
X+ ${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
X+ ${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
X ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
X- if [ ! -d ${SAMBA_PRIVATE} ] ; then \
X- ${MKDIR} ${SAMBA_PRIVATE} ; \
X- ${CHOWN} root:wheel ${SAMBA_PRIVATE} ; \
X- fi
X- ${CHMOD} 700 ${SAMBA_PRIVATE}
X-.if defined(PACKAGE_BUILDING)
X+ # Spool
X+ @test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && \
X+ ${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
X+ @${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_SPOOL} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHMOD} 1777 ${SAMBA_SPOOL}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_SPOOL}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" >> ${TMPPLIST}
X+ # Logdir
X+ @test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR} && \
X+ ${CHMOD} 0755 ${SAMBA_LOGDIR} && ${CHOWN} root:wheel ${SAMBA_LOGDIR}
X+ @${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOGDIR}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOGDIR}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOGDIR}/* manually.\"" >> ${TMPPLIST}
X+ # Lockdir
X+ @test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} && \
X+ ${CHMOD} 0755 ${SAMBA_LOCKDIR} && ${CHOWN} root:wheel ${SAMBA_LOCKDIR}
X+ @${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec for file in `${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'`; do ${RM} -rf ${SAMBA_LOCKDIR}/${file}; done" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
X+ # Private
X+ @test -d ${SAMBA_PRIVATE} || ${MKDIR} ${SAMBA_PRIVATE} && \
X+ ${CHMOD} 700 ${SAMBA_PRIVATE} && ${CHOWN} root:wheel ${SAMBA_PRIVATE}
X @${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
X @${ECHO_CMD} "@exec ${CHMOD} 700 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
X- @${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_PRIVATE}" >> ${TMPPLIST}
X-.else
X- @${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/* manually.\"" >> ${TMPPLIST}
X-.endif
X+ @${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
X+ @${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
X .if !defined(WITHOUT_WINBIND)
X .if defined(WITH_WINBIND_NSS)
X ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
XIndex: pkg-plist
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/pkg-plist,v
Xretrieving revision 1.48
Xdiff -u -r1.48 pkg-plist
X--- pkg-plist 6 Apr 2004 11:56:20 -0000 1.48
X+++ pkg-plist 20 Apr 2004 14:35:12 -0000
X@@ -231,7 +231,6 @@
X %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
X %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
X %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
X-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/.cvsignore
X %%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/oldtdbutil.py
X %%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/tdbtimetrial.py
X %%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/test_tdbpack.py
X@@ -719,18 +718,9 @@
X @dirrm lib/samba/charset
X @dirrm lib/samba/auth
X @dirrm lib/samba
X-%%PYTHON%%@unexec rmdir -p %D/lib/%%PYTHON_VERSION%%/site-packages/samba 2>/dev/null || true
X+%%PYTHON%%@unexec rmdir -p %D/lib/%%PYTHON_VERSION%%/site-packages/samba/. 2>/dev/null || true
X %%PORTDOCS%%@dirrm %%DOCSDIR%%/Registry
X %%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs/images
X %%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs
X %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
X %%PORTDOCS%%@dirrm %%DOCSDIR%%
X-@exec mkdir -p %%SAMBA_SPOOL%% || true
X-@exec chmod 0755 %%SAMBA_SPOOL%%
X-@unexec rm -fr %%SAMBA_SPOOL%%/printing
X-@unexec for file in `ls %%SAMBA_SPOOL%% | grep -v '^winbindd_'`; do rm -fr %%SAMBA_SPOOL%%/$file; done
X-@unexec rmdir %%SAMBA_SPOOL%% 2>/dev/null || true
X-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_SPOOL%%/*.tdb manually."
X-@exec mkdir -p %%SAMBA_LOGDIR%% || true
X-@unexec rmdir %%SAMBA_LOGDIR%% 2>/dev/null || true
X-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_LOGDIR%% manually."
XIndex: files/samba.sh.sample
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/files/samba.sh.sample,v
Xretrieving revision 1.5
Xdiff -u -r1.5 samba.sh.sample
X--- files/samba.sh.sample 18 Apr 2004 14:26:11 -0000 1.5
X+++ files/samba.sh.sample 20 Apr 2004 14:35:12 -0000
X@@ -38,7 +38,7 @@
X esac
X fi
X
X-if test -n ${samba_enable:-} && checkyesno samba_enable; then
X+if test -n ${samba_enable:-""} && checkyesno samba_enable; then
X nmbd_enable=${nmbd_enable:-"YES"}
X smbd_enable=${smbd_enable:-"YES"}
X %%WINBIND%% winbindd_enable=${winbindd_enable:-"YES"}
X@@ -64,13 +64,13 @@
X
X nmbd_precmd() {
X # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
X- if [ -d "%%SAMBA_SPOOL%%" ]; then
X+ if [ -d "%%SAMBA_LOCKDIR%%" ]; then
X echo "Starting SAMBA: removing stale tdbs :"
X for file in connections.tdb locking.tdb messages.tdb \
X sessionid.tdb unexpected.tdb brlock.tdb \
X namelist.debug
X do
X- rm -vf "%%SAMBA_SPOOL%%/$file"
X+ rm -vf "%%SAMBA_LOCKDIR%%/$file"
X done
X fi
X }
X@@ -79,7 +79,7 @@
X name=nmbd
X rcvar=`set_rcvar`
X command="%%PREFIX%%/sbin/${name}"
X-required_dirs="%%SAMBA_SPOOL%%"
X+required_dirs="%%SAMBA_LOCKDIR%%"
X pidfile=%%SAMBA_RUNDIR%%/${name}.pid
X start_precmd="nmbd_precmd"
X stop_cmd="samba_stop"
X@@ -110,7 +110,7 @@
X %%WINBIND%%name=winbindd
X %%WINBIND%%rcvar=`set_rcvar`
X %%WINBIND%%command="%%PREFIX%%/sbin/${name}"
X-%%WINBIND%%required_dirs="%%SAMBA_SPOOL%%"
X+%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
X %%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
X %%WINBIND%%start_precmd=":"
X %%WINBIND%%stop_cmd="samba_stop"
END-of-samba-devel.diff
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404201501.i3KF1WCs076585>