| 1 |
commit: 814e564fa65b5855b0b55f704670b9593575d2b8 |
| 2 |
Author: Dennis Gaebler <dennis.gaebler <AT> uni-ulm <DOT> de> |
| 3 |
AuthorDate: Mon Jul 8 17:54:48 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 8 18:03:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=814e564f |
| 7 |
|
| 8 |
sys-cluster/ceph: Drop old version and add new one from the main tree |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-cluster/ceph/Manifest | 3 +- |
| 13 |
...eph-12.2.10-r100.ebuild => ceph-12.2.11.ebuild} | 25 +++++----- |
| 14 |
...-12.2.10-r100.ebuild => ceph-12.2.12-r2.ebuild} | 54 +++++++++++++--------- |
| 15 |
.../ceph/files/ceph-12.2.11-fix-min-call.patch | 13 ++++++ |
| 16 |
.../ceph-12.2.12-civetweb-openssl-1.1.1.patch | 10 ++++ |
| 17 |
.../ceph-12.2.12-dont-use-bad-namespace.patch | 13 ++++++ |
| 18 |
.../ceph/files/ceph-12.2.12-ncurses-tinfo.patch | 20 ++++++++ |
| 19 |
.../ceph/files/ceph-12.2.12-qa-warning.patch | 13 ++++++ |
| 20 |
8 files changed, 114 insertions(+), 37 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
| 23 |
index f4035b8..7ab4d89 100644 |
| 24 |
--- a/sys-cluster/ceph/Manifest |
| 25 |
+++ b/sys-cluster/ceph/Manifest |
| 26 |
@@ -1 +1,2 @@ |
| 27 |
-DIST ceph-12.2.10.tar.gz 78884870 BLAKE2B 321d8256fc6659be3da2ce348e022e79ded63783925c02d3140ffa7fed5528a2b03388f0dfcdf536c81eec7b2484c6db9def8aefb1d5d335c86bad525977977b SHA512 2195a04bf937dba6af61389132240661126ef32e9fd86ca75af27a33c712053b15aa89b52c91ced04f06dc880d7c018afa3f26fff78bf313603f4fb73331b80c |
| 28 |
+DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef |
| 29 |
+DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc |
| 30 |
|
| 31 |
diff --git a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 32 |
similarity index 93% |
| 33 |
copy from sys-cluster/ceph/ceph-12.2.10-r100.ebuild |
| 34 |
copy to sys-cluster/ceph/ceph-12.2.11.ebuild |
| 35 |
index d58bcca..dbd539a 100644 |
| 36 |
--- a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild |
| 37 |
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 38 |
@@ -1,9 +1,8 @@ |
| 39 |
-# Copyright 1999-2018 Gentoo Authors |
| 40 |
-# Copyright 2017-2018 Sony Interactive Entertainment Inc. |
| 41 |
+# Copyright 1999-2019 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
EAPI=6 |
| 45 |
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
| 46 |
+PYTHON_COMPAT=( python{2_7,3_{5,6}} ) |
| 47 |
DISTUTILS_OPTIONAL=1 |
| 48 |
|
| 49 |
inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ |
| 50 |
@@ -26,9 +25,8 @@ SLOT="0" |
| 51 |
|
| 52 |
CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
| 53 |
|
| 54 |
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng" |
| 55 |
-IUSE+=" +mgr nss +radosgw +ssl static-libs +system-boost" |
| 56 |
-IUSE+=" systemd +tcmalloc test xfs zfs" |
| 57 |
+IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw +ssl" |
| 58 |
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" |
| 59 |
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
| 60 |
|
| 61 |
# unbundling code commented out pending bugs 584056 and 584058 |
| 62 |
@@ -53,12 +51,12 @@ COMMON_DEPEND=" |
| 63 |
lttng? ( dev-util/lttng-ust:= ) |
| 64 |
nss? ( dev-libs/nss:= ) |
| 65 |
fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 66 |
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 67 |
+ zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 68 |
ssl? ( |
| 69 |
- !libressl? ( <dev-libs/openssl-1.1:=[static-libs?] ) |
| 70 |
+ !libressl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) |
| 71 |
libressl? ( <dev-libs/libressl-2.8 ) |
| 72 |
) |
| 73 |
- xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 74 |
- zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 75 |
radosgw? ( |
| 76 |
dev-libs/expat:=[static-libs?] |
| 77 |
!libressl? ( |
| 78 |
@@ -69,7 +67,7 @@ COMMON_DEPEND=" |
| 79 |
<dev-libs/libressl-2.8:=[static-libs?] |
| 80 |
net-misc/curl:=[curl_ssl_libressl,static-libs?] |
| 81 |
) |
| 82 |
- |
| 83 |
+ net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 84 |
) |
| 85 |
system-boost? ( |
| 86 |
=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
| 87 |
@@ -143,6 +141,7 @@ PATCHES=( |
| 88 |
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" |
| 89 |
"${FILESDIR}/ceph-12.2.5-no-werror.patch" |
| 90 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 91 |
+ "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" |
| 92 |
) |
| 93 |
|
| 94 |
check-reqs_export_vars() { |
| 95 |
@@ -178,7 +177,7 @@ src_prepare() { |
| 96 |
cmake-utils_src_prepare |
| 97 |
|
| 98 |
if use system-boost; then |
| 99 |
- eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch" |
| 100 |
+ eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" |
| 101 |
fi |
| 102 |
|
| 103 |
# remove tests that need root access |
| 104 |
@@ -272,14 +271,14 @@ src_install() { |
| 105 |
newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh |
| 106 |
|
| 107 |
insinto /etc/logrotate.d/ |
| 108 |
- newins "${FILESDIR}"/ceph.logrotate-r1 ${PN} |
| 109 |
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
| 110 |
|
| 111 |
keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
| 112 |
|
| 113 |
fowners -R ceph:ceph /var/lib/ceph /var/log/ceph |
| 114 |
|
| 115 |
newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
| 116 |
- newinitd "${FILESDIR}/${PN}.initd-r10" ${PN} |
| 117 |
+ newinitd "${FILESDIR}/${PN}.initd-r11" ${PN} |
| 118 |
newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
| 119 |
|
| 120 |
insinto /etc/sysctl.d |
| 121 |
|
| 122 |
diff --git a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild |
| 123 |
similarity index 84% |
| 124 |
rename from sys-cluster/ceph/ceph-12.2.10-r100.ebuild |
| 125 |
rename to sys-cluster/ceph/ceph-12.2.12-r2.ebuild |
| 126 |
index d58bcca..79f077e 100644 |
| 127 |
--- a/sys-cluster/ceph/ceph-12.2.10-r100.ebuild |
| 128 |
+++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild |
| 129 |
@@ -1,9 +1,8 @@ |
| 130 |
-# Copyright 1999-2018 Gentoo Authors |
| 131 |
-# Copyright 2017-2018 Sony Interactive Entertainment Inc. |
| 132 |
+# Copyright 1999-2019 Gentoo Authors |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
|
| 135 |
-EAPI=6 |
| 136 |
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
| 137 |
+EAPI=7 |
| 138 |
+PYTHON_COMPAT=( python{2_7,3_{5,6}} ) |
| 139 |
DISTUTILS_OPTIONAL=1 |
| 140 |
|
| 141 |
inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ |
| 142 |
@@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then |
| 143 |
SRC_URI="" |
| 144 |
else |
| 145 |
SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
| 146 |
- KEYWORDS="~amd64 ~x86" |
| 147 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 148 |
fi |
| 149 |
|
| 150 |
DESCRIPTION="Ceph distributed filesystem" |
| 151 |
@@ -26,9 +25,8 @@ SLOT="0" |
| 152 |
|
| 153 |
CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
| 154 |
|
| 155 |
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng" |
| 156 |
-IUSE+=" +mgr nss +radosgw +ssl static-libs +system-boost" |
| 157 |
-IUSE+=" systemd +tcmalloc test xfs zfs" |
| 158 |
+IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw +ssl" |
| 159 |
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" |
| 160 |
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
| 161 |
|
| 162 |
# unbundling code commented out pending bugs 584056 and 584058 |
| 163 |
@@ -53,12 +51,12 @@ COMMON_DEPEND=" |
| 164 |
lttng? ( dev-util/lttng-ust:= ) |
| 165 |
nss? ( dev-libs/nss:= ) |
| 166 |
fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 167 |
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 168 |
+ zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 169 |
ssl? ( |
| 170 |
- !libressl? ( <dev-libs/openssl-1.1:=[static-libs?] ) |
| 171 |
+ !libressl? ( dev-libs/openssl:0=[static-libs?] ) |
| 172 |
libressl? ( <dev-libs/libressl-2.8 ) |
| 173 |
) |
| 174 |
- xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 175 |
- zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 176 |
radosgw? ( |
| 177 |
dev-libs/expat:=[static-libs?] |
| 178 |
!libressl? ( |
| 179 |
@@ -69,7 +67,7 @@ COMMON_DEPEND=" |
| 180 |
<dev-libs/libressl-2.8:=[static-libs?] |
| 181 |
net-misc/curl:=[curl_ssl_libressl,static-libs?] |
| 182 |
) |
| 183 |
- |
| 184 |
+ net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 185 |
) |
| 186 |
system-boost? ( |
| 187 |
=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
| 188 |
@@ -90,7 +88,6 @@ DEPEND="${COMMON_DEPEND} |
| 189 |
sys-devel/bc |
| 190 |
virtual/pkgconfig |
| 191 |
test? ( |
| 192 |
- dev-python/tox[${PYTHON_USEDEP}] |
| 193 |
dev-python/virtualenv[${PYTHON_USEDEP}] |
| 194 |
sys-apps/grep[pcre] |
| 195 |
sys-fs/btrfs-progs |
| 196 |
@@ -127,7 +124,8 @@ RESTRICT+=" test" |
| 197 |
# false positives unless all USE flags are on |
| 198 |
CMAKE_WARN_UNUSED_CLI="no" |
| 199 |
|
| 200 |
-STRIP_MASK="/usr/lib*/rados-classes/*" |
| 201 |
+# ninja does not work at all |
| 202 |
+CMAKE_MAKEFILE_GENERATOR="emake" |
| 203 |
|
| 204 |
UNBUNDLE_LIBS=( |
| 205 |
src/erasure-code/jerasure/jerasure |
| 206 |
@@ -143,6 +141,11 @@ PATCHES=( |
| 207 |
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" |
| 208 |
"${FILESDIR}/ceph-12.2.5-no-werror.patch" |
| 209 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 210 |
+ "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" |
| 211 |
+ "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch" |
| 212 |
+ "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch" |
| 213 |
+ "${FILESDIR}/ceph-12.2.12-qa-warning.patch" |
| 214 |
+ "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" |
| 215 |
) |
| 216 |
|
| 217 |
check-reqs_export_vars() { |
| 218 |
@@ -178,7 +181,7 @@ src_prepare() { |
| 219 |
cmake-utils_src_prepare |
| 220 |
|
| 221 |
if use system-boost; then |
| 222 |
- eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch" |
| 223 |
+ eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" |
| 224 |
fi |
| 225 |
|
| 226 |
# remove tests that need root access |
| 227 |
@@ -190,6 +193,8 @@ src_prepare() { |
| 228 |
ceph_src_configure() { |
| 229 |
local flag |
| 230 |
local mycmakeargs=( |
| 231 |
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
| 232 |
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
| 233 |
-DWITH_BABELTRACE=$(usex babeltrace) |
| 234 |
-DWITH_CEPHFS=$(usex cephfs) |
| 235 |
-DWITH_FUSE=$(usex fuse) |
| 236 |
@@ -204,7 +209,7 @@ ceph_src_configure() { |
| 237 |
-DWITH_XFS=$(usex xfs) |
| 238 |
-DWITH_ZFS=$(usex zfs) |
| 239 |
-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') |
| 240 |
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') |
| 241 |
+ -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
| 242 |
-DWITH_SYSTEM_BOOST=$(usex system-boost) |
| 243 |
-DBOOST_J=$(makeopts_jobs) |
| 244 |
-DWITH_RDMA=no |
| 245 |
@@ -222,7 +227,7 @@ ceph_src_configure() { |
| 246 |
|
| 247 |
# bug #630232 |
| 248 |
sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
| 249 |
- "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ |
| 250 |
+ "${BUILD_DIR:--${S}}"/include/acconfig.h \ |
| 251 |
|| die "sed failed" |
| 252 |
} |
| 253 |
|
| 254 |
@@ -247,7 +252,7 @@ src_compile() { |
| 255 |
cmake-utils_src_make all |
| 256 |
|
| 257 |
# we have to do this here to prevent from building everything multiple times |
| 258 |
- BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources |
| 259 |
+ python_copy_sources |
| 260 |
python_foreach_impl python_compile |
| 261 |
} |
| 262 |
|
| 263 |
@@ -258,7 +263,7 @@ src_test() { |
| 264 |
python_install() { |
| 265 |
local CMAKE_USE_DIR="${S}" |
| 266 |
pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
| 267 |
- DESTDIR="${D}" emake install |
| 268 |
+ DESTDIR="${ED}" emake install |
| 269 |
popd >/dev/null || die |
| 270 |
} |
| 271 |
|
| 272 |
@@ -266,20 +271,20 @@ src_install() { |
| 273 |
cmake-utils_src_install |
| 274 |
python_foreach_impl python_install |
| 275 |
|
| 276 |
- prune_libtool_files --all |
| 277 |
+ find "${D}" -name '*.la' -delete || die |
| 278 |
|
| 279 |
exeinto /usr/$(get_libdir)/ceph |
| 280 |
- newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh |
| 281 |
+ newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh |
| 282 |
|
| 283 |
insinto /etc/logrotate.d/ |
| 284 |
- newins "${FILESDIR}"/ceph.logrotate-r1 ${PN} |
| 285 |
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
| 286 |
|
| 287 |
keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
| 288 |
|
| 289 |
fowners -R ceph:ceph /var/lib/ceph /var/log/ceph |
| 290 |
|
| 291 |
newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
| 292 |
- newinitd "${FILESDIR}/${PN}.initd-r10" ${PN} |
| 293 |
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
| 294 |
newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
| 295 |
|
| 296 |
insinto /etc/sysctl.d |
| 297 |
@@ -312,6 +317,9 @@ src_install() { |
| 298 |
# python_fix_shebang apparently is not idempotent |
| 299 |
sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ |
| 300 |
"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" |
| 301 |
+ |
| 302 |
+ local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) |
| 303 |
+ dostrip -x "${rados_classes[@]#${D}}" |
| 304 |
} |
| 305 |
|
| 306 |
pkg_postinst() { |
| 307 |
|
| 308 |
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 |
| 309 |
new file mode 100644 |
| 310 |
index 0000000..cd9eb48 |
| 311 |
--- /dev/null |
| 312 |
+++ b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch |
| 313 |
@@ -0,0 +1,13 @@ |
| 314 |
+diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc |
| 315 |
+index 0074c7964b..98991be7d2 100644 |
| 316 |
+--- a/src/osd/PrimaryLogPG.cc |
| 317 |
++++ b/src/osd/PrimaryLogPG.cc |
| 318 |
+@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to() |
| 319 |
+ if (limit != eversion_t() && |
| 320 |
+ limit != pg_trim_to && |
| 321 |
+ pg_log.get_log().approx_size() > target) { |
| 322 |
+- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, |
| 323 |
++ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target), |
| 324 |
+ cct->_conf->osd_pg_log_trim_max); |
| 325 |
+ if (num_to_trim < cct->_conf->osd_pg_log_trim_min && |
| 326 |
+ cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { |
| 327 |
|
| 328 |
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 |
| 329 |
new file mode 100644 |
| 330 |
index 0000000..a21bcc9 |
| 331 |
--- /dev/null |
| 332 |
+++ b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch |
| 333 |
@@ -0,0 +1,10 @@ |
| 334 |
+--- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700 |
| 335 |
++++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700 |
| 336 |
+@@ -851,6 +851,7 @@ |
| 337 |
+ #include <openssl/crypto.h> |
| 338 |
+ #include <openssl/x509.h> |
| 339 |
+ #include <openssl/pem.h> |
| 340 |
++#include <openssl/engine.h> |
| 341 |
+ #else |
| 342 |
+ /* SSL loaded dynamically from DLL. |
| 343 |
+ * I put the prototypes here to be independent from OpenSSL source |
| 344 |
|
| 345 |
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 |
| 346 |
new file mode 100644 |
| 347 |
index 0000000..9a23e1e |
| 348 |
--- /dev/null |
| 349 |
+++ b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch |
| 350 |
@@ -0,0 +1,13 @@ |
| 351 |
+diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc |
| 352 |
+index cf4e38995e..7a4089fca9 100644 |
| 353 |
+--- a/src/rgw/rgw_crypt.cc |
| 354 |
++++ b/src/rgw/rgw_crypt.cc |
| 355 |
+@@ -31,7 +31,7 @@ using namespace CryptoPP; |
| 356 |
+ #define dout_subsys ceph_subsys_rgw |
| 357 |
+ |
| 358 |
+ using namespace rgw; |
| 359 |
+-using ceph::crypto::PK11_ImportSymKey_FIPS; |
| 360 |
++//using ceph::crypto::PK11_ImportSymKey_FIPS; |
| 361 |
+ |
| 362 |
+ /** |
| 363 |
+ * Encryption in CTR mode. offset is used as IV for each block. |
| 364 |
|
| 365 |
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 |
| 366 |
new file mode 100644 |
| 367 |
index 0000000..1b72e54 |
| 368 |
--- /dev/null |
| 369 |
+++ b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch |
| 370 |
@@ -0,0 +1,20 @@ |
| 371 |
+diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt |
| 372 |
+index 7aa42e9efd..66186b159f 100644 |
| 373 |
+--- a/src/tools/rbd/CMakeLists.txt |
| 374 |
++++ b/src/tools/rbd/CMakeLists.txt |
| 375 |
+@@ -1,3 +1,6 @@ |
| 376 |
++set(CURSES_NEED_NCURSES TRUE) |
| 377 |
++find_package(Curses REQUIRED) |
| 378 |
++ |
| 379 |
+ set(rbd_srcs |
| 380 |
+ rbd.cc |
| 381 |
+ ArgumentTypes.cc |
| 382 |
+@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados |
| 383 |
+ cls_journal_client cls_rbd_client |
| 384 |
+ rbd_types |
| 385 |
+ journal |
| 386 |
+- ceph-common global |
| 387 |
++ ceph-common global ${CURSES_LIBRARIES} |
| 388 |
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 389 |
+ if(WITH_KRBD) |
| 390 |
+ target_link_libraries(rbd |
| 391 |
|
| 392 |
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 |
| 393 |
new file mode 100644 |
| 394 |
index 0000000..1b63d6e |
| 395 |
--- /dev/null |
| 396 |
+++ b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch |
| 397 |
@@ -0,0 +1,13 @@ |
| 398 |
+diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc |
| 399 |
+index d95a397a84..d2cbf4b7b9 100644 |
| 400 |
+--- a/src/common/blkdev.cc |
| 401 |
++++ b/src/common/blkdev.cc |
| 402 |
+@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition, |
| 403 |
+ rc = get_block_device_base(partition, basename, |
| 404 |
+ sizeof(basename)); |
| 405 |
+ if (rc >= 0) { |
| 406 |
+- strncpy(device, basename, sizeof(basename)); |
| 407 |
++ strncpy(device, basename, sizeof(device)); |
| 408 |
+ rc = 0; |
| 409 |
+ } else { |
| 410 |
+ rc = -ENODEV; |
Archives