version bump 0.80.1, fix bug #510396, #507956, thanks @babykart, @Changyuan Yu, @LeeL

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

7 files changed, 121 insertions, 29 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 1cfe90b81c5a..87e95aadae2e 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.49 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.50 2014/05/21 07:43:24 dlan Exp $
+
+*ceph-0.80.1 (21 May 2014)
+
+  21 May 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.79.ebuild,
+  +ceph-0.80.1.ebuild, ceph-9999.ebuild, +files/ceph.confd-r1,
+  +files/ceph.initd-r1, +files/ceph.logrotate, metadata.xml:
+  version bump 0.80.1, fix bug #510396, #507956, thanks @babykart, @Changyuan
+  Yu, @LeeL
 
 *ceph-0.79 (17 Apr 2014)
 
diff --git a/sys-cluster/ceph/ceph-0.79.ebuild b/sys-cluster/ceph/ceph-0.80.1.ebuild
index bbca4bba03b2..14d01b0a3b8e 100644
--- a/sys-cluster/ceph/ceph-0.79.ebuild
+++ b/sys-cluster/ceph/ceph-0.80.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.79.ebuild,v 1.1 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.1.ebuild,v 1.1 2014/05/21 07:43:23 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ if [[ $PV = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}
@@ -24,7 +24,7 @@ HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio libxfs libzfs +nss radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,8 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
-	libxfs? ( sys-fs/xfsprogs )
-	libzfs? ( sys-fs/zfs )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -74,7 +74,7 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-gnustack.patch
-	"${FILESDIR}"/${P}-libzfs.patch
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
 
 pkg_setup() {
@@ -84,9 +84,6 @@ pkg_setup() {
 src_prepare() {
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-
 	epatch_user
 	eautoreconf
 }
@@ -106,8 +103,8 @@ src_configure() {
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
-		$(use_with libxfs) \
-		$(use_with libzfs)
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -119,7 +116,7 @@ src_install() {
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -127,8 +124,8 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
 	_python_rewrite_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
@@ -144,4 +141,12 @@ pkg_postinst() {
 	elog " sys-block/parted		to manage disk partions"
 	elog " sys-fs/btrfs-progs	to use btrfs filesytem"
 	elog " sys-fs/cryptsetup	to use encrypted devices with dm-crypt"
+	elog ""
+	elog "To have many daemons of one type, create your own script:"
+	elog ""
+	elog "cd /etc/init.d"
+	elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
+	elog "  ln -s ceph ceph-${dmn};"
+	elog "  rc-update add ceph-${dmn} default;"
+	elog "done"
 }
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index 1c47eb6aaaf6..045d94161e3f 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.9 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.10 2014/05/21 07:43:23 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -24,7 +24,7 @@ HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio libxfs libzfs +nss radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,8 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
-	libxfs? ( sys-fs/xfsprogs )
-	libzfs? ( sys-fs/zfs )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -79,9 +79,6 @@ pkg_setup() {
 src_prepare() {
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-
 	epatch_user
 	eautoreconf
 }
@@ -101,8 +98,8 @@ src_configure() {
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
-		$(use_with libxfs) \
-		$(use_with libzfs)
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -114,7 +111,7 @@ src_install() {
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -122,8 +119,8 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
 	_python_rewrite_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
@@ -139,4 +136,12 @@ pkg_postinst() {
 	elog " sys-block/parted		to manage disk partions"
 	elog " sys-fs/btrfs-progs	to use btrfs filesytem"
 	elog " sys-fs/cryptsetup	to use encrypted devices with dm-crypt"
+	elog ""
+	elog "To have many daemons of one type, create your own script:"
+	elog ""
+	elog "cd /etc/init.d"
+	elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
+	elog "  ln -s ceph ceph-${dmn};"
+	elog "  rc-update add ceph-${dmn} default;"
+	elog "done"
 }
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
new file mode 100644
index 000000000000..3bdb8b485ed8
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.confd-r1
@@ -0,0 +1,4 @@
+# Example
+
+# default ceph conf file
+#ceph_conf="/etc/ceph/ceph.conf"
diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1
new file mode 100644
index 000000000000..f3bc87fd1de5
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r1
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+
+ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
+extra_commands="reload"
+type=${RC_SVCNAME:5:3}
+id=${RC_SVCNAME:9}
+id=${id:-"0"}
+command="/usr/bin/ceph-${type}"
+pidfile="/run/ceph/${type}.${id}.pid"
+command_args="-i ${id} --pid-file ${pidfile} -c ${ceph_conf}"
+
+depend() {
+	after net
+	before netmount
+}
+
+is_type_valid() {
+	case ${type} in
+		mon|mds|osd) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+        checkpath -d -q $(dirname ${pidfile})
+}
+
+start() {
+	ebegin "Starting Ceph ${type}.${id}"
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+	fi
+	${command} ${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Ceph ${type}.${id}"
+	start-stop-daemon --stop --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading Ceph ${type}.${id}"
+	start-stop-daemon --signal 1 --pidfile ${pidfile}
+	eend $?
+}
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
new file mode 100644
index 000000000000..16028aea78c6
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.logrotate
@@ -0,0 +1,22 @@
+/var/log/ceph/admin.log
+/var/log/ceph/ceph.log
+/var/log/ceph/ceph-mon.*
+/var/log/ceph/ceph-mds.*
+/var/log/ceph/ceph-osd.*
+{
+    rotate 7
+    daily
+    compress
+    sharedscripts
+    prerotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >&1
+	done
+    endscript
+    postrotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >&1
+        done
+    endscript
+    missingok
+}
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index a51b0a656879..ef955205b372 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -15,9 +15,9 @@ Ceph is a distributed network file system designed to provide excellent performa
 	<flag name='fuse'>Build fuse client</flag>
 	<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
 	<flag name='libaio'>Use libaio as asynchronous input/output library</flag>
-	<flag name='libxfs'>Add xfs support</flag>
-	<flag name='libzfs'>Add zfs support</flag>
 	<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 	<flag name='radosgw'>Add radosgw support</flag>
+	<flag name='xfs'>Add xfs support</flag>
+	<flag name='zfs'>Add zfs support</flag>
 </use>
 </pkgmetadata>