public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2016-10-02 18:09 David Seifert
  0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2016-10-02 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     c7044a76c6a28f056d618ae476735252b7dabc3f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 18:06:42 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 18:08:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7044a76

net-libs/xrootd: Version bump to 4.4.0

Gentoo-bug: 595314
* EAPI=6
* Make PATCHES -p1 compliant

Package-Manager: portage-2.3.1

 net-libs/xrootd/Manifest                     |  1 +
 net-libs/xrootd/files/xrootd-no-werror.patch |  4 +-
 net-libs/xrootd/xrootd-4.4.0.ebuild          | 78 ++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 47a8625..f33a836 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,2 +1,3 @@
 DIST xrootd-3.3.6.tar.gz 1836866 SHA256 06656d919f5296bcf49953e97b1f3d1cf601c9a1d676945529032fa0046d7217 SHA512 87682fbc49ac13e0c98ee72f506c7c23902f983cfdb672f52a041bcd8de3f723d0ce26638d366a74cffbb3e251e69335454da4b9f8dd8e00ae80bb3bfc432572 WHIRLPOOL 9da9140743b3679ac49f6ae42e9ae4fd430ababd1bf3a021331b804fbe6c56140c6b36fe7d10113a0efc14283ab934240e3d7dac6b4e94c794e8dc47c9896559
 DIST xrootd-4.1.1.tar.gz 1957303 SHA256 3e472ec8068adc76f10df8a1bb1c795bb37a0a9936d4a255cc62073eb86c70c4 SHA512 ad5793b622ef967f69bf4be16b23fd00c9db183c3d0664e1913b82697d663c885499db780acd0d968148af6c33e9dad18fe798093e3fec72b20eba0717f3cc7e WHIRLPOOL 4de2ac56599af17188fe608f95cc10434c22d87d72b534b80865a79f648e20b98908b8703c18259d96ea43fb34a683cb45c19656efcae6b32cb13f58bbc37d2e
+DIST xrootd-4.4.0.tar.gz 2146909 SHA256 f066e7488390c0bc50938d23f6582fb154466204209ca92681f0aa06340e77c8 SHA512 3e81285b97b928830538f358daf358538609d1678d5beb23b8c0f8fdda7ad22895cc96ba0aaadf55892b7cba08a60182fee19e27af3225b638cb209a4146bbfa WHIRLPOOL febb09eb0a18660807e05bf1ae3645bb5969eba7dbe7a764d4efec4883b1c8558dcc6f5577881bc2b37feeb99b77f2dd9d087b22d933a1be186959e8b79f837e

diff --git a/net-libs/xrootd/files/xrootd-no-werror.patch b/net-libs/xrootd/files/xrootd-no-werror.patch
index d9f3b1c..b8010b7 100644
--- a/net-libs/xrootd/files/xrootd-no-werror.patch
+++ b/net-libs/xrootd/files/xrootd-no-werror.patch
@@ -1,5 +1,5 @@
---- cmake/XRootDOSDefs.cmake.orig	2014-06-04 20:31:15.000000000 +0400
-+++ cmake/XRootDOSDefs.cmake	2014-08-21 12:12:55.397368485 +0400
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
 @@ -15,7 +15,7 @@
  # GCC
  #-------------------------------------------------------------------------------

