Bump of 3.4

Package-Manager: portage-2.2_rc81/cvs/Linux x86_64

3 files changed, 399 insertions, 2 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 498df95e66bb..157121355680 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.441 2010/09/14 18:16:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.442 2010/09/14 21:00:49 patrick Exp $
+
+*samba-3.4.9 (14 Sep 2010)
+
+  14 Sep 2010; Patrick Lauer <patrick@gentoo.org> +samba-3.4.9.ebuild:
+  Bump of 3.4
 
   14 Sep 2010; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Cleanup of metadata.xml for unused useflags
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 62773727cb3d..482adf76ec98 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -46,11 +46,13 @@ AUX samba-xinetd 286 RMD160 c90bd8518082eb4c182d5f7bd223a76f8e3c7fab SHA1 b250c5
 AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad
 DIST samba-3.4.6.tar.gz 34849318 RMD160 d94c6c85e1c30a160d3440630943fd0af2f8da72 SHA1 7896340d96a9c7f8a57d3a4c425bbbed78886f5c SHA256 c06504a5dcf6f0dea26c40869e7350af634500114052ddaf3590086cfbba6a16
 DIST samba-3.4.8.tar.gz 34851288 RMD160 a43d6fcfa3745754afca9d2c35682f69217b3040 SHA1 941daefd092e94eb9fb57d4617fcc6844c967317 SHA256 5237bc7a32e0eafd70b78c9cd6735e46dbad0c6f9794f50476b50dd1b43752d6
+DIST samba-3.4.9.tar.gz 34850281 RMD160 1c724ac3bee4f1a5b547a89cd5f899226aac6717 SHA1 2e16ee2398d232a0bd6e457df8b5b3d45217ad22 SHA256 593952940f6c460a8486906aff55c56c8168c0f74d2d016bb55d080259048b8e
 DIST samba-3.5.5.tar.gz 30807931 RMD160 3af88b26399f3602ce1c050c453fa56e55bb750f SHA1 c02e40ba0d1d9787e7cc5cc636929291f0b318ae SHA256 1b720bdb668cd621795c94ef4e07f7de303379f812ea05818e8f2b1dd1ab4003
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 EBUILD samba-3.4.6.ebuild 11253 RMD160 8ddf1696921b4469dc847c4224a139c61d261ed7 SHA1 9a83116b04d036437b29859a8c1d81417e8ecee6 SHA256 a5461a655ea2797bf6d8199e71a437d70164f46d8bbc92b6e9486dd9fdaed2b7
 EBUILD samba-3.4.8.ebuild 11250 RMD160 022ae9b501e00a3fcd719db70f88ca724da3926d SHA1 c38da7955a99985f7d88e5b56832ec7841ddea67 SHA256 a4383c4664c255b495cba5a0bf8a146a8fafc8d1dd313f88ddbfc09369558603
+EBUILD samba-3.4.9.ebuild 11264 RMD160 b7c70cf1929cfe9747bd2f9c455aa775d65d3ae5 SHA1 c8e219f70ba617f33a0e3b46158464bd40e2a075 SHA256 86b37931b5bf505211e53fc2b3fc02ece2e7e4729684386f8def27c777fe861d
 EBUILD samba-3.5.5.ebuild 12311 RMD160 5cc0ae1a2dba8b0e90f774fb76983f59a9119ebb SHA1 c5eccc78efdf4b0d8a2775ba6f820e5079f368b3 SHA256 e7f84430c12123581a7cae6d393a207bde13ca6870df384f4f314c5c95570e96
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 73995 RMD160 fe9f96936c4d837498aa654c98cfeacda19b0248 SHA1 f4bb460da68e77d5a8cc17f2d4ecd283f666e0f1 SHA256 86e2eb3bde799c768b92bf793d342539cbb2a8902557d45293045444a9051d1e
+MISC ChangeLog 74109 RMD160 f2e41956cc52f819750530357319f9f27b58ca8a SHA1 f80d9d0b1b7c9d24ee101d6cd28c2bdd83767509 SHA256 308142bb884e7deda15aef224e28fa519968774fc6169dbcc297e2a3000d4a0d
 MISC metadata.xml 1365 RMD160 2f64795a1d7d7c42fef60ebf208dd7b857786e47 SHA1 5c76d183a1f4f77832415fce1eb02e7ee4ecea2f SHA256 adffcfd42c6c2895909ba3eb6dda9a398d9d499fbced64c6c65d51ac71a0374b
