SAMBA_3_0_20030706; update of beta2 release

6 files changed, 35 insertions, 389 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c4e4e9ca357c..076d71196413 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,8 +1,8 @@
 MD5 b4f7c9e6b05c610bf52033ed430de265 samba-2.2.8.ebuild 10688
-MD5 0577acea45b4a13a21badab2e14c9b5c samba-3.0.0_beta2-r1.ebuild 9820
+MD5 029774350d88d76984d4b718e35d0d67 samba-3.0.0_beta2-r1.ebuild 9820
 MD5 ffaa2e0509dbf5a45ca4e11c784e797a samba-2.2.8a.ebuild 10687
 MD5 c8ac626d5f4cac00c57c7a5a2dcf9964 samba-3.0.0_beta1-r1.ebuild 10157
-MD5 1473eb64bdd2e470eb3d37135419625e ChangeLog 9085
+MD5 803fd7d83b1391a8a12fa88417e59d50 ChangeLog 9085
 MD5 23bf9d13bd13e51abb07688b00cab9b6 files/winbind-init 896
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
 MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
diff --git a/net-fs/samba/files/digest-samba-3.0.0_beta2-r1 b/net-fs/samba/files/digest-samba-3.0.0_beta2-r1
new file mode 100644
index 000000000000..e7a60f621766
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.0_beta2-r1
@@ -0,0 +1 @@
+MD5 92c386e8a667f83fa19a0b5dd137cc2d samba_3_0_20030706.tar.bz2 7593799
diff --git a/net-fs/samba/files/digest-samba-3.0_alpha22 b/net-fs/samba/files/digest-samba-3.0_alpha22
deleted file mode 100644
index 71753f447ce9..000000000000
--- a/net-fs/samba/files/digest-samba-3.0_alpha22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1399b9e297f51bd18cb21339a3f8f67 samba-vscan-0.3.2.tar.bz2 68127
-MD5 0d39d08eb60c395d61ac50ce490e4b17 samba-3.0alpha22.tar.bz2 4447271
-MD5 b2f0b818ca0545d34b1bb39b238d4d17 samba-3.0alpha22-patches-1.tar.bz2 5551
diff --git a/net-fs/samba/files/digest-samba-3.0_alpha24-r1 b/net-fs/samba/files/digest-samba-3.0_alpha24-r1
deleted file mode 100644
index 55b3d49af87c..000000000000
--- a/net-fs/samba/files/digest-samba-3.0_alpha24-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a9b4c191452d2e4656c1ca98581830f samba_3_0_20030528.tar.bz2 4807871
-MD5 cacc32f21812494993e32be558b91bdd samba-vscan-0.3.2b.tar.bz2 69479
diff --git a/net-fs/samba/samba-3.0_alpha24-r1.ebuild b/net-fs/samba/samba-3.0.0_beta2-r1.ebuild
index 98ae5a542eab..47c4cb83e8ab 100644
--- a/net-fs/samba/samba-3.0_alpha24-r1.ebuild
+++ b/net-fs/samba/samba-3.0.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0_alpha24-r1.ebuild,v 1.3 2003/05/30 14:08:15 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0_beta2-r1.ebuild,v 1.1 2003/07/07 00:17:11 woodchip Exp $
 
 inherit eutils
 
@@ -8,17 +8,18 @@ IUSE="kerberos mysql xml acl cups ldap pam readline python"
 IUSE="${IUSE} oav"
 
 DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org"
+HOMEPAGE="http://www.samba.org
+	http://www.openantivirus.org/projects.php"
 
-VSCAN_VER=0.3.2b
+VSCAN_VER=HEAD-06-25-2003
 VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
 # To build the "kapersky" plugin, the kapersky lib must be installed.
 
-_CVS=_3_0_20030528
+_CVS=_3_0_20030706
 S=${WORKDIR}/${PN}${_CVS}
 
 SRC_URI="mirror://gentoo/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2"
+	oav? http://www.openantivirus.org/snapshots/${PN}-vscan-${VSCAN_VER}.tar.gz"
 
 DEPEND="sys-devel/autoconf dev-libs/popt
 	readline? sys-libs/readline
