cleanup a few things. see the changelog for details.

11 files changed, 125 insertions, 227 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8a0c80efb115..9cfbdb507946 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.5 2002/03/11 03:56:49 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.6 2002/03/27 22:54:19 woodchip Exp $
+
+*samba-2.2.3a-r2 (27 March 2002)
+
+  27 March 2002; Donny Davies <woodchip@gentoo.org> samba-2.2.3a-r2.ebuild,
+  swat.xinetd, smbusers, samba.rc6, samba-2.2.3a-srv_spoolss_nt.patch :
+
+  The "tidy up a bunch of loose-ends before the 1.0 release, release :)"
+
+  *** Changes important for people upgrading ***:
+    -> /etc/smb has moved to the better-suited /etc/samba directory.
+       Simply move your /etc/smb/* to /etc/samba.  Then delete the /etc/samba/codepages
+       directory.  These files are now in /var/lib/samba/codepages since I see no need
+       to have 3.3MB of files in /etc which people will never change :)
+    -> /var/run/smb has moved to /var/run/samba.
+       Again, simply move your /var/run/smb/* to /var/run/samba and all will be well.
+    -> If you have the string "/etc/smb" in your smb.conf file (likely), then please
+       change all occurances of that to "/etc/samba".  Thats it, you're done.
+
+  Other changes:
+    As mentioned above, /etc/smb/codepages has moved to /var/lib/samba/codepages.  The
+    initscript was tweaked to start cupsd before samba and also tweaked to start smbd
+    before nmbd.  Added a sample smbusers file.  Added an xinetd snippet for the swat
+    service.  Added a patch to fix changing printer properties from Windows NT.
 
   10 March 2002; Donny Davies <woodchip@gentoo.org> files/samba.rc6 :
 
diff --git a/net-fs/samba/files/digest-samba-2.2.3a b/net-fs/samba/files/digest-samba-2.2.3a
deleted file mode 100644
index e97eab21f1c8..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.3a
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b6ec2f076af69331535a82b586f55254 samba-2.2.3a.tar.gz 5460531
-MD5 df642726476af756df8a2e6c0537eb0d loadparm.c.patch 1146
-MD5 b8b577540c1de5202e70584a402c2d74 proto.h.patch 319
-MD5 fcc861e805f74ec610ba44ab5cc9f1b7 reply.c.patch 3146
diff --git a/net-fs/samba/files/digest-samba-2.2.3a-r1 b/net-fs/samba/files/digest-samba-2.2.3a-r2
index 4ec219f76d0d..4ec219f76d0d 100644
--- a/net-fs/samba/files/digest-samba-2.2.3a-r1
+++ b/net-fs/samba/files/digest-samba-2.2.3a-r2
diff --git a/net-fs/samba/files/samba-2.2.3a-cli_spoolss_notify.diff b/net-fs/samba/files/samba-2.2.3a-cli_spoolss_notify.patch
index aa07abdc294e..1fb2f50ac9e8 100644
--- a/net-fs/samba/files/samba-2.2.3a-cli_spoolss_notify.diff
+++ b/net-fs/samba/files/samba-2.2.3a-cli_spoolss_notify.patch
@@ -1,13 +1,12 @@
-diff -ur samba-2.2.3a.orig/source/rpc_client/cli_spoolss_notify.c samba-2.2.3a/source/rpc_client/cli_spoolss_notify.c
---- samba-2.2.3a.orig/source/rpc_client/cli_spoolss_notify.c	Sat Feb  2 19:46:49 2002
-+++ samba-2.2.3a/source/rpc_client/cli_spoolss_notify.c	Sun Mar  3 21:05:20 2002
-@@ -70,8 +70,7 @@
- 	}
-   
- 	if (!attempt_netbios_session_request(cli, global_myname, remote_machine, &cli->dest_ip)) {
--		DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request. Error was %s\n", remote_machine, cli_errstr(cli) ));
--		cli_shutdown(cli);
-+		DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request.\n", remote_machine));
- 		return False;
- 	}
- 
+--- samba-2.2.3a/source/rpc_client/cli_spoolss_notify.c	Sat Feb  2 18:46:49 2002

++++ samba-2.2.3a/source/rpc_client/cli_spoolss_notify.c.new	Wed Feb 13 09:42:25 2002

+@@ -70,8 +70,7 @@

+ 	}

+   

+ 	if (!attempt_netbios_session_request(cli, global_myname, remote_machine, &cli->dest_ip)) {

+-		DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request. Error was %s\n", remote_machine, cli_errstr(cli) ));

+-		cli_shutdown(cli);

++		DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request.\n", remote_machine));

+ 		return False;

+ 	}

+ 

diff --git a/net-fs/samba/files/samba-2.2.3a-srv_spoolss_nt.patch b/net-fs/samba/files/samba-2.2.3a-srv_spoolss_nt.patch
new file mode 100644
index 000000000000..218653b52f96
--- /dev/null
+++ b/net-fs/samba/files/samba-2.2.3a-srv_spoolss_nt.patch
@@ -0,0 +1,12 @@
+diff -u -r1.115.2.150 srv_spoolss_nt.c

+--- samba-2.2.3a/source/rpc_server/srv_spoolss_nt.c	12 Feb 2002 15:21:04 -0000	1.115.2.150

++++ samba-2.2.3a/source/rpc_server/srv_spoolss_nt.c	12 Feb 2002 19:10:47 -0000

+@@ -4800,7 +4814,7 @@

+ 		 * lookup previously saved driver initialization info, which is then

+ 		 * bound to the printer, simulating what happens in the Windows arch.

+ 		 */

