Bump to 1.0.88, thanks to John Simmonds for the patches and modified ebuild. Closes #278695

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

7 files changed, 240 insertions, 12 deletions

diff --git a/dev-db/ctdb/ChangeLog b/dev-db/ctdb/ChangeLog
index 28b3e833bc81..bb8235df9e2b 100644
--- a/dev-db/ctdb/ChangeLog
+++ b/dev-db/ctdb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2009/10/03 09:28:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.7 2009/10/09 22:49:10 patrick Exp $
+
+*ctdb-1.0.88 (09 Oct 2009)
+
+  09 Oct 2009; Patrick Lauer <patrick@gentoo.org> +ctdb-1.0.88.ebuild,
+  +files/ctdb-41.httpd_gentoo.patch, +files/ctdb-50.samba_gentoo.patch,
+  +files/ctdb.initd, +files/ctdb-functions.patch:
+  Bump to 1.0.88, thanks to John Simmonds for the patches and modified
+  ebuild. Closes #278695
 
   03 Oct 2009; Markus Meier <maekke@gentoo.org> ctdb-1.0.73.ebuild:
   add ~arm, bug #285952
diff --git a/dev-db/ctdb/Manifest b/dev-db/ctdb/Manifest
index e75c32f61196..57125ae3d909 100644
--- a/dev-db/ctdb/Manifest
+++ b/dev-db/ctdb/Manifest
@@ -1,16 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf453abea SHA1 2adfe8d3a5ea32971c67305fc047f39e5c03ba76 SHA256 0b9b80b52899154f6526d4864218742c2ec836d44a8a4045e091b3bb40449171
+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.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.73.ebuild 990 RMD160 8dcc65c17c36aa0ec6a7bf4f66b944fbe006dc50 SHA1 606862457f51aecf5172ec1c7bc89efb8d511ab1 SHA256 527e7808725b85ccd5db690bba70dd27ac7a34d3efb5692c680a4f6063282126
+EBUILD ctdb-1.0.88.ebuild 1279 RMD160 64deccc0e8f22b0823f67f42b4650fe7d155b1a8 SHA1 e35047209dfc9488b319ba0f30e13e26014a5cfe SHA256 2cdcd5b9d655671b053380bfc090931c237c8da9003df8ce0c5dc47508228f55
 EBUILD ctdb-9999.ebuild 1074 RMD160 c55a0e7a6a98a00e37e9d9baeb64b0247ab0406a SHA1 fad4142c20bb8f60ff7cbef9a4a142dbef90b2d0 SHA256 a4b68b540571abb3600984405536b3df9edd2bbe6166f638dbd21a63a43e919f
