Bump for #479710. ntdb is now mandatory. swat is removed.

(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 289 insertions, 1 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 02e40b244077..bb7956e2317f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # 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.586 2013/07/26 07:57:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.587 2013/08/05 04:41:22 patrick Exp $
+
+*samba-4.1.0_rc1 (05 Aug 2013)
+
+  05 Aug 2013; Patrick Lauer <patrick@gentoo.org> +files/4.1/com_err.patch,
+  +files/4.1/samba4.confd, +files/4.1/samba4.initd-r1, +samba-4.1.0_rc1.ebuild:
+  Bump for #479710. ntdb is now mandatory. swat is removed.
 
   26 Jul 2013; Patrick Lauer <patrick@gentoo.org> samba-3.5.21.ebuild:
   Disable cups in samba-3.5 since it depends on old versions that were removed.
diff --git a/net-fs/samba/files/4.1/com_err.patch b/net-fs/samba/files/4.1/com_err.patch
new file mode 100644
index 000000000000..2c9ad88f01d7
--- /dev/null
+++ b/net-fs/samba/files/4.1/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.1/samba4.confd b/net-fs/samba/files/4.1/samba4.confd
new file mode 100644
index 000000000000..58b2c7827bdf
--- /dev/null
+++ b/net-fs/samba/files/4.1/samba4.confd
@@ -0,0 +1,38 @@
+# Add "winbind" to the daemon_list if you also want winbind to start.
+# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
+# file server part or the rpc proxy to start.
+# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
+# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
+# accordingly.
+daemon_list="smbd nmbd"
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+my_service_name="samba"
+my_service_PRE="unset TMP TMPDIR"
+my_service_POST=""
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+smbd_start_options="-D"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
+smbd_reload="killall -HUP smbd"
+
+nmbd_start_options="-D"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
+nmbd_reload="killall -HUP nmbd"
+
+samba4_start_options=""
+samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
+samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
+samba4_reload="killall -HUP samba"
+
+winbind_start_options=""
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
+winbind_reload="killall -HUP winbindd"
+
diff --git a/net-fs/samba/files/4.1/samba4.initd-r1 b/net-fs/samba/files/4.1/samba4.initd-r1
new file mode 100644
index 000000000000..ebdd3f18f750
--- /dev/null
+++ b/net-fs/samba/files/4.1/samba4.initd-r1
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.1 2013/08/05 04:41:21 patrick Exp $
+
+extra_started_commands="reload"
+
+depend() {
+        after slapd
+        need net
+        use cupsd
+}
+
+DAEMONNAME="${SVCNAME##samba.}"
+[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
+
+signal_do() {
+        local signal="$1"
+        [ -z "${signal}" ] && return 0
+
+        local result=0 last_result=0 daemon= cmd_exec=
+        for daemon in ${daemon_list} ; do
+                eval cmd_exec=\$${daemon}_${signal}
+                if [ -n "${cmd_exec}" ]; then
+                        ebegin "${my_service_name} -> ${signal}: ${daemon}"
+                        #echo ${cmd} '->' ${!cmd}
+                        ${cmd_exec} > /dev/null
+                        last_result=$?
+                        eend ${last_result}
+                fi
+                result=$(( ${result} + ${last_result} ))
+        done
+        return ${result}
+}
+
+mkdir_sambadirs() {
+        [ -d /var/run/samba ] || mkdir -p /var/run/samba
+}
+
+start() {
+        ${my_service_PRE}
+        mkdir_sambadirs
+        signal_do start && return 0
+
+        eerror "Error: starting services (see system logs)"
+        signal_do stop
+        return 1
+}
+stop() {
+        ${my_service_PRE}
+        if signal_do stop ; then
+            ${my_service_POST}
+            return 0
+        fi
+}
+reload() {
+        ${my_service_PRE}
+        signal_do reload
+}
diff --git a/net-fs/samba/samba-4.1.0_rc1.ebuild b/net-fs/samba/samba-4.1.0_rc1.ebuild
new file mode 100644
index 000000000000..5c9a6b24c85d
--- /dev/null
+++ b/net-fs/samba/samba-4.1.0_rc1.ebuild
@@ -0,0 +1,150 @@
+# 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.1.0_rc1.ebuild,v 1.1 2013/08/05 04:41:22 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-r1 waf-utils multilib linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="mirror://samba/rc/${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 gnutls iprint
+ldap pam quota selinux 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.16
+	>=sys-libs/tdb-1.2.11[python]
+	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tevent-0.9.18
+	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 \
+		--bundled-libraries=ntdb \
+		--builtin-libraries=ntdb \
+		$(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 winbind)
+		"
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# Seems like the build script gets the shebangs correct by itself
+	# (4.0.6)
+	#python_replicate_script \
+	#	"${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 {} +
+
+	# 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
+}
+
+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 "
+}