Adding cifsupcall support.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 295 insertions, 4 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f25533bcdb37..3bf3d376c2fe 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.361 2009/06/26 20:25:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.362 2009/06/27 07:27:20 patrick Exp $
+
+*samba-3.2.13-r2 (27 Jun 2009)
+
+  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> +samba-3.2.13-r2.ebuild,
+  metadata.xml:
+  Adding cifsupcall support.
 
 *samba-3.3.6 (26 Jun 2009)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 206a69950479..4629d08a9f7d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -39,7 +39,8 @@ EBUILD samba-3.0.34.ebuild 10116 RMD160 ee8f7ec7636a35df2d62f432e8b086e734d956b6
 EBUILD samba-3.0.35.ebuild 10114 RMD160 142f18ec729d107e7048ab4cdc6329c92f8fdffe SHA1 c896996379d51a2f0c55e1bea20e0512a32accde SHA256 6c95478f41e24073c6efd4fdc0b780e2276b2ea6d7c8c15c6432068d8492ebde
 EBUILD samba-3.2.11.ebuild 8291 RMD160 894aff8b443c73ab65c6a0bdbb9a602907c771af SHA1 292a791031267868a08b486cff05bca58ac70a8b SHA256 d85019e0b7dea53f78f0075aac0112d146a0b283e4f4b16ba6181e2db7a09ba2
 EBUILD samba-3.2.13-r1.ebuild 8434 RMD160 79050ac1cf7aadcaf1199f8a0ea3acd63d5eb49d SHA1 26c993d3110488673d860b61258093067032cb97 SHA256 d3c14633f429115274bed0ea2ae6e262ed9a71ac88e3b7ce596192a87ff89a22
+EBUILD samba-3.2.13-r2.ebuild 8523 RMD160 25d05642e63bf9cda620155db7c865e81269840a SHA1 ef3ca94de75d0e0f4d9a131a7b17aa861ccd0559 SHA256 57768bef72962a69ec9f9b2ab8727e450b8af3ad8502c153ecd439cd073c1da9
 EBUILD samba-3.2.13.ebuild 8289 RMD160 e46b181d7bfe407bba6c130e454a3e96dd17a916 SHA1 4cab6c1b57c3d07b54dffed8bf4e51a1a5045442 SHA256 c4d549b826b06f74219cfe9ead564f0d02230b3ca9997bb1527706c7d819b387
 EBUILD samba-3.3.6.ebuild 513 RMD160 0296dd282a9293eb0d45005db8d6b5e1a4571149 SHA1 eb15639ff0e58b69dc6de90011b71732f5e965be SHA256 04ecb07302c468b3a8f0b47ee1d1526c8942f2e64f6e2d8b5d3050b4bf15d2f5
-MISC ChangeLog 61169 RMD160 76345736f9ae8866aa8d1e2b6acbde38a7a5ea69 SHA1 d8500de1a1b3e4b8062c57a76ad6600ba23f587b SHA256 56cd288a0a8af71867142a02de1fd0f5f1d7d014a402d7090b2569c3a5d37e45
-MISC metadata.xml 1069 RMD160 eb0321b9638db7d55c7e828dad1dd91bbc28f7b0 SHA1 77dd8e895f72250f3e78e110355b879ed536ac72 SHA256 762e9f02f67ae34dbc0bfaf8856541b0b0f1d2f282cd81ef51b7eeba1919331a
+MISC ChangeLog 61322 RMD160 8ebde84f1cfe6fb08a85ea08fab17f397df9ec9a SHA1 15c58f0b26266115c35577b45d6ef0e19fc19446 SHA256 9bb05cfd0d8e2ce2b107ff037c8dec450f424cfc5fdc1681d8d40ebcc062cddc
+MISC metadata.xml 1132 RMD160 388c951fd5c66a375a0fe08cec063ea0bdbda196 SHA1 145a8409682eb144ddd9aee0ffc5d0d8cb004483 SHA256 17aef1fbecececf19ade8632dbd66c00c145ed538dc8b01c3c691e9171b1300b
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index b7c50b8dc7e7..450c7f919302 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -19,6 +19,6 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="winbind">Enables support for the winbind auth daemon</flag>
         <flag name="client">Enables the client part</flag>
         <flag name="server">Enables the server part</flag>
-
+	<flag name="cifsupcall">Enables userspace upcall helper</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-3.2.13-r2.ebuild b/net-fs/samba/samba-3.2.13-r2.ebuild
new file mode 100644
index 000000000000..0d981ebb0093
--- /dev/null
+++ b/net-fs/samba/samba-3.2.13-r2.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.2.13-r2.ebuild,v 1.1 2009/06/27 07:27:20 patrick Exp $
+
+inherit eutils pam multilib versionator confutils
+
+MY_P=${PN}-${PV/_/}
+
+DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE_LINGUAS="linguas_ja linguas_pl"
+IUSE="${IUSE_LINGUAS} acl ads async automount caps cifsupcall cups doc examples ipv6 kernel_linux ldap fam
+	pam quotas readline selinux swat syslog winbind"
+
+RDEPEND="dev-libs/popt
+	dev-libs/iniparser
+	virtual/libiconv
+	acl? ( virtual/acl )
+	cifsupcall? ( sys-apps/keyutils )
+	cups? ( net-print/cups )
+	ipv6? ( sys-apps/xinetd )
+	ads? ( virtual/krb5 sys-fs/e2fsprogs )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	readline? ( sys-libs/readline )
+	selinux? ( sec-policy/selinux-samba )
+	swat? ( sys-apps/xinetd )
+	syslog? ( virtual/logger )
+	fam? ( virtual/fam )
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+CONFDIR="${FILESDIR}/config-3.2"
+PRIVATE_DST=/var/lib/samba/private
+
+# Tests are currently broken due to hardcoded paths (due to --with-fhs)
+# The problem is that --without-fhs lets samba use lockdir (which can be changed in smb.conf)
+# which is wrong as well.
+RESTRICT="test"
+
+pkg_setup() {
+	confutils_use_depend_all ads ldap
+	confutils_use_depend_all cifsupcall ads
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/source"
+
+	# Ok, agreed, this is ugly. But it avoids a patch we
+	# need for every samba version and we don't need autotools
+	sed -i \
+		-e 's|"lib32" ||' \
+		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+		configure || die "sed failed"
+
+	rm "${S}/docs/manpages"/{mount,umount}.cifs.8
+
+	sed -i \
+		-e 's|tdbsam|tdbsam:${PRIVATEDIR}/passdb.tdb|' \
+		"${S}/source/script/tests/selftest.sh" || die "sed failed"
+}
+
+src_compile() {
+	cd "${S}/source"
+
+	local myconf
+	local mylangs
+	local mymod_shared
+
+	mylangs="--with-manpages-langs=en"
+	use linguas_ja && mylangs="${mylangs},ja"
+	use linguas_pl && mylangs="${mylangs},pl"
+
+	use winbind && mymod_shared="--with-shared-modules=idmap_rid"
+	if use ldap ; then
+		myconf="${myconf} $(use_with ads)"
+		use winbind && mymod_shared="${mymod_shared},idmap_ad"
+	fi
+
+	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
+
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	# Otherwise we get the whole swat stuff installed
+	if ! use swat ; then
+		sed -i \
+			-e 's/^\(install:.*\)installswat \(.*\)/\1\2/' \
+			Makefile.in || die "sed failed"
+	fi
+
+	econf \
+		--with-fhs \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		--with-configdir=/etc/samba \
+		--with-libdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		--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 \
+		--enable-nss-wrapper \
+		--with-cifsmount=no \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_with cifsupcall) \
+		$(use_enable cups) \
+		$(use_enable fam) \
+		$(use_with ads krb5) \
+		$(use_with ads dnsupdate) \
+		$(use_with ldap) \
+		$(use_with pam) $(use_with pam pam_smbpass) \
+		$(use_with quotas) $(use_with quotas sys-quotas) \
+		$(use_with readline) \
+		$(use_with syslog) \
+		$(use_with winbind) \
+		${myconf} ${mylangs} ${mymod_shared} || die "econf failed"
+
+	emake proto || die "emake proto failed"
+	emake everything || die "emake everything failed"
+
+}
+
+src_test() {
+	cd "${S}/source"
+	emake test || die "tests failed"
+}
+
+src_install() {
+	cd "${S}/source"
+
+	emake DESTDIR="${D}" install-everything || die "emake install-everything failed"
+
+	# Extra rpctorture progs
+	local extra_bins="rpctorture"
+	for i in ${extra_bins} ; do
+		[[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}"
+	done
+
+	# remove .old stuff from /usr/bin:
+	rm -f "${D}"/usr/bin/*.old
+
+	# Removing executable bits from header-files
+	fperms 644 /usr/include/libsmbclient.h
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		dolib.so nsswitch/libnss_wins.so
+		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+		dolib.so nsswitch/libnss_winbind.so
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+	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
+	dosym samba/libsmbclient.so.0 /usr/$(get_libdir)/libsmbclient.so.0
+	dosym samba/libtalloc.so /usr/$(get_libdir)/libtalloc.so
+	dosym samba/libtalloc.so.1 /usr/$(get_libdir)/libtalloc.so.1
+	dosym samba/libtdb.so /usr/$(get_libdir)/libtdb.so
+	dosym samba/libtdb.so.1 /usr/$(get_libdir)/libtdb.so.1
+	dosym samba/libwbclient.so.0 /usr/$(get_libdir)/libwbclient.so.0
+	dosym samba/libsmbsharemodes.so.0 /usr/$(get_libdir)/libsmbsharemodes.so.0
+
+	# 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
+
+	cd "${S}/source"
+
+	# General config files
+	insinto /etc/samba
+	doins "${CONFDIR}"/{smbusers,lmhosts}
+	newins "${CONFDIR}/smb.conf.example-samba3" smb.conf.example
+
+	newpamd "${CONFDIR}/samba.pam" samba
+	use winbind && dopamd "${CONFDIR}/system-auth-winbind"
+	if use swat ; then
+		insinto /etc/xinetd.d
+		newins "${CONFDIR}/swat.xinetd" swat
+	else
+		rm -f "${D}/usr/sbin/swat"
+		rm -f "${D}/usr/share/man/man8/swat.8"
+	fi
+
+	newinitd "${FILESDIR}/samba-init" samba
+	newconfd "${FILESDIR}/samba-conf" samba
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/examples/LDAP/samba.schema"
+	fi
+
+	if use ipv6 ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/samba-xinetd" smb
+	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,X64,IA64,COLOR}
+	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
+
+	# docs
+	dodoc "${FILESDIR}/README.gentoo"
+	dodoc "${S}"/{MAINTAINERS,README,Roadmap,WHATSNEW.txt}
+	dodoc "${CONFDIR}/nsswitch.conf-wins"
+	use winbind && dodoc "${CONFDIR}/nsswitch.conf-winbind"
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples/"
+		find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755
+		find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644
+	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
+
+}
+
+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 "${D}/${PRIVATE_DST}"
+			cp -pPRf "${ROOT}/${PRIVATE_SRC}"/* "${D}/${PRIVATE_DST}/"
+		eend $?
+	fi
+
+	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]] ; then
+		touch "${D}/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
+
+	if use ipv6 ; then
+		einfo "ipv6 support must be enabled by xinetd:"
+		einfo "  change the /etc/xinetd.d/smb configuration"
+	fi
+
+	elog "It is possible to start/stop daemons separately:"
+	elog "  Create a symlink from /etc/init.d/samba.{smbd,nmbd,winbind} to"
+	elog "  /etc/init.d/samba. Calling /etc/init.d/samba directly will start"
+	elog "  the daemons configured in /etc/conf.d/samba"
+
+	elog "The mount/umount.cifs helper applications are not included anymore."
+	elog "Please install net-fs/mount-cifs instead."
+
+	ewarn "If you're upgrading from 3.0.24 or earlier, please make sure to"
+	ewarn "restart your clients to clear any cached information about the server."
+	ewarn "Otherwise they might not be able to connect to the volumes."
+}