add samba4 with mit-krb5 changes

2013-04-20 19:16:45 +02:00 · 2013-04-20 19:16:45 +02:00 · a06e492c90
commit a06e492c90
parent 4dedeb6724
8 changed files with 2890 additions and 0 deletions
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@ -0,0 +1,8 @@
+AUX 4.0/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31 SHA512 62800c962cfb613b11c77ae9360f6c3c610bb1551f9ac3673ab814f6f8e1f589d1192fb3019f1afdc8becf8e692c8d19f4dcaa8b00aeeeb282642327c959c27e WHIRLPOOL 37d06f7f6d7d77acd9e5d794a6b2512aa092f04c553853045fa42e11f850a91912239385b21f8d76694e37d21d63405ea864ea0627a40aa72850b1fe4b8f4b3b
+AUX 4.0/samba4.confd 1783 SHA256 53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d WHIRLPOOL 868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
+AUX 4.0/samba4.initd-r1 1575 SHA256 4d00243dbd85ee81e2e989f1ac8035c1c1b9379133584291b959bb7bc45fe780 SHA512 941a4f8e6c839d11140c4caa3efd65176e11f07194e43f37e4f97f9c0e7ee4e8696093876c4b21f808cedcd80d3f7810b3fdcd126a8a0fa87e922299ea605e2c WHIRLPOOL 379166290c15c405c7ff50f6bf2654607282bff71546aa79279bdcd2a00cbb21989f42bb2d0be0588c174db2712b39b4e3eece56104b2ebe6ebbedccb69eb354
+AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
+DIST samba-4.0.4.tar.gz 22055293 SHA256 20a84280155543892ce939e70482243396a9a8bfa77dcb4bf58328f7029772c5 SHA512 f27925bd978eabe79c720d3697964fbfd70aaa2eba0eeeeb8de29f4f448d1a3a198c03b289f5f60e4910fcfc46ff7bce695e4726997f42bc19f406fc3c9d5456 WHIRLPOOL 01b44914981acbde5629410925b878e91195a0339f20520e9de09fdf74d33d8460ee5a05f15c078430100a121538593a50c8e0f31d7a2f92116af9f675d0160d
+EBUILD samba-4.0.4.ebuild 4128 SHA256 ab3cf7387f2b0450f3a96ac373924bf83ccd666ef13a165fabc3e5b766ed2eae SHA512 78dfa9166914a5134e59750955658a86cfd2262ffbdbf969bab7979235c5205a7fc51143ae0fb903057c3760272d275fe3d81d426b47513c98b827f21bd79f58 WHIRLPOOL a8111ab327f8f5db007112c06b3b9ad7f8431396be7e79d7b2e6c942e7e280feb17f11c57aa4d3eff40612f6b5c0fd03cfcf11ec840f836141185cceba9413be
+MISC ChangeLog 94819 SHA256 a8ba067f5c4a830998b06f57440504d4d61f7bcef7cbb013b9f71d3f89c0d2f2 SHA512 5c04ad5295765cd87bcee4f5678d0e9b0b09ab59f684d50a2f4cb4f34ae9b6b4b17e2c9dd2b075e72bf374e94c023abab57c132846c9ae86c0a5b9edd151cf80 WHIRLPOOL 122c6e6990b30e6495ea10d2d2d08845eb1d2ecc4b3ff97d72a51fdcb22e77477d466d11dd5cb6ab232d55308a28afa06b859ea59e7a688e1708a5bae110070e
+MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
--- a/net-fs/samba/files/4.0/com_err.patch
+++ 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
+
--- a/net-fs/samba/files/4.0/samba4.confd
+++ b/net-fs/samba/files/4.0/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"
+
--- a/net-fs/samba/files/4.0/samba4.initd-r1
+++ b/net-fs/samba/files/4.0/samba4.initd-r1
@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.0/samba4.initd-r1,v 1.1 2012/11/24 23:59:23 polynomial-c 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
+}
--- a/net-fs/samba/files/samba4.initd
+++ b/net-fs/samba/files/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/samba4.initd,v 1.3 2011/09/14 22:52:33 polynomial-c 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 $?
+}
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba Team</name>
+</maintainer>
+<longdescription>
+Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
+</longdescription>
+<use>
+	<flag name="ads">Enable Active Directory support</flag>
+	<flag name="swat">Enables support for swat configuration gui</flag>
+	<flag name="winbind">Enables support for the winbind auth daemon</flag>
+        <flag name="client">Enables the client part</flag>
+        <flag name="server">Enables the server part</flag>
+	<flag name="netapi">Enable building of netapi bits</flag>
+	<flag name="addns">Enable AD DNS integration</flag>
+	<flag name="aio">Enable asynchronous IO support</flag>
+	<flag name="cluster">Enable support for clustering</flag>
+	<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
+	<flag name="ldb">Enable the ldb tools</flag>
+	<flag name="quota">Enables support for user quotas</flag>
+	<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="iprint">Enabling iPrint technology by Novell</flag>
+</use>
+</pkgmetadata>
--- a/net-fs/samba/samba-4.0.4.ebuild
+++ b/net-fs/samba/samba-4.0.4.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.4.ebuild,v 1.1 2013/03/24 13:53:10 patrick 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.15
+	>=sys-libs/tdb-1.2.11[python]
+	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tevent-0.9.17
+	sys-libs/zlib
+	|| ( >=app-crypt/heimdal-1.5[-ssl] >=app-crypt/mit-krb5-1.9 )
+	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)/samba/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 "
+}