From b5f60171a77af35c747c0f4b0ad9fbf07bf15d17 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Mon, 1 Jan 2001 23:26:31 +0000 Subject: Samba now has supervise/multilog support --- net-fs/samba/files/nmbd-log | 3 ++ net-fs/samba/files/nmbd-run | 9 ++++ net-fs/samba/files/samba | 43 +++++++++++------ net-fs/samba/files/smbd-log | 3 ++ net-fs/samba/files/smbd-run | 9 ++++ net-fs/samba/samba-2.0.7-r1.ebuild | 87 --------------------------------- net-fs/samba/samba-2.0.7-r2.ebuild | 98 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 150 insertions(+), 102 deletions(-) create mode 100755 net-fs/samba/files/nmbd-log create mode 100755 net-fs/samba/files/nmbd-run create mode 100755 net-fs/samba/files/smbd-log create mode 100755 net-fs/samba/files/smbd-run delete mode 100644 net-fs/samba/samba-2.0.7-r1.ebuild create mode 100644 net-fs/samba/samba-2.0.7-r2.ebuild (limited to 'net-fs') diff --git a/net-fs/samba/files/nmbd-log b/net-fs/samba/files/nmbd-log new file mode 100755 index 000000000000..a9c37656f035 --- /dev/null +++ b/net-fs/samba/files/nmbd-log @@ -0,0 +1,3 @@ +#!/bin/bash +test -p logfifo || mknod logfifo p +exec multilog t ./nmbd-log < logfifo diff --git a/net-fs/samba/files/nmbd-run b/net-fs/samba/files/nmbd-run new file mode 100755 index 000000000000..860e2ce7eb47 --- /dev/null +++ b/net-fs/samba/files/nmbd-run @@ -0,0 +1,9 @@ +#!/bin/sh +mypid=`pidof /usr/sbin/nmbd` +if [ -z "$mypid" ] +then + /usr/sbin/nmbd -l ./log/logfifo + sleep 2 + mypid=`pidof /usr/sbin/nmbd` +fi +exec /usr/bin/watchpid $mypid diff --git a/net-fs/samba/files/samba b/net-fs/samba/files/samba index 32088e3bfdcd..7d0775dfeabd 100755 --- a/net-fs/samba/files/samba +++ b/net-fs/samba/files/samba @@ -1,34 +1,47 @@ #!/bin/sh -#RCUPDATE:2 3 4:75:This line is required for script management +#RCUPDATE:3 4:76:This line is required for script management . /etc/rc.d/config/functions -SERVICE0=nmbd -SERVICE1=smbd +SERVICE=samba opts="start stop restart" EXE0=/usr/sbin/nmbd EXE1=/usr/sbin/smbd start() { - ebegin "Starting $SERVICE0..." - start-stop-daemon --start --quiet --exec $EXE0 - eend $? "Started $SERVICE0." "Error Starting $SERVICE0." - ebegin "Starting $SERVICE1..." - start-stop-daemon --start --quiet --exec $EXE1 - eend $? "Started $SERVICE1." "Error Starting $SERVICE1." + ebegin "Starting $SERVICE" + start-stop-daemon --start --quiet --exec $EXE0 + result=$? + start-stop-daemon --start --quiet --exec $EXE1 + result=$(( $result + $? )) + eend $result "Started $SERVICE." "Error starting $SERVICE." } stop() { - ebegin "Stopping $SERVICE0..." - start-stop-daemon --stop --quiet --exec $EXE0 - eend $? "Stopped $SERVICE0." "Error Stopping $SERVICE0." - ebegin "Stopping $SERVICE1..." - start-stop-daemon --stop --quiet --exec $EXE1 - eend $? "Stopped $SERVICE1." "Error Stopping $SERVICE1." + ebegin "Starting $SERVICE" + start-stop-daemon --stop --quiet --exec $EXE0 + result=$? + start-stop-daemon --stop --quiet --exec $EXE1 + result=$(( $result + $? )) + eend $result "Stopped $SERVICE." "Error stopping $SERVICE." } +supervise_start() { + ebegin "Starting supervised $SERVICE" + svc -u /etc/supervise/smbd + svc -u /etc/supervise/nmbd + eend $? "Started $SERVICE." "Error starting $SERVICE." +} + + +supervise_stop() { + ebegin "Stopping supervised $SERVICE" + svc -d /etc/supervise/smbd + svc -d /etc/supervise/nmbd + eend $? "Stopped $SERVICE." "Error stopping $SERVICE." +} restart () { stop diff --git a/net-fs/samba/files/smbd-log b/net-fs/samba/files/smbd-log new file mode 100755 index 000000000000..b9cc0dddbde7 --- /dev/null +++ b/net-fs/samba/files/smbd-log @@ -0,0 +1,3 @@ +#!/bin/bash +test -p logfifo || mknod logfifo p +exec multilog t ./smbd-log < logfifo diff --git a/net-fs/samba/files/smbd-run b/net-fs/samba/files/smbd-run new file mode 100755 index 000000000000..fbd9e4704f6e --- /dev/null +++ b/net-fs/samba/files/smbd-run @@ -0,0 +1,9 @@ +#!/bin/sh +mypid=`pidof /usr/sbin/smbd` +if [ -z "$mypid" ] +then + /usr/sbin/smbd -l ./log/logfifo + sleep 2 + mypid=`pidof /usr/sbin/smbd` +fi +exec /usr/bin/watchpid $mypid diff --git a/net-fs/samba/samba-2.0.7-r1.ebuild b/net-fs/samba/samba-2.0.7-r1.ebuild deleted file mode 100644 index d98bb7c0a098..000000000000 --- a/net-fs/samba/samba-2.0.7-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.7-r1.ebuild,v 1.8 2000/12/28 15:31:10 drobbins Exp $ - -P=samba-2.0.7 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Samba" -SRC_URI="ftp://sunsite.org.uk/packages/samba/${A}" -HOMEPAGE="http://www.samba.org" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-apps/gawk-3.0.6 - >=sys-libs/glibc-2.1.3 - >=sys-libs/pam-0.72" - -#ssl support removed -- it doesn't work... - -src_compile() { - cd ${S}/source - CFLAGS="$CFLAGS -I/usr/include/openssl" try ./configure --prefix=/usr \ - --sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \ - --with-automount \ - --with-utmp --without-sambabook --with-netatalk \ - --with-smbmount --with-pam --with-syslog \ - --with-privatedir=/etc/smb/private --with-lockdir=/var/lock --with-swatdir=/usr/share/swat - try make -} - -src_install() { - cd ${S}/source - dodir /usr - dodir /etc/smb - dodir /usr/share/swat - dodir /usr/doc/${P}/html/book - dodir /var/log - dodir /var/lock - try make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \ - PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \ - LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin - prepman - - into /usr - cd ${S} - dodoc COPYING Manifest README README-smbmount Roadmap WHATSNEW.txt - cd ${S}/docs - dodoc announce history NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg - dodoc samba.lsm THANKS Win* - docinto html - dodoc htmldocs/*.html - docinto html/book - dodoc htmldocs/using_samba/*.html - docinto html/book/gifs - dodoc htmldocs/using_samba/gifs/* - docinto html/book/figs - dodoc htmldocs/using_samba/figs/* - docinto faq - dodoc faq/*.txt - docinto html/faq - dodoc faq/*.html - docinto textdocs - dodoc textdocs/* - cd ${S} - cp -a examples ${D}/usr/doc/${PF} - cp examples/smb.conf.default ${D}/etc/smb/smb.conf.example - dodir /etc/rc.d/init.d - cp ${O}/files/samba ${D}/etc/rc.d/init.d - diropts -m0700 - dodir /etc/smb/private -} - -pkg_config() { - - source ${ROOT}/etc/rc.d/config/functions - - echo "Generating symlinks..." - - ${ROOT}/usr/sbin/rc-update add samba - -} - - - - - - diff --git a/net-fs/samba/samba-2.0.7-r2.ebuild b/net-fs/samba/samba-2.0.7-r2.ebuild new file mode 100644 index 000000000000..9c8b33db1af7 --- /dev/null +++ b/net-fs/samba/samba-2.0.7-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2000 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Author Achim Gottinger +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.7-r2.ebuild,v 1.1 2001/01/01 23:26:29 drobbins Exp $ + +P=samba-2.0.7 +A=${P}.tar.gz +S=${WORKDIR}/${P} +DESCRIPTION="Samba" +SRC_URI="ftp://sunsite.org.uk/packages/samba/${A}" +HOMEPAGE="http://www.samba.org" + +DEPEND=">=sys-apps/bash-2.04 + >=sys-apps/gawk-3.0.6 + >=sys-libs/glibc-2.1.3 + >=sys-libs/pam-0.72" + +#ssl support removed -- it doesn't work... + +src_compile() { + cd ${S}/source + CFLAGS="$CFLAGS -I/usr/include/openssl" try ./configure --prefix=/usr \ + --sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \ + --with-automount --with-utmp --without-sambabook --with-netatalk --with-smbmount --with-pam \ + --with-privatedir=/etc/smb/private --with-lockdir=/var/lock --with-swatdir=/usr/share/swat + try make +} + +src_install() { + cd ${S}/source + dodir /usr + dodir /etc/smb + dodir /usr/share/swat + dodir /usr/doc/${P}/html/book + dodir /var/log + dodir /var/lock + try make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \ + PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \ + LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin + prepman + + into /usr + cd ${S} + dodoc COPYING Manifest README README-smbmount Roadmap WHATSNEW.txt + cd ${S}/docs + dodoc announce history NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg + dodoc samba.lsm THANKS Win* + docinto html + dodoc htmldocs/*.html + docinto html/book + dodoc htmldocs/using_samba/*.html + docinto html/book/gifs + dodoc htmldocs/using_samba/gifs/* + docinto html/book/figs + dodoc htmldocs/using_samba/figs/* + docinto faq + dodoc faq/*.txt + docinto html/faq + dodoc faq/*.html + docinto textdocs + dodoc textdocs/* + cd ${S} + cp -a examples ${D}/usr/doc/${PF} + cp examples/smb.conf.default ${D}/etc/smb/smb.conf.example + dodir /etc/rc.d/init.d + cp ${O}/files/samba ${D}/etc/rc.d/init.d + diropts -m0700 + dodir /etc/smb/private + + #supervise support + local x + for x in smbd nmbd + do + dodir /var/supervise/${x}/log + chmod +t ${D}/var/supervise/${x} + exeinto /var/supervise/${x} + newexe ${FILESDIR}/${x}-run run + exeinto /var/supervise/${x}/log + newexe ${FILESDIR}/${x}-log run + dosym /var/supervise/${x}/log/${x}-log /var/log/${x}.d + done +} + +pkg_config() { + + source ${ROOT}/etc/rc.d/config/functions + + echo "Generating symlinks..." + + ${ROOT}/usr/sbin/rc-update add samba + +} + + + + + + -- cgit v1.2.3-65-gdbad