Ok this spams in the necessary changes to support rc5 and rc6

at the same time. The svc stuff was an experiment mostly, but
seemed useful for other things.. i thought maybe logger could
be plugged in or something.

7 files changed, 519 insertions, 0 deletions

diff --git a/net-fs/samba/files/config-svc-smbd+nmbd b/net-fs/samba/files/config-svc-smbd+nmbd
new file mode 100644
index 000000000000..69484276023b
--- /dev/null
+++ b/net-fs/samba/files/config-svc-smbd+nmbd
@@ -0,0 +1,40 @@
+# this is an idea for maintaining trivial config file stubs
+config_install() {
+
+for x in smbd nmbd
+do
+	dodir /var/lib/supervise/services/${x}/log
+	chmod +t ${D}var/lib/supervise/services/${x}
+
+# install svc-run stub - pretty lame eh
+rm -f ${T}/config.config
+cat > ${T}/config.config <<EOF
+#!/bin/sh
+mypid=\`pidof /usr/sbin/${x}\`
+if [ -z "\$mypid" ] ; then
+	/usr/sbin/${x} -l ./log/logfifo
+	sleep 2
+	mypid=\`pidof /usr/sbin/${x}\`
+fi
+exec /usr/bin/watchpid $mypid
+EOF
+	exeinto /var/lib/supervise/services/${x}
+	newexe ${T}/config.config run
+
+
+# install svc-log stub
+rm -f ${T}/config.config
+cat > ${T}/config.config <<EOF
+#!/bin/sh
+if [ ! -p logfifo ] ; then
+	rm -f logfifo
+	mknod logfifo p
+fi
+exec multilog t ./${x}-log < logfifo
+EOF
+	exeinto /var/lib/supervise/services/${x}/log
+	newexe ${T}/config.config run
+
+
+done
+}
diff --git a/net-fs/samba/files/samba.rc5 b/net-fs/samba/files/samba.rc5
new file mode 100644
index 000000000000..3c52dbc2784c
--- /dev/null
+++ b/net-fs/samba/files/samba.rc5
@@ -0,0 +1,31 @@
+#!/bin/sh
+#RCUPDATE:3 4:76:This line is required for script management
+
+. /etc/rc.d/config/functions
+
+SERVICE=samba
+opts="start stop"
+
+EXE0=/usr/sbin/nmbd
+EXE1=/usr/sbin/smbd
+
+start() {
+	ebegin "Starting $SERVICE"
+	start-stop-daemon --start --quiet --exec $EXE0 
+	result=$?
+	start-stop-daemon --start --quiet --exec $EXE1 
+	result=$(( $result + $? ))
+	eend $result
+}
+
+stop() {
+	ebegin "Stopping $SERVICE"
+	start-stop-daemon --stop --quiet --exec $EXE0 
+	result=$?
+	start-stop-daemon --stop --quiet --exec $EXE1 
+	result=$(( $result + $? ))
+	eend $result
+}
+
+doservice ${@}
+
diff --git a/net-fs/samba/files/samba.rc6 b/net-fs/samba/files/samba.rc6
new file mode 100644
index 000000000000..ae7c62c5877f
--- /dev/null
+++ b/net-fs/samba/files/samba.rc6
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting SAMBA"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nmbd
+	result=$?
+	start-stop-daemon --start --quiet --exec /usr/sbin/smbd
+	result=$(( $result + $? ))
+	eend $result
+}
+
+stop() {
+	ebegin "Stopping $SAMBA"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nmbd
+	result=$?
+	start-stop-daemon --stop --quiet --exec /usr/sbin/smbd
+	result=$(( $result + $? ))
+	eend $result
+}
diff --git a/net-fs/samba/files/samba.svc.rc5 b/net-fs/samba/files/samba.svc.rc5
new file mode 100644
index 000000000000..88b56684170a
--- /dev/null
+++ b/net-fs/samba/files/samba.svc.rc5
@@ -0,0 +1,42 @@
+#!/bin/sh
+#RCUPDATE:3 4:76:This line is required for script management
+
+. /etc/rc.d/config/functions
+
+SERVICE=svc-samba
+opts="start stop"
+
+start() {
+	ebegin "Starting $SERVICE"
+	if [ ! -e ${SVCDIR}/control/smbd ]
+	then
+		ln -sf ../services/smbd ${SVCDIR}/control/smbd
+	fi
+	if [ ! -e ${SVCDIR}/control/nmbd ]
+	then
+		ln -sf ../services/nmbd ${SVCDIR}/control/nmbd
+	fi
+	/usr/bin/svc -u ${SVCDIR}/control/smbd
+	/usr/bin/svc -u ${SVCDIR}/control/nmbd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $SERVICE"
+    if [ -e ${SVCDIR}/control/smbd ]
+	then
+		/usr/bin/svc -dx ${SVCDIR}/control/smbd/log
+		/usr/bin/svc -dx ${SVCDIR}/control/smbd
+#		rm ${SVCDIR}/control/smbd
+	fi
+	if [ -e ${SVCDIR}/control/nmbd ]
+	then
+		/usr/bin/svc -dx ${SVCDIR}/control/nmbd/log
+		/usr/bin/svc -dx ${SVCDIR}/control/nmbd
+#		rm ${SVCDIR}/control/nmbd
+	fi
+	eend $?
+}
+
+doservice ${@}
+
diff --git a/net-fs/samba/files/samba.svc.rc6 b/net-fs/samba/files/samba.svc.rc6
new file mode 100644
index 000000000000..1928291c19b8
--- /dev/null
+++ b/net-fs/samba/files/samba.svc.rc6
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+
+SVCDIR=/var/lib/supervise
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting SAMBA"
+	if [ ! -e ${SVCDIR}/control/smbd ] ; then
+		ln -sf ../services/smbd ${SVCDIR}/control/smbd
+	fi
+	if [ ! -e ${SVCDIR}/control/nmbd ] ; then
+		ln -sf ../services/nmbd ${SVCDIR}/control/nmbd
+	fi
+	/usr/bin/svc -u ${SVCDIR}/control/smbd
+	/usr/bin/svc -u ${SVCDIR}/control/nmbd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $SERVICE"
+	if [ -e ${SVCDIR}/control/smbd ] ; then
+		/usr/bin/svc -dx ${SVCDIR}/control/smbd/log
+		/usr/bin/svc -dx ${SVCDIR}/control/smbd
+		# rm ${SVCDIR}/control/smbd
+	fi
+	if [ -e ${SVCDIR}/control/nmbd ] ; then
+		/usr/bin/svc -dx ${SVCDIR}/control/nmbd/log
+		/usr/bin/svc -dx ${SVCDIR}/control/nmbd
+		# rm ${SVCDIR}/control/nmbd
+	fi
+	eend $?
+}
diff --git a/net-fs/samba/samba-2.2.1a-r2.ebuild b/net-fs/samba/samba-2.2.1a-r2.ebuild
new file mode 100644
index 000000000000..68fdf07c7e43
--- /dev/null
+++ b/net-fs/samba/samba-2.2.1a-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r2.ebuild,v 1.1 2001/09/02 01:49:18 woodchip Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Samba :)"
+SRC_URI="http://us1.samba.org/samba/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.samba.org"
+
+DEPEND="virtual/glibc sys-devel/autoconf
+        cups? ( net-print/cups )
+        pam? ( >=sys-libs/pam-0.72 )
+        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+        ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+RDEPEND="virtual/glibc cups? ( net-print/cups )"
+# PAM support can cause lots of problems. We want the admin of the box to
+# do this on his own. There is a mailing list thread on samba-devel that's
+# about 40 posts long about this
+# pam? ( >=sys-libs/pam-0.72 )"
+
+
+src_unpack() {
+
+  unpack ${A}
+
+  if [ "`use afs`" ]; then
+    cd ${S}
+    cat ${FILESDIR}/patch.221a.10 | patch -p0
+  fi
+
+  if [ ! "`use cups`" ] ; then
+    cd ${S}/source
+    cp configure.in configure.in.orig
+    sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in
+    autoconf
+  fi
+}
+
+
+src_compile() { 
+
+  local myconf
+  use afs && myconf="$myconf --with-afs"
+
+  # Again same as above, PAM and Samba not good. Consult samba.org for
+  # details. Only enable if you KNOW what you're doing and you really really
+  # wanna venture down this path.
+  # use pam && myconf="${myconf} --with-pam"
+  myconf="${myconf} --without-pam"
+
+  # Samba doesn't seem to work well with ssl support but I'll add the check 
+  # anyway (otherwise it seems to be built with ssl if it finds it). This should 
+  # be tested. I'll mail gentoo-dev and add a todo in wiki. /Hallski
+  # use ssl && myconf="${myconf} --with-ssl"
+  myconf="${myconf} --without-ssl"
+  
+  cd ${S}/source
+  # Disabled automout support, because it failed
+  # Added -lncurses for readline detection
+  ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
+	--libdir=/etc/smb --sbindir=/usr/sbin --without-automount --with-utmp \
+	--without-sambabook --with-netatalk --with-privatedir=/etc/smb/private \
+	--with-smbmount --with-msdfs --with-vfs --with-spinlocks \
+	--with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \
+	--with-mandir=/usr/share/man --with-profile ${myconf} || die "bad configure"
+  make || die "couldn't compile"
+}
+
+
+src_install() { 
+
+  cd ${S}/source
+  dodir /usr
+  dodir /etc/smb
+  dodir /usr/share/swat
+  dodir /usr/share/doc/${PF}/html/book
+  dodir /var/log
+  dodir /var/run/smb
+  diropts -m 0700 ; dodir /etc/smb/private
+
+  make install prefix=${D}/usr BASEDIR=${D}/usr PRIVATEDIR=${D}/etc/smb/private \
+	LIBDIR=${D}/etc/smb VARDIR=${D}/var/log SWATDIR=${D}/usr/share/swat \
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man || die
+
+  # buggy makefile? we specified PRIVATEDIR as /etc/smb/private already. bogus lint.
+  rm -rf ${D}/usr/private
+
+  # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
+  # which allows it to work transparently with standard 'mount' command
+  diropts -m 0755 ; dodir /sbin
+  mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs
+
+  cd ${S}/source/script
+  exeinto /usr/sbin
+  doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
+
+
+  # docs. samba has some really good ones.
+  cd ${S}
+  insinto /etc/smb ; insopts -m 0644 ; newins examples/smb.conf.default smb.conf.eg
+  insinto /usr/share/sgml/docbook/dbsgml ; doins docbook/dbsgml/*
+  insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docbook/dbsgml/ent/*
+  dodoc COPYING Manifest README Roadmap WHATSNEW.txt
+  docinto examples ; dodoc examples/*
+  cd ${S}/docs ; dodoc announce history samba.lsm THANKS
+  docinto reg ; dodoc *.reg
+  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/*.txt textdocs/README*
+  docinto print ; dodoc textdocs/*.{tex,ps,pdf} 
+  docinto sgml/faq ; dodoc faq/*.sgml
+  docinto sgml/docbook/faq ; dodoc docbook/faq/*.sgml
+  docinto sgml/docbook/howto ; dodoc docbook/howto/*.sgml	
+  docinto sgml/docbook/manpages ; dodoc docbook/manpages/*.sgml
+  docinto sgml/docbook/projdoc ; dodoc docbook/projdoc/*.sgml
+
+
+  # install a standard, standalone-type init script
+  exeinto /etc/rc.d/init.d ; exeopts -m 0755
+  newexe ${FILESDIR}/samba.rc5 samba
+
+  # svc stuff should go away
+  svcdebug=0
+  if [ $svcdebug == 1 ] ; then
+	source ${FILESDIR}/config-svc-smbd+nmbd
+	config_install
+	exeinto /etc/rc.d/init.d ; exeopts -m 0755
+	newexe ${FILESDIR}/samba.svc.rc5 svc-samba
+  fi
+}
+
+
+pkg_preinst() {
+
+  if [ "$ROOT" = "/" ] ; then
+	if [ -e /etc/rc.d/init.d/svc-samba ] ; then
+		/etc/rc.d/init.d/svc-samba stop
+	fi
+	if [ -e /etc/rc.d/init.d/samba ] ; then
+		/etc/rc.d/init.d/samba stop
+	fi
+  fi
+}
+
+
+pkg_postinst() {
+
+  # we touch ${D}/etc/smb/smb.conf so that people installing samba just to mount smb shares
+  # don't get annoying warnings all the time.
+  if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then
+	touch ${ROOT}etc/smb/smb.conf
+  fi
+
+  echo " #"
+  echo " To configure samba (the server) to start on boot, type:"
+  echo " % rc-update add svc-samba [ for high-availability supervised samba ]"
+  echo " % rc-update add samba     [ for normal non-supervised, standalone samba ]"
+  echo
+  echo " If you had samba running earlier, you'll need to start it again. Also, please note"
+  echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly."
+  echo " Mounting smb shares and the smbclient program should work immediately.  To accomplish"
+  echo " this there is an empty /etc/smb/smb.conf file installed."
+  echo
+  echo " To mount smb shares, type something like this. You will need kernel SMB support first:"
+  echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo"
+  echo " If you wish to allow normal users to mount smb shares, type the following as root:"
+  echo " % chmod u+s /usr/bin/smbmnt"
+  echo " #"
+}
diff --git a/net-fs/samba/samba-2.2.1a-r6.ebuild b/net-fs/samba/samba-2.2.1a-r6.ebuild
new file mode 100644
index 000000000000..9f9173a4c566
--- /dev/null
+++ b/net-fs/samba/samba-2.2.1a-r6.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r6.ebuild,v 1.1 2001/09/02 01:49:19 woodchip Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Samba :)"
+SRC_URI="http://us1.samba.org/samba/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.samba.org"
+
+DEPEND="virtual/glibc sys-devel/autoconf
+        cups? ( net-print/cups )
+        pam? ( >=sys-libs/pam-0.72 )
+        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+        ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+RDEPEND="virtual/glibc cups? ( net-print/cups )"
+# PAM support can cause lots of problems. We want the admin of the box to
+# do this on his own. There is a mailing list thread on samba-devel that's
+# about 40 posts long about this
+# pam? ( >=sys-libs/pam-0.72 )"
+
+
+src_unpack() {
+
+  unpack ${A}
+
+  if [ "`use afs`" ]; then
+    cd ${S}
+    cat ${FILESDIR}/patch.221a.10 | patch -p0
+  fi
+
+  if [ ! "`use cups`" ] ; then
+    cd ${S}/source
+    cp configure.in configure.in.orig
+    sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in
+    autoconf
+  fi
+}
+
+
+src_compile() { 
+
+  local myconf
+  use afs && myconf="$myconf --with-afs"
+
+  # Again same as above, PAM and Samba not good. Consult samba.org for
+  # details. Only enable if you KNOW what you're doing and you really really
+  # wanna venture down this path.
+  # use pam && myconf="${myconf} --with-pam"
+  myconf="${myconf} --without-pam"
+
+  # Samba doesn't seem to work well with ssl support but I'll add the check 
+  # anyway (otherwise it seems to be built with ssl if it finds it). This should 
+  # be tested. I'll mail gentoo-dev and add a todo in wiki. /Hallski
+  # use ssl && myconf="${myconf} --with-ssl"
+  myconf="${myconf} --without-ssl"
+  
+  cd ${S}/source
+  # Disabled automout support, because it failed
+  # Added -lncurses for readline detection
+  ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
+	--libdir=/etc/smb --sbindir=/usr/sbin --without-automount --with-utmp \
+	--without-sambabook --with-netatalk --with-privatedir=/etc/smb/private \
+	--with-smbmount --with-msdfs --with-vfs --with-spinlocks \
+	--with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \
+	--with-mandir=/usr/share/man --with-profile ${myconf} || die "bad configure"
+  make || die "couldn't compile"
+}
+
+
+src_install() { 
+
+  cd ${S}/source
+  dodir /usr
+  dodir /etc/smb
+  dodir /usr/share/swat
+  dodir /usr/share/doc/${PF}/html/book
+  dodir /var/log
+  dodir /var/run/smb
+  diropts -m 0700 ; dodir /etc/smb/private
+
+  make install prefix=${D}/usr BASEDIR=${D}/usr PRIVATEDIR=${D}/etc/smb/private \
+	LIBDIR=${D}/etc/smb VARDIR=${D}/var/log SWATDIR=${D}/usr/share/swat \
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man || die
+
+  # buggy makefile? we specified PRIVATEDIR as /etc/smb/private already. bogus lint.
+  rm -rf ${D}/usr/private
+
+  # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
+  # which allows it to work transparently with standard 'mount' command
+  diropts -m 0755 ; dodir /sbin
+  mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs
+
+  cd ${S}/source/script
+  exeinto /usr/sbin
+  doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
+
+
+  # docs. samba has some really good ones.
+  cd ${S}
+  insinto /etc/smb ; insopts -m 0644 ; newins examples/smb.conf.default smb.conf.eg
+  insinto /usr/share/sgml/docbook/dbsgml ; doins docbook/dbsgml/*
+  insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docbook/dbsgml/ent/*
+  dodoc COPYING Manifest README Roadmap WHATSNEW.txt
+  docinto examples ; dodoc examples/*
+  cd ${S}/docs ; dodoc announce history samba.lsm THANKS
+  docinto reg ; dodoc *.reg
+  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/*.txt textdocs/README*
+  docinto print ; dodoc textdocs/*.{tex,ps,pdf} 
+  docinto sgml/faq ; dodoc faq/*.sgml
+  docinto sgml/docbook/faq ; dodoc docbook/faq/*.sgml
+  docinto sgml/docbook/howto ; dodoc docbook/howto/*.sgml	
+  docinto sgml/docbook/manpages ; dodoc docbook/manpages/*.sgml
+  docinto sgml/docbook/projdoc ; dodoc docbook/projdoc/*.sgml
+
+
+  # install a standard, standalone-type init script
+  exeinto /etc/init.d ; exeopts -m 0755
+  newexe ${FILESDIR}/samba.rc6 samba
+
+  # svc tools not in rc6
+  svcdebug=0
+  if [ $svcdebug == 1 ] ; then
+	source ${FILESDIR}/config-svc-smbd+nmbd
+	config_install
+	exeinto /etc/init.d ; exeopts -m 0755
+	newexe ${FILESDIR}/samba.svc.rc6 svc-samba
+  fi
+}
+
+
+pkg_preinst() {
+
+  if [ "$ROOT" = "/" ] ; then
+	#if [ -e /etc/init.d/svc-samba ] ; then
+	#	/etc/init.d/svc-samba stop
+	#fi
+	if [ -e /etc/init.d/samba ] ; then
+		/etc/init.d/samba stop
+	fi
+  fi
+}
+
+
+pkg_postinst() {
+
+  # we touch ${D}/etc/smb/smb.conf so that people installing samba just to mount smb shares
+  # don't get annoying warnings all the time.
+  if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then
+	touch ${ROOT}etc/smb/smb.conf
+  fi
+
+  echo " #"
+  echo " If you had samba running earlier, you'll need to start it again. Also, please note"
+  echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly."
+  echo " Mounting smb shares and the smbclient program should work immediately.  To accomplish"
+  echo " this there is an empty /etc/smb/smb.conf file installed."
+  echo
+  echo " To mount smb shares, type something like this. You will need kernel SMB support first:"
+  echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo"
+  echo " If you wish to allow normal users to mount smb shares, type the following as root:"
+  echo " % chmod u+s /usr/bin/smbmnt"
+  echo " #"
+}