close #9249 and other fixes

6 files changed, 70 insertions, 438 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index fdbf751d2761..86037307628e 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,13 +1,18 @@
 # 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.19 2002/10/26 23:41:50 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.20 2002/11/07 06:32:42 woodchip Exp $
+
+*samba-2.2.6-r2 (Nov 07 2002)
+
+  07 Nov 2002; Donny Davies <woodchip@gentoo.org> : Added patch to fix fd leak.
+  Made pam support optional.  Added --with-sendfile-support.  Fixup digest (vscan).
+  Fix for #9249.
 
 *samba-2.2.6-r1 (Oct 26 2002)
 
-  26 Oct 2002; Jon Nall <nall@gentoo.org> :
-  samba expects ldap to depend on sasl in order for libresolv.so to
-  get linked in, but ldap need not be compiled with sasl support. in
-  this case samba needs to link in libresolv.so
+  26 Oct 2002; Jon Nall <nall@gentoo.org> : samba expects ldap to depend on sasl
+  in order for libresolv.so to get linked in, but ldap need not be compiled with
+  sasl support. in this case samba needs to link in libresolv.so
 
 *samba-2.2.6 (Oct 24 2002)
 
@@ -15,29 +20,26 @@
 
   25 Oct 2002; Donny Davies <woodchip@gentoo.org> : Fix openldap dependency from #9249.
 
-  24 Oct 2002; Donny Davies <woodchip@gentoo.org> :
-  Chase latest release.  New local USE vscan flag for building the
-  openantivirus project plugins.  Added several more ldap files
-  and scripts.  Now builds the bundled VFS plugins.  Added more docs
-  and findsmb script.  Added lazy smbumount and VFS plugins reloc patches.
+  24 Oct 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release.  New local USE
+  vscan flag for building the openantivirus project plugins.  Added several more ldap files
+  and scripts.  Now builds the bundled VFS plugins.  Added more docs and findsmb script.
+  Added lazy smbumount and VFS plugins reloc patches.
 
 *samba-2.2.5-r1 (Aug 27 2002)
 
-  20 Oct 2002; Michael Cohen <mjc@gentoo.org> samba-2.2.5-r1.ebuild,
+  20 Oct 2002; Michael Cohen <mjc@gentoo.org> samba-2.2.5-r1.ebuild:
   added portldap use flag for my nifty ldap stuff coming up.  no need 
   to bump version.
 
   27 Aug 2002; Donny Davies <woodchip@gentoo.org> samba-2.2.5-r1.ebuid,
-  smb.conf.example :
-  Fix #6936; thanks shadow@ines.ro.  Fix #7133, thanks klebermass@limtec.de.
+  smb.conf.example :  Fix #6936; thanks shadow@ines.ro.  Fix #7133, thanks
+  klebermass@limtec.de.
 
 *samba-2.2.5 (23 Jun 2002)
 
-  25 Aug 2002; Jack Morgan <jmorgan@gentoo.org> :
-  Added sparc64 keyword
+  25 Aug 2002; Jack Morgan <jmorgan@gentoo.org> : Added sparc64 keyword
 
-  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
-  Added ppc keyword
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> : Added ppc keyword
 
   23 Jun 2002; Donny Davies <woodchip@gentoo.org> :
   Update to latest; samba-2.2.5.  Please see the samba WHATSNEW.txt file
@@ -45,10 +47,9 @@
 
 *samba-2.2.4-r1 (13 May 2002)
 
-  13 May 2002; Donny Davies <woodchip@gentoo.org> :
-  Install smbmnt and smbumount suid root, close #2635.
-  Pass --bindir to ./configure, close #2515.
-  Add a few more codepages.
+  13 May 2002; Donny Davies <woodchip@gentoo.org> :  Install smbmnt and smbumount
+  suid root, close #2635. Pass --bindir to ./configure, close #2515. Add a few
+  more codepages.
 
 *samba-2.2.4 (6 May 2002)
   