diff --git a/net-libs/xrootd/xrootd-4.4.0.ebuild b/net-libs/xrootd/xrootd-4.4.0.ebuild
new file mode 100644
index 00000000..d664ec8
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.4.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils 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 fuse http kerberos readline ssl test"
+
+RDEPEND="
+	!<sci-physics/root-5.32[xrootd]
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse )
+	kerberos? ( virtual/krb5 )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-util/cppunit )"
+
+REQUIRED_USE="http? ( kerberos ssl )"
+PATCHES=( "${FILESDIR}"/${PN}-no-werror.patch )
+
+pkg_setup() {
+	enewgroup xrootd
+	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_CEPH=OFF
+		-DENABLE_PYTHON=OFF # TODO: install python bindings properly
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+	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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2018-05-18 15:38 Guilherme Amadio
  0 siblings, 0 replies; 9+ messages in thread
From: Guilherme Amadio @ 2018-05-18 15:38 UTC (permalink / raw
  To: gentoo-commits

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 <amadio@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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2019-12-29 23:18 Marek Szuba
  0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2019-12-29 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     77ec8e9ee23def7148efe1cc1c7c49c3f9b895b3
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 23:17:24 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 23:17:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ec8e9e

net-libs/xrootd: do not set -Werror in normal builds

Backported to 4.8 and 4.9 from 4.10. Should allow these versions to
build under gcc-9.

Closes: https://bugs.gentoo.org/703412
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/xrootd-4.8.3-Werror_only_Debug.patch     | 22 ++++++++++++++++++++++
 net-libs/xrootd/xrootd-4.8.3.ebuild                |  5 ++++-
 net-libs/xrootd/xrootd-4.9.0.ebuild                |  5 ++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
new file mode 100644
index 00000000000..2f0a64b13fd
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
@@ -0,0 +1,22 @@
+Only set -Werror - which among other things prevents xrootd-4.8.3 from being
+compiled with gcc-9 - either in debug mode or when explicitly requested.
+Backport of the change made upstream in 4.10.
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -26,7 +26,15 @@
+ #-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
+-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
++  #-----------------------------------------------------------------------------
++  # Set -Werror only for Debug (or undefined) build type or if we have been
++  # explicitly asked to do so
++  #-----------------------------------------------------------------------------
++  if( ( CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL ""
++        OR FORCE_WERROR ) )
++    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
++  endif()
+   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/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
index 90f82f05b9a..df36a3d6213 100644
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -42,7 +42,10 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-crc32.patch
+	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,

diff --git a/net-libs/xrootd/xrootd-4.9.0.ebuild b/net-libs/xrootd/xrootd-4.9.0.ebuild
index f42a32f1833..55c0653ee3b 100644
--- a/net-libs/xrootd/xrootd-4.9.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.9.0.ebuild
@@ -42,7 +42,10 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/xrootd-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2020-06-26 11:08 Marek Szuba
  0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2020-06-26 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     32a8f1cee1e0281b2818a7c8b8fbaff32a46f401
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 10:59:45 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 11:00:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a8f1ce

net-libs/xrootd: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-libs/xrootd/Manifest                           |   3 -
 .../files/xrootd-4.8.3-Werror_only_Debug.patch     |  22 ----
 net-libs/xrootd/metadata.xml                       |   1 -
 net-libs/xrootd/xrootd-4.11.1.ebuild               | 113 -------------------
 net-libs/xrootd/xrootd-4.12.1.ebuild               | 113 -------------------
 net-libs/xrootd/xrootd-4.8.3.ebuild                | 119 ---------------------
 6 files changed, 371 deletions(-)

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index cfbf0bc738c..ed8b0fab993 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,5 +1,2 @@
-DIST xrootd-4.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
-DIST xrootd-4.12.1.tar.gz 2564202 BLAKE2B df6334884d12ea68d98f5e8d1c83bb44d9a7d9232f1350323beff8de3815fd24711a90b5180824c9a9fd3f9e4f45ad3448bb32cde57efd646343bf2fd202237e SHA512 8d5c7029ccad8cb898ff41671e6f360154549df926b1fb5e7747503bed477f7bf1daec7addbc5a832b76f0f5c40ef8fdcda708907389fa790c3b87a944af4d93
 DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
-DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911

diff --git a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
deleted file mode 100644
index 2f0a64b13fd..00000000000
--- a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Only set -Werror - which among other things prevents xrootd-4.8.3 from being
-compiled with gcc-9 - either in debug mode or when explicitly requested.
-Backport of the change made upstream in 4.10.
---- a/cmake/XRootDOSDefs.cmake
-+++ b/cmake/XRootDOSDefs.cmake
-@@ -26,7 +26,15 @@
- #-------------------------------------------------------------------------------
- if( CMAKE_COMPILER_IS_GNUCXX )
-   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
--  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
-+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
-+  #-----------------------------------------------------------------------------
-+  # Set -Werror only for Debug (or undefined) build type or if we have been
-+  # explicitly asked to do so
-+  #-----------------------------------------------------------------------------
-+  if( ( CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL ""
-+        OR FORCE_WERROR ) )
-+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
-+  endif()
-   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/metadata.xml b/net-libs/xrootd/metadata.xml
index ecd16e038b9..b961d03874b 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -16,6 +16,5 @@
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
-    <flag name="rbd">Enable rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/xrootd/xrootd-4.11.1.ebuild b/net-libs/xrootd/xrootd-4.11.1.ebuild
deleted file mode 100644
index 735dfba0810..00000000000
--- a/net-libs/xrootd/xrootd-4.11.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit cmake-utils python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/xrootd-4.8.3-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() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}

diff --git a/net-libs/xrootd/xrootd-4.12.1.ebuild b/net-libs/xrootd/xrootd-4.12.1.ebuild
deleted file mode 100644
index 6acdc5a472e..00000000000
--- a/net-libs/xrootd/xrootd-4.12.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit cmake-utils python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/xrootd-4.8.3-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.*-$(ver_cut 1).so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}

diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
deleted file mode 100644
index df36a3d6213..00000000000
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( 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
-	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2020-09-18 17:43 Marek Szuba
  0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2020-09-18 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4a0003172e29b7c7d16a8dbffb7065c2cb1d72a2
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 17:38:21 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 17:43:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a000317

net-libs/xrootd: bump to 4.12.4

Also includes the http-key-leakage patch backported from 5.0.2.

Bug: https://bugs.gentoo.org/743391
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-libs/xrootd/Manifest                           |  2 +-
 .../files/xrootd-4.12.4-http_secret_leakage.patch  | 41 ++++++++++++++++++++++
 .../{xrootd-4.12.3.ebuild => xrootd-4.12.4.ebuild} |  8 +++--
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index afebf6d2494..0ac03ed45ac 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,5 +1,5 @@
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
-DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
+DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
 DIST xrootd-5.0.0.tar.gz 2754256 BLAKE2B c80a38ede3263ae669181f2173f6ee2bb0a347dc973cecc9dedf00867041190f7bceb7f475696e8cd3921c57d4c197b73ee57b29c9e78a027393ca61dca1b6d3 SHA512 75b69d3da2a6e477edbf5588afd943a91a2e1e86fcc98afc34d964c9231fc0224b4eec82336e9a7d5bd8bd0cd5c20e442ee37b8f6239f417b05efdf39038d93c
 DIST xrootd-5.0.1.tar.gz 2759931 BLAKE2B 2bc76f660f7fb3c9202c37dc10f099f2bd06868b00c43e6015ebb0d9cf3edf8ac777f76c1f71d0f1f4b252cedd62c9aa74a449cb5f369492a5ee63813bb7924f SHA512 95e0fe97f66a320999d4c2dd2ac5be4e2ba7779f220aa521e4882925d5e9262c34991f0ecbd3c2449b97977ff4cdbdcd9477ed780d1a6dbf8fbd3f547b4932ba
 DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255

diff --git a/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch b/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
new file mode 100644
index 00000000000..953c6aa3b2b
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
@@ -0,0 +1,41 @@
+Backported from 5.0.2. Not quite sure if xrootd-4 is actually vulnerable
+to this - but just in case.
+
+From fff97c2dc6703dc1ba8b28b1bf67eeb278ff3e22 Mon Sep 17 00:00:00 2001
+From: Andrew Hanushevsky <abh@stanford.edu>
+Date: Wed, 2 Sep 2020 23:13:52 -0700
+Subject: [PATCH] [HTTP] Prevent secret key leakage if specified in the config
+ file.
+
+---
+ src/XrdHttp/XrdHttpProtocol.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/XrdHttp/XrdHttpProtocol.cc b/src/XrdHttp/XrdHttpProtocol.cc
+index 66b89df20ed..5f50f2aeadd 100644
+--- a/src/XrdHttp/XrdHttpProtocol.cc
++++ b/src/XrdHttp/XrdHttpProtocol.cc
+@@ -1986,6 +1986,7 @@ int XrdHttpProtocol::xsslcafile(XrdOucStream & Config) {
+ 
+ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   char *val;
++  bool inFile = false;
+ 
+   // Get the path
+   //
+@@ -2001,6 +2002,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   // otherwise, the token itself is the secretkey
+   if (val[0] == '/') {
+     struct stat st;
++    inFile = true;
+     if ( stat(val, &st) ) {
+       eDest.Emsg("Config", errno, "stat shared secret key file", val);
+       return 1;
+@@ -2059,6 +2061,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   // Record the path
+   if (secretkey) free(secretkey);
+   secretkey = strdup(val);
++  if (!inFile) Config.noEcho();
+ 
+   return 0;
+ }

diff --git a/net-libs/xrootd/xrootd-4.12.3.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
similarity index 92%
rename from net-libs/xrootd/xrootd-4.12.3.ebuild
rename to net-libs/xrootd/xrootd-4.12.4.ebuild
index 17545ef3217..105a4611edc 100644
--- a/net-libs/xrootd/xrootd-4.12.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.4.ebuild
@@ -42,12 +42,16 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.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.*-$(ver_cut 1).so"
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so
+	/usr/lib.*/libXrdClTests\.so"
 
 pkg_setup() {
 	use python && python_setup


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2021-03-04 23:39 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-03-04 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba83dd16022c0208803b2098e44c1958d37af5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 23:12:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 23:39:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba83dd1

net-libs/xrootd: Drop 4.12.4, 4.12.5, 5.0.2

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/xrootd/Manifest                           |   3 -
 .../files/xrootd-4.12.4-http_secret_leakage.patch  |  41 --------
 net-libs/xrootd/xrootd-4.12.4.ebuild               | 117 ---------------------
 net-libs/xrootd/xrootd-4.12.5.ebuild               | 117 ---------------------
 net-libs/xrootd/xrootd-5.0.2.ebuild                | 116 --------------------
 5 files changed, 394 deletions(-)

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 3d44fe265d5..b0da9372de2 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,5 +1,2 @@
-DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
-DIST xrootd-4.12.5.tar.gz 2580794 BLAKE2B 217abb8ad332b3eb0cbe2289f4fa7c31abce7c3122ef8d23f409a3a03b7691f0e8a1939a42c831774e6902bf0f3242a2583bbf010478a66f5a2e634008799c5b SHA512 c252866ccdc4465c9ffe3f5cb4bb83a2a70e775db5ff3a55bcd8ac70c72d280ea41fb31501f30550d8ac61b6d474ce602e0ee8a02485f1f2722617aeb25aff0d
-DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
 DIST xrootd-5.1.0.tar.gz 2862622 BLAKE2B cb166adcd60b263f7fbed22033fe362ed5b32b7a05c76ff2d8a5ab25d730673d0c5d22bc41816083c84c3f14832cca34d801738594c7b58dcebbea9882a7df37 SHA512 f9bb293433e16b86d3395f29cf23f10a4a5447b367aa762219559278b3f75402892be85e0ca914762bfe892ad0dcc05bcfc64ac1ad0316c5855586141b537bad

diff --git a/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch b/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
deleted file mode 100644
index 953c6aa3b2b..00000000000
--- a/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Backported from 5.0.2. Not quite sure if xrootd-4 is actually vulnerable
-to this - but just in case.
-
-From fff97c2dc6703dc1ba8b28b1bf67eeb278ff3e22 Mon Sep 17 00:00:00 2001
-From: Andrew Hanushevsky <abh@stanford.edu>
-Date: Wed, 2 Sep 2020 23:13:52 -0700
-Subject: [PATCH] [HTTP] Prevent secret key leakage if specified in the config
- file.
-
----
- src/XrdHttp/XrdHttpProtocol.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/XrdHttp/XrdHttpProtocol.cc b/src/XrdHttp/XrdHttpProtocol.cc
-index 66b89df20ed..5f50f2aeadd 100644
---- a/src/XrdHttp/XrdHttpProtocol.cc
-+++ b/src/XrdHttp/XrdHttpProtocol.cc
-@@ -1986,6 +1986,7 @@ int XrdHttpProtocol::xsslcafile(XrdOucStream & Config) {
- 
- int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
-   char *val;
-+  bool inFile = false;
- 
-   // Get the path
-   //
-@@ -2001,6 +2002,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
-   // otherwise, the token itself is the secretkey
-   if (val[0] == '/') {
-     struct stat st;
-+    inFile = true;
-     if ( stat(val, &st) ) {
-       eDest.Emsg("Config", errno, "stat shared secret key file", val);
-       return 1;
-@@ -2059,6 +2061,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
-   // Record the path
-   if (secretkey) free(secretkey);
-   secretkey = strdup(val);
-+  if (!inFile) Config.noEcho();
- 
-   return 0;
- }

diff --git a/net-libs/xrootd/xrootd-4.12.4.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
deleted file mode 100644
index bd57f9288dc..00000000000
--- a/net-libs/xrootd/xrootd-4.12.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.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.*-$(ver_cut 1).so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}

diff --git a/net-libs/xrootd/xrootd-4.12.5.ebuild b/net-libs/xrootd/xrootd-4.12.5.ebuild
deleted file mode 100644
index 9d9b131b8c7..00000000000
--- a/net-libs/xrootd/xrootd-4.12.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.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.*-$(ver_cut 1).so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}

diff --git a/net-libs/xrootd/xrootd-5.0.2.ebuild b/net-libs/xrootd/xrootd-5.0.2.ebuild
deleted file mode 100644
index b96f560be94..00000000000
--- a/net-libs/xrootd/xrootd-5.0.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/xrootd-4.8.3-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.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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_src_configure
-}
-
-src_compile() {
-	cmake_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_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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2022-06-10 15:25 Marek Szuba
  0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2022-06-10 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b6989bd50f3a7d466f68969049d2388720d6f183
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 13:22:15 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 15:25:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6989bd5

net-libs/xrootd: add 5.4.3, drop 5.3.1 and 5.4.0

Disables several cases of dependency automagic present upstream build
scripts, and limits FUSE support to slot 0 (it doesn't work with, or
indeed detect, fuse-3 yet).

Furthermore, dev-libs/openssl is now a mandatory dependency - although
it is nominally (and only nominally, see Bug #822684) still possible
to disable the building of XrdCrypto in CMake, calls to OpenSSL functions
are now present elsewhere in xrootd code as well.

Closes: https://bugs.gentoo.org/822684
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-libs/xrootd/Manifest                           |   3 +-
 .../xrootd/files/xrootd-5.4.3-no_automagic.patch   |  24 +++++
 net-libs/xrootd/metadata.xml                       |   1 +
 net-libs/xrootd/xrootd-5.3.1.ebuild                | 117 ---------------------
 .../{xrootd-5.4.0.ebuild => xrootd-5.4.3.ebuild}   |  27 +++--
 5 files changed, 43 insertions(+), 129 deletions(-)

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 882c4506b26e..bb0210d32398 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,3 +1,2 @@
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
-DIST xrootd-5.3.1.tar.gz 2957788 BLAKE2B 6669ce4811e6c65ef17f06ae219e19e1f12027f4f9b620ad447df53ac437b30ce6425dc783a0ac7e4557d18ab562c266ac2497d93e93a2058fe5bd4aa7bc1d42 SHA512 a65436fe649233bb28123d9529d496c11b4ff40ba5490cbcbb32ff5379e555cfd684fad350c784c80e70056bb5d2e9701a80543c7f4a8ceb11e935aea01800b3
-DIST xrootd-5.4.0.tar.gz 3225065 BLAKE2B cda6b14fae4c4c8d34367fa3ff448c02bf3ecda9c6bb4029d3a6b53370a57445ac25de77d5324dd4dab8c92cda77490efdbb862e4db6b926e19ad3363278f046 SHA512 59f93db433f0e88439d5edfffb75d7813bae253e50c390fe8c43ef924bc36f5f4a56db9b00a44013c60c4b4bd5a0accaff2a8ca793fe37e59dc77dd8ab8f6837
+DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72

diff --git a/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch b/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch
new file mode 100644
index 000000000000..d50ea40e1c49
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch
@@ -0,0 +1,24 @@
+--- a/cmake/XRootDFindLibs.cmake
++++ b/cmake/XRootDFindLibs.cmake
+@@ -25,15 +25,19 @@
+ 
+ find_package( TinyXml )
+ 
+-find_package( LibXml2 )
++if( ENABLE_LIBXML2 )
++find_package( LibXml2 REQUIRED )
+ if( LIBXML2_FOUND )
+   add_definitions( -DHAVE_XML2 )
+ endif()
++endif()
+ 
+-find_package( Systemd )
++if( ENABLE_SYSTEMD )
++find_package( Systemd REQUIRED )
+ if( SYSTEMD_FOUND )
+   add_definitions( -DHAVE_SYSTEMD )
+ endif()
++endif()
+ 
+ find_package( CURL )
+ 

diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index a911c7c2e75c..a8b5e8a0921c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -16,6 +16,7 @@
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
+    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
     <flag name="server">Install xrootd server and related plug-ins</flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/xrootd/xrootd-5.3.1.ebuild b/net-libs/xrootd/xrootd-5.3.1.ebuild
deleted file mode 100644
index a33ccf3fde4d..000000000000
--- a/net-libs/xrootd/xrootd-5.3.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-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 ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( <dev-libs/openssl-3.0.0:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	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}"/xrootd-4.8.3-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.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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_src_configure
-}
-
-src_compile() {
-	cmake_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_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
-}

diff --git a/net-libs/xrootd/xrootd-5.4.0.ebuild b/net-libs/xrootd/xrootd-5.4.3.ebuild
similarity index 83%
rename from net-libs/xrootd/xrootd-5.4.0.ebuild
rename to net-libs/xrootd/xrootd-5.4.3.ebuild
index b13ed2e2e71d..a8edf6912fda 100644
--- a/net-libs/xrootd/xrootd-5.4.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
 # Upstream does not support the building of Python bindings
 # via CMake for more than one implementation at a time.
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit cmake python-single-r1
 
 DESCRIPTION="Extended ROOT remote file server"
@@ -16,18 +16,20 @@ SRC_URI="https://xrootd.slac.stanford.edu/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 +server ssl systemd test"
+IUSE="doc examples fuse http kerberos +libxml2 python readline +server systemd test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
 	acct-user/xrootd
+	dev-libs/openssl:0=
 	sys-libs/zlib
 	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
+	fuse? ( sys-fs/fuse:0= )
+	http? ( net-misc/curl:= )
 	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2:2= )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( <dev-libs/openssl-3.0.0:0= )
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${CDEPEND}"
@@ -37,18 +39,22 @@ BDEPEND="
 		virtual/latex-base
 		python? ( dev-python/sphinx )
 	)
+	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
 	test? ( dev-util/cppunit )
 "
 RDEPEND="${CDEPEND}
 	dev-lang/perl
 "
 REQUIRED_USE="
-	http? ( kerberos ssl )
+	http? ( kerberos )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( server )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
@@ -60,17 +66,18 @@ pkg_setup() {
 	use python && python_setup
 }
 
-# FIXME: no systemd automagic!
 # FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
 		-DENABLE_FUSE=$(usex fuse)
 		-DENABLE_HTTP=$(usex http)
 		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
 		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VOMS=no
+		-DFORCE_ENABLED=yes
 		-DXRDCL_ONLY=$(usex server "no" "yes")
 	)
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2022-09-07 12:26 Marek Szuba
  0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2022-09-07 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b18c65f6d5aca4149c87c62e2b82d529adebadda
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 11:40:14 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 12:26:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18c65f6

net-libs/xrootd: use distutils-r1 to handle Python bindings

Now we can finally install the bindings for multiple Python implementations!

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/xrootd-5.4.3-cmake_no_python.patch       |  15 ++
 .../files/xrootd-5.4.3-python_tests_py3.patch      | 169 ++++++++++++++++++++
 net-libs/xrootd/xrootd-5.4.3-r2.ebuild             | 173 +++++++++++++++++++++
 3 files changed, 357 insertions(+)

diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
new file mode 100644
index 000000000000..04607cdd7b04
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
@@ -0,0 +1,15 @@
+--- a/bindings/python/CMakeLists.txt
++++ b/bindings/python/CMakeLists.txt
+@@ -32,6 +32,7 @@
+ 
+ configure_file(${SETUP_PY_IN} ${SETUP_PY})
+ 
++if (0)
+ string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION)
+ if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" )
+   string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}")
+@@ -100,3 +101,4 @@
+       )"
+   )
+ endif()
++endif()

