commit: 814e564fa65b5855b0b55f704670b9593575d2b8
Author: Dennis Gaebler <dennis.gaebler <AT> uni-ulm <DOT> de>
AuthorDate: Mon Jul 8 17:54:48 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 18:03:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=814e564f
sys-cluster/ceph: Drop old version and add new one from the main tree
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-cluster/ceph/Manifest | 3 +-
...eph-12.2.10-r100.ebuild => ceph-12.2.11.ebuild} | 25 +++++-----
...-12.2.10-r100.ebuild => ceph-12.2.12-r2.ebuild} | 54 +++++++++++++---------
.../ceph/files/ceph-12.2.11-fix-min-call.patch | 13 ++++++
.../ceph-12.2.12-civetweb-openssl-1.1.1.patch | 10 ++++
.../ceph-12.2.12-dont-use-bad-namespace.patch | 13 ++++++
.../ceph/files/ceph-12.2.12-ncurses-tinfo.patch | 20 ++++++++
.../ceph/files/ceph-12.2.12-qa-warning.patch | 13 ++++++
8 files changed, 114 insertions(+), 37 deletions(-)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f4035b8..7ab4d89 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1 +1,2 @@
-DIST ceph-12.2.10.tar.gz 78884870 BLAKE2B
321d8256fc6659be3da2ce348e022e79ded63783925c02d3140ffa7fed5528a2b03388f0dfcdf536c81eec7b2484c6db9def8aefb1d5d335c86bad525977977b
SHA512
2195a04bf937dba6af61389132240661126ef32e9fd86ca75af27a33c712053b15aa89b52c91ced04f06dc880d7c018afa3f26fff78bf313603f4fb73331b80c
+DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B
d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35
SHA512
14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
+DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B
a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461
SHA512
e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
diff --git a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild
b/sys-cluster/ceph/ceph-12.2.11.ebuild
similarity index 93%
copy from sys-cluster/ceph/ceph-12.2.10-r100.ebuild
copy to sys-cluster/ceph/ceph-12.2.11.ebuild
index d58bcca..dbd539a 100644
--- a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
DISTUTILS_OPTIONAL=1
inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -26,9 +25,8 @@ SLOT="0"
CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng"
-IUSE+=" +mgr nss +radosgw +ssl static-libs +system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
+IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw
+ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
# unbundling code commented out pending bugs 584056 and 584058
@@ -53,12 +51,12 @@ COMMON_DEPEND="
lttng? ( dev-util/lttng-ust:= )
nss? ( dev-libs/nss:= )
fuse? ( sys-fs/fuse:0=[static-libs?] )
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+ zfs? ( sys-fs/zfs:=[static-libs?] )
ssl? (
- !libressl? ( <dev-libs/openssl-1.1:=[static-libs?] )
+ !libressl? ( <dev-libs/openssl-1.1:0=[static-libs?] )
libressl? ( <dev-libs/libressl-2.8 )
)
- xfs? ( sys-fs/xfsprogs:=[static-libs?] )
- zfs? ( sys-fs/zfs:=[static-libs?] )
radosgw? (
dev-libs/expat:=[static-libs?]
!libressl? (
@@ -69,7 +67,7 @@ COMMON_DEPEND="
<dev-libs/libressl-2.8:=[static-libs?]
net-misc/curl:=[curl_ssl_libressl,static-libs?]
)
-
+ net-misc/curl:=[curl_ssl_openssl,static-libs?]
)
system-boost? (
=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
@@ -143,6 +141,7 @@ PATCHES=(
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
"${FILESDIR}/ceph-12.2.5-no-werror.patch"
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+ "${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
)
check-reqs_export_vars() {
@@ -178,7 +177,7 @@ src_prepare() {
cmake-utils_src_prepare
if use system-boost; then
- eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+ eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
fi
# remove tests that need root access
@@ -272,14 +271,14 @@ src_install() {
newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate-r1 ${PN}
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
insinto /etc/sysctl.d
diff --git a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild
b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
similarity index 84%
rename from sys-cluster/ceph/ceph-12.2.10-r100.ebuild
rename to sys-cluster/ceph/ceph-12.2.12-r2.ebuild
index d58bcca..79f077e 100644
--- a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
DISTUTILS_OPTIONAL=1
inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz";
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Ceph distributed filesystem"
@@ -26,9 +25,8 @@ SLOT="0"
CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng"
-IUSE+=" +mgr nss +radosgw +ssl static-libs +system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
+IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw
+ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
# unbundling code commented out pending bugs 584056 and 584058
@@ -53,12 +51,12 @@ COMMON_DEPEND="
lttng? ( dev-util/lttng-ust:= )
nss? ( dev-libs/nss:= )
fuse? ( sys-fs/fuse:0=[static-libs?] )
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+ zfs? ( sys-fs/zfs:=[static-libs?] )
ssl? (
- !libressl? ( <dev-libs/openssl-1.1:=[static-libs?] )
+ !libressl? ( dev-libs/openssl:0=[static-libs?] )
libressl? ( <dev-libs/libressl-2.8 )
)
- xfs? ( sys-fs/xfsprogs:=[static-libs?] )
- zfs? ( sys-fs/zfs:=[static-libs?] )
radosgw? (
dev-libs/expat:=[static-libs?]
!libressl? (
@@ -69,7 +67,7 @@ COMMON_DEPEND="
<dev-libs/libressl-2.8:=[static-libs?]
net-misc/curl:=[curl_ssl_libressl,static-libs?]
)
-
+ net-misc/curl:=[curl_ssl_openssl,static-libs?]
)
system-boost? (
=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
@@ -90,7 +88,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bc
virtual/pkgconfig
test? (
- dev-python/tox[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
sys-apps/grep[pcre]
sys-fs/btrfs-progs
@@ -127,7 +124,8 @@ RESTRICT+=" test"
# false positives unless all USE flags are on
CMAKE_WARN_UNUSED_CLI="no"
-STRIP_MASK="/usr/lib*/rados-classes/*"
+# ninja does not work at all
+CMAKE_MAKEFILE_GENERATOR="emake"
UNBUNDLE_LIBS=(
src/erasure-code/jerasure/jerasure
@@ -143,6 +141,11 @@ PATCHES=(
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
"${FILESDIR}/ceph-12.2.5-no-werror.patch"
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+ "${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
+ "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch"
+ "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch"
+ "${FILESDIR}/ceph-12.2.12-qa-warning.patch"
+ "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
)
check-reqs_export_vars() {
@@ -178,7 +181,7 @@ src_prepare() {
cmake-utils_src_prepare
if use system-boost; then
- eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+ eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
fi
# remove tests that need root access
@@ -190,6 +193,8 @@ src_prepare() {
ceph_src_configure() {
local flag
local mycmakeargs=(
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-DWITH_BABELTRACE=$(usex babeltrace)
-DWITH_CEPHFS=$(usex cephfs)
-DWITH_FUSE=$(usex fuse)
@@ -204,7 +209,7 @@ ceph_src_configure() {
-DWITH_XFS=$(usex xfs)
-DWITH_ZFS=$(usex zfs)
-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc
'jemalloc' '' 'libc' '')" '')
+ -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc
'jemalloc' 'libc')")
-DWITH_SYSTEM_BOOST=$(usex system-boost)
-DBOOST_J=$(makeopts_jobs)
-DWITH_RDMA=no
@@ -222,7 +227,7 @@ ceph_src_configure() {
# bug #630232
sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
- "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+ "${BUILD_DIR:--${S}}"/include/acconfig.h \
|| die "sed failed"
}
@@ -247,7 +252,7 @@ src_compile() {
cmake-utils_src_make all
# we have to do this here to prevent from building everything multiple
times
- BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+ python_copy_sources
python_foreach_impl python_compile
}
@@ -258,7 +263,7 @@ src_test() {
python_install() {
local CMAKE_USE_DIR="${S}"
pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
- DESTDIR="${D}" emake install
+ DESTDIR="${ED}" emake install
popd >/dev/null || die
}
@@ -266,20 +271,20 @@ src_install() {
cmake-utils_src_install
python_foreach_impl python_install
- prune_libtool_files --all
+ find "${D}" -name '*.la' -delete || die
exeinto /usr/$(get_libdir)/ceph
- newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+ newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate-r1 ${PN}
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
insinto /etc/sysctl.d
@@ -312,6 +317,9 @@ src_install() {
# python_fix_shebang apparently is not idempotent
sed -i -r
's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed
failed"
+
+ local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
+ dostrip -x "${rados_classes[@]#${D}}"
}
pkg_postinst() {
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
new file mode 100644
index 0000000..cd9eb48
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
@@ -0,0 +1,13 @@
+diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
+index 0074c7964b..98991be7d2 100644
+--- a/src/osd/PrimaryLogPG.cc
++++ b/src/osd/PrimaryLogPG.cc
+@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to()
+ if (limit != eversion_t() &&
+ limit != pg_trim_to &&
+ pg_log.get_log().approx_size() > target) {
+- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
++ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() -
target),
+ cct->_conf->osd_pg_log_trim_max);
+ if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
+ cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
new file mode 100644
index 0000000..a21bcc9
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
@@ -0,0 +1,10 @@
+--- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700
++++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700
+@@ -851,6 +851,7 @@
+ #include <openssl/crypto.h>
+ #include <openssl/x509.h>
+ #include <openssl/pem.h>
++#include <openssl/engine.h>
+ #else
+ /* SSL loaded dynamically from DLL.
+ * I put the prototypes here to be independent from OpenSSL source
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
new file mode 100644
index 0000000..9a23e1e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
@@ -0,0 +1,13 @@
+diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
+index cf4e38995e..7a4089fca9 100644
+--- a/src/rgw/rgw_crypt.cc
++++ b/src/rgw/rgw_crypt.cc
+@@ -31,7 +31,7 @@ using namespace CryptoPP;
+ #define dout_subsys ceph_subsys_rgw
+
+ using namespace rgw;
+-using ceph::crypto::PK11_ImportSymKey_FIPS;
++//using ceph::crypto::PK11_ImportSymKey_FIPS;
+
+ /**
+ * Encryption in CTR mode. offset is used as IV for each block.
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
new file mode 100644
index 0000000..1b72e54
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
@@ -0,0 +1,20 @@
+diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
+index 7aa42e9efd..66186b159f 100644
+--- a/src/tools/rbd/CMakeLists.txt
++++ b/src/tools/rbd/CMakeLists.txt
+@@ -1,3 +1,6 @@
++set(CURSES_NEED_NCURSES TRUE)
++find_package(Curses REQUIRED)
++
+ set(rbd_srcs
+ rbd.cc
+ ArgumentTypes.cc
+@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados
+ cls_journal_client cls_rbd_client
+ rbd_types
+ journal
+- ceph-common global
++ ceph-common global ${CURSES_LIBRARIES}
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+ if(WITH_KRBD)
+ target_link_libraries(rbd
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
new file mode 100644
index 0000000..1b63d6e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
+index d95a397a84..d2cbf4b7b9 100644
+--- a/src/common/blkdev.cc
++++ b/src/common/blkdev.cc
+@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label,
char* partition,
+ rc = get_block_device_base(partition, basename,
+ sizeof(basename));
+ if (rc >= 0) {
+- strncpy(device, basename, sizeof(basename));
++ strncpy(device, basename, sizeof(device));
+ rc = 0;
+ } else {
+ rc = -ENODEV;