+-		if (strequal(printer->info_2->drivername, old_printer->info_2->drivername))

++		if (!strequal(printer->info_2->drivername, old_printer->info_2->drivername))

+ 			set_driver_init(printer, 2);

+ 	}

+ 

diff --git a/net-fs/samba/files/samba.pam b/net-fs/samba/files/samba.pam
index 3a6e4e57fc22..a6bac1283f86 100644
--- a/net-fs/samba/files/samba.pam
+++ b/net-fs/samba/files/samba.pam
@@ -3,4 +3,4 @@
 auth       required     pam_smbpass.so nodelay
 account    required     pam_pwdb.so audit nodelay
 session    required     pam_pwdb.so nodelay
-password   required     pam_smbpass.so nodelay smbconf=/etc/smb/smb.conf
+password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba/files/samba.rc6 b/net-fs/samba/files/samba.rc6
index f5a672ab3aec..6d3a89b49e1f 100644
--- a/net-fs/samba/files/samba.rc6
+++ b/net-fs/samba/files/samba.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba.rc6,v 1.7 2002/03/25 20:01:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba.rc6,v 1.8 2002/03/27 22:54:22 woodchip Exp $
 
 depend() {
 	need net
@@ -10,18 +10,18 @@ depend() {
 
 start() {
 	ebegin "Starting samba"
-	start-stop-daemon --start --quiet --exec /usr/sbin/nmbd
-	result=$?
 	start-stop-daemon --start --quiet --exec /usr/sbin/smbd
+	result=$?
+	start-stop-daemon --start --quiet --exec /usr/sbin/nmbd
 	result=$(( $result + $? ))
 	eend $result
 }
 
 stop() {
 	ebegin "Stopping samba"
-	start-stop-daemon --stop --quiet --pidfile /var/run/smb/nmbd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/samba/smbd.pid
 	result=$?
-	start-stop-daemon --stop --quiet --pidfile /var/run/smb/smbd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/samba/nmbd.pid
 	result=$(( $result + $? ))
 	eend $result
 }
diff --git a/net-fs/samba/files/smbusers b/net-fs/samba/files/smbusers
new file mode 100644
index 000000000000..ae3389f53f85
--- /dev/null
+++ b/net-fs/samba/files/smbusers
@@ -0,0 +1,3 @@
+# Unix_name = SMB_name1 SMB_name2 ...
+root = administrator admin
+nobody = guest pcguest smbguest
diff --git a/net-fs/samba/files/swat.xinetd b/net-fs/samba/files/swat.xinetd
new file mode 100644
index 000000000000..692be435b53d
--- /dev/null
+++ b/net-fs/samba/files/swat.xinetd
@@ -0,0 +1,16 @@
+# default: off
+# description: SWAT is the Samba Web Admin Tool. Use swat \
+#	       to configure your Samba server. To use SWAT, \
+#	       connect to port 901 with your favorite web browser.
+
+service swat
+{
+	port            = 901
+	socket_type     = stream
+	wait            = no
+	only_from       = localhost
+	user            = root
+	server          = /usr/sbin/swat
+	log_on_failure += USERID
+	disable         = yes
+}
diff --git a/net-fs/samba/samba-2.2.3a-r1.ebuild b/net-fs/samba/samba-2.2.3a-r2.ebuild
index 814c281c4f7d..c62cd519ebaf 100644
--- a/net-fs/samba/samba-2.2.3a-r1.ebuild
+++ b/net-fs/samba/samba-2.2.3a-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.3a-r1.ebuild,v 1.1 2002/03/05 15:22:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.3a-r2.ebuild,v 1.1 2002/03/27 22:54:21 woodchip Exp $
 
 DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
 HOMEPAGE="http://samba.org http://www.amherst.edu/~bbstone/howto/samba.html"
@@ -22,12 +22,12 @@ DEPEND="${RDEPEND}
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
 src_unpack() {
-
 	unpack ${P}.tar.gz ; cd ${S}
 	use afs && ( patch -p0 < ${FILESDIR}/samba-2.2.1a-afs.diff || die )
 	patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
 	patch -p1 < ${FILESDIR}/samba-2.2.3a-pam_smbpass.diff || die
-	patch -p1 < ${FILESDIR}/samba-2.2.3a-cli_spoolss_notify.diff || die
+	patch -p1 < ${FILESDIR}/samba-2.2.3a-cli_spoolss_notify.patch || die
+	patch -p1 < ${FILESDIR}/samba-2.2.3a-srv_spoolss_nt.patch || die
 
 	# network recycle bin must be enabled in your smb.conf per share
 	cd ${S}/source
@@ -53,7 +53,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	use afs && myconf="${myconf} --with-afs"
 	use acl && myconf="${myconf} --with-acl-support"
@@ -64,14 +63,15 @@ src_compile() {
 	cd ${S}/source
 	./configure \
 		--prefix=/usr \
-		--libdir=/etc/smb \
+		--libdir=/etc/samba \
 		--sbindir=/usr/sbin \
-		--sysconfdir=/etc/smb \
+		--sysconfdir=/etc/samba \
 		--localstatedir=/var/log \
-		--with-lockdir=/var/run/smb \
 		--with-mandir=/usr/share/man \
+		--with-lockdir=/var/run/samba \
 		--with-swatdir=/usr/share/swat \
-		--with-privatedir=/etc/smb/private \
+		--with-privatedir=/etc/samba/private \
+		--with-codepagedir=/var/lib/samba/codepages \
 		--with-pam --with-pam_smbpass \
 		--without-sambabook \
 		--without-automount \
@@ -90,24 +90,24 @@ src_compile() {
 }
 
 src_install() {
-
 	cd ${S}/source
-	dodir /sbin /etc/smb /usr/share/swat /var/log /var/run/smb /lib/security
+	dodir /sbin /etc/samba /usr/share/swat /var/log /var/run/samba \
+		/lib/security /var/lib/samba/codepages
 
 	make install \
 		prefix=${D}/usr \
 		BASEDIR=${D}/usr \
-		LIBDIR=${D}/etc/smb \
 		VARDIR=${D}/var/log \
-		LOCKDIR=${D}/var/lock \
+		LIBDIR=${D}/etc/samba \
 		SBINDIR=${D}/usr/sbin \
 		MANDIR=${D}/usr/share/man \
+		LOCKDIR=${D}/var/run/samba \
 		SWATDIR=${D}/usr/share/swat \
-		PRIVATEDIR=${D}/etc/smb/private || die
+		PRIVATEDIR=${D}/etc/samba/private \
+		CODEPAGEDIR=${D}/var/lib/samba/codepages || die
 
-	# we specified PRIVATEDIR=/etc/smb/private
+	# we specified PRIVATEDIR=/etc/samba/private
 	rm -rf ${D}/usr/private
-	diropts -m 0700 ; dodir /etc/smb/private
 
 	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
 	# to work transparently with standard 'mount' command
@@ -134,9 +134,12 @@ src_install() {
 	docinto examples ; cp -a examples/* ${D}/usr/share/doc/${PF}/examples
 	prepalldocs
 
+	insinto /etc/samba
+	newins examples/smb.conf.default smb.conf.example
+	doins ${FILESDIR}/smbusers
 	insinto /etc/pam.d ; newins ${FILESDIR}/samba.pam samba
-	insinto /etc/smb ; newins examples/smb.conf.default smb.conf.example
 	exeinto /etc/init.d ; newexe ${FILESDIR}/samba.rc6 samba
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/swat.xinetd swat
 }
 
 pkg_preinst() {
@@ -153,21 +156,40 @@ pkg_prerm() {
 
 pkg_postinst() {
 
-	# we touch ${D}/etc/smb/smb.conf so that people installing samba
+	# we touch ${D}/etc/samba/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
+	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
+		touch ${ROOT}/etc/samba/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 "##"
+	# might be empty for some people so do it here..
+	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
+
+	# /etc/smb is changed to /etc/samba; /var/run/smb to /var/run/samba
+	ewarn "******************************************************************"
+	ewarn "* NOTE: If you upgraded from an earlier version of samba you     *"
+	ewarn "*       must move your /etc/smb files to the more aptly suited   *"
+	ewarn "*       /etc/samba directory.  Also, please move the files in    *"
+	ewarn "*       /var/run/smb to /var/run/samba.  Lastly, if you have     *"
+	ewarn "*       the string "/etc/smb" in your smb.conf file, please      *"
+	ewarn "*       change that to "/etc/samba".  The old /etc/smb/codepages *"
+	ewarn "*       directory doesn't need to be moved into /etc/samba       *"
+	ewarn "*       because those files are now kept in the                  *"
+	ewarn "*       /var/lib/samba/codepages directory.                      *"
+	ewarn "*                                                                *"
+	ewarn "*       If you need help with upgrading, email me:               *"
+	ewarn "*       woodchip@gentoo.org and I'll assist you.                 *"
+	ewarn "******************************************************************"
+
+	#echo "##"
+	#echo " If you had samba running earlier, you'll need to start it again. Also, please note"
+	#echo " that you must configure /etc/samba/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/samba/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.3a.ebuild b/net-fs/samba/samba-2.2.3a.ebuild
deleted file mode 100644
index c1e8031fa7ff..000000000000
--- a/net-fs/samba/samba-2.2.3a.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.3a.ebuild,v 1.1 2002/03/05 03:04:54 woodchip Exp $
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://samba.org http://www.amherst.edu/~bbstone/howto/samba.html"
-
-S=${WORKDIR}/${P}
-SRC_URI="http://us1.samba.org/samba/ftp/${P}.tar.gz
-	http://www.amherst.edu/~bbstone/recycle_bin/${PV/a/}/loadparm.c.patch
-	http://www.amherst.edu/~bbstone/recycle_bin/${PV/a/}/proto.h.patch
-	http://www.amherst.edu/~bbstone/recycle_bin/${PV/a/}/reply.c.patch"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/pam-0.72
-	acl? ( sys-apps/acl )
-	cups? ( net-print/cups )"
-	# needs testing -- ssl? ( >=dev-libs/openssl-0.9.6 )
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-src_unpack() {
-
-	unpack ${P}.tar.gz ; cd ${S}
-	use afs && ( patch -p0 < ${FILESDIR}/samba-2.2.1a-afs.diff || die )
-	patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
-	patch -p1 < ${FILESDIR}/samba-2.2.3a-pam_smbpass.diff || die
-	patch -p1 < ${FILESDIR}/samba-2.2.3a-cli_spoolss_notify.diff || die
-
-	# network recycle bin must be enabled in your smb.conf per share
-	cd ${S}/source
-	patch -p0 < ${DISTDIR}/loadparm.c.patch || die
-	patch -p0 < ${DISTDIR}/proto.h.patch || die
-	patch -p0 < ${DISTDIR}/reply.c.patch || die
-
-	# makes cups not absolutely required
-	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
-	fi
-
-	# fix kerberos include file collision
-	cd ${S}/source/include
-	mv profile.h smbprofile.h
-	sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new
-	mv includes.h.new includes.h
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-
-	local myconf
-	use afs && myconf="${myconf} --with-afs"
-	use acl && myconf="${myconf} --with-acl-support"
-	# ssl needs testing...
-	myconf="${myconf} --without-ssl"
-
-	export CFLAGS="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--libdir=/etc/smb \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc/smb \
-		--localstatedir=/var/log \
-		--with-lockdir=/var/run/smb \
-		--with-mandir=/usr/share/man \
-		--with-swatdir=/usr/share/swat \
-		--with-privatedir=/etc/smb/private \
-		--with-pam --with-pam_smbpass \
-		--without-sambabook \
-		--without-automount \
-		--without-spinlocks \
-		--with-netatalk \
-		--with-smbmount \
-		--with-profile \
-		--with-quotas \
-		--with-syslog \
-		--with-msdfs \
-		--with-utmp \
-		--with-vfs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	cd ${S}/source
-	dodir /sbin /etc/smb /usr/share/swat /var/log /var/run/smb /lib/security
-
-	make install \
-		prefix=${D}/usr \
-		BASEDIR=${D}/usr \
-		LIBDIR=${D}/etc/smb \
-		VARDIR=${D}/var/log \
-		LOCKDIR=${D}/var/lock \
-		SBINDIR=${D}/usr/sbin \
-		MANDIR=${D}/usr/share/man \
-		SWATDIR=${D}/usr/share/swat \
-		PRIVATEDIR=${D}/etc/smb/private || die
-
-	# we specified PRIVATEDIR=/etc/smb/private
-	rm -rf ${D}/usr/private
-	diropts -m 0700 ; dodir /etc/smb/private
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with standard 'mount' command
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# handy scripts for user management
-	cd ${S}/source/script
-	exeinto /usr/sbin
-	doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh
-
-	# place this correctly
-	mv ${D}/usr/bin/pam_smbpass.so ${D}/lib/security/pam_smbpass.so
-
-	# make the smb backend symlink for smb printing support with cups
-	if [ "`use cups`" ] ; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# too many docs to sort through -- install them all :)
-	cd ${S}
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs ; cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples ; cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/samba.pam samba
-	insinto /etc/smb ; newins examples/smb.conf.default smb.conf.example
-	exeinto /etc/init.d ; newexe ${FILESDIR}/samba.rc6 samba
-}
-
-pkg_preinst() {
-	if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then
-		/etc/init.d/samba stop
-	fi
-}
-
-pkg_prerm() {
-	if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then
-		/etc/init.d/samba stop
-	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 "##"
-}