removing due to acl bug (https://bugzilla.samba.org/show_bug.cgi?id=2521)

(Portage version: 2.0.51.20-r5)

3 files changed, 7 insertions, 376 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 3572c6ace6b6..3764826b718a 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.171 2005/04/28 14:39:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.172 2005/04/28 14:48:13 satya Exp $
+
+  28 Apr 2005; Christian Andreetta <satya@gentoo.org> -samba-3.0.13.ebuild:
+  removing due to acl bug (https://bugzilla.samba.org/show_bug.cgi?id=2521)
 
   28 Apr 2005; Heinrich Wendel <lanius@gentoo.org> files/samba-init:
   revert 'use cupsd' again, it was the wrong way around
 
+  28 Apr 2005; Christian Andreetta <satya@gentoo.org> -samba-3.0.13.ebuild:
+  removing due to acl bug (https://bugzilla.samba.org/show_bug.cgi?id=2521)
+
   28 Apr 2005; Christian Andreetta <satya@gentoo.org> samba-3.0.10.ebuild:
   exaples permissions issue fixed (bug #90002)
 
diff --git a/net-fs/samba/files/digest-samba-3.0.13 b/net-fs/samba/files/digest-samba-3.0.13
deleted file mode 100644
index 4f06458efbda..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 262c9f8b2f2d6910f5b3472e215eddf6 samba-3.0.13.tar.gz 15584244
-MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733
diff --git a/net-fs/samba/samba-3.0.13.ebuild b/net-fs/samba/samba-3.0.13.ebuild
deleted file mode 100644
index 6c9cddf95ff9..000000000000
--- a/net-fs/samba/samba-3.0.13.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.13.ebuild,v 1.1 2005/03/25 11:34:03 satya Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
-IUSE="${IUSE} libclamav oav"
-IUSE="${IUSE} selinux"
-#---------------------------------------------------------------------------
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-#---------------------------------------------------------------------------
-VSCAN_VER=0.3.6
-# all vscan modules are being installed
-#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
-#---------------------------------------------------------------------------
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-#---------------------------------------------------------------------------
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
-	oav? ( mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2 )
-	"
-#---------------------------------------------------------------------------
-_COMMON_DEPS="dev-libs/popt
-	acl?       ( sys-apps/acl )
-	cups?      ( net-print/cups )
-	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
-	mysql?     ( dev-db/mysql sys-libs/zlib )
-	pam?       ( sys-libs/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
-	"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#selinux: bug #62907
-RDEPEND="${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#===========================================================================
-pkg_setup() {
-	ewarn "2004-11: new ebuild flags:"
-	ewarn "    quotas:    now disabled by default"
-	ewarn "    winbind:   now disabled by default"
-	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
-	ewarn "/etc/samba/private moved to /var/lib/samba/private"
-	ebeep
-	epause
-	local PRIVATEDIR=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
-		mkdir -p ${D}${PRIVATEDIR}/
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
-	fi
-}
-#===========================================================================
-src_unpack() {
-	local i
-	unpack ${A} || die
-	# Clean up CVS ---------------------------------------------------------
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-	# Add patch(es) --------------------------------------------------------
-	cd ${S}/source
-	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
-	#bug #44743 ------------------------------------------------------------
-	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
-	fi
-	#Fix for bug #27858 ----------------------------------------------------
-	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch
-	# examples: to be copied as docs ---------------------------------------
-	rm -rf ${S}/examples.ORIG
-	cp -a ${S}/examples ${S}/examples.ORIG
-	# Prep samba-vscan source.
-	if use oav ; then
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		#epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch # invalid for 3.0.13
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	fi
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--localstatedir=/var \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--sysconfdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/var/lib/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	local myconf
-	local mymods
-	#mymods="nisplussam" #this is deprecated...
-	#-----------------------------------------------------------------------
-	use xml || use xml2 && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${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 quotas \
-		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
-		|| myconf="${myconf} --without-quotas --without-sys-quotas"
-	use winbind \
-		&& myconf="${myconf} --with-winbind" \
-		|| myconf="${myconf} --without-winbind"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-	my_configure "${myconf}"
-	# Compile main SAMBA pieces --------------------------------------------
-	einfo "make everything" && emake everything || die "SAMBA make everything error"
-	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
-	# build smbget ---------------------------------------------------------
-	einfo "smbget"
-	emake bin/smbget; assert "smbget compile error"
-	# Build selected samba-vscan plugins -----------------------------------
-	if use oav; then
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		my_conf="--prefix=/usr --libdir=/usr/$(get_libdir)/samba"
-		use libclamav && my_conf="${my_conf} --with-libclamav"
-		./configure ${my_conf}
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake # ${VSCAN_MODS}
-	fi
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
-	#smbsh editreg
-	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
-		locktest2 nsstest vfstest rpctorture"
-	# ----------------------------------------------------------------------
-	cd ${S}/source
-	make DESTDIR=${D} install-everything
-	# Extra binary files, testing/torture progs ----------------------------
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
-		einfo "Extra binaries: ${i}"
-	done
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
-	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
-		fperms 4111 ${i} || die "No perms: ${i}"
-		einfo "suid: ${i}"
-	done
-	# Nsswitch extensions. Make link for wins and winbind resolvers --------
-	exeinto /$(get_libdir)
-	doexe ${S}/source/nsswitch/libnss_wins.so
-	( cd ${D}/$(get_libdir); ln -s libnss_wins.so libnss_wins.so.2 )
-	if use winbind; then
-		doexe ${S}/source/nsswitch/libnss_winbind.so
-		( cd ${D}/$(get_libdir); ln -s libnss_winbind.so libnss_winbind.so.2 )
-		exeinto /$(get_libdir)/security && doexe ${S}/source/nsswitch/pam_winbind.so
-	fi
-	exeinto /$(get_libdir)/security
-	use pam && doexe ${S}/source/bin/pam_smbpass.so
-	# mount backend --------------------------------------------------------
-	dodir /sbin
-	dosym ../usr/bin/smbmount /sbin/mount.smbfs
-	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046 
-	dosym /usr/$(get_libdir)/samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
-	dosym /usr/$(get_libdir)/samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym /usr/bin/smbspool /usr/$(get_libdir)/cups/backend/smb
-	fi
-	# VFS plugin modules ---------------------------------------------------
-	if use oav; then
-		#exeinto /usr/$(get_libdir)/samba/vfs
-		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
-	fi
-	# Python extensions ----------------------------------------------------
-	if use python; then
-		cd ${S}/source
-		python python/setup.py install --root=${D} || die
-	fi
-	# General config files -------------------------------------------------
-	insinto /etc/samba
-	touch ${D}/etc/samba/smb.conf
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	newpamd ${FILESDIR}/samba.pam samba
-	use winbind && doins ${FILESDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S}/examples/LDAP/samba.schema
-	fi
-	# dirs -----------------------------------------------------------------
-	diropts -m0700
-	local PRIVATE_DST=/var/lib/samba/private
-	keepdir ${PRIVATE_DST}
-	diropts -m1777
-	keepdir /var/spool/samba
-	diropts -m0755
-	keepdir /var/{log,run,cache}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	# docs -----------------------------------------------------------------
-	docinto ""
-	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-wins
-	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind
-	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
-	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
-	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
-	fi
-	if ! use doc; then
-		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-	fi
-	# moving manpages ------------------------------------------------------
-	mv ${D}/usr/man ${D}/usr/share/man
-}
-#===========================================================================
-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..
-	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	ewarn "3.0.12: libsmbclient shared library retrocompatibility is not "
-	ewarn "        assured: please rebuild all samba-linked third part packages"
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "    attribute on all accounts, and ensure it is not 0."
-		einfo ""
-		ewarn "2005-03 [3.0.12]: smbldap-tools is now a separate package"
-		ewarn "                      for ease of upgrade"
-	fi
-	einfo "There is a good HOWTO about setting up samba3 with cups and clamav at"
-	einfo "http://www.gentoo.org/doc/en/quick-samba-howto.xml"
-}
-