Updating samba 4, based in work of Ewoud Kohl van Wijngaarden <gentoo@kohlvanwijngaarden.nl> bug 195703

Package-Manager: portage-2.1.10.11/cvs/Linux i686

6 files changed, 226 insertions, 3 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index b9a9cc4ba779..64c5b5d7d17f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.491 2011/10/28 19:56:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.492 2011/11/01 19:23:53 vostorga Exp $
+
+*samba-4.0.0_alpha17 (01 Nov 2011)
+
+  01 Nov 2011; Víctor Ostorga <vostorga@gentoo.org> +files/4.0/com_err.patch,
+  +files/4.0/samba4.initd, +samba-4.0.0_alpha17.ebuild:
+  Updating samba 4, based in work of Ewoud Kohl van Wijngaarden
+  <gentoo@kohlvanwijngaarden.nl> bug 195703
 
 *samba-3.6.1 (28 Oct 2011)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d03224e77a86..043629216d57 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536986bddaf961d77e73f3bf04f39212333d SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e
 AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893
 AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
@@ -19,16 +22,27 @@ AUX 3.6/smb.conf.default.patch 2385 RMD160 807cc1e9d18e41d4f15fec2ef675bc8bbbdea
 AUX 3.6/smbusers 217 RMD160 3dd2a60bbaf206ad7343ea80509b44a84459a72a SHA1 a8114a2ff5b03e3c8f23104a9bd28381044ce413 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211a8bd9d58703f
 AUX 3.6/swat.xinetd 526 RMD160 2a407763cfacfbe9b31c0901e43b4d227ea02a12 SHA1 88c6db599a1463dfd4c69392fc7374453c50ad00 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac
 AUX 3.6/system-auth-winbind.pam 704 RMD160 4b9220ea16830f6ccb3afbcd2bef9b074c02f749 SHA1 d8ab709fb750300bcf642064015fddd1a9c3ed23 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56
+AUX 4.0/com_err.patch 1276 RMD160 7fc5ec46212a6bf8d7f9b2edf5b182d048587d7d SHA1 e4730a95ea33e73be2762ebd4e7785849f76cc85 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31
+AUX 4.0/samba4.initd 657 RMD160 4c3221b5144c9776cf895e9eae9df16ae3e2b663 SHA1 581f78653d2e6128fc49433255241f53d2786e3b SHA256 0b8c9df0d7ec7229f6cfb397f9ee1edb9b85d4379ed088629afe11cf589a32ad
 AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153
 AUX samba4.initd 657 RMD160 0bf3499a59ee032bd92486a32b211b779e34a80e SHA1 b5fbc25eccb63f19f5ca5cdca27ea948f0e9385d SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9
 DIST samba-3.5.11.tar.gz 30752782 RMD160 b3ee1e044e9df417b0dcaf954a6a137db742cba3 SHA1 0801871ab6a11f7d8eb8bf32ff0b87896d263441 SHA256 fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597
 DIST samba-3.6.0.tar.gz 28990069 RMD160 8e17800466443bd6529c2312eeec8acfab1d7f63 SHA1 c87e2481d755f3a7f22bae44ef2f22ca64b9d173 SHA256 e1c14569e4785758838e77852bc1e958c15405146cface568c25c5726802f53f
 DIST samba-3.6.1.tar.gz 28984820 RMD160 6ed44e66b22cef00168831fa7ed13571fd5e45ed SHA1 fed82fd92958f3209edb3c71321d4b48abee9c4b SHA256 c5b0f2ab02fe2c641b1ce52a141c28f1b3fbc093ada8a62eeca70c25e15bd564
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
+DIST samba-4.0.0alpha17.tar.gz 20749528 RMD160 d7fda13f4d1b18c871c916487966e97f65034e06 SHA1 7c5877c6559cb4ac8fe9047d245c40448e9ad3cb SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
 EBUILD samba-3.5.11.ebuild 12035 RMD160 4694eae59c965bddfe1f05c905193d7c6666249c SHA1 8569b7ca068323525087e57d49b6db59bfe65dfb SHA256 f68798341db54a9f023aefc89797a03b374be792ab03af71ce13031c0352172e
 EBUILD samba-3.6.0.ebuild 11245 RMD160 5951fdf5ddc8e3c60109645b2dd96bd037d97c2b SHA1 9b2bd936482a397d05e4d3945125b7724d4e08c4 SHA256 622b2b17cc8548fb740ed5b223ca9d2a5f29127894aaec150296af664bc29c9e
 EBUILD samba-3.6.1.ebuild 11244 RMD160 8b56c35571c39c24da87e637599d3ca995db34ad SHA1 628f5f02fb142c9495d848d90492e522f7b52912 SHA256 763c7163ce4e6bf8032b762d2f0442b00dec1c495b052231d093294aca4dd492
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 93f8fee4d9633d7541e112ff4e29acc7ba883dd0 SHA1 1863c5b92d457757964401cd0f9d89dc45d40e2b SHA256 88079c3ad65eea307dd9e870c57157fea04489fd7790b58337d8cd6b65ed2f94
-MISC ChangeLog 82701 RMD160 ca9ef85e0a3c222bd767780a248e70c6825d1173 SHA1 3eaa9ecb8d5d6fe939369ad7e70e042d7debee4c SHA256 78b603f6562fe595f78e2721288ebd21edf7304ab1b6f92b533bff90b751e255
-MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
+EBUILD samba-4.0.0_alpha17.ebuild 3224 RMD160 ab1766aeec51b23a04f51a64df67302e6060cc91 SHA1 dfab3f334677883d959652327ea460611af1b838 SHA256 b3880fed7783530514a8bedbd70f005b4275ca82a3586900c0a457b913de59d6
+MISC ChangeLog 82982 RMD160 16d697b69d1725fee0398f2cecfdd521cb839b0c SHA1 07ee2693c9ba454340d734d01be5f7451f5b2be6 SHA256 85a993cd3e19542b8ecdbe341bf3bc35a4d100e16a7079ee5149939d8fe0c9b8
+MISC metadata.xml 1616 RMD160 30ca62a74056e762ab9cbdbd988d762cf53fa155 SHA1 05766875bb3132da9857ce944d8f94cfbabe65e3 SHA256 5f4d121826fd55bc58092da3d0597991a27fcf3f5e0dffd1af11c9984994fe40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6wR14ACgkQKQaZ7OJe4zaxlACfbS8oyqQdw0rcHiS+IBsh7wPv
+AEoAnROzCllsz0Osfo13lCfyIC/ouLcK
+=gH0m
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/4.0/com_err.patch b/net-fs/samba/files/4.0/com_err.patch
new file mode 100644
index 000000000000..2c9ad88f01d7
--- /dev/null
+++ b/net-fs/samba/files/4.0/com_err.patch
@@ -0,0 +1,35 @@
+From 2f34bfbc1941127d17a7a91c6598d6a6c35620e2 Mon Sep 17 00:00:00 2001
+From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
+Date: Thu, 6 Oct 2011 00:19:01 +0200
+Subject: [PATCH] Add missing com_err dependencies
+
+---
+ auth/kerberos/wscript_build |    2 +-
+ nsswitch/wscript_build      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/auth/kerberos/wscript_build b/auth/kerberos/wscript_build
+index 1070770..2421b16 100644
+--- a/auth/kerberos/wscript_build
++++ b/auth/kerberos/wscript_build
+@@ -1,3 +1,3 @@
+ bld.SAMBA_SUBSYSTEM('KRB5_PAC',
+                     source='gssapi_pac.c kerberos_pac.c',
+-                    deps='gssapi_krb5 krb5 ndr-krb5pac')
++                    deps='gssapi_krb5 krb5 ndr-krb5pac com_err')
+diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
+index 298da06..4e353d3 100644
+--- a/nsswitch/wscript_build
++++ b/nsswitch/wscript_build
+@@ -33,7 +33,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
+ if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+ 	bld.SAMBA_LIBRARY('winbind_krb5_locator',
+ 		source='winbind_krb5_locator.c',
+-		deps='wbclient krb5',
++		deps='wbclient krb5 com_err',
+ 		realname='winbind_krb5_locator.so')
+ 
+ bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
+-- 
+1.7.3.4
+
diff --git a/net-fs/samba/files/4.0/samba4.initd b/net-fs/samba/files/4.0/samba4.initd
new file mode 100644
index 000000000000..7a09233795e0
--- /dev/null
+++ b/net-fs/samba/files/4.0/samba4.initd
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd,v 1.1 2011/11/01 19:23:53 vostorga Exp $
+
+extra_started_commands="reload"
+
+description="The samba daemon init script"
+description_reload="Reloads the samba daemon"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting samba"
+	start-stop-daemon --start --exec /usr/sbin/samba
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping samba"
+	start-stop-daemon --stop --pidfile /var/run/samba/samba.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading samba"
+	killall -HUP samba
+	eend $?
+}
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 3289e14490fb..6db9563ef26d 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -26,5 +26,8 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="smbclient">Enable smbclient tool</flag>
 	<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
 	<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
