commit: 518dbf0b81b27225e09bc939ba6af14a15830922
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 12:04:34 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri May 18 15:35:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518dbf0b
net-libs/xrootd: version bump to 4.8.3
Package-Manager: Portage-2.3.38, Repoman-2.3.9
net-libs/xrootd/Manifest | 1 +
net-libs/xrootd/files/xrootd-4.8.3-crc32.patch | 58 +++++++++++++
net-libs/xrootd/xrootd-4.8.3.ebuild | 115 +++++++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 0447ad254a1..5c5e8ae90a0 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,2 +1,3 @@
DIST xrootd-4.4.0.tar.gz 2146909 BLAKE2B
4ea84a0c395984cf3ca0f072d3dab080a128e8554f20f7347f9622430b1adc8bda279fa3c8cd587260affe432700332ce7cbb6f512bc29d7d7921b2c6a349bdc
SHA512
3e81285b97b928830538f358daf358538609d1678d5beb23b8c0f8fdda7ad22895cc96ba0aaadf55892b7cba08a60182fee19e27af3225b638cb209a4146bbfa
DIST xrootd-4.5.0.tar.gz 2172752 BLAKE2B
0e1251f9b064e5bf5e0bf9df0575a9605c4437eddecca312bbfad5ce91b9e3e83ff14a00b7ba1b3e3305f1bd00b5dce151241293441852da95f439788671c4f7
SHA512
0ffa982b872ac94eae1e26d1ebbb94db46f607fb4b0f1d4a2261a7d34dc7715b67cb7c7beecea300f82578bf4773d18e9b86c55b32dfd65ab2e48f3cbb03f173
+DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B
1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe
SHA512
6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
new file mode 100644
index 00000000000..9f27c436988
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
@@ -0,0 +1,58 @@
+From 64f81b7fad227097f5e135d25a5574cfecf4d50d Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <ama...@cern.ch>
+Date: Fri, 18 May 2018 11:30:58 +0200
+Subject: [PATCH] Remove declarations of crc32 and adler32
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These break compilation with the error below:
+
+xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:
+ In function ‘int DoA32(const char*)’:
+xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:418:34:
+ error: expected initializer before ‘OF’
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+ ^^
+---
+ src/XrdSsi/XrdSsiShMam.cc | 2 +-
+ tests/XrdSsiTests/XrdShMap.cc | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc
+index 013dc855..a4803d71 100644
+--- a/src/XrdSsi/XrdSsiShMam.cc
++++ b/src/XrdSsi/XrdSsiShMam.cc
+@@ -882,7 +882,7 @@ bool XrdSsiShMam::GetItem(void *data, const char *key, int
hash)
+
/******************************************************************************/
+
+ int XrdSsiShMam::HashVal(const char *key)
+-{ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
++{
+ uLong crc;
+ int hval, klen = strlen(key);
+
+diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc
+index bb642ac3..860fa7ad 100644
+--- a/tests/XrdSsiTests/XrdShMap.cc
++++ b/tests/XrdSsiTests/XrdShMap.cc
+@@ -415,7 +415,6 @@ void Explain(const char *what)
+
+ int DoA32(const char *buff)
+ {
+- ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt
len));
+ uLong adler = adler32(0L, Z_NULL, 0);
+
+ // Check for ID request now
+@@ -438,8 +437,6 @@ int DoA32(const char *buff)
+
+ int DoC32(const char *buff)
+ {
+- ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+-
+ // Check for ID request now
+ //
+ if (!buff) {int myID; memcpy(&myID, "c32 ", sizeof(int)); return myID;}
+--
+2.17.0
+
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild
b/net-libs/xrootd/xrootd-4.8.3.ebuild
new file mode 100644
index 00000000000..e43d7d367bd
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 user
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/";
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz";
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline rbd ssl test"
+
+CDEPEND="
+ !<sci-physics/root-5.32[xrootd]
+ sys-libs/zlib
+ fuse? ( sys-fs/fuse:= )
+ kerberos? ( virtual/krb5 )
+ python? ( ${PYTHON_DEPS} )
+ rbd? ( sys-cluster/ceph )
+ readline? ( sys-libs/readline:0= )
+ ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}
+ doc? (
+ app-doc/doxygen[dot]
+ python? ( dev-python/sphinx )
+ )
+ test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+"
+REQUIRED_USE="
+ http? ( kerberos ssl )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd*-4.so"
+
+pkg_setup() {
+ enewgroup xrootd
+ enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+ use python && python_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_CEPH=$(usex rbd)
+ -DENABLE_CRYPTO=$(usex ssl)
+ -DENABLE_FUSE=$(usex fuse)
+ -DENABLE_HTTP=$(usex http)
+ -DENABLE_KRB5=$(usex kerberos)
+ -DENABLE_PYTHON=$(usex python)
+ -DENABLE_READLINE=$(usex readline)
+ -DENABLE_TESTS=$(usex test)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ doxygen Doxyfile || die
+ if use python; then
+ emake -C bindings/python/docs html
+ fi
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doxydoc/html/. )
+ dodoc docs/ReleaseNotes.txt
+ cmake-utils_src_install
+ find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+ # 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
+
+ if use python; then
+ python_optimize "${D}/$(python_get_sitedir)"
+
+ if use doc; then
+ docinto python
+ docompress -x "/usr/share/doc/${PF}/python/html"
+ dodoc -r bindings/python/docs/build/html
+ fi
+ if use examples; then
+ docinto python
+ dodoc -r bindings/python/examples
+ fi
+ fi
+}
