version bump. USE flags removed: xml, mysql, postgres, libclamav. Better "-ldap" configure options. Added FEATURES="test" support (--enable-socket-wrapper)

Package-Manager: portage-2.1

4 files changed, 329 insertions, 5 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 336e904534e1..7a9f662c8eab 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.252 2006/07/17 00:24:48 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.253 2006/07/23 15:46:10 satya Exp $
+
+*samba-3.0.23a (23 Jul 2006)
+
+  23 Jul 2006; Christian Andreetta <satya@gentoo.org> +samba-3.0.23a.ebuild:
+  version bump. USE flags removed: xml, mysql, postgres, libclamav. Better
+  "-ldap" configure options. Added FEATURES="test" support
+  (--enable-socket-wrapper)
 
   16 Jul 2006; Jose Luis Rivero <yoswink@gentoo.org> samba-3.0.22-r3.ebuild:
   Stable on alpha wrt security bug #139369
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 225d99f89cab..ae92830c342b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -14,6 +14,7 @@ DIST samba-3.0.21a.tar.gz 17524018 RMD160 0daede1526cacd631654a82b33af48ffb4789c
 DIST samba-3.0.21b.tar.gz 17539079 RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a SHA1 349324617a091d13102b97fe8dd37c3632ebe2ed SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0
 DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 SHA1 76eba872b3e8f647e16d0d8d129e02848a7989d7 SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d
 DIST samba-3.0.23.tar.gz 17677551 RMD160 d8814845c5e177e5ac0a376c40e7e2d1b3733dd7 SHA1 94b40c42b976ef19714a105823416e64fd855d5c SHA256 a198213c44c9837169916c82a885c9916e1627c5dc2285663998f8c307d8590e
+DIST samba-3.0.23a.tar.gz 17683518 RMD160 d7ab7ec895923d74c8b11507c3cc678d0b0b895c SHA1 11d6b75811c38ed89da2460386e36fd23af24d3c SHA256 e0504eabb825875213cc06607d93946227d884cb3d09e551c4a1de547b1956f2
 DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a
 DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
 EBUILD samba-3.0.14a-r2.ebuild 9191 RMD160 d217d211044720ec3efa448734d0f6203f759d1d SHA1 7b5d748c1a821adb0f22b5a3831273cbb5fb9474 SHA256 e3700d97828ed3863d5460cc6e80548e4105c53e800ceb18a173f01765483207
@@ -48,10 +49,14 @@ EBUILD samba-3.0.23.ebuild 8725 RMD160 793246b318580bc52e2dd85f9a55777eda61d2e5
 MD5 23b872056433d1c59db6d34b7af91c1f samba-3.0.23.ebuild 8725
 RMD160 793246b318580bc52e2dd85f9a55777eda61d2e5 samba-3.0.23.ebuild 8725
 SHA256 52e8dfb7fca3ada327538e8f5b409ca3af2c9ed571fb5ef4361c7d32e2e30fc0 samba-3.0.23.ebuild 8725