@@ -67,8 +68,7 @@
 
 *samba-2.2.3a-r3 (3 May 2002)
   
-  3 May 2002; Donny Davies <woodchip@gentoo.org> :  
-  Added LICENSE, SLOT, $Headers.
+  3 May 2002; Donny Davies <woodchip@gentoo.org> : Added LICENSE, SLOT, $Headers.
 
 *samba-2.2.3a-r2 (27 March 2002)
 
diff --git a/net-fs/samba/files/digest-samba-2.2.6-r1 b/net-fs/samba/files/digest-samba-2.2.6-r1
deleted file mode 100644
index d8fd4d11ca88..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 147efc95ecd4ca69ec679c73f246e5de samba-2.2.6.tar.bz2 4390352
diff --git a/net-fs/samba/files/digest-samba-2.2.6 b/net-fs/samba/files/digest-samba-2.2.6-r2
index ca9fb0ac43f1..ca9fb0ac43f1 100644
--- a/net-fs/samba/files/digest-samba-2.2.6
+++ b/net-fs/samba/files/digest-samba-2.2.6-r2
diff --git a/net-fs/samba/files/samba-2.2.6-notify_kernel.patch b/net-fs/samba/files/samba-2.2.6-notify_kernel.patch
new file mode 100644
index 000000000000..f3803c1a06a4
--- /dev/null
+++ b/net-fs/samba/files/samba-2.2.6-notify_kernel.patch
@@ -0,0 +1,18 @@
+--- notify_kernel.c.orig	2002-11-06 14:32:36.000000000 -0500
++++ notify_kernel.c	2002-11-06 14:33:48.000000000 -0500
+@@ -127,7 +127,6 @@
+ 		BlockSignals(True, RT_SIGNAL_NOTIFY);
+ 		for (i = 0; i < signals_received; i++) {
+ 			if (fd == (int)fd_pending_array[i]) {
+-				close(fd);
+ 				fd_pending_array[i] = (SIG_ATOMIC_T)-1;
+ 				if (signals_received - i - 1) {
+  					memmove((void *)&fd_pending_array[i], (void *)&fd_pending_array[i+1],
+@@ -138,6 +137,7 @@
+ 				break;
+ 			}
+ 		}
++		close(fd);
+ 		BlockSignals(False, RT_SIGNAL_NOTIFY);
+ 	}
+ 	SAFE_FREE(data);
diff --git a/net-fs/samba/samba-2.2.6-r1.ebuild b/net-fs/samba/samba-2.2.6-r2.ebuild
index 1df518c7c189..18d9e0389695 100644
--- a/net-fs/samba/samba-2.2.6-r1.ebuild
+++ b/net-fs/samba/samba-2.2.6-r2.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.6-r1.ebuild,v 1.1 2002/10/26 23:32:04 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.6-r2.ebuild,v 1.1 2002/11/07 06:32:42 woodchip Exp $
 
-IUSE="tcpd ldap cups ssl acl vscan"
+IUSE="pam acl cups ldap ssl tcpd vscan"
 
-inherit perl-module
-
-# please test/report your experiences with these new VFS plugins.
 VSCAN_VER=0.2.5e
 VSCAN_MODS="fprot mks openantivirus" #kaspersky sophos symantec trend
-#need libs/headers/extra support for these ones^^
+#need libs/headers/extra support for these ones^; please test!
 
 DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
 HOMEPAGE="http://www.samba.org"
@@ -18,13 +15,13 @@ S=${WORKDIR}/${P}
 SRC_URI="vscan? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.gz
 	http://us2.samba.org/samba/ftp/${P}.tar.bz2"
 
-DEPEND=">=sys-libs/pam-0.72
-	acl? ( sys-apps/acl )
-	cups? ( net-print/cups )
-	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	vscan? ( >=dev-libs/popt-1.6.3 )"
+DEPEND="pam? >=sys-libs/pam-0.72
+	acl? sys-apps/acl
+	cups? net-print/cups
+	ldap? =net-nds/openldap-2*
+	ssl? >=dev-libs/openssl-0.9.6
+	tcpd? >=sys-apps/tcp-wrappers-7.6
+	vscan? >=dev-libs/popt-1.6.3"
 KEYWORDS="~x86 ~ppc ~sparc64"
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,21 +31,21 @@ src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
 
-	patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
-	patch -p1 < ${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch || die
-	cd source/client; patch -p0 < ${FILESDIR}/samba-2.2.6-smbumount_lazy.patch || die
+	patch -p0 <${FILESDIR}/samba-2.2.2-smbmount.diff || die
+	patch -p1 <${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch || die
+	cd ${S}/source/smbd
+	patch -p0 <${FILESDIR}/samba-2.2.6-notify_kernel.patch || die
+	cd ${S}/source/client
+	patch -p0 <${FILESDIR}/samba-2.2.6-smbumount_lazy.patch || die
 
 	if use portldap; then
 		cd ${S}/source
-		patch -p0 < $FILESDIR/nonroot-bind.diff || die
-		cd ${S}
+		patch -p0 <$FILESDIR/nonroot-bind.diff || die
 	fi
 
-	if use ldap ; then
-		if ! use sasl ; then
-			cd ${S}
-			patch -p0 < ${FILESDIR}/samba-2.2.6-libresolv.patch || die
-		fi
+	if use ldap; then
+		cd ${S}
+		patch -p0 <${FILESDIR}/samba-2.2.6-libresolv.patch || die
 	fi
 
 	# fix kerberos include file collision..
@@ -76,6 +73,8 @@ src_compile() {
 	local i myconf
 	use acl && myconf="${myconf} --with-acl-support" ||  myconf="${myconf} --without-acl-support"
 	use ssl && myconf="${myconf} --with-ssl" || myconf="${myconf} --without-ssl"
+	use pam && myconf="${myconf} --with-pam --with-pam_smbpass" || \
+		myconf="${myconf} --without-pam --without-pam_smbpass"
 	use cups && myconf="${myconf} --enable-cups" || myconf="${myconf} --disable-cups"
 	use ldap && myconf="${myconf} --with-ldapsam" || myconf="${myconf} --without-ldapsam"
 
@@ -94,7 +93,7 @@ src_compile() {
 		--with-swatdir=/usr/share/swat \
 		--with-privatedir=/etc/samba/private \
 		--with-codepagedir=/var/lib/samba/codepages \
-		--with-pam --with-pam_smbpass \
+		--with-sendfile-support \
 		--without-sambabook \
 		--without-automount \
 		--without-spinlocks \
@@ -109,11 +108,15 @@ src_compile() {
 		--with-utmp \
 		--with-vfs \
 		--host=${CHOST} ${myconf} || die "bad ./configure"
+		#--with-winbind-ldap-hack
 
 	# compile samba..
-	make all smbfilter smbwrapper smbcacls pam_smbpass \
+	make all smbfilter smbwrapper smbcacls \
 		nsswitch nsswitch/libnss_wins.so debug2html
 	assert "samba compile problem"
+	if use pam; then
+		make pam_smbpass || die "pam_smbpass compile problem"
+	fi
 
 	# compile the bundled vfs modules..
 	cd ${S}/examples.bin/VFS
@@ -168,7 +171,7 @@ src_install() {
 	insinto /usr/lib
 	doins source/bin/libsmbclient.a
 	exeinto /lib/security
-	doexe source/bin/pam_smbpass.so
+	use pam && doexe source/bin/pam_smbpass.so
 	doexe source/nsswitch/pam_winbind.so
 
 
diff --git a/net-fs/samba/samba-2.2.6.ebuild b/net-fs/samba/samba-2.2.6.ebuild
deleted file mode 100644
index a18e95e64c88..000000000000
--- a/net-fs/samba/samba-2.2.6.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.6.ebuild,v 1.4 2002/10/26 18:22:46 woodchip Exp $
-
-IUSE="tcpd ldap cups ssl acl vscan"
-
-inherit perl-module
-
-# please test/report your experiences with these new VFS plugins.
-VSCAN_VER=0.2.5e
-VSCAN_MODS="fprot mks openantivirus" #kaspersky sophos symantec trend
-#need libs/headers/extra support for these ones^^
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org"
-
-S=${WORKDIR}/${P}
-SRC_URI="vscan? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.gz
-	http://us2.samba.org/samba/ftp/${P}.tar.bz2"
-
-DEPEND=">=sys-libs/pam-0.72
-	acl? ( sys-apps/acl )
-	cups? ( net-print/cups )
-	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	vscan? ( >=dev-libs/popt-1.6.3 )"
-KEYWORDS="~x86 ~ppc ~sparc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
-	patch -p1 < ${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch || die
-	cd source/client; patch -p0 < ${FILESDIR}/samba-2.2.6-smbumount_lazy.patch || die
-
-	if use portldap; then
-		cd ${S}/source
-		patch -p0 < $FILESDIR/nonroot-bind.diff || die
-		cd ${S}
-	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
-
-	# for clean docs packaging sake, make a copy..
-	cp -a ${S}/examples ${S}/examples.bin
-	if use vscan; then
-		# prep source for selected vscan plugin modules..
-		for i in ${VSCAN_MODS}
-		do
-			cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER}/$i \
-				${S}/examples.bin/VFS
-		done
-	fi
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-	local i myconf
-	use acl && myconf="${myconf} --with-acl-support" ||  myconf="${myconf} --without-acl-support"
-	use ssl && myconf="${myconf} --with-ssl" || myconf="${myconf} --without-ssl"
-	use cups && myconf="${myconf} --enable-cups" || myconf="${myconf} --disable-cups"
-	use ldap && myconf="${myconf} --with-ldapsam" || myconf="${myconf} --without-ldapsam"
-
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--libdir=/etc/samba \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var/log \
-		--with-configdir=/etc/samba \
-		--with-mandir=/usr/share/man \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-privatedir=/etc/samba/private \
-		--with-codepagedir=/var/lib/samba/codepages \
-		--with-pam --with-pam_smbpass \
-		--without-sambabook \
-		--without-automount \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-smbwrapper \
-		--with-netatalk \
-		--with-smbmount \
-		--with-profile \
-		--with-quotas \
-		--with-syslog \
-		--with-msdfs \
-		--with-utmp \
-		--with-vfs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# compile samba..
-	make all smbfilter smbwrapper smbcacls pam_smbpass \
-		nsswitch nsswitch/libnss_wins.so debug2html
-	assert "samba compile problem"
-
-	# compile the bundled vfs modules..
-	cd ${S}/examples.bin/VFS
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "bad ./configure"
-	make || die "VFS modules compile problem"
-
-	# compile mkntpasswd in examples/LDAP/ for smbldaptools..
-	if use ldap; then
-		cd ${S}/examples.bin/LDAP/smbldap-tools/mkntpwd
-		make || die "mkntpwd compile problem"
-	fi
-
-	# compile the selected antivirus vfs plugins..
-	if use vscan; then
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/$i && make
-			assert "problem building $i vscan module"
-		done
-	fi
-}
-
-src_install() {
-	local i
-
-	# we may as well do this all manually since it was starting
-	# to get out of control and samba _does_ have some rather
-	# silly installation quirks ;)  much of this was adapted
-	# from mandrake's .spec file..
-	#
-	# // woodchip - 5 May 2002
-
-
-	# install standard binary files..
-	for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-		make_smbcodepage make_unicodemap make_printerdef rpcclient \
-		smbspool smbcacls smbclient smbmount smbumount smbsh wbinfo
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/bin/smbumount
-
-
-	# libraries..
-	exeinto /usr/lib
-	doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	exeinto /lib/security
-	doexe source/bin/pam_smbpass.so
-	doexe source/nsswitch/pam_winbind.so
-
-
-	# vfs modules..
-	exeinto /usr/lib/samba/vfs
-	doexe examples.bin/VFS/audit.so
-	doexe examples.bin/VFS/block/block.so
-	doexe examples.bin/VFS/recycle/recycle.so
-	use vscan && doexe examples.bin/VFS/*/vscan-*.so
-
-
-	# some utility scripts..
-	for i in mksmbpasswd.sh smbtar convert_smbpasswd
-	do
-		exeinto /usr/bin
-		doexe source/script/${i}
-	done
-	# and this handy one..
-	doexe packaging/Mandrake/findsmb
-
-
-	# secure binary files..
-	for i in smbd nmbd swat smbfilter debug2html smbmnt smbcontrol winbindd
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/sbin/smbmnt
-
-
-	# man pages..
-	doman docs/manpages/*
-
-
-	# codepage source files
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/codepage_def.${i}
-	done
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/CP${i}.TXT
-	done
-
-
-	# build codepage load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		${D}/usr/bin/make_smbcodepage c ${i} \
-			${D}/var/lib/samba/codepages/src/codepage_def.${i} \
-			${D}/var/lib/samba/codepages/codepage.${i}
-	done
-
-
-	# build unicode load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		${D}/usr/bin/make_unicodemap ${i} \
-			${D}/var/lib/samba/codepages/src/CP${i}.TXT \
-			${D}/var/lib/samba/codepages/unicode_map.${i}
-	done
-	rm -rf ${D}/var/lib/samba/codepages/src
-
-
-	# install the nsswitch library extension files..
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-
-	# install SWAT helper files..
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-
-	# install the O'Reilly "Using Samba" book..
-	for i in docs/htmldocs/using_samba/*.html
-	do
-		insinto /usr/share/swat/using_samba
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/gifs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/gifs
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/figs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/figs
-		doins ${i}
-	done
-
-
-	# install the utilities from LDAP/smbldap-tools
-	if use ldap; then
-		exeinto /usr/share/samba/smbldap-tools
-		doexe examples/LDAP/smbldap-tools/*.pl
-		doexe examples/LDAP/smbldap-tools/smbldap_tools.pm
-		doexe examples/LDAP/{import,export}_smbpasswd.pl
-		chmod 0700 ${D}/usr/share/samba/smbldap-tools/{import,export}_smbpasswd.pl
-		exeinto /usr/sbin
-		doexe examples.bin/LDAP/smbldap-tools/mkntpwd/mkntpwd
-		#dodir /usr/lib/perl5/site_perl/5.6.1
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /usr/share/samba/smbldap-tools/smbldap_tools.pm ${installarchlib}
-	fi
-
-
-	# we don't want two copies of the book or manpages
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	# attempt to install all the docs as easily as possible :/
-	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
-	# keep this next line *after* prepalldocs!
-	dosym /usr/share/swat/using_samba /usr/share/doc/${PF}/using_samba
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use vscan; then
-		docinto vscan-modules
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		for i in ${VSCAN_MODS}
-		do
-			docinto vscan-modules/$i
-			dodoc $i/INSTALL
-		done
-	fi
-	cd ${S} # hyaah; thems a lotta docs!
-
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-
-	# make a symlink on /usr/lib/smbwrapper.so in /usr/sbin
-	# to fix smbsh problem.  #6936
-	dosym /usr/lib/smbwrapper.so /usr/sbin/smbwrapper.so
-
-
-	# now the config files..
-	insinto /etc
-	doins ${FILESDIR}/nsswitch.conf-winbind
-	doins ${FILESDIR}/nsswitch.conf-wins
-
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	doins ${FILESDIR}/smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	if use ldap; then
-		doins ${FILESDIR}/smbldap_conf.pm
-		doins ${FILESDIR}/samba-slapd-include.conf
-	fi
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-}
-
-pkg_postinst() {
-	# touch /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/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}