Version bump (needed for samba-3.5.x, one patch not needed anymore, other patch ported), fixed tests (bug #278141).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 152 insertions, 3 deletions

diff --git a/dev-db/ctdb/ChangeLog b/dev-db/ctdb/ChangeLog
index 237f4ca078d3..6c0b8cfcbae8 100644
--- a/dev-db/ctdb/ChangeLog
+++ b/dev-db/ctdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/ctdb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.11 2009/11/30 16:02:46 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.12 2010/04/05 06:14:52 dev-zero Exp $
+
+*ctdb-1.0.114_p1 (05 Apr 2010)
+
+  05 Apr 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +ctdb-1.0.114_p1.ebuild, +files/ctdb-1.0.114_p1-functions.patch:
+  Version bump (needed for samba-3.5.x, one patch not needed anymore, other
+  patch ported), fixed tests (bug #278141).
 
   30 Nov 2009; Raúl Porcel <armin76@gentoo.org> ctdb-1.0.88.ebuild:
   Add ~arm/~ia64/~s390/~sh/~sparc wrt #285952
diff --git a/dev-db/ctdb/Manifest b/dev-db/ctdb/Manifest
index a005d4087902..94bcb44cd113 100644
--- a/dev-db/ctdb/Manifest
+++ b/dev-db/ctdb/Manifest
@@ -1,12 +1,15 @@
 AUX autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf453abea SHA1 2adfe8d3a5ea32971c67305fc047f39e5c03ba76 SHA256 0b9b80b52899154f6526d4864218742c2ec836d44a8a4045e091b3bb40449171
+AUX ctdb-1.0.114_p1-functions.patch 1573 RMD160 c338f6043d4710ad515f34d5dcb2df8180fca286 SHA1 7ff23b032a55f7bda3f5c310eecf4b62b1d758cf SHA256 cf7994d562d9cbc2852dd32706134ad204f930b3a8535d8bfa9e3a2d89d30be5
 AUX ctdb-41.httpd_gentoo.patch 368 RMD160 2ce987bfccaf1b44dbc7b43bb1ef5eca9f6009ab SHA1 c3e0959d1f0584cdccc4277121b0f387c920c0ed SHA256 84400fe5c6e289c05cc1ceeefcb2eab0a7ecb3d7076af747cd9eaa5a558499a5
 AUX ctdb-50.samba_gentoo.patch 534 RMD160 ac980344bce4f87fd8a3ffabc8525def326f136b SHA1 619480bd2fe9d1037e36c6cba224d754478b0c3d SHA256 91e6869bc45613bd003834e1024ceba07765205f09dea05357041776c76e209e
 AUX ctdb-functions.patch 1717 RMD160 41053379ad72c61c253bf865fbab7dacf14f9846 SHA1 caa6a25b2542230550f8c320eea02d983823a79b SHA256 db642eb8c77a651559a9a41c2d1eae7ee6663e3b695a623a90b4f9e863e84367
 AUX ctdb.initd 3059 RMD160 363bbd02a4f4b1f58c49deabeaa583f4f2d64342 SHA1 f298bd583bc0fe871eed42495a869a818af9820e SHA256 9babddefeabf6b90aca821aff1cee3735d2cd49bdc45dcaa7eb3156940cde128
+DIST ctdb-1.0.114-1.src.rpm 836695 RMD160 a52c0bf19be916a0c1400af86f5447a767542fca SHA1 acf734cfd51f1d68b7aa0c06253ffff64df02a28 SHA256 66c3eb72f6ba2c9787484d8796e5fb59083a1b1bf45c6c96c32c31952d4ad1ce
 DIST ctdb-1.0.73.tgz 627095 RMD160 b716d91031ee2953091be10bcc5cf4be87f0124f SHA1 b400d08bfcc78f54d7c4e138fd2d77897ae28abd SHA256 348779e2414c364cb84b6bb2659fa50d0a001315a2ca82ed944cce7f0851c14d
 DIST ctdb-1.0.88.tgz 681220 RMD160 78fe1241adba4fa55fdb4e7999c8ac601e48681a SHA1 9de3d4e9b669c2cc27b942983e3f3ec48e787a01 SHA256 d9b0cc07b83334caeaf7852162fb54861bb79577682c2e6936770572ede68e32
+EBUILD ctdb-1.0.114_p1.ebuild 1867 RMD160 1634568b1f61a6414081ff798de032b5f65a0704 SHA1 d156787f2710f4cd395de97833d5391e28021a82 SHA256 2e8d6467b4d9da9822563beff9a53481abcb53d5948c6956f6c44f427863e81f
 EBUILD ctdb-1.0.73.ebuild 995 RMD160 14fa16d6aa09d97ab613e4e765592b3a14ca599e SHA1 914cdc2680870904e1d1c3290b749a01f8bc0da4 SHA256 8602d5783a56296906e74bfde0c50c105be082229db458234dd46c79d5b6ef85
 EBUILD ctdb-1.0.88.ebuild 1314 RMD160 597f9f4fd9b5407b4c1b53705b9790c908da2173 SHA1 3fa438e48d93e47073af006b349ad530855f0f70 SHA256 d9a4f648728587b86f423fee1863616bf67a69a3d84c5b8c2a2be8883e3b5c4d
 EBUILD ctdb-9999.ebuild 1069 RMD160 79303ebdb1d317aaf5b8f0130357bea375635416 SHA1 82a5b8f56356b255ecfee6be3f902aba45183ee3 SHA256 d448faf2367c9a051a60b2dfb779bcdba8cc9994d09f7887072eed340274195e
-MISC ChangeLog 1791 RMD160 901f5b2e1849cacf33898df36a627df225bbc409 SHA1 3bce43da079346e4fa776aa9ea0aadb8c6765384 SHA256 5dc22dd11a1a8f9e4492ac745c6fb80a34360b18c23434338ed2567444eb2f53
+MISC ChangeLog 2065 RMD160 84813a3d1e94d0a0d04f215a0e3280e337270e42 SHA1 28271c3b2f2182aecdc9b0034d02051297044eb3 SHA256 9755e3e39871aecfaf6b43343c7966c43a4322c89a4c7788cd7edfad8c726edc
 MISC metadata.xml 158 RMD160 9f86563998c883dd327d4fa7a6c23f95dbf2a139 SHA1 3d17a291c1dcf571169ff3a7c1e064a96014f270 SHA256 d96140a5870e6f49fd382f26aaade7bf71d767243bfc3ac1ad6a986718386a38
diff --git a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
new file mode 100644
index 000000000000..ed685dae5162
--- /dev/null
+++ b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.1 2010/04/05 06:14:52 dev-zero Exp $
+
+EAPI="2"
+
+inherit autotools rpm
+
+DESCRIPTION="A cluster implementation of the TDB database used by Samba and other projects to store temporary data."
+HOMEPAGE="http://ctdb.samba.org/"
+SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P/_p/-}.src.rpm
+	http://ctdb.samba.org/packages/redhat/RHEL5/old/${P/_p/-}.src.rpm"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/iproute2
+		sys-process/procps )"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+	AT_M4DIR="-I ${S}/lib/replace -I ${S}/lib/talloc -I ${S}/lib/tdb -I ${S}/lib/popt -I ${S}/lib/events"
+	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
+	eautoconf ${AT_M4DIR}
+
+	# fix tests
+	sed -i \
+		-e "s|/tmp|${T}|" \
+		tests/simple/54_ctdb_transaction_recovery.sh || die "sed failed"
+
+	# the following tests assume that the setup was indeed able to add new ip
+	# addresses to the lo device (11,16), resp make assumptions about the
+	# performance (52)
+	rm \
+		tests/simple/{11,16,52}_*.sh || die "removing failing tests failed"
+
+	epatch \
+		"${FILESDIR}/${PN}-50.samba_gentoo.patch" \
+		"${FILESDIR}/${P}-functions.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc "${D}/usr/share/doc/ctdb/README.eventscripts"
+	rm -rf "${D}/usr/share/doc/ctdb"
+
+	dohtml web/* doc/*.html
+
+	newinitd "${FILESDIR}/${PN}.initd" ctdb || die "newinitd failed"
+	newconfd "${S}/config/ctdb.sysconfig" ctdb || die "newconfd failed"
+}
+
+src_test() {
+	emake test || { pkill ctdb ; die "running tests failed" ; }
+	pkill ctdb
+}
+
diff --git a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch b/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
new file mode 100644
index 000000000000..c70350c110ab
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
@@ -0,0 +1,77 @@
+diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
+--- ctdb-1.0.114.orig/config/functions	2010-04-04 18:01:18.278707515 +0200
++++ ctdb-1.0.114/config/functions	2010-04-04 18:08:05.792447032 +0200
+@@ -22,6 +22,8 @@
+ 	. /etc/default/$1
+     elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
+ 	. $CTDB_BASE/sysconfig/$1
++	elif [ -f /etc/config.d/$1 ]; then
++	. /etc/config.d/$name
+     fi
+ }
+ 
+@@ -33,6 +35,8 @@
+ 
+     if [ -x /sbin/startproc ]; then
+         CTDB_INIT_STYLE="suse"
++	elif [ -x /bin/rc-status ] ; then
++		CTDB_INIT_STYLE="gentoo"
+     elif [ -x /sbin/start-stop-daemon ]; then
+         CTDB_INIT_STYLE="debian"
+     else
+@@ -356,6 +360,9 @@
+ 	[ -x /etc/init.d/nfslock ] && {
+ 		PLATFORM="rhel"
+ 	}
++	[ -x etc/init.d/nfs ] && {
++		PLATFORM="gentoo"
++	}
+ 
+ 	case $PLATFORM in
+ 	sles)
+@@ -380,6 +387,16 @@
+ 			;;
+ 		esac
+ 		;;
++	gentoo)
++		case $1 in
++		start)
++			service nfs start
++			;;
++		stop)
++			service nfs stop > /dev/null 2>&1
++			;;
++		esac
++		;;
+ 	*)
+ 		echo "Unknown platform. NFS is not supported with ctdb"
+ 		exit 1
+@@ -398,6 +415,9 @@
+ 	[ -x /etc/init.d/nfslock ] && {
+ 		PLATFORM="rhel"
+ 	}
++	[ -x etc/init.d/nfs ] && {
++		PLATFORM="gentoo"
++	}
+ 
+ 	case $PLATFORM in
+ 	sles)
+@@ -422,6 +442,18 @@
+ 			;;
+ 		esac
+ 		;;
++	gentoo)
++		# for gentoo there is no service for lockmanager
++		# so we instead just shutdown/restart nfs
++		case $1 in
++		start)
++			service nfs start
++			;;
++		stop)
++			service nfs stop > /dev/null 2>&1
++			;;
++		esac
++		;;
+ 	*)
+ 		echo "Unknown platform. NFS locking is not supported with ctdb"
+ 		exit 1