commit: 223a1e5a4aed65761371dded2a7af37fa5d5e981
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 24 23:01:10 2014 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 24 23:01:10 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=223a1e5a
net-libs/xrootd: version bump and fix bug 521496
1. Version bump of xrootd to 4.0.4.
2. Remove -Werror from CXXFLAGS. While it doesn't cause problem in
my case, it may cause them for other users with other CXXFLAGS.
---
net-libs/xrootd/ChangeLog | 118 +++++++++++++++++++++++++++
net-libs/xrootd/files/cmsd.confd | 9 ++
net-libs/xrootd/files/cmsd.initd | 35 ++++++++
net-libs/xrootd/files/frm_purged.initd | 35 ++++++++
net-libs/xrootd/files/frm_xfrd.initd | 35 ++++++++
net-libs/xrootd/files/xrootd-no-werror.patch | 11 +++
net-libs/xrootd/files/xrootd.confd | 21 +++++
net-libs/xrootd/files/xrootd.initd | 33 ++++++++
net-libs/xrootd/metadata.xml | 16 ++++
net-libs/xrootd/xrootd-4.0.4.ebuild | 82 +++++++++++++++++++
10 files changed, 395 insertions(+)
diff --git a/net-libs/xrootd/ChangeLog b/net-libs/xrootd/ChangeLog
new file mode 100644
index 0000000..0c0326f
--- /dev/null
+++ b/net-libs/xrootd/ChangeLog
@@ -0,0 +1,118 @@
+# ChangeLog for net-libs/xrootd
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/ChangeLog,v 1.19 2014/06/19
18:13:17 bicatali Exp $
+
+*xrootd-4.0.0 (19 Jun 2014)
+
+ 19 Jun 2014; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-4.0.0.ebuild:
+ Version bump
+
+ 11 Mar 2014; Patrick Lauer <patr...@gentoo.org> xrootd-3.3.6.ebuild:
+ Whitespace
+
+*xrootd-3.3.6 (10 Mar 2014)
+
+ 10 Mar 2014; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.3.6.ebuild:
+ Version bump
+
+ 20 Nov 2013; Patrick Lauer <patr...@gentoo.org> xrootd-3.3.4.ebuild:
+ Whitespace
+
+*xrootd-3.3.4 (19 Nov 2013)
+
+ 19 Nov 2013; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.3.4.ebuild,
+ -xrootd-3.3.1.ebuild, metadata.xml:
+ Version bump
+
+*xrootd-3.3.2 (04 Jun 2013)
+
+ 04 Jun 2013; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.3.2.ebuild,
+ -xrootd-3.2.7.ebuild, files/cmsd.initd, files/frm_purged.initd,
+ files/frm_xfrd.initd:
+ Version bump. Keyword amd64-linux and x86-linux. Fixed non-bashism in init
+ scripts
+
+*xrootd-3.3.1 (23 Mar 2013)
+
+ 23 Mar 2013; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.3.1.ebuild,
+ -xrootd-3.2.6.ebuild:
+ Version bump
+
+*xrootd-3.2.7 (24 Jan 2013)
+
+ 24 Jan 2013; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.2.7.ebuild:
+ Version bump
+
+ 05 Dec 2012; Sébastien Fabbro <bicat...@gentoo.org> xrootd-3.2.6.ebuild:
+ add user eclass
+
+*xrootd-3.2.6 (05 Dec 2012)
+
+ 05 Dec 2012; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.2.6.ebuild,
+ -xrootd-3.2.2.ebuild, -xrootd-3.2.4.ebuild, files/cmsd.initd,
+ files/frm_purged.initd, files/frm_xfrd.initd, files/xrootd.initd,
+ metadata.xml, xrootd-3.2.1.ebuild:
+ Version bump. Transfering checks on /var/run and /var/spool at install time
to
+ run-time (bug #445882)
+
+*xrootd-3.2.4 (29 Sep 2012)
+
+ 29 Sep 2012; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.2.4.ebuild:
+ Version bump
+
+ 24 Jul 2012; Sébastien Fabbro <bicat...@gentoo.org>
+ +files/xrootd-3.2.2-glibc216.patch, xrootd-3.2.2.ebuild:
+ fixed for glibc-2.16, bug #426300
+
+*xrootd-3.2.2 (09 Jul 2012)
+
+ 09 Jul 2012; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.2.2.ebuild:
+ Version bump
+
+ 09 Jul 2012; Justin Lecher <j...@gentoo.org> -xrootd-3.1.0.ebuild,
+ -xrootd-3.1.1.ebuild, xrootd-3.2.1.ebuild, metadata.xml:
+ Cleaned old, add missing eclass
+
+ 08 Jul 2012; Jeff Horelick <jdh...@gentoo.org> xrootd-3.2.1.ebuild:
+ marked x86 per bug 425054
+
+ 06 Jul 2012; Agostino Sarubbo <a...@gentoo.org> xrootd-3.2.1.ebuild:
+ Stable for amd64, wrt bug #425054
+
+*xrootd-3.2.1 (22 May 2012)
+
+ 22 May 2012; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.2.1.ebuild:
+ Version bump
+
+*xrootd-3.1.1 (06 Mar 2012)
+
+ 06 Mar 2012; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.1.1.ebuild:
+ Version bump
+
+ 19 Dec 2011; Sébastien Fabbro <bicat...@gentoo.org> +xrootd-3.1.0.ebuild,
+ +files/cmsd.confd, +files/cmsd.initd, +files/frm_purged.initd,
+ +files/frm_xfrd.initd, +files/xrootd.confd, +files/xrootd.initd,
+ +metadata.xml:
+ Initial import to the main tree
+
+*xrootd-3.1.0 (03 Dec 2011)
+
+ 03 Dec 2011; Andrew Savchenko <birc...@gmail.com> +xrootd-3.1.0.ebuild,
+ +files/cmsd.initd, +files/frm_purged.initd, +files/frm_xfrd.initd,
+ +files/xrootd.confd, +files/xrootd.initd, +metadata.xml:
+ XRootD isn't really a new program in this overlay. It was
+ previously bundled within sci-physics/root, but now it is unbundled
+ upstream and needs to be installed as a separate package in order
+ to be used from ROOT.
+
+ Aside from standard xrootd distribution, this ebuild may install
+ useful pdf documentation from the official web site.
+
+ Program was tested on ~x86 and ~amd64 with some basic setup, though
+ no real production tests were done. Please note, that xrootd and
+ accompany daemons do not work with root privileges any longer, so
+ special xrootd user was used.
+
+ Another note: all daemons MUST use the same config (-c
+ /etc/xrootd/your._config), that's why there is only one conf.d file
+ for all four daemons.
diff --git a/net-libs/xrootd/files/cmsd.confd b/net-libs/xrootd/files/cmsd.confd
new file mode 100644
index 0000000..ab5aa8c
--- /dev/null
+++ b/net-libs/xrootd/files/cmsd.confd
@@ -0,0 +1,9 @@
+# conf.d file for cmsd daemon
+
+# User to run as (default is root)
+CMSD_USER="root"
+
+#
+# Please refer to the cmsd(1) man(1) page for more
+# information on command line parameters.
+CMSD_OPTS=""
diff --git a/net-libs/xrootd/files/cmsd.initd b/net-libs/xrootd/files/cmsd.initd
new file mode 100644
index 0000000..b04ca57
--- /dev/null
+++ b/net-libs/xrootd/files/cmsd.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/cmsd.initd,v 1.3
2013/06/04 15:51:34 bicatali Exp $
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting Cluster Management Service daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${CMSD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Cluster Management Service daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/frm_purged.initd
b/net-libs/xrootd/files/frm_purged.initd
new file mode 100644
index 0000000..1e95d5c
--- /dev/null
+++ b/net-libs/xrootd/files/frm_purged.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_purged.initd,v
1.3 2013/06/04 15:51:34 bicatali Exp $
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting File Residency Manager purge daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${FRM_PURGED_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping File Residency Manager purge daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/frm_xfrd.initd
b/net-libs/xrootd/files/frm_xfrd.initd
new file mode 100644
index 0000000..0b28f87
--- /dev/null
+++ b/net-libs/xrootd/files/frm_xfrd.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_xfrd.initd,v 1.3
2013/06/04 15:51:34 bicatali Exp $
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting File Residency Manager transfer daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${FRM_XFRD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping File Residency Manager transfer daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/xrootd-no-werror.patch
b/net-libs/xrootd/files/xrootd-no-werror.patch
new file mode 100644
index 0000000..d9f3b1c
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-no-werror.patch
@@ -0,0 +1,11 @@
+--- cmake/XRootDOSDefs.cmake.orig 2014-06-04 20:31:15.000000000 +0400
++++ cmake/XRootDOSDefs.cmake 2014-08-21 12:12:55.397368485 +0400
+@@ -15,7 +15,7 @@
+ # GCC
+
#-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
+ # gcc 4.1 is retarded
+ execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
diff --git a/net-libs/xrootd/files/xrootd.confd
b/net-libs/xrootd/files/xrootd.confd
new file mode 100644
index 0000000..0e847e5
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd.confd
@@ -0,0 +1,21 @@
+# conf.d file for xroot, cmsd, frm_purged, frm_xfrd daemons
+
+# User to run as, please note that:
+# 1) daemons will refuse to run as root;
+# 2) several dirs must be created with an appropriate permissions
+# and ownership, so be careful when changing default 'xrootd' user.
+XROOTD_USER="xrootd"
+
+# Configuration file MUST be the same for all four daemons.
+# See /etc/xrootd for available simple defaults.
+XROOTD_CONF="/etc/xrootd/xrootd-clustered.cfg"
+
+# Logdir for all daemons
+XROOTD_LOGDIR="/var/log/xrootd"
+
+# Additional options for each daemon, please refer to their
+# documentation for details
+XROOTD_OPTS=""
+CMSD_OPTS=""
+FRM_PURGED=""
+FRM_XFRD=""
diff --git a/net-libs/xrootd/files/xrootd.initd
b/net-libs/xrootd/files/xrootd.initd
new file mode 100644
index 0000000..1685ccc
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/xrootd.initd,v 1.2
2012/12/05 18:19:15 bicatali Exp $
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting extended ROOTD file server"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${XROOTD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping extended ROOTD file server"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
new file mode 100644
index 0000000..604e389
--- /dev/null
+++ b/net-libs/xrootd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<herd>sci-physics</herd>
+<longdescription lang="en">
+ XROOTD software framework is a fully generic suite for fast, low latency
+ and scalable data access, which can serve natively any kind of data,
+ organized as a hierarchical filesystem-like namespace, based on the
+ concept of directory.
+ It is usually used with <pkg>sci-physics/root</pkg> and its PROOF
+ facilities for cluster computing in high energy physics.
+</longdescription>
+<use>
+ <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-4.0.4.ebuild
b/net-libs/xrootd/xrootd-4.0.4.ebuild
new file mode 100644
index 0000000..ef02d45
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.0.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-4.0.0.ebuild,v 1.1
2014/06/19 18:13:17 bicatali Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils user multilib
+
+DURI="http://xrootd.slac.stanford.edu/doc/prod";
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/";
+SRC_URI="${HOMEPAGE}/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fuse kerberos perl readline ssl test"
+
+RDEPEND="
+ !<sci-physics/root-5.32[xrootd]
+ sys-libs/zlib:0=
+ fuse? ( sys-fs/fuse:0= )
+ kerberos? ( virtual/krb5 )
+ perl? (
+ dev-lang/perl
+ readline? ( dev-perl/Term-ReadLine-Perl )
+ )
+ readline? ( sys-libs/readline:0= )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+ perl? ( dev-lang/swig )
+ test? ( dev-util/cppunit )"
+
+pkg_setup() {
+ enewgroup xrootd
+ enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-no-werror.patch"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable fuse)
+ $(cmake-utils_use_enable kerberos KRB5)
+ $(cmake-utils_use_enable perl)
+ $(cmake-utils_use_enable readline)
+ $(cmake-utils_use_enable ssl CRYPTO)
+ $(cmake-utils_use_enable test TESTS)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && doxygen Doxyfile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # base configs
+ insinto /etc/xrootd
+ doins packaging/common/*.cfg
+
+ fowners root:xrootd /etc/xrootd
+ keepdir /var/log/xrootd
+ fowners xrootd:xrootd /var/log/xrootd
+
+ local i
+ for i in cmsd frm_purged frm_xfrd xrootd; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ done
+ # all daemons MUST use single master config file
+ newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+ dodoc docs/ReleaseNotes.txt
+ use doc && dohtml -r doxydoc/html/*
+}