diff --git a/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch
new file mode 100644
index 000000000000..e20e45309e39
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch
@@ -0,0 +1,169 @@
+--- a/bindings/python/tests/test_copy.py
++++ b/bindings/python/tests/test_copy.py
+@@ -61,15 +61,15 @@
+ 
+ class TestProgressHandler(object):
+   def begin(self, id, total, source, target):
+-    print '+++ begin(): %d, total: %d' % (id, total)
+-    print '+++ source: %s' % source
+-    print '+++ target: %s' % target
++    print('+++ begin(): %d, total: %d' % (id, total))
++    print('+++ source: %s' % source)
++    print('+++ target: %s' % target)
+ 
+   def end(self, jobId, status):
+-    print '+++ end(): jobId: %s, status: %s'  % (jobId, status)
++    print('+++ end(): jobId: %s, status: %s'  % (jobId, status))
+ 
+   def update(self, jobId, processed, total):
+-    print '+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total)
++    print('+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total))
+ 
+ def test_copy_progress_handler():
+   c = client.CopyProcess()
+--- a/bindings/python/tests/test_file.py
++++ b/bindings/python/tests/test_file.py
+@@ -289,9 +289,9 @@
+   for i, l in enumerate(lines):
+     total += len(l)
+     if l != pylines[i]:
+-      print '!!!!!', total, i
+-      print '+++++ py: %r' % pylines[i]
+-      print '+++++ me: %r' % l
++      print('!!!!!', total, i)
++      print('+++++ py: %r' % pylines[i])
++      print('+++++ me: %r' % l)
+       break
+     if pylines[i].endswith('\n'):
+       assert l.endswith('\n')
+--- a/bindings/python/tests/test_filesystem.py
++++ b/bindings/python/tests/test_filesystem.py
+@@ -37,20 +37,20 @@
+   status, response = f.open(smallfile, OpenFlags.NEW)
+ 
+   for func, args, hasReturnObject in funcspecs:
+-      async(func, args, hasReturnObject)
++      run_async(func, args, hasReturnObject)
+ 
+ def sync(func, args, hasReturnObject):
+   status, response = func(*args)
+-  print status
++  print(status)
+   assert status.ok
+   if hasReturnObject:
+-      print response
++      print(response)
+       assert response
+ 
+-def async(func, args, hasReturnObject):
++def run_async(func, args, hasReturnObject):
+   handler = AsyncResponseHandler()
+   status = func(callback=handler, *args)
+-  print status
++  print(status)
+   assert status.ok
+   status, response, hostlist = handler.wait()
+ 
+@@ -60,7 +60,7 @@
+ 
+   for host in hostlist:
+     assert host.url
+-    print host.url
++    print(host.url)
+ 
+   if hasReturnObject:
+     assert response
+@@ -79,7 +79,7 @@
+ 
+   try:
+     os.remove('/tmp/eggs')
+-  except OSError, __:
++  except OSError as __:
+     pass
+ 
+ def test_locate_sync():
+@@ -127,7 +127,7 @@
+ 
+   for item in response:
+     assert item.name
+-    print item.statinfo
++    print(item.statinfo)
+     assert item.statinfo
+     assert item.hostaddr
+     
+@@ -143,11 +143,11 @@
+   assert status.ok
+ 
+   for h in hostlist:
+-    print h.url
++    print(h.url)
+ 
+   for item in response:
+     assert item.name
+-    print item.statinfo
++    print(item.statinfo)
+     assert item.statinfo
+     assert item.hostaddr
+ 
+@@ -158,7 +158,7 @@
+   status, response = c.query(QueryCode.STATS, 'a')
+   assert status.ok
+   assert response
+-  print response
++  print(response)
+ 
+ def test_query_async():
+   c = client.FileSystem(SERVER_URL)
+@@ -169,7 +169,7 @@
+   status, response, hostlist = handler.wait()
+   assert status.ok
+   assert response
+-  print response
++  print(response)
+   
+ def test_mkdir_flags():
+   c = client.FileSystem(SERVER_URL)
+--- a/bindings/python/tests/test_glob.py
++++ b/bindings/python/tests/test_glob.py
+@@ -2,7 +2,7 @@
+ import os
+ import glob as norm_glob
+ import XRootD.client.glob_funcs as glob
+-from pathlib2 import Path
++from pathlib import Path
+ 
+ 
+ @pytest.fixture
+@@ -13,7 +13,7 @@
+     subdir2.mkdir()
+     for i in range(3):
+         dummy = subdir1 / ("a_file_%d.txt" % i)
+-        dummy.write_text(u"This is file %d\n" % i, encoding="utf-8")
++        dummy.write_text("This is file %d\n" % i, encoding="utf-8")
+     return tmpdir
+ 
+ 
+--- a/bindings/python/tests/test_threads.py
++++ b/bindings/python/tests/test_threads.py
+@@ -15,10 +15,10 @@
+     s, _ = self.file.write(smallbuffer)
+     assert s.ok
+ 
+-    print '+++ thread %d says: %s' % (self.id, self.file.read())
++    print('+++ thread %d says: %s' % (self.id, self.file.read()))
+ 
+     for line in self.file:
+-      print '+++ thread %d says: %s' % (self.id, line)
++      print('+++ thread %d says: %s' % (self.id, line))
+ 
+     self.file.close()
+ 
+@@ -28,7 +28,7 @@
+ #   assert f.is_open()
+ #   f.write(smallbuffer)
+ 
+-  for i in xrange(3):
++  for i in range(3):
+     tt = TestThread(f, i)
+     tt.start()
+     tt.join()

diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
new file mode 100644
index 000000000000..e0c005ecfcb9
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP571="setuptools"
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos +libxml2 python readline +server systemd test test-suite"
+
+# Python tests currently require manual configuration and start-up of an xrootd server.
+# No actual build-time test suite for native code.
+RESTRICT="test"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	fuse? ( sys-fs/fuse:0= )
+	http? ( net-misc/curl:= )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd:= )
+	test-suite? ( dev-util/cppunit )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+		python? ( dev-python/sphinx )
+	)
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( server )
+	test-suite? ( server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
+	"${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
+	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.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.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdClTests\.so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+# FIXME: support xrdec - currently only builds against bundled isa-l
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test-suite)
+		-DENABLE_VOMS=no
+		-DFORCE_ENABLED=yes
+		-DXRDCL_ONLY=$(usex server "no" "yes")
+	)
+	cmake_src_configure
+
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	epytest
+}
+
+src_test() {
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake_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
+
+	if use server; then
+		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
+	fi
+
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/
@ 2023-10-27 16:29 Guilherme Amadio
  0 siblings, 0 replies; 9+ messages in thread
From: Guilherme Amadio @ 2023-10-27 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     297e26122cb1561e7820978ac3e5a8f4f5204944
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 15:07:30 2023 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 16:29:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297e2612

net-libs/xrootd: install XrdNetPMark.hh header

Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 net-libs/xrootd/files/xrootd-5.6.3-add-pmark-header.patch   | 13 +++++++++++++
 .../xrootd/{xrootd-5.6.3.ebuild => xrootd-5.6.3-r1.ebuild}  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/net-libs/xrootd/files/xrootd-5.6.3-add-pmark-header.patch b/net-libs/xrootd/files/xrootd-5.6.3-add-pmark-header.patch
new file mode 100644
index 000000000000..9731e7da16a5
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.6.3-add-pmark-header.patch
@@ -0,0 +1,13 @@
+
+ Add XrdNetPMark.hh to set of public headers
+
+--- a/src/XrdHeaders.cmake
++++ b/src/XrdHeaders.cmake
+@@ -21,6 +21,7 @@ set( XROOTD_PUBLIC_HEADERS
+   XrdNet/XrdNetCmsNotify.hh
+   XrdNet/XrdNetConnect.hh
+   XrdNet/XrdNetOpts.hh
++  XrdNet/XrdNetPMark.hh
+   XrdNet/XrdNetSockAddr.hh
+   XrdNet/XrdNetSocket.hh
+   XrdOuc/XrdOucBuffer.hh

diff --git a/net-libs/xrootd/xrootd-5.6.3.ebuild b/net-libs/xrootd/xrootd-5.6.3-r1.ebuild
similarity index 98%
rename from net-libs/xrootd/xrootd-5.6.3.ebuild
rename to net-libs/xrootd/xrootd-5.6.3-r1.ebuild
index 5d7a5ba3b531..52f4603174e4 100644
--- a/net-libs/xrootd/xrootd-5.6.3.ebuild
+++ b/net-libs/xrootd/xrootd-5.6.3-r1.ebuild
@@ -75,6 +75,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
 	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
+	"${FILESDIR}"/${PN}-5.6.3-add-pmark-header.patch
 )
 
 # xrootd plugins are not intended to be linked with,


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-10-27 16:29 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-02 18:09 [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/, net-libs/xrootd/files/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2018-05-18 15:38 Guilherme Amadio
2019-12-29 23:18 Marek Szuba
2020-06-26 11:08 Marek Szuba
2020-09-18 17:43 Marek Szuba
2021-03-04 23:39 Andreas Sturmlechner
2022-06-10 15:25 Marek Szuba
2022-09-07 12:26 Marek Szuba
2023-10-27 16:29 Guilherme Amadio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox