Version bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 164 insertions, 22 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index e35b68cf3e7b..e6507e4f02df 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.557 2013/02/03 12:56:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.558 2013/02/04 11:24:19 pinkbyte Exp $
+
+*samba-4.0.2 (04 Feb 2013)
+
+  04 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +samba-4.0.2.ebuild:
+  Version bump
 
   03 Feb 2013; Lars Wendler <polynomial-c@gentoo.org> samba-4.0.1-r1.ebuild:
   Non-maintainer commit: Added test USE flag to IUSE.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 3bef3d6b2a24..4e91b3830396 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
 AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
@@ -35,6 +32,7 @@ DIST samba-3.6.10.tar.gz 34076720 SHA256 4af53840773b5768b620e8afb66e081b84f8639
 DIST samba-3.6.11.tar.gz 34077337 SHA256 dcf01bc4af9c6a10c0b6c697a96a452598681d65a8894ca4843055a8b55b0020 SHA512 db064c96fb6fff167aec09acb38359892148b36bd88752f835e09d439b288ba8433fde5428bdaa4275ee95841e2e1bba28fd6bd8a6d44e48b2b4778f858312cd WHIRLPOOL 27585f344cfd1a2bd04bdafbfd8515503b316f02ea9c9fb40be02f118bcf7fdb10ba670eadc9f32322c0273b0938aebb8c35a21121e049a23df35a802c949b6c
 DIST samba-3.6.9.tar.gz 34077002 SHA256 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 SHA512 be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7 WHIRLPOOL 4e4f091329517872117160e167cb60ce71cfd441a0b6eb46157aa48b16369e887b7373b9c2bada8751de62db10f8db748f53ecc28a90b70aaf38df3af2649b1e
 DIST samba-4.0.1.tar.gz 22030490 SHA256 4b6370559ea4fbb332b6c8febdb2ed37d24209dd4c9c9fdf783030e34f02c6c2 SHA512 7377b60f40ad58a386ded1a3eceaa3ae8adf0df1c8855ecbd8ff8724cf2c69a0048b8c99c36bf1d15b988c231d204bc72f1095f5bd5fb35904ad9828e3c1e69c WHIRLPOOL e644e6278234e20bd3473b7e2ce2146d7e32baefcaa70956a9a848100e6842848d81ffc077f7bb65b68bf6e10ef5e1187c7f765442e3efe548f2a3e270f20498
+DIST samba-4.0.2.tar.gz 22030954 SHA256 da996dca41f0ac0e95a072cce86f4098a8c85b82d4c9404b4a8847867c2e618e SHA512 7fe66baa5857b9300cfd1b6c812a1adb04421c6da42e7a01a9c81620b9aad83ea7730704e0a18601395074586463c7a61b82634ed6c33a12d40b505b1bf5c75a WHIRLPOOL dc70fcb28f825fb94a3c0bf1eb3b7595e1a8c84817e86d476c9f536070eae79b51f69cfe20f03d0914ceea1c7b24069aca7cbff6987b5eafc86a41d8bc83dfb2
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.15.ebuild 12458 SHA256 2837e33a487578958d53e1bb39762a7426d3b698392da6e63534502f6e9ec74f SHA512 24f10e3ad829d198ffaa7d00deb9692240688fe787827c1bea243e002ebc92f28b23d8c967d4701154dd19ca00d2bd5d5f7c8613bf667209395a29195ef44ce7 WHIRLPOOL 6638a9ad91fdd88152a3d3826d6efb1f1e4e486c472bc46a79a46c994a80e05ec4535915155b8314eb79d617aa0bfa82f49b7a73d5d5a5eee6a8d8753b81864b
 EBUILD samba-3.5.19.ebuild 12464 SHA256 936b24f5a5fe2d9fc7f0d5a7307395eef3e7fc0007cdd9b68f3ec7bc14c7ccf4 SHA512 03c4cb8cc9e73771753b39cf2fc1c2e350cd7c09bc08d0f3f0748d13769fadb0bb08a6855d8f27201412a6ab16cf32c2ce665a53d4d1714462de552ef66f6ab4 WHIRLPOOL b476ee0c7637cb43eb54541add97410c7ec2e5066d546aee7df40309d57978b63a5304a34fd779b448a530d8b0ada178e38eb4a8c43fe7aa4216ee6269e4ab78
@@ -45,22 +43,6 @@ EBUILD samba-3.6.11.ebuild 11865 SHA256 779aa21eaf90a721c5ec2b67fee1067e7dcf3967
 EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
 EBUILD samba-4.0.1-r1.ebuild 4098 SHA256 00023e177d5298b6c8f0fb3da4a03834fb1694fa55b7a543275c5648fffaaa13 SHA512 cd03d2995ce5737eac5e7d2af6c7e58baedabec4f14f72dac28b89eaa90bfb8cbf3d6c4901dcc63ad4cb4d15af8da72f02b5785bc4c82dc07de22b9fe5dbb1e0 WHIRLPOOL 57d7d0c905bc9e986a6a2a673aada4868ff3d8db0ef6df867c91c86dfd09f062db6a4cd73d8656706fcf0d14d481356263195a84bfe34cc5ddea641569d6da56
 EBUILD samba-4.0.1.ebuild 3990 SHA256 4b067cd86fdaf4db4d80ab0e4a9fb356f23ca8508da455b538c8493832587556 SHA512 2afbd30b3164edb30e9cda167985dd66380352e088ccde2f1d57c9f3ccf649699f6b9df75f3126937ab4d0deab5b2a4e3717941084d4bd0c84461f551e7fee56 WHIRLPOOL 37db16ac12543cb3a7c6e688b3ef41ae38c45bb5805ced164bf24c49509d6be9c10e906b638657f751abb0ececbf1110ae3d6a7b18df31fe891c4539fe38fd17