@@ -43,17 +44,7 @@ src_unpack() {
 	# Clean up CVS and add patch(es)
 	find . -name .cvsignore | xargs rm -f
 	find . -name CVS | xargs rm -rf
-	cd source; epatch ${FILESDIR}/samba-pdb_ldap-exop.patch; cd ..
-
-	#HACK!! else get linker errors starting with vfstest
-	#and then the build will fail.  not sure whats going on
-	#with this yet.
-	if use ldap || use kerberos; then
-		cd source; cp Makefile.in Makefile.in.orig
-		sed -e "s%^\(LIBS=.*\)%\1 -llber -lldap%" Makefile.in.orig >Makefile.in
-		cd ..
-	fi
-
+	# no patches ...
 
 	# For clean docs packaging sake.
 	rm -rf ${S}/examples.bin ; cp -a ${S}/examples ${S}/examples.bin
@@ -61,10 +52,6 @@ src_unpack() {
 	# Prep samba-vscan source.
 	if use oav; then
 		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/include
-		sed -e "s%^\(# define SAMBA_VERSION_MAJOR\).*%\1 3%" \
-			vscan-global.h >vscan-global.h.3
-		mv -f vscan-global.h.3 vscan-global.h
 	fi
 
 	cd ${S}/source
@@ -74,11 +61,14 @@ src_unpack() {
 src_compile() {
 	local i
 	local myconf
-	local mymods #="nisplussam"
+	local mymods
 
+	#looks like this is deprecated...
+	#mymods="nisplussam"
 	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
-	myconf="${myconf} --with-expsam=${mymods}"
+
+	myconf="--with-expsam=${mymods}"
 
 	use acl \
 		&& myconf="${myconf} --with-acl-support" \
@@ -138,45 +128,45 @@ src_compile() {
 		\
 		--enable-static --enable-shared \
 		--with-manpages-langs=en \
-		--with-sendfile-support \
 		--without-spinlocks \
 		--with-libsmbclient \
 		--with-automount \
 		--with-smbmount \
 		--with-winbind \
 		--with-quotas \
-		--with-tdbsam \
 		--with-syslog \
 		--with-idmap \
-		--with-utmp \
 		--host=${CHOST} ${myconf} || die
 
 	# Compile main SAMBA pieces.
-	make everything wins || die "SAMBA pieces"
+	make everything || die "SAMBA pieces"
 	#make rpctorture
 
 	# Build selected samba-vscan plugins.
-	use oav && \
-	for i in ${VSCAN_MODS}
-	do
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-		make USE_INCLMKSDLIB=1 #needed for the mks build
-		assert "problem building $i vscan module"
-	done
+	if use oav; then
+		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
+		./configure || die "bad ${PN}-vscan-${VSCAN_VER} ./configure"
+		for i in ${VSCAN_MODS}
+		do
+			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
+			make USE_INCLMKSDLIB=1 #needed for the mks build
+			assert "problem building $i vscan module"
+		done
+	fi
 }
 
 src_install() {
-# For tesing the latest brokeness with the Make/Install system :-)
+# For testing brokeness of make install
 #	cd source
 #	make DESTDIR=${D} install installmodules install_python
-#	assert "yawn, still horribly broken ... sigh."
+#	assert "It would be nice if that worked. REALLY worked."
 
 	# Install standard binary files.
 	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit editreg \
+		smbcontrol smbtree tdbbackup nmblookup pdbedit \
 		smbpasswd rpcclient smbcacls profiles ntlm_auth \
 		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort # smbsh
+		debug2html smbfilter talloctort #smbsh editreg
 	do
 		exeinto /usr/bin
 		doexe source/bin/${i}
@@ -195,8 +185,8 @@ src_install() {
 	done
 
 	# Installing these two setuid-root allows users to (un)mount smbfs.
-	fperms 4755 /usr/bin/smbumount
-	fperms 4755 /usr/bin/smbmnt
+	fperms 4111 /usr/bin/smbumount
+	fperms 4111 /usr/bin/smbmnt
 
 	# Install server binaries.
 	for i in smbd nmbd swat winbindd # wrepld
@@ -340,7 +330,8 @@ src_install() {
 
 	insinto /etc/samba
 	doins ${FILESDIR}/smbusers
-# need to update this one! :)
+
+# need to update this one!!
 	doins ${FILESDIR}/smb.conf.example
 	doins ${FILESDIR}/lmhosts
 	doins ${FILESDIR}/recycle.conf
@@ -351,7 +342,7 @@ src_install() {
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/samba-init samba
-# this one looks funny
+# hmmm
 	newexe ${FILESDIR}/winbind-init winbind
 
 	insinto /etc/xinetd.d
diff --git a/net-fs/samba/samba-3.0_alpha22.ebuild b/net-fs/samba/samba-3.0_alpha22.ebuild
deleted file mode 100644
index e5a4e2902840..000000000000
--- a/net-fs/samba/samba-3.0_alpha22.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0_alpha22.ebuild,v 1.2 2003/03/29 05:12:08 woodchip Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org"
-
-VSCAN_VER=0.3.2
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-S=${WORKDIR}/${PN}-${PV/_/}
-PATCHBALL=1
-SRC_URI="oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	http://us2.samba.org/samba/ftp/alpha/${PN}-${PV/_/}.tar.bz2
-	mirror://gentoo/${PN}-${PV/_/}-patches-${PATCHBALL}.tar.bz2"
-
-DEPEND="sys-devel/autoconf dev-libs/popt
-	readline? sys-libs/readline
-	kerberos? app-crypt/mit-krb5
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Apply patches.
-	for i in ${WORKDIR}/${PN}-${PV/_/}-patches-${PATCHBALL}/*.patch
-	do
-		epatch $i
-	done
-
-	# For clean docs packaging sake.
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav; then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/include
-
-		sed -e "s%^\(# define SAMBA_VERSION_MAJOR\).*%\1 3%" \
-			vscan-global.h >vscan-global.h.3
-		mv -f vscan-global.h.3 vscan-global.h
-	fi
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-	local i myconf
-	use acl \
-		&& myconf="--with-acl-support" \
-		|| myconf="--without-acl-support"
-
-	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-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	use kerberos \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-
-	#this isnt building at the moment.. not for me anyhow :\
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-	cd source
-	./configure \
-		--with-fhs \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libdir=/etc/samba \
-		--with-privatedir=/etc/samba/private \
-		--localstatedir=/var \
-		\
-		--with-manpages-langs=en \
-		--with-sendfile-support \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--enable-dynrpc \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-tdbsam \
-		--with-syslog \
-		--with-utmp \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything wins || die
-	#make rpctorture
-
-	if use mysql
-	then
-		make bin/pdb_mysql.so || die
-	fi
-	if use xml
-	then
-		make bin/pdb_xml.so || die
-	fi
-	#python now handled in 'everything'
-
-	# Build selected samba-vscan plugins.
-	use oav && \
-	for i in ${VSCAN_MODS}
-	do
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-		make USE_INCLMKSDLIB=1 #needed for the mks build
-		assert "problem building $i vscan module"
-	done
-}
-
-src_install() {
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup wbinfo smbpasswd rpcclient \
-		smbcacls smbmount smbmnt smbumount nmblookup pdbedit \
-		smbgroupedit ntlm_auth profiles \
-		debug2html smbfilter talloctort #smbsh
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these two setuid-root allows users to (un)mount smbfs.
-	fperms 4755 /usr/bin/smbumount
-	fperms 4755 /usr/bin/smbmnt
-
-	# Install server binaries.
-	for i in smbd nmbd swat wrepld winbindd
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	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 )
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	doexe source/bin/vfs_*.so
-	use oav && \
-	doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-
-	# Install passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/pdb_mysql.so
-	use xml && doexe source/bin/pdb_xml.so
-
-	# Install librpc modules.
-	exeinto /usr/lib/samba/rpc
-	doexe source/bin/librpc_*.so
-
-	# Install codepage data files.
-	insinto /usr/share/samba
-	doins source/codepages/*.dat
-
-	# 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 man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-
-	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 oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	chown -R root.root ${D}/usr/share/doc/${PF}
-
-	# 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
-
-	# Now the config files.
-	insinto /etc/openldap/schema
-	doins examples/LDAP/samba.schema
-
-	insinto /etc
-	dodoc ${FILESDIR}/nsswitch.conf-winbind
-	doins ${FILESDIR}/nsswitch.conf-wins
-
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-# need to update this one! :)
-	doins ${FILESDIR}/smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-# this one looks funny
-	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/cache/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}
-}