[patch] samba-4.2.0-r1.ebuild.patch (kdc & ctdb fix)

samba-4.2.0-r1.ebuild.patch (text/plain), 1.21 KB, created by Denis Kaganovich on 2015-03-10 14:04:03 UTC

--- /usr/portage/net-fs/samba/samba-4.2.0.ebuild	2015-03-08 16:21:55.000000000 +0300
+++ samba-4.2.0-r1.ebuild	2015-03-10 16:40:38.799756000 +0300
@@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS}
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	aio? ( dev-libs/libaio )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cluster? ( !dev-db/ctdb )
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
@@ -93,9 +93,14 @@ pkg_setup() {
 	fi
 }
 
+src_prepare(){
+	cd "${S}" || die
+	sed -i -e 's:USING_SYSTEM_KDC:USING_SYSTEM_KDC_:' source4/kdc/wscript_build
+	sed -i -e 's:/tmp/ctdb.socket:/var/run/ctdb/ctdb.socket:g' {ctdb/doc,docs-xml/smbdotconf/misc}/*ml
+}
+
 src_configure() {
 	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
 	use "test" && myconf+=" --enable-selftest"
 	myconf="${myconf} \
 		--enable-fhs \
@@ -151,6 +156,11 @@ src_install() {
 	newinitd "${CONFDIR}/samba4.initd-r1" samba
 	newconfd "${CONFDIR}/samba4.confd" samba
 
+	if use cluster; then
+		newinitd "${CONFDIR}/ctdb.initd" ctdb
+		newconfd "${CONFDIR}/ctdb.confd" ctdb
+	fi
+
 	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
 	systemd_dounit "${FILESDIR}"/nmbd.service
 	systemd_dounit "${FILESDIR}"/smbd.{service,socket}