idmap_ad (active directory) backend on winbind use flag (bug #131443)

Package-Manager: portage-2.1_pre7-r5

4 files changed, 337 insertions, 4 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 5d6e0d781c2b..fe23e80a8603 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # 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.235 2006/04/27 13:24:48 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.236 2006/04/27 17:06:36 satya Exp $
+
+*samba-3.0.22-r2 (27 Apr 2006)
+
+  27 Apr 2006; Christian Andreetta <satya@gentoo.org>
+  +samba-3.0.22-r2.ebuild:
+  idmap_ad (active directory) backend on winbind use flag (bug #131443)
 
   27 Apr 2006; Christian Andreetta <satya@gentoo.org>
   -samba-3.0.20-r1.ebuild, -samba-3.0.20a.ebuild, -samba-3.0.21b.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 5dd1bd90d04c..697fd8c7cc5b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
-MD5 36be4c2e307e8e0e7989c4f7ed1bb1f6 ChangeLog 40782
-RMD160 c51d82a5b5e0bbf1f6b2c7dd3b96dfd78541da9d ChangeLog 40782
-SHA256 dcb5dd79ce6bc8c0be1632148b3005ee9950b093b95e5f3944f6238343976960 ChangeLog 40782
+MD5 6e51a7b6f5d3d95f8561e867781d13e9 ChangeLog 40968
+RMD160 dc25f821e7148b31c5d614c942ada87de0699da9 ChangeLog 40968
+SHA256 bb471b185c4486a6a9fb0eacd3b7b4f8488d1887aefc353fc6d3342e531bfe8e ChangeLog 40968
 MD5 7cbe28bc9f7e821c88c4f80c39752eb5 files/035_all_samba-3.0.21-winbind_log.patch 438
 RMD160 11b402af2f251c91de0ca1fd2ef0d011f28f1450 files/035_all_samba-3.0.21-winbind_log.patch 438
 SHA256 cf22a104c251470be1347079951d2eef847e1e3e8a9604e491985b9aadd8e0d0 files/035_all_samba-3.0.21-winbind_log.patch 438
@@ -31,6 +31,9 @@ SHA256 484bc72e02eeb2de02b9f707d1edbb72125631c85e96c9a0ff4c06afe78d5194 files/di
 MD5 1463ff1b83a8b87658e88d95b1f74493 files/digest-samba-3.0.22-r1 768
 RMD160 72df0e06bc0b9843ced9bec5537be6495386219e files/digest-samba-3.0.22-r1 768
 SHA256 484bc72e02eeb2de02b9f707d1edbb72125631c85e96c9a0ff4c06afe78d5194 files/digest-samba-3.0.22-r1 768
+MD5 1463ff1b83a8b87658e88d95b1f74493 files/digest-samba-3.0.22-r2 768
+RMD160 72df0e06bc0b9843ced9bec5537be6495386219e files/digest-samba-3.0.22-r2 768
+SHA256 484bc72e02eeb2de02b9f707d1edbb72125631c85e96c9a0ff4c06afe78d5194 files/digest-samba-3.0.22-r2 768
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
 SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 metadata.xml 491
@@ -55,6 +58,9 @@ SHA256 468255300550c0e661b043bf2774e1c14d91d2016af3340fb1180d8c1be7c8e7 samba-3.
 MD5 1c5f835c90c13a8c771fd6de5eef6aed samba-3.0.22-r1.ebuild 8766
 RMD160 b695ef4d04df051cc31dbf2f21be3ab74ae2989a samba-3.0.22-r1.ebuild 8766
 SHA256 a40342629e7ff6a07c18992ba997c1fe4d32e161a428aa1218bed53af9684c19 samba-3.0.22-r1.ebuild 8766
+MD5 8623528b15ce9b7435c0880af951d47d samba-3.0.22-r2.ebuild 8775
+RMD160 c71faa36c5f28f96b5f78c3c25cfe23d7155d229 samba-3.0.22-r2.ebuild 8775
+SHA256 9e780245c28a8fef0f5582b39517434b10eb3528145222455af67adeeab386b6 samba-3.0.22-r2.ebuild 8775
 MD5 150e5e4395f7f98fbf93d7085f0a0a27 samba-3.0.22.ebuild 8725
 RMD160 972d875edcbb08cc3f996642154679d7d63bdbcf samba-3.0.22.ebuild 8725
 SHA256 f0b5c97e4b20384a73dcda4afe80720356d9ad6fbb0de8f077058739b10a052a samba-3.0.22.ebuild 8725
diff --git a/net-fs/samba/files/digest-samba-3.0.22-r2 b/net-fs/samba/files/digest-samba-3.0.22-r2
new file mode 100644
index 000000000000..89a82f875b68
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.22-r2
@@ -0,0 +1,9 @@
+MD5 e68da25c1ff30482c9401e279ae62797 samba-3-gentoo-0.3.11.tar.bz2 15929
+RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 samba-3-gentoo-0.3.11.tar.bz2 15929
+SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da samba-3-gentoo-0.3.11.tar.bz2 15929
+MD5 5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz 17542657
+RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 samba-3.0.22.tar.gz 17542657
+SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d samba-3.0.22.tar.gz 17542657
+MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
+RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
+SHA256 2fa680c85ef036a9ac27d1039807881c7a0f35f64f731b1d3a13b860a9135e7a samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.22-r2.ebuild b/net-fs/samba/samba-3.0.22-r2.ebuild
new file mode 100644
index 000000000000..b0e4e405e90d
--- /dev/null
+++ b/net-fs/samba/samba-3.0.22-r2.ebuild
@@ -0,0 +1,312 @@
+# 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.22-r2.ebuild,v 1.1 2006/04/27 17:06:36 satya Exp $
+
+inherit eutils versionator
+
+IUSE_LINGUAS="ja pl"
+IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav
+	msdfs mysql oav pam postgres python quotas readline selinux swat syslog
+	winbind xml xml2"
+RESTRICT="test"
+
+VSCAN_VER="0.3.6b"
+PATCH_VER="0.3.11"
+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 )
+	mysql?     ( dev-db/mysql sys-libs/zlib )
+	pam?       ( virtual/pam )
+	postgres?  ( dev-db/postgresql sys-libs/zlib )
+	python?    ( dev-lang/python )
+	readline?  ( sys-libs/readline )
+	selinux?   ( sec-policy/selinux-samba )
+	swat?      ( sys-apps/xinetd )
+	syslog?    ( virtual/logger )
+	xml?       ( dev-libs/libxml2 sys-libs/zlib )
+	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
+	"
+
+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}
+		epatch ${PATCHDIR}/vscan
+		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 mymods
+	local mylangs
+
+	if use xml || use xml2 ; then
+		mymods="xml,${mymods}"
+	fi
+	use mysql && mymods="mysql,${mymods}"
+	use postgres && mymods="pgsql,${mymods}"
+	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
+
+	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"
+	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 \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_enable cups) \
+		$(use_with kerberos krb5) \
+		$(use_with msdfs) \
+		$(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 \
+			$(use_with libclamav) || 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..
+	if use cups; then
+		dodir /usr/$(get_libdir)/cups/backend
+		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/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 "SQL and XML backends are *experimental*: sql is being deprecated"
+	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}
+}
+