-MISC ChangeLog 92520 SHA256 c85d9b89743bb71fbbe297c8aae8eda98bff7bb6fc3de8a8c75d5c74ff0fcf6b SHA512 6c2a0a0119d970ff4025832d89cce0c609dd174b9cf06e3963d1f9cc31561d3fa3921afcdf4da89880f84d305fd58d244ce3a479892d8469bd5c04c53cefedac WHIRLPOOL bfba5b8fb948d3b7565247c40e5000a9c7f6f36b71cf457087460feb19f1641a5682eadc06e21ae49a26abd9ad7d7e0e33dfbaf27fa0b69b9ee6e7d49fa77f76
+EBUILD samba-4.0.2.ebuild 4091 SHA256 1e98fe4280d0883d74fbbcad0a408e341f0b4841d9c8492b9eb03370f7c98461 SHA512 1645c73b0786baec9bf9892397f5ad8f281da2f91b5c9e628094bfbb4292000afe36db728175b0aabcc43e15eee4fc9658c762df97e8c09fb4923ae3fabd5034 WHIRLPOOL 412795b1d190d48b9e459165b5f2b5ee9d375d46c6d550fad9627d5a5d47b66d73f94de0490280a6208ee0f1612d1cde79a5f89c6a953f177c6852053097ec2c
+MISC ChangeLog 92631 SHA256 f9340fda9bfc99857251ee4c3b001db625730a14f011b34b4229858d01da2979 SHA512 8aae80e4e4557f363a3dd4143dc4374af86d0cbc45537fdc05a89e5a7fc0fd83a71a546284a46559a211d1aab761bcf6a819e05a4bd20af99a63a41030ae776c WHIRLPOOL 75d3428e16a3a5bb9b1ddedcad33c234fd81f804f151491643b611c490953bc231ed2224744c89607cf2b990fcb0d31db72d124959d121ed0307d8a91b0c9ad8
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRDl6KAAoJEPiazRVxLXTFlS4QAN7k19O0jdvcoZaaYgDimGlK
-RaqRe113zk2MgHKYQupgti7k0jESxdDc8N9sftgsqUyJrN61w693FDhZacZAJzaH
-WwK7nbUeDNjWCMBGNx9FK0kcDNfFpOYbBQ6/kZdR55LgBE2/zZLlLHNfL0zAI5Fn
-Td8UoCnYLJ/LWaJ3ko8MySPrcL7+m28vYw5qJL75381C5Y7LYDjJeuvxDPayBrVf
-grR1qgXBVjk19uKXg+WjUfIRH+4C5xi9iGzxY6TDM+i5anxev65kQRL2Wckxo/oL
-mfbfWL+VwIGJJW83jnNed20i2jDiDMVgHA2fgYwaUbAlVSq+d4frzmUyWoNeq+/Q
-kXbQlzE8LOpP79vlFyCM1J5uD01lrahFA4HL/Vn5nVL6GYaQ69+7CJFfnVoQmP6g
-8/JBKorWiLznkirWm+0BVLaK8uydT0dl5Qj38/fV19nW5/aqHAG+IC+0QbMBg18l
-0wf7YzCDexcuJvwIYUapNV+RAQndloXbdvIlARWU9iXyeaIVRsNkHqLqxvTGZR60
-4rMQ4IPEdNu0nvrow2XQGX5reRJLsHjd1Sn5E0e9JCDBVFCLklJim2Kh0rM7JDb3
-JX/Ynp2sDrtDiVoh3taiznCWGR7L6eV3H9E/8DP8KafhajPQST+zwoAnWpnroJ7X
-tlmp3OxiVBlOfTZGLoyQ
-=vRkX
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.2.ebuild b/net-fs/samba/samba-4.0.2.ebuild
new file mode 100644
index 000000000000..dbcdf4c59a1e
--- /dev/null
+++ b/net-fs/samba/samba-4.0.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.2.ebuild,v 1.1 2013/02/04 11:24:19 pinkbyte Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-r1 waf-utils multilib linux-info
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+if [ "${PV}" = "4.9999" ]; then
+	EGIT_REPO_URI="git://git.samba.org/samba.git"
+	KEYWORDS=""
+	inherit git-2
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
+ldap pam quota selinux swat syslog test winbind"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser
+	dev-libs/popt
+	sys-libs/readline
+	virtual/libiconv
+	dev-python/subunit
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.13
+	>=sys-libs/tdb-1.2.10[python]
+	>=sys-libs/talloc-2.0.7[python]
+	>=sys-libs/tevent-0.9.17
+	sys-libs/zlib
+	>=app-crypt/heimdal-1.5[-ssl]
+	addns? ( net-dns/bind-tools[gssapi] )
+	client? ( net-fs/cifs-utils[ads?] )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	ldap? ( net-nds/openldap )
+	gnutls? ( >=net-libs/gnutls-1.4.0 )
+	selinux? ( sec-policy/selinux-samba )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="ads? ( ldap )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+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 \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--disable-ntdb \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with quota) \
+		$(use_with syslog) \
+		$(use_with swat) \
+		$(use_with winbind)
+		"
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	python_replicate_script \
+		"${D}/usr/sbin/samba_upgradeprovision" \
+		"${D}/usr/sbin/samba_dnsupdate" \
+		"${D}/usr/sbin/samba_spnupdate" \
+		"${D}/usr/sbin/samba_upgradedns" \
+		"${D}/usr/sbin/samba_kcc" \
+		"${D}/usr/bin/samba-tool"
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Move all LDB modules to their correct path
+	mkdir -p "${D}"/usr/$(get_libdir)/ldb/modules/ldb
+	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	elog "This is is the first stable release of Samba 4.0"
+
+	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 "
+}