diff options
Diffstat (limited to 'net-libs/xrootd')
| -rw-r--r-- | net-libs/xrootd/Manifest | 11 | ||||
| -rw-r--r-- | net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch | 41 | ||||
| -rw-r--r-- | net-libs/xrootd/xrootd-4.12.4.ebuild (renamed from net-libs/xrootd/xrootd-4.12.3.ebuild) | 8 | ||||
| -rw-r--r-- | net-libs/xrootd/xrootd-5.0.1.ebuild | 116 | ||||
| -rw-r--r-- | net-libs/xrootd/xrootd-5.0.2.ebuild (renamed from net-libs/xrootd/xrootd-5.0.0.ebuild) | 0 |
5 files changed, 52 insertions, 124 deletions
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index 5da466876d0c..f7ac2e291aa9 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -1,15 +1,14 @@ AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768 +AUX xrootd-4.12.4-http_secret_leakage.patch 1339 BLAKE2B 47ff77bbc2c5a4d2ef0dafbb10dc75de45b7a263ed13867f050c11f07555d7818b811c20e9020696d0a2c69568b79e329523354973a61124a6b084d0ff4680f9 SHA512 c22d744444f96b2b4b93f9e6dbb18622a271e2a88313ed796783bb722a951098bfde60be19f5ea747e83d71d66754cab00e4ca7141c5f3d91ad643228f29c146 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955 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-5.0.0.tar.gz 2754256 BLAKE2B c80a38ede3263ae669181f2173f6ee2bb0a347dc973cecc9dedf00867041190f7bceb7f475696e8cd3921c57d4c197b73ee57b29c9e78a027393ca61dca1b6d3 SHA512 75b69d3da2a6e477edbf5588afd943a91a2e1e86fcc98afc34d964c9231fc0224b4eec82336e9a7d5bd8bd0cd5c20e442ee37b8f6239f417b05efdf39038d93c -DIST xrootd-5.0.1.tar.gz 2759931 BLAKE2B 2bc76f660f7fb3c9202c37dc10f099f2bd06868b00c43e6015ebb0d9cf3edf8ac777f76c1f71d0f1f4b252cedd62c9aa74a449cb5f369492a5ee63813bb7924f SHA512 95e0fe97f66a320999d4c2dd2ac5be4e2ba7779f220aa521e4882925d5e9262c34991f0ecbd3c2449b97977ff4cdbdcd9477ed780d1a6dbf8fbd3f547b4932ba +DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364 +DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255 EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d -EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0 -EBUILD xrootd-5.0.0.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6 -EBUILD xrootd-5.0.1.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6 +EBUILD xrootd-4.12.4.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc +EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36 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 000000000000..953c6aa3b2bc --- /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 index 17545ef3217e..105a4611edcc 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 diff --git a/net-libs/xrootd/xrootd-5.0.1.ebuild b/net-libs/xrootd/xrootd-5.0.1.ebuild deleted file mode 100644 index b96f560be940..000000000000 --- a/net-libs/xrootd/xrootd-5.0.1.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 -} diff --git a/net-libs/xrootd/xrootd-5.0.0.ebuild b/net-libs/xrootd/xrootd-5.0.2.ebuild index b96f560be940..b96f560be940 100644 --- a/net-libs/xrootd/xrootd-5.0.0.ebuild +++ b/net-libs/xrootd/xrootd-5.0.2.ebuild |