From 8c9da308d9c8ee174b4627b75bbfc30bc91c6f65 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Fri, 8 Nov 2019 15:25:23 -0800 Subject: sys-cluster/ceph: revbump to 14.2.4-r1, misc fixes Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Patrick McLean --- sys-cluster/ceph/ceph-14.2.4-r1.ebuild | 360 +++++++++++++++++++++ sys-cluster/ceph/ceph-14.2.4.ebuild | 356 -------------------- .../ceph/files/ceph-14.2.4-python-executable.patch | 29 ++ .../files/ceph-14.2.4-undefined-behaviour.patch | 76 +++++ 4 files changed, 465 insertions(+), 356 deletions(-) create mode 100644 sys-cluster/ceph/ceph-14.2.4-r1.ebuild delete mode 100644 sys-cluster/ceph/ceph-14.2.4.ebuild create mode 100644 sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch create mode 100644 sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch (limited to 'sys-cluster') diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild new file mode 100644 index 000000000000..02af6882fd58 --- /dev/null +++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +DISTUTILS_OPTIONAL=1 + +inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ + multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ + systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ceph/ceph.git" + SRC_URI="" +else + SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/" + +LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" +SLOT="0" + +CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) + +IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" +IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" +IUSE+=" systemd +tcmalloc test xfs zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +COMMON_DEPEND=" + virtual/libudev:= + app-arch/bzip2:=[static-libs?] + app-arch/lz4:=[static-libs?] + app-arch/snappy:=[static-libs?] + app-arch/zstd:=[static-libs?] + app-misc/jq:=[static-libs?] + dev-libs/crypto++:=[static-libs?] + dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] + dev-libs/libaio:=[static-libs?] + dev-libs/libxml2:=[static-libs?] + dev-libs/nss:= + sys-auth/oath-toolkit:= + sys-apps/keyutils:=[static-libs?] + sys-apps/util-linux:=[static-libs?] + sys-libs/ncurses:0=[static-libs?] + sys-libs/zlib:=[static-libs?] + babeltrace? ( dev-util/babeltrace ) + ldap? ( net-nds/openldap:=[static-libs?] ) + lttng? ( dev-util/lttng-ust:= ) + fuse? ( sys-fs/fuse:0=[static-libs?] ) + kerberos? ( virtual/krb5 ) + rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) + ssl? ( + !libressl? ( dev-libs/openssl:=[static-libs?] ) + libressl? ( dev-libs/libressl:=[static-libs?] ) + ) + xfs? ( sys-fs/xfsprogs:=[static-libs?] ) + zfs? ( sys-fs/zfs:=[static-libs?] ) + radosgw? ( + dev-libs/expat:=[static-libs?] + !libressl? ( + dev-libs/openssl:=[static-libs?] + net-misc/curl:=[curl_ssl_openssl,static-libs?] + ) + libressl? ( + dev-libs/libressl:=[static-libs?] + net-misc/curl:=[curl_ssl_libressl,static-libs?] + ) + ) + system-boost? ( + || ( + ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) + !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) + ${PYTHON_DEPS} + " +DEPEND="${COMMON_DEPEND} + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + dev-python/cython[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/cunit + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + ) + " +BDEPEND=" app-arch/cpio + >=dev-util/cmake-3.5.0 + dev-util/gperf + dev-util/valgrind + sys-apps/which + sys-devel/bc + virtual/pkgconfig + " +RDEPEND="${COMMON_DEPEND} + net-misc/socat + sys-apps/gptfdisk + sys-block/parted + sys-fs/cryptsetup + sys-fs/lvm2[-device-mapper-only(-)] + !=dev-libs/boost-1.70.0' || \ + eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" + fi + + sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + src/bash_completion/CMakeLists.txt || die + + # remove tests that need root access + rm src/test/cli/ceph-authtool/cap*.t || die +} + +ceph_src_configure() { + local flag + local mycmakeargs=( + -DWITH_BABELTRACE=$(usex babeltrace) + -DWITH_CEPHFS=$(usex cephfs) + -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) + -DWITH_DPDK=$(usex dpdk) + -DWITH_FUSE=$(usex fuse) + -DWITH_LTTNG=$(usex lttng) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_GRAFANA=$(usex grafana) + -DWITH_MGR=$(usex mgr) + -DWITH_MGR_DASHBOARD_FRONTEND=NO + -DWITH_NUMA=$(usex numa) + -DWITH_OPENLDAP=$(usex ldap) + -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) + -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) + -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) + -DWITH_RADOSGW=$(usex radosgw) + -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) + -DWITH_SSL=$(usex ssl) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TESTS=$(usex test) + -DWITH_XFS=$(usex xfs) + -DWITH_ZFS=$(usex zfs) + -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_BOOST=$(usex system-boost) + -DBOOST_J=$(makeopts_jobs) + -DWITH_RDMA=no + -DWITH_TBB=no + -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) + -DEPYTHON_VERSION="${EPYTHON#python}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + #-Wno-dev + ) + if use amd64 || use x86; then + for flag in ${CPU_FLAGS_X86[@]}; do + mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") + done + fi + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + cmake-utils_src_configure + + # bug #630232 + sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ + || die "sed failed" +} + +src_configure() { + ceph_src_configure +} + +python_compile() { + local CMAKE_USE_DIR="${S}" + ceph_src_configure + + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + emake VERBOSE=1 clean + emake VERBOSE=1 all + + # python modules are only compiled with "make install" so we need to do this to + # prevent doing a bunch of compilation in src_install + DESTDIR="${T}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_compile() { + cmake-utils_src_make VERBOSE=1 all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_compile +} + +src_test() { + make check || die "make check failed" +} + +python_install() { + local CMAKE_USE_DIR="${S}" + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + DESTDIR="${ED}" emake VERBOSE=1 install + popd >/dev/null || die + + python_optimize +} + +src_install() { + cmake-utils_src_install + python_foreach_impl python_install + + find "${ED}" -name '*.la' -type f -delete || die + + exeinto /usr/$(get_libdir)/ceph + newexe "${BUILD_DIR}/bin/init-ceph" init-ceph + + insinto /etc/logrotate.d/ + 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-r12" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ + "ceph-mds@.service" + + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ + "ceph-osd@.service" + fi + + udev_dorules udev/*.rules + + readme.gentoo_create_doc + + python_setup 'python3*' + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # 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/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + + local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${ED}}" +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-cluster/ceph/ceph-14.2.4.ebuild b/sys-cluster/ceph/ceph-14.2.4.ebuild deleted file mode 100644 index 82af9e6a844e..000000000000 --- a/sys-cluster/ceph/ceph-14.2.4.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ - systemd - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git" - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" -IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" -IUSE+=" systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/ncurses:0=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - kerberos? ( virtual/krb5 ) - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - || ( - ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) - " -BDEPEND=" app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - " -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - !=dev-libs/boost-1.70.0' || \ - eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" - fi - - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) - -DWITH_DPDK=$(usex dpdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_GRAFANA=$(usex grafana) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DWITH_TBB=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - #-Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ - || die "failed to remove cmake cache" - - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - emake VERBOSE=1 clean - emake VERBOSE=1 all - - # python modules are only compiled with "make install" so we need to do this to - # prevent doing a bunch of compilation in src_install - DESTDIR="${T}" emake VERBOSE=1 install - popd >/dev/null || die -} - -src_compile() { - cmake-utils_src_make VERBOSE=1 all - - # we have to do this here to prevent from building everything multiple times - python_copy_sources - python_foreach_impl python_compile -} - -src_test() { - make check || die "make check failed" -} - -python_install() { - local CMAKE_USE_DIR="${S}" - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${ED}" emake VERBOSE=1 install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - find "${ED}" -name '*.la' -type f -delete || die - - exeinto /usr/$(get_libdir)/ceph - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph - - insinto /etc/logrotate.d/ - 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-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - insinto /etc/sysctl.d - newins "${FILESDIR}"/sysctld 90-${PN}.conf - - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc - - # units aren't installed by the build system unless systemd is enabled - # so no point installing these with the USE flag disabled - if use systemd; then - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ - "ceph-mds@.service" - - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ - "ceph-osd@.service" - fi - - udev_dorules udev/*.rules - - readme.gentoo_create_doc - - python_setup 'python3*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # 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/{mount.*,ceph-volume{,-systemd}} || die "sed failed" - - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${ED}}" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch b/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch new file mode 100644 index 000000000000..40feaf11ad39 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch @@ -0,0 +1,29 @@ +diff --git a/src/ceph-crash.in b/src/ceph-crash.in +index 5bfb50c474..d53c4eeb6a 100755 +--- a/src/ceph-crash.in ++++ b/src/ceph-crash.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!@PYTHON3_EXECUTABLE@ + # -*- mode:python -*- + # vim: ts=4 sw=4 smarttab expandtab + +diff --git a/src/ceph.in b/src/ceph.in +index f060023f57..3a84263ccc 100755 +--- a/src/ceph.in ++++ b/src/ceph.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!@PYTHON3_EXECUTABLE@ + # -*- mode:python -*- + # vim: ts=4 sw=4 smarttab expandtab + # +@@ -66,7 +66,7 @@ DEVMODEMSG = '*** DEVELOPER MODE: setting PATH, PYTHONPATH and LD_LIBRARY_PATH * + def respawn_in_path(lib_path, pybind_path, pythonlib_path, asan_lib_path): + execv_cmd = [] + if 'CEPH_DBG' in os.environ: +- execv_cmd += ['@PYTHON_EXECUTABLE@', '-mpdb'] ++ execv_cmd += ['@PYTHON3_EXECUTABLE@', '-mpdb'] + + if platform.system() == "Darwin": + lib_path_var = "DYLD_LIBRARY_PATH" diff --git a/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch b/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch new file mode 100644 index 000000000000..99249fb01a0c --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch @@ -0,0 +1,76 @@ +diff --git a/src/include/blobhash.h b/src/include/blobhash.h +index 597884e4c9..97f2065ce3 100644 +--- a/src/include/blobhash.h ++++ b/src/include/blobhash.h +@@ -14,33 +14,40 @@ + #ifndef CEPH_BLOBHASH_H + #define CEPH_BLOBHASH_H + ++#include + #include "hash.h" + +-/* +-- this is to make some of the STL types work with 64 bit values, string hash keys, etc. +-- added when i was using an old STL.. maybe try taking these out and see if things +- compile now? +-*/ +- + class blobhash { + public: +- uint32_t operator()(const char *p, unsigned len) { +- static rjhash H; +- uint32_t acc = 0; ++ uint32_t operator()(const void* p, size_t len) { ++ static rjhash H; ++ std::uint32_t acc = 0; ++ auto buf = static_cast(p); + while (len >= sizeof(acc)) { +- acc ^= *(uint32_t*)p; +- p += sizeof(uint32_t); +- len -= sizeof(uint32_t); ++ acc ^= unaligned_load(buf); ++ buf += sizeof(std::uint32_t); ++ len -= sizeof(std::uint32_t); + } +- int sh = 0; +- while (len) { +- acc ^= (uint32_t)*p << sh; +- sh += 8; +- len--; +- p++; ++ // handle the last few bytes of p[-(len % 4):] ++ switch (len) { ++ case 3: ++ acc ^= buf[2] << 16; ++ [[fallthrough]]; ++ case 2: ++ acc ^= buf[1] << 8; ++ [[fallthrough]]; ++ case 1: ++ acc ^= buf[0]; ++ [[fallthrough]]; + } + return H(acc); + } ++private: ++ static inline std::uint32_t unaligned_load(const unsigned char* p) { ++ std::uint32_t result; ++ __builtin_memcpy(&result, p, sizeof(result)); ++ return result; ++ } + }; + + +diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h +index b6952ca498..576b7d6b8a 100644 +--- a/src/msg/msg_types.h ++++ b/src/msg/msg_types.h +@@ -566,7 +566,7 @@ namespace std { + size_t operator()( const entity_addr_t& x ) const + { + static blobhash H; +- return H((const char*)&x, sizeof(x)); ++ return H(&x, sizeof(x)); + } + }; + } // namespace std -- cgit v1.2.3-65-gdbad