+	<flag name="fulltest">Enabling extra tests in test phase </flag>
+	<flag name="krb5">Enable kerberos support</flag>
+	<flag name="iprint">Enabling iPrint technology by Novell</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-4.0.0_alpha17.ebuild b/net-fs/samba/samba-4.0.0_alpha17.ebuild
new file mode 100644
index 000000000000..98bd7186e712
--- /dev/null
+++ b/net-fs/samba/samba-4.0.0_alpha17.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0_alpha17.ebuild,v 1.1 2011/11/01 19:23:53 vostorga Exp $
+
+EAPI=4
+
+inherit eutils confutils python waf-utils versionator
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+if [ "${PV}" = "4.9999" ]; then
+	EGIT_REPO_URI="git://git.samba.org/samba.git"
+	inherit git-2
+else
+	SRC_URI="mirror://samba/samba4/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Samba Server component"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint
+krb5 ldap pam quota swat syslog winbind"
+
+RDEPEND="dev-libs/popt
+	sys-libs/readline
+	virtual/libiconv
+	>=dev-lang/python-2.4.2
+	dev-python/subunit
+	>=app-crypt/heimdal-1.5[-ssl]
+	>=sys-libs/tdb-1.2.9[python]
+	>=sys-libs/ldb-1.1.2
+	>=sys-libs/talloc-2.0.6[python]
+	>=sys-libs/tevent-0.9.14
+	sys-libs/zlib
+	ads? ( client? ( net-fs/cifs-utils[ads] ) )
+	client? ( net-fs/cifs-utils )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	ldap? ( net-nds/openldap )
+	gnutls? ( >=net-libs/gnutls-1.4.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	confutils_use_depend_all fulltest test
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/com_err.patch
+}
+
+src_configure() {
+	local myconf=''
+	if use "debug"; then
+		myconf="${myconf} --enable-developer"
+	fi
+	if use "cluster"; then
+		myconf="${myconf} --with-ctdb-dir=/usr"
+	fi
+	myconf="${myconf} \
+		--enable-fhs \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--bundled-libraries=NONE \
+		--builtin-libraries=replace,ccan \
+		$(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 krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with quota) \
+		$(use_with syslog) \
+		$(use_with swat) \
+		$(use_with winbind)"
+	waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	newinitd "${CONFDIR}/samba4.initd" samba || die "newinitd failed"
+
+	#remove conflicting file for tevent profided by sys-libs/tevent
+	find "${D}" -type f -name "_tevent.so" -exec rm -f {} \;
+}
+
+src_test() {
+	local extra_opts=""
+	use fulltest || extra_opts+="--quick"
+	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
+}
+
+pkg_postinst() {
+	# Optimize the python modules so they get properly removed
+	python_mod_optimize "${PN}"
+
+	einfo "See http://wiki.samba.org/index.php/Samba4/HOWTO for more"
+	einfo "information about samba 4."
+
+	# Warn that it's an alpha
+	ewarn "Samba 4 is an alpha and therefore not considered stable. It's only"
+	ewarn "meant to test and experiment and definitely not for production"
+}
+
+pkg_postrm() {
+	# Clean up the python modules
+	python_mod_cleanup "${PN}"
+}