digest fix0r

4 files changed, 3 insertions, 349 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a4cb96ba4ca4..21502ed83cff 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -28,3 +28,4 @@ MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
 MD5 a5650295e9d46255ca61463b1a2ec2da files/digest-samba-3.0_alpha24-r1 142
 MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
 MD5 2d70ae9a31823d990cadd00f7e35ff22 files/digest-samba-3.0_alpha22 216
+MD5 9f80a723be975274daa62b9ccc07fbe0 files/digest-samba-3.0_alpha23 216
diff --git a/net-fs/samba/files/digest-samba-3.0.0_beta1-r1 b/net-fs/samba/files/digest-samba-3.0.0_beta1-r1
index 5c62db278108..f95e573c260f 100644
--- a/net-fs/samba/files/digest-samba-3.0.0_beta1-r1
+++ b/net-fs/samba/files/digest-samba-3.0.0_beta1-r1
@@ -1 +1,2 @@
 MD5 c9190b1102f085895382cd98a21036fa samba_3_0_20030616.tar.bz2 7636549
+MD5 cacc32f21812494993e32be558b91bdd samba-vscan-0.3.2b.tar.bz2 69479
diff --git a/net-fs/samba/files/digest-samba-3.0_alpha22 b/net-fs/samba/files/digest-samba-3.0_alpha22
index be51119f2e6e..71753f447ce9 100644
--- a/net-fs/samba/files/digest-samba-3.0_alpha22
+++ b/net-fs/samba/files/digest-samba-3.0_alpha22
@@ -1,2 +1,3 @@
+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/samba-3.0_alpha23.ebuild b/net-fs/samba/samba-3.0_alpha23.ebuild
deleted file mode 100644
index 978c8ef774b8..000000000000
--- a/net-fs/samba/samba-3.0_alpha23.ebuild
+++ /dev/null
@@ -1,349 +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_alpha23.ebuild,v 1.1 2003/04/10 23:04:36 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/_/}
-_PATCHREV=1
-_PATCHBALL=${PN}-3.0alpha22-patches-${_PATCHREV}
-#_PATCHBALL=${PN}-${PV/_/}-patches-${_PATCHREV}
-
-SRC_URI="oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	mirror://samba/alpha/${PN}-${PV/_/}.tar.bz2
-	mirror://gentoo/${_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 ../${_PATCHBALL}/*.patch
-	do
-		epatch $i
-	done
-	#samba-3.0_alpha23; `torture' target seems broken
-	#havent taken a close look at it...
-	cp source/Makefile.in source/Makefile.in.orig
-	sed -e "s|^\(everything:.*\) torture|\1|" \
-		source/Makefile.in.orig >source/Makefile.in
-
-	# 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}
-}