Version bump. Finally link against system heimdal (bug #504694). Use sys-libs/ntdb instead of bundled copy

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 194 insertions, 15 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index a74e1df1239a..ab3bdd812ee2 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.665 2014/04/15 11:37:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.666 2014/04/17 13:02:42 polynomial-c Exp $
+
+*samba-4.1.7 (17 Apr 2014)
+
+  17 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> +samba-4.1.7.ebuild:
+  Version bump. Finally link against system heimdal (bug #504694). Use
+  sys-libs/ntdb instead of bundled copy.
 
 *samba-4.0.17 (15 Apr 2014)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c897f6d0683a..3a12f71c0189 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -47,6 +47,7 @@ DIST samba-3.6.23.tar.gz 34122387 SHA256 25bbfa81b9a26609a0be744240b63e1f5030bbc
 DIST samba-4.0.16.tar.gz 22113747 SHA256 50f45bb2c90fdef958d959b1c6bbac57731238e268301d5fc5e9bf304b62ed15 SHA512 e449e228a1603d78401d1ee4adced0f3911dbc3a07f19ed65d571d304a457c65fa7f190815513cd365b15fae29760c6230b0c2803df31ea0f43213fb79675981 WHIRLPOOL 89b9688f8e2bc04a65fd8edd8a3af780e6a1fa4029d089928ec8cbd9572e9d3b8d6fc1a6b25d103ada39ce72151cdf5059e83517766aea777912f958d19bfaf5
 DIST samba-4.0.17.tar.gz 22126553 SHA256 6775cc093dc1f5b4feec3b47b458b78ad44f14de11f4bc8838b69e86d1ddf6ed SHA512 507561d122d0628b95b6e5837d175d951e535523be6a519836390651cb552b4a7f695e3bd519bdee22bf5287e3981c8f042c15197ea47071f8213b5b4ed83adb WHIRLPOOL a99771797c4903173c701f0b726e22bae9efc19e9dc4e460923cff97ef5a6ee7d6637c68fbf43e87ed62d9ce0e2aa399f430e96494881ab05eaae02023ffe37b
 DIST samba-4.1.6.tar.gz 23177462 SHA256 6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b SHA512 3eaca534c475d57962088df6a23ae7230e05da4696b5b9314a6f21bff669bfd50c7f2abf04eb62462d69866545c8429f01d9886014c526eacf4009d81c8d7ff8 WHIRLPOOL b4d0e76be8740c54df07bb7e134c4727127be87df710cbd1b3e872c27a6b57bcb8499d2f4990eaff52031dd97280c654c995c2d58c43f101a840ab6a81b94e8b
+DIST samba-4.1.7.tar.gz 23187644 SHA256 15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89 SHA512 fc6fe651da34f27e4d7dd2c500b9c1d9de8190fc095021c492c32890c8682b50c8f2fccdb02f9bbaf832239b67b67d1af7d992009c2f2cf1912a11469ed291c1 WHIRLPOOL e9e9c83542144bd52863fbab4f6c7ec0cfcd75cc04e716849ebc74094c06b2ad8feb4e1d9eee883dbd7c3b91ed2463631d6c29b02e4d5f9d1ac85a3a347edea3
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
@@ -55,23 +56,24 @@ EBUILD samba-3.6.23.ebuild 12795 SHA256 208240cec556bfcc16f2653fcad3984465005a10
 EBUILD samba-4.0.16.ebuild 4867 SHA256 3e32c48e5c3b470bf412e74d9f45e79e100364d26f54d3d4d5fcfd5a7a310059 SHA512 cf70e8f37260a1cd1dbc4d6d9282c69fe298a3879d97e7865fee1dc38bbf1c50bfc5897ad48fd3caa16bdebc1cbad086447df74682b125b3ddf8c50d0d74e419 WHIRLPOOL ac0ea0dbd2e135d5183ae77f3be30d10e063e043f00e08e3e710caa16886c70fb47fd7dcceec3c28c9a53728750584d003b3055b38fda066858d98fa7ac60ac1
 EBUILD samba-4.0.17.ebuild 4813 SHA256 ec98ed3faab01945f06557ab6aa652e9c65b16ff0053bdb434c76614a83ed65f SHA512 a3bc70bc74b451dfb7a30767371e1c43a20032de6359bbcc8a2ce7f12810e03c11d3df71dafc48d8070300932caf46c989688bf892eb03af5e3de60e89542653 WHIRLPOOL 28b457101b6e843fadf53a63f571887dc8730a3db01bc8d840570c9676fb76c4865e91264af32353ff9fcca871a85810e3651f17e3cb7edcab700defb91b950e
 EBUILD samba-4.1.6.ebuild 4748 SHA256 f914f52a788afcd5e1ff8328896baf261d7ed3347a58caba7734b751852f3501 SHA512 5c9b1406becebd8a91c57811c6f0e6ce35514934c9a35b8273ef15e3521727ad8c51272b28d9014e24f8a5852728299c5933169529d3cf7592c7c3dcd6556710 WHIRLPOOL 0c82aa42a50b2aac785ff6cca715fdeba52a8e722a78d9ba8d11a60e3e5a071d73bc89e58ae87598c580f533a03de9ae1a2116a456d29021944a8d0b13557106
-MISC ChangeLog 3258 SHA256 05a19d3fcd108e44f4087fe8b8c8a88a045ee44afe69efa5185656f3766d05d7 SHA512 135b2e842aa5187fe0847a8240ae6ac078bbfbde9c86686bde71a43a904d96fdeec0f812b62ca8e8e5faa0eaf73c118e80f2fb49184b6bb23c3a1ffbef1b1d9f WHIRLPOOL 52c03458bb2f2197e6899883e358e9a85d61028af90689071d3000cd3dcb9f55d1721f661db91eb1bdf7fc08afc15f0ab52976060aaa575971782d7b33201bd8
+EBUILD samba-4.1.7.ebuild 4665 SHA256 1b6e82c2b4b99e207d9f1ff4dfb207e9052e73a0e59478b25b45dd3aef38468b SHA512 28d61cd2d09762ad6b5b9482377143b6c56f21196e8b1ced16414a3a42d37b50388633559bf22cc90addffc016b3c59d59c7e1ab82ea8e61a2707dfc23dc3260 WHIRLPOOL 13263bccb71013914b7894478319f3407ac20de5f8c857c19751f905699578641702fa25335ad4b7638ceed8cf6285208f504909614781cf8a49e8724a5e5e7c
+MISC ChangeLog 3474 SHA256 c3ef3c4c6bcb360be4b070fd02d4f0730dbd17c408c407d0761947c4667075e4 SHA512 cb13095f0cd29fafc107514971082fc45a319196c94a922773d6884d2ac81a1d0df77c8c379cde10540ebb670e350035d6a7c939100140e929893a31b40f3a0d WHIRLPOOL d82eadfaedb209339e55da3afa3803278b5bc267f4826fba85f82ba4c95218ad35725760f396582cb79cd6dce993f503873ae38c7791b5364e32962dfd7d4c62
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTTRoXAAoJEPiazRVxLXTFaXEQAMTdpqq+PYGisGa/c8QV1EZz
-MHbpzzDBmzZRw6aWA2eEMkN5NQvG6OGiSp4990QKTHzwSQjgwDXwdHfDCjg8wOo8
-b8iFUFuwUMMPLYLS6YY1ebRGzkiwlsr3x/sAGzCE/t4t7lBuSQ2dbXtNpp9Q6OUM
-qDSaDLm/RpdSGVvINKauU8btCgrQDTM/KZdaFI3ytoQgxcbMYmlyoj2JvgW/loWP
-U1TEwKtMOOigPOAkkVwdiEq0Z3amjbB3NnMQ226L9NLTW9aT/FQ9QW3TZi+NhRSi
-Um2JFmwylFiVqHOcVEvqCInX5ByPkax7rWFjfbR5r7F+s8llPiJPyStlQ3ic5SrF
-WBlKsOLVTk/nOfD9h6+Q57LKChygds+BGwCnXlcBAtY6aS9ZQnYt2NqIPULI2HvZ
-rSuGUdM6c8BBF5NEn8bC7RbN8Dm4UZFAFaFRvW2ue0+WzC06Pa828+q006LLpePP
-EdTGyHtt3muPtNoQ68Exgb23HEqmjzgmIjWB0EYY9c8jHGMg5bqkCYv28GR+7dU8
-8iHXuwz/5odSay5xjlFYyifBF4OzjOMYcSBP2XbiYLSlU6HqcqIY+1FNd7LEM3GP
-leL8A1IfjC0AWiI8kZdws/W3ZvXG7LaksYtDY4enspTPrrxxX0FnjApstCEUbFwS
-DhtBu9PtG56P2vh/EQR/
-=g4N1
+iQIcBAEBCAAGBQJTT9DzAAoJEPiazRVxLXTF63gP/A4Yx9E+PjyhaXB88BNKnElo
+xHxEqsvZCj59Tjia3zsv/L4GJSRqPbNRpAoJPbDn83d7Bq2cLTfZvEDhUHw+0uX9
+dGFl7mVGAvbJV08n79FxYPX9Uz5JeVf8adPL2seu2Ehf0dMprnmjokVJ6HlgV92S
+H6k9MbclH3eU1pjprtRWG2hY8NcfURetoCWdIAEpiLolHBtCNxGKv4UjBZ2g0SAO
+Xf8DKwsODiGHK25e36UU3VavHqr4gMJ4h5pNyrVKOUwv6z7VMGmRyieBCV9FHj5t
+ALB6avAhsDgluX0waAeKGF2BR3ngg9xwN72eo0P3/iEII3TBfrGUTTDzwE8P8ICl
+7Vcf4rnAXegm6KF2Wuqah3S2yg2bbdH6LTeYz485ccjuf2pU/QGg8/a24PbosK9R
+aX/gI+08N7HaJphq5/VguubZsXaSw21aRMZI7hfKLlWxHjbsGH6dx6W7C2UsPgkv
+RTqzmPORtZCgEvFinrmqsGN/jPA8HMof8OwwHCJNfG2zLDSJ4yYPiUrONfUm1RA3
+sGKiblUEKa8b0Xuc38Tock9Sk/n2hCzuYwP3RKf0yOKqJi3VKOo3JNNf22Aqz6WA
+ryloLylfjPdEN7SRpE8R64XQ+cS7hgNjxufEMiTm1qih3fn06iMYqnNIp99B/4Pw
+pJWgGALsP+u+ABwDRgtS
+=6SfV
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.1.7.ebuild b/net-fs/samba/samba-4.1.7.ebuild
new file mode 100644
index 000000000000..7c35d5023a0e
--- /dev/null
+++ b/net-fs/samba/samba-4.1.7.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.7.ebuild,v 1.1 2014/04/17 13:02:42 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit python-r1 waf-utils multilib linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap quota selinux syslog test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# dev-libs/libaio is an automagic dependency (see bug #489764)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	>=app-crypt/heimdal-1.5[-ssl]
+	dev-libs/iniparser
+	dev-libs/libaio
+	dev-libs/popt
+	sys-libs/readline
+	virtual/libiconv
+	dev-python/subunit
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ntdb-1.0[python]
+	>=sys-libs/ldb-1.1.16
+	>=sys-libs/tdb-1.2.11[python]
+	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tevent-0.9.18
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	selinux? ( sec-policy/selinux-samba )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
+
+REQUIRED_USE="ads? ( acl ldap )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+# sys-apps/dmapi is an automagic dependency (see bug #474492)
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
+	"${FILESDIR}/named.conf.dlz.patch"
+)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python_export_best
+	if use aio; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=''
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
+	myconf="${myconf} \
+		--enable-fhs \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/var/run/${PN} \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl acl-support) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_with dmapi) \
+		$(use_with fam) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
+		$(use_with syslog) \
+		$(use_with winbind)
+		"
+	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
+
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}