-MISC ChangeLog 914 RMD160 501f91108ec0cd5bb8c0363dc2d4167b986dd7b3 SHA1 3a1472704fbc7ea33c92e7941447ead127acc84c SHA256 1beb30ea1ba3a9cbdd2696cb1d7eee2e6776f99f8adad9c7be40a6389b054f5a
+MISC ChangeLog 1233 RMD160 f95bce94685454e972745f71c52c51cbb009f082 SHA1 afa2f152c0087c2b99047f5e426de83814fca5d2 SHA256 29cdfcdc030338ad3c267be65e812b86d99ccbf382c4adfb457f7e5d5d8db35b
 MISC metadata.xml 158 RMD160 9f86563998c883dd327d4fa7a6c23f95dbf2a139 SHA1 3d17a291c1dcf571169ff3a7c1e064a96014f270 SHA256 d96140a5870e6f49fd382f26aaade7bf71d767243bfc3ac1ad6a986718386a38
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrHGW8ACgkQkKaRLQcq0GKyrgCfSp3CpqeuCr+43CvLFjyuGQIY
-nwcAnReItPa3Bq/OfHJphhYVapYKbi5t
-=YVxb
------END PGP SIGNATURE-----
diff --git a/dev-db/ctdb/ctdb-1.0.88.ebuild b/dev-db/ctdb/ctdb-1.0.88.ebuild
new file mode 100644
index 000000000000..66abf912ea3b
--- /dev/null
+++ b/dev-db/ctdb/ctdb-1.0.88.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.88.ebuild,v 1.1 2009/10/09 22:49:10 patrick Exp $
+
+EAPI="2"
+
+inherit autotools
+
+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}.tgz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/popt"
+RDEPEND="${DEPEND}"
+
+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}
+
+	epatch "${FILESDIR}"/${PN}-functions.patch
+	epatch "${FILESDIR}"/${PN}-50.samba_gentoo.patch
+	epatch "${FILESDIR}"/${PN}-41.httpd_gentoo.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"
+}
diff --git a/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch b/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch
new file mode 100644
index 000000000000..6865d899a12d
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch
@@ -0,0 +1,13 @@
+--- ./config/events.d/41.httpd	2009-05-29 14:19:30.741662868 +0100
++++ ./config/events.d/41.httpd	2009-07-28 18:31:48.016042964 +0100
+@@ -19,6 +19,10 @@
+ 		CTDB_SERVICE_HTTP="apache2"
+ 		CTDB_CONFIG_HTTP="apache2"
+ 		;;
++	gentoo)
++		CTDB_SERVICE_HTTP="apache2"
++		CTDB_CONFIG_HTTP="apache2"
++		;;
+ 	*)
+ 		# should not happen.
+ 		# for now use red hat style as default
diff --git a/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch b/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch
new file mode 100644
index 000000000000..fdd68ffc8d92
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch
@@ -0,0 +1,14 @@
+--- ./config/events.d/50.samba	2009-05-29 14:19:30.741662868 +0100
++++ ./config/events.d/50.samba	2009-07-28 18:27:21.896042994 +0100
+@@ -25,6 +25,11 @@
+ 		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ 		CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
+ 		;;
++	gentoo)
++		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
++		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
++		CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-""}
++		;;
+ 	*)
+ 		# should not happen, but for now use redhat style as default:
+ 		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
diff --git a/dev-db/ctdb/files/ctdb-functions.patch b/dev-db/ctdb/files/ctdb-functions.patch
new file mode 100644
index 000000000000..61eda720d6ae
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb-functions.patch
@@ -0,0 +1,76 @@
+--- ./config/functions	2009-05-29 14:19:30.741662868 +0100
++++ ./config/functions	2009-07-29 14:15:19.436043164 +0100
+@@ -10,6 +10,8 @@
+ 	. /etc/default/$name
+     elif [ -f $CTDB_BASE/sysconfig/$name ]; then
+ 	. $CTDB_BASE/sysconfig/$name
++    elif [ -f /etc/config.d/$name ]; then
++	. /etc/config.d/$name
+     fi
+ }
+ 
+@@ -21,6 +23,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="ubuntu"
+     else
+@@ -400,6 +404,9 @@
+ 	[ -x /etc/init.d/nfslock ] && {
+ 		PLATFORM="rhel"
+ 	}
++	[ -x etc/init.d/nfs ] && {
++		PLATFORM="gentoo"
++        }
+ 
+ 	case $PLATFORM in
+ 	sles)
+@@ -424,6 +431,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
+@@ -442,6 +459,9 @@
+ 	[ -x /etc/init.d/nfslock ] && {
+ 		PLATFORM="rhel"
+ 	}
++        [ -x etc/init.d/nfs ] && {
++                PLATFORM="gentoo"
++        }
+ 
+ 	case $PLATFORM in
+ 	sles)
+@@ -466,6 +486,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
diff --git a/dev-db/ctdb/files/ctdb.initd b/dev-db/ctdb/files/ctdb.initd
new file mode 100644
index 000000000000..ca96019e22b1
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb.initd
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+
+depend() {
+  need localmount
+  need net
+  before samba
+  after bootmisc
+}
+
+start() {
+  ebegin "Starting ctdb"
+  
+  [ -z "$CTDB_RECOVERY_LOCK" ] && {
+    eerror "You must configure the location of the CTDB_RECOVERY_LOCK in /etc/conf.d/ctdb"
+    return 1
+  }
+
+  [ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
+    eerror "You must configure the location of the CTDB_PUBLIC_ADDRESSES in /etc/conf.d/ctdb"
+    return 1
+  }
+
+  [ -z "$CTDB_PUBLIC_INTERFACE" ] && {
+    eerror "You must configure the location of the CTDB_PUBLIC_INTERFACE in /etc/conf.d/ctdb"
+    return 1
+  }
+
+  CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
+
+  # build up CTDB_OPTIONS variable from optional parameters
+  [ -z "$CTDB_LOGFILE" ]          || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$CTDB_LOGFILE"
+  [ -z "$CTDB_NODES" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$CTDB_NODES"
+  [ -z "$CTDB_SOCKET" ]           || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
+  [ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
+  [ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
+  [ -z "$CTDB_SINGLE_PUBLIC_IP" ] || CTDB_OPTIONS="$CTDB_OPTIONS --single-public-ip=$CTDB_SINGLE_PUBLIC_IP"
+  [ -z "$CTDB_DBDIR" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
+  [ -z "$CTDB_DBDIR_PERSISTENT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir-persistent=$CTDB_DBDIR_PERSISTENT"
+  [ -z "$CTDB_EVENT_SCRIPT_DIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR"
+  [ -z "$CTDB_TRANSPORT" ]        || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
+  [ -z "$CTDB_DEBUGLEVEL" ]       || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
+  [ -z "$CTDB_START_AS_DISABLED" ] || [ "$CTDB_START_AS_DISABLED" != "yes" ] || {
+    CTDB_OPTIONS="$CTDB_OPTIONS --start-as-disabled"
+  }
+  [ -z "$CTDB_CAPABILITY_RECMASTER" ] || [ "$CTDB_CAPABILITY_RECMASTER" != "no" ] || {
+    CTDB_OPTIONS="$CTDB_OPTIONS --no-recmaster"
+  }
+  [ -z "$CTDB_CAPABILITY_LMASTER" ] || [ "$CTDB_CAPABILITY_LMASTER" != "no" ] || {
+    CTDB_OPTIONS="$CTDB_OPTIONS --no-lmaster"
+  }
+  [ -z "$CTDB_LVS_PUBLIC_IP" ] || {
+    CTDB_OPTIONS="$CTDB_OPTIONS --lvs"
+  }
+  [ -z "$CTDB_SCRIPT_LOG_LEVEL" ] || {
+    CTDB_OPTIONS="$CTDB_OPTIONS --script-log-level=$CTDB_SCRIPT_LOG_LEVEL"
+  }
+
+  # check all persistent databases that they look ok
+  PERSISTENT_DB_DIR="/var/ctdb/persistent"
+  [ -z "$CTDB_DBDIR" ] || {
+    PERSISTENT_DB_DIR="$CTDB_DBDIR/persistent"
+  }
+  mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
+  for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2>/dev/null`; do
+    /usr/bin/tdbdump $PDBASE >/dev/null 2>/dev/null || {
+      eerror "Persistent database $PDBASE is corrupted! CTDB will not start."
+      return 1
+    }
+  done
+ 
+  start-stop-daemon --start --background --exec /usr/sbin/ctdbd \
+    --pidfile /var/run/ctdbd.pid -- $CTDB_OPTIONS
+  eend $?
+
+}
+  
+stop() {
+  start-stop-daemon --stop --exec /usr/sbin/ctdbd \
+    --pidfile /var/run/ctdbd.pid
+}
+