diff --git a/net-fs/samba/samba-3.4.9.ebuild b/net-fs/samba/samba-3.4.9.ebuild
new file mode 100644
index 000000000000..fd32146c9b67
--- /dev/null
+++ b/net-fs/samba/samba-3.4.9.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.9.ebuild,v 1.1 2010/09/14 21:00:49 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
+	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
+	syslog winbind "
+
+DEPEND="dev-libs/popt
+	!net-fs/samba-client
+	!net-fs/samba-libs
+	!net-fs/samba-server
+	sys-libs/talloc
+	sys-libs/tdb
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils ) )
+	avahi? ( net-dns/avahi )
+	caps? ( sys-libs/libcap )
+	client? ( !net-fs/mount-cifs
+		dev-libs/iniparser )
+	cluster? ( dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-libs/dmalloc )
+	fam? ( virtual/fam )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser ) )
+	readline? ( >=sys-libs/readline-5.2 )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+
+if use server ; then
+	SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
+	BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
+		bin/profiles bin/sharesec bin/eventlogadm"
+
+	use swat && SBINPROGS="${SBINPROGS} bin/swat"
+	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
+fi
+
+if use client ; then
+	BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
+		bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
+		bin/ntlm_auth"
+
+	use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
+fi
+
+use cups && BINPROGS="${BINPROGS} bin/smbspool"
+use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
+
+S="${WORKDIR}/${MY_P}/source3"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+# - AFS?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	 if use winbind &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
+	then
+		eerror "It is a known issue that ${P} will not build with "
+		eerror "winbind use flag enabled when using gcc < 4.3 ."
+		eerror "Please use at least the latest stable gcc version."
+		die "Using sys-devel/gcc < 4.3 with winbind use flag."
+	fi
+
+	confutils_use_depend_all ads ldap
+	confutils_use_depend_all swat server
+	confutils_use_depend_all client netapi
+}
+
+src_prepare() {
+	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
+
+	# ensure that winbind has correct ldflags (QA notice)
+	sed -i \
+		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	local myconf
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] || use hppa && myconf="${myconf} --disable-pie"
+
+	# Upstream refuses to make this configurable
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	# use_with doesn't accept 2 USE-flags
+	if use client && use ads ; then
+		myconf="${myconf} --with-cifsupcall"
+	else
+		myconf="${myconf} --without-cifsupcall"
+	fi
+
+	# Notes:
+	# - automount is only needed in conjunction with NIS and we don't have that
+	# anymore => LDAP?
+	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
+	econf ${myconf} \
+		--with-piddir=/var/run/samba \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable debug developer) \
+		--enable-largefile \
+		--enable-socket-wrapper \
+		--enable-nss-wrapper \
+		$(use_enable swat) \
+		$(use_enable debug dmalloc) \
+		$(use_enable cups) \
+		--disable-iprint \
+		$(use_enable fam) \
+		--enable-shared-libs \
+		--disable-dnssd \
+		$(use_enable avahi) \
+		--with-fhs \
+		--with-privatedir=/var/lib/samba/private \
+		--with-rootsbindir=/var/cache/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-configdir=/etc/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		--without-afs \
+		--without-fake-kaserver \
+		--without-vfs-afsacl \
+		$(use_with ldap) \
+		$(use_with ads) \
+		$(use_with ads krb5 /usr) \
+		$(use_with ads dnsupdate) \
+		--without-automount \
+		$(use_with client cifsmount) \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with syslog) \
+		$(use_with quota quotas) \
+		$(use_with quota sys-quotas) \
+		--without-utmp \
+		--without-lib{talloc,tdb} \
+		$(use_with netapi libnetapi) \
+		$(use_with smbclient libsmbclient) \
+		$(use_with smbsharemodes libsmbsharemodes) \
+		$(use_with addns libaddns) \
+		$(use_with cluster ctdb /usr) \
+		$(use_with cluster cluster-support) \
+		$(use_with acl acl-support) \
+		$(use_with aio aio-support) \
+		--with-sendfile-support \
+		$(use_with winbind) \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns || die "emake libaddns failed"
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi || die "emake libnetapi failed"
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient || die "emake libsmbclient failed"
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
+	fi
+
+	# compile modules
+	emake modules || die "building modules failed"
+
+	# compile pam moudles
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules || die "emake pam_modules failed";
+	fi
+
+	# compile winbind nss modules
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules || die "emake nss_modules failed";
+	fi
+
+	# compile utilities
+	if [ -n "${BINPROGS}" ] ; then
+		einfo "make binprogs"
+		emake ${BINPROGS} || die "emake binprogs failed";
+	fi
+	if [ -n "${SBINPROGS}" ] ; then
+		einfo "make sbinprogs"
+		emake ${SBINPROGS} || die "emake sbinprogs failed";
+	fi
+
+	if use client ; then
+		einfo "make {,u}mount.cifs"
+		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
+	fi
+}
+
+src_install() {
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}" || die "installing modules failed"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install libwbclient"
+		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
+		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
+
+	# install binaries
+	insinto /usr
+	for prog in ${SBINPROGS} ; do
+		dosbin ${prog} || die "installing ${prog} failed"
+		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+	done
+
+	for prog in ${BINPROGS} ; do
+		dobin ${prog} || die "installing ${prog} failed"
+		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+	done
+
+	# install server components
+	if use server ; then
+		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
+
+		diropts -m0700
+		keepdir /var/lib/samba/private
+
+		diropts -m1777
+		keepdir /var/spool/samba
+
+		diropts -m0755
+		keepdir /var/{cache,log}/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/{auth,pdb,rpc,idmap,nss_info,gpext}
+
+		newconfd "${CONFDIR}/samba.confd" samba
+		newinitd "${CONFDIR}/samba.initd" samba
+
+		insinto /etc/samba
+		doins "${CONFDIR}"/{smbusers,lmhosts}
+
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins ../examples/LDAP/samba.schema
+		fi
+
+		if use swat ; then
+			insinto /etc/xinetd.d
+			newins "${CONFDIR}/swat.xinetd" swat
+			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
+				|| die "installing swat failed"
+		fi
+
+		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install client files ({u,}mount.cifs into /)
+	if use client ; then
+		into /
+		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
+		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
+	fi
+
+	# install the spooler to cups
+	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+
+	# install misc files
+	insinto /etc/samba
+	doins "${CONFDIR}"/smb.conf.default
+	doman  ../docs/manpages/smb.conf.5
+
+	insinto /usr/"$(get_libdir)"/samba
+	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
+
+	# install docs
+	if use doc ; then
+		dohtml -r ../docs/htmldocs/*
+		dodoc ../docs/*.pdf
+	fi
+
+	# install examples
+	if use examples ; then
+		einfo "install examples"
+		insinto /usr/share/doc/${PF}/examples
+
+		if use smbclient ; then
+			doins -r ../examples/libsmbclient
+		fi
+
+		if use winbind ; then
+			doins -r ../examples/pam_winbind ../examples/nss
+		fi
+
+		if use server ; then
+			doins -r \
+				auth autofs dce-dfs LDAP logon misc pdb perfcounter \
+				printer-accounting printing scripts tridge validchars VFS
+		fi
+	fi
+
+	# Remove empty installation directories
+	rmdir --ignore-fail-on-non-empty \
+		"${D}/usr/$(get_libdir)/samba" \
+		"${D}/usr"/{sbin,bin} \
+		"${D}/usr/share"/{man,locale,} \
+		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
+	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
+}
+
+pkg_postinst() {
+	elog "The default passdb backend has been changed to 'tdbsam' in samba 3.4!"
+	elog "That breaks existing setups using the 'smbpasswd' backend without"
+	elog "explicit declaration!"
+	elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
+	elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
+	elog "'pdbedit -i smbpasswd -e tdbsam'."
+	elog "For further information make sure to read the release notes at"
+	elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-3.4.0.html"
+}