-MISC ChangeLog 43617 RMD160 39d94f4895be93774a2d4403820037f10cc5187d SHA1 6892c5e3f0390488e5e79572a0125c60b6132eae SHA256 3e8d40ccacc622326b13f6a3c58c63fc433da73114ed8934ac087ddc568cc03d
-MD5 bd79bad6cbec6d90459f821253fce2a6 ChangeLog 43617
-RMD160 39d94f4895be93774a2d4403820037f10cc5187d ChangeLog 43617
-SHA256 3e8d40ccacc622326b13f6a3c58c63fc433da73114ed8934ac087ddc568cc03d ChangeLog 43617
+EBUILD samba-3.0.23a.ebuild 8381 RMD160 b4a6a9634dfdd283d01ae38eec0aefb83b2b4588 SHA1 410429c66ef89e6603f9aea2457965ecacce5abb SHA256 2082406bd38560ff77f8a51467cfbb3f8e70a4101856be6514201a7ff6453116
+MD5 43deaa6e610e48a8cdd0d3e71ecd2856 samba-3.0.23a.ebuild 8381
+RMD160 b4a6a9634dfdd283d01ae38eec0aefb83b2b4588 samba-3.0.23a.ebuild 8381
+SHA256 2082406bd38560ff77f8a51467cfbb3f8e70a4101856be6514201a7ff6453116 samba-3.0.23a.ebuild 8381
+MISC ChangeLog 43885 RMD160 4d70d8f52d2406423c64845f440c8d9bb2d3abdd SHA1 929485ee1711adafa28d6daca22f02928609592d SHA256 1f21a8dd1276addcfbc017a424082bc9d3b9486bbf3ffd97a7b26350a124c173
+MD5 46f7a0d0bd0b65386abceaa8e02d4fa5 ChangeLog 43885
+RMD160 4d70d8f52d2406423c64845f440c8d9bb2d3abdd ChangeLog 43885
+SHA256 1f21a8dd1276addcfbc017a424082bc9d3b9486bbf3ffd97a7b26350a124c173 ChangeLog 43885
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
@@ -80,3 +85,6 @@ SHA256 ec81536abaa1ab3b05885d89e9a0ccc34033018301fc8c9473542d7a01c56511 files/di
 MD5 1293e07246affd852e6fe4050ba8ff40 files/digest-samba-3.0.23 768
 RMD160 faf80e312948ddbfdb9077d744aa0a6d892fb232 files/digest-samba-3.0.23 768
 SHA256 ae4166a3ea2e4d460f1f421d9f79e04809eca19153ede6904d7104fcab04fc61 files/digest-samba-3.0.23 768
+MD5 1b4ea5b0f2f47a85b1632d4cfb19d7c5 files/digest-samba-3.0.23a 771
+RMD160 77c01ce47cda16f1c0fd6ca791dc3b17e3e1fc5b files/digest-samba-3.0.23a 771
+SHA256 16d8cbdd4db0901523de3d7d7cf693deb7394bf71bcf47c7826bd182f10183bf files/digest-samba-3.0.23a 771
diff --git a/net-fs/samba/files/digest-samba-3.0.23a b/net-fs/samba/files/digest-samba-3.0.23a
new file mode 100644
index 000000000000..697e20f34254
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.23a
@@ -0,0 +1,9 @@
+MD5 9e17b085a88c7447ae3ef73fad52359d samba-3-gentoo-0.3.14.tar.bz2 16011
+RMD160 9b0b5bb67ccc554e337a242fcacb1d41b4c97add samba-3-gentoo-0.3.14.tar.bz2 16011
+SHA256 6d76ad33bea7af92a8445275bad6aab05e7a59a7bac67be09ebca4f9e9af8dfc samba-3-gentoo-0.3.14.tar.bz2 16011
+MD5 e48f196fa51c22ff67463680ce95a58d samba-3.0.23a.tar.gz 17683518
+RMD160 d7ab7ec895923d74c8b11507c3cc678d0b0b895c samba-3.0.23a.tar.gz 17683518
+SHA256 e0504eabb825875213cc06607d93946227d884cb3d09e551c4a1de547b1956f2 samba-3.0.23a.tar.gz 17683518
+MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
+RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
+SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.23a.ebuild b/net-fs/samba/samba-3.0.23a.ebuild
new file mode 100644
index 000000000000..fe626b7c0069
--- /dev/null
+++ b/net-fs/samba/samba-3.0.23a.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.23a.ebuild,v 1.1 2006/07/23 15:46:10 satya Exp $
+
+inherit eutils versionator
+
+IUSE_LINGUAS="ja pl"
+IUSE="acl async automount cups doc examples kerberos kernel_linux ldap ldapsam
+	oav pam python quotas readline selinux swat syslog winbind"
+#RESTRICT="test" # tests are enabled with --enable-socket-wrapper
+
+VSCAN_VER="0.3.6b"
+PATCH_VER="0.3.14"
+MY_P=${PN}-${PV/_/}
+MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
+S2=${WORKDIR}/${MY_P}
+S=${S2}/source
+PFVSCAN=${PN}-vscan-${VSCAN_VER}
+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"
+SRC_URI="mirror://samba/${MY_P}.tar.gz
+	mirror://samba/old-versions/${MY_P}.tar.gz
+	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
+	mirror://gentoo/${MY_PP}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="dev-libs/popt
+	virtual/libiconv
+	acl?       ( kernel_linux? ( sys-apps/acl ) )
+	cups?      ( net-print/cups )
+	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
+	pam?       ( virtual/pam )
+	python?    ( dev-lang/python )
+	readline?  ( sys-libs/readline )
+	selinux?   ( sec-policy/selinux-samba )
+	swat?      ( sys-apps/xinetd )
+	syslog?    ( virtual/logger )
+	"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	>=sys-apps/sed-4"
+
+PRIVATE_DST=/var/lib/samba/private
+PATCHDIR=${WORKDIR}/patches
+CONFDIR=${WORKDIR}/configs
+
+src_unpack() {
+	unpack ${A}; cd ${S2}
+
+	rm -rf ${S2}/examples.ORIG
+
+	export EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}/general
+	if use oav ; then
+		cd ${WORKDIR}
+		if [[ -d ${PATCHDIR}/vscan ]]; then
+			epatch ${PATCHDIR}/vscan
+		fi
+		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
+	fi
+
+	#uClib: bug #120383, https://bugzilla.samba.org/show_bug.cgi?id=3451
+	sed -i -e '/include.*fstab.h/d' "${S}"/client/umount.cifs.c
+}
+
+src_compile() {
+	ebegin "Running autoconf"
+		autoconf
+	eend $?
+
+	local myconf
+	local mylangs
+
+	mylangs="en"
+	use linguas_ja && mylangs="${mylangs},ja"
+	use linguas_pl && mylangs="${mylangs},pl"
+	myconf="${myconf} --with-manpages-langs=${mylangs}"
+
+	if use ldap; then
+		myconf="${myconf} $(use_with ldap) $(use_with kerberos ads)"
+		myconf="${myconf} $(use_with ldapsam)"
+	else
+		myconf="${myconf} --without-ldapsam $(use_with ldap)"
+	fi
+	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid,idmap_ad"
+
+	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
+
+	econf \
+		--with-fhs \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		--with-configdir=/etc/samba \
+		--with-libdir=/usr/$(get_libdir)/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-privatedir=${PRIVATE_DST} \
+		--with-libsmbclient \
+		--without-spinlocks \
+		--enable-socket-wrapper \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_enable cups) \
+		$(use_with kerberos krb5) \
+		$(use_with pam) $(use_with pam pam_smbpass) \
+		$(use_with python) \
+		$(use_with quotas) $(use_with quotas sys-quotas) \
+		$(use_with readline) \
+		$(use_with kernel_linux smbmount) \
+		$(use_with syslog) \
+		${myconf} || die
+
+	emake proto || die "SAMBA make proto error"
+	emake everything || die "SAMBA make everything error"
+
+	einfo "make rpctorture"
+	emake rpctorture || ewarn "rpctorture didn't build"
+
+	if use python ; then
+		python python/setup.py build
+	fi
+
+	# Build samba-vscan plugins
+	if use oav; then
+		cd ${S2}/examples/VFS/${PFVSCAN}
+		econf \
+			--with-fhs \
+			--libdir=/usr/$(get_libdir)/samba \
+			|| die "${PFVSCAN} ./configure failed"
+		emake || die "Failed to make ${PFVSCAN}"
+	fi
+
+}
+
+src_install() {
+	local extra_bins="rpctorture"
+
+	make DESTDIR=${D} install-everything || die
+
+	# Extra rpctorture progs
+	exeinto /usr/bin
+	for i in ${extra_bins}; do
+		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
+		einfo "Extra binaries: ${i}"
+	done
+
+	# remove .old stuff from /usr/bin:
+	rm -f ${D}/usr/bin/*.old
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	dolib.so ${S}/nsswitch/libnss_wins.so
+	dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+	if use winbind; then
+		dolib.so ${S}/nsswitch/libnss_winbind.so
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+	fi
+
+	if use pam; then
+		exeinto /$(get_libdir)/security
+		doexe ${S}/bin/pam_smbpass.so
+		if use winbind; then
+			exeinto /$(get_libdir)/security
+			doexe ${S}/nsswitch/pam_winbind.so
+		fi
+	fi
+
+	if use kernel_linux; then
+		# mount backend
+		dodir /sbin
+		dosym ../usr/bin/smbmount /sbin/mount.smbfs
+		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
+	fi
+
+	# bug #46389: samba doesn't create symlink anymore
+	# beaviour seems to be changed in 3.0.6, see bug #61046
+	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
+	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
+
+	# make the smb backend symlink for cups printing support (bug #133133)
+	if use cups; then
+		dodir $(cups-config --serverbin)/backend
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	# VFS plugin modules
+	if use oav; then
+		cd ${S2}/examples/VFS/${PFVSCAN}
+		make install DESTDIR=${D} || die "VFS: vscan error"
+		insinto /etc/samba
+		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
+	fi
+
+	# Python extensions
+	if use python; then
+		cd ${S}
+		python python/setup.py install --root=${D} || die
+	fi
+
+	# General config files
+	insinto /etc/samba
+	doins ${CONFDIR}/smbusers
+	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
+	doins ${CONFDIR}/lmhosts
+
+	newpamd ${CONFDIR}/samba.pam samba
+	use winbind && doins ${CONFDIR}/system-auth-winbind
+	insinto /etc/xinetd.d
+	newins ${CONFDIR}/swat.xinetd swat
+	newinitd ${CONFDIR}/samba-init samba
+	newconfd ${CONFDIR}/samba-conf samba
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins ${S2}/examples/LDAP/samba.schema
+	fi
+
+	# dirs
+	diropts -m0700 ; 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}
+	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
+
+	# docs
+	dodoc ${FILESDIR}/README.gentoo
+	dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
+	dodoc ${CONFDIR}/nsswitch.conf-wins
+	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
+
+	if use oav; then
+		docinto ${PFVSCAN}
+		cd ${WORKDIR}/${PFVSCAN}
+		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+		dodoc */*.conf
+	fi
+
+	if use examples; then
+		docinto examples
+		cp -pPR ${S2}/examples/* ${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`
+	fi
+
+	if ! use doc; then
+		if ! use swat; then
+			rm -rf ${D}/usr/share/doc/${PF}/swat
+		else
+			rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
+			rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
+		fi
+	fi
+
+	# Patch ChangeLog
+	docinto gentoo
+	dodoc ${PATCHDIR}/ChangeLog
+}
+
+pkg_preinst() {
+	local PRIVATE_SRC=/etc/samba/private
+	if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
+		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
+		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
+			mkdir -p ${IMAGE}/${PRIVATE_DST}
+			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
+		eend $?
+	fi
+
+	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
+		touch ${IMAGE}/etc/samba/smb.conf
+	fi
+}
+
+pkg_postinst() {
+	if use swat; then
+		einfo "swat must be enabled by xinetd:"
+		einfo "    change the /etc/xinetd.d/swat configuration"
+	fi
+	einfo "As of 3.0.20: New USE flags: syslog, automount, async (default: disabled)"
+	einfo "As of 3.0.20b: New USE flags: ldapsam, swat (default: disabled)"
+	einfo "Latest info: README.gentoo in documentation directory"
+}
+
+pkg_postrm(){
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is actually a portage bug, though)
+	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf ${ROOT}/usr/share/doc/${PF}
+}
+