Merge remote-tracking branch 'origin/f32' into f31

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0003-src-common-bitstr.h.patch

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
++++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
+=======
 --- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
 +++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
+>>>>>>> origin/f32
 @@ -17,6 +17,7 @@
  #include <cstdint>
  #include <iosfwd>
@@ -8,3 +13,14 @@
  
  namespace ceph {
    class Formatter;
+--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
++++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
+@@ -16,6 +16,8 @@
+ #define CEPH_GLOBAL_SIGNAL_HANDLER_H
+
+ #include <signal.h>
++#include <string>
++
+ #include "acconfig.h"
+
+ typedef void (*signal_handler_t)(int);

ceph.spec

@@ -111,8 +111,8 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	14.2.21
-Release:	1%{?dist}
+Version:	14.2.13
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -144,6 +144,7 @@ Requires:       ceph-mds = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mon = %{_epoch_prefix}%{version}-%{release}
 Requires(post):	binutils
+
 %if 0%{with cephfs_java}
 BuildRequires:	java-devel
 BuildRequires:	sharutils
@@ -160,8 +161,6 @@ BuildRequires:  cmake > 3.5
 %endif
 BuildRequires:	cryptsetup
 BuildRequires:	fuse-devel
-BuildRequires:	rocksdb-devel
-BuildRequires:	npm
 %if 0%{?rhel} == 7
 # devtoolset offers newer make and valgrind-devel, but the old ones are good
 # enough.
@@ -169,6 +168,10 @@ BuildRequires:	devtoolset-8-gcc-c++ >= 8.2.1
 %else
 BuildRequires:	gcc-c++
 %endif
+%ifarch s390 s390x
+# unlike with gcc-10, installing gcc-9 does not include gcc/libatomic
+BuildRequires:	libatomic
+%endif
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
 %if 0%{?fedora} || 0%{?rhel}
@@ -302,24 +305,14 @@ BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
 BuildRequires:  python%{_python_buildid}-pyOpenSSL
 %endif
-BuildRequires:	libtool-ltdl-devel
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-jwt
 BuildRequires:	python%{_python_buildid}-routes
 BuildRequires:	python%{_python_buildid}-scipy
 BuildRequires:	python%{_python_buildid}-werkzeug
 BuildRequires:  xmlsec1
-BuildRequires:	xmlsec1-devel
-BuildRequires:	xmlsec1-nss
-BuildRequires:	xmlsec1-openssl
-BuildRequires:	xmlsec1-openssl-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:	libxmlsec1-1
-BuildRequires:	libxmlsec1-nss1
-BuildRequires:	libxmlsec1-openssl1
-BuildRequires:	xmlsec1-devel
-BuildRequires:	xmlsec1-openssl-devel
 BuildRequires:	python%{_python_buildid}-CherryPy
 BuildRequires:	python%{_python_buildid}-PyJWT
 BuildRequires:	python%{_python_buildid}-Routes
@@ -330,6 +323,7 @@ BuildRequires:	python%{_python_buildid}-pecan
 BuildRequires:	python%{_python_buildid}-pyOpenSSL
 BuildRequires:	python%{_python_buildid}-tox
 BuildRequires:	rpm-build
+BuildRequires:  xmlsec1-devel
 %endif
 %endif
 # lttng and babeltrace for rbd-replay-prep
@@ -485,7 +479,6 @@ Requires:       python%{_python_buildid}-werkzeug
 %if 0%{?suse_version}
 Requires:       python%{_python_buildid}-CherryPy
 Requires:       python%{_python_buildid}-Werkzeug
-
 %endif
 %if 0%{?weak_deps}
 Recommends:	ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
@@ -530,7 +523,6 @@ Requires:       python%{_python_buildid}-CherryPy
 Requires:       python%{_python_buildid}-PyJWT
 Requires:       python%{_python_buildid}-Routes
 Requires:       python%{_python_buildid}-Werkzeug
-Recommends:	python%{_python_buildid}-python3-saml
 %endif
 %if 0%{?rhel} == 7
 Requires:       pyOpenSSL
@@ -1251,8 +1243,6 @@ cd build
 %if 0%{with ocf}
     -DWITH_OCF=ON \
 %endif
-    -DWITH_SYSTEM_NPM=ON \
-    -DWITH_SYSTEM_ROCKSDB=ON \
 %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64
     -DWITH_BOOST_CONTEXT=ON \
 %else
@@ -1290,8 +1280,8 @@ make "$CEPH_MFLAGS_JOBS"
 %if 0%{with make_check}
 %check
 # run in-tree unittests
-# cd build
-# ctest "$CEPH_MFLAGS_JOBS"
+cd build
+ctest "$CEPH_MFLAGS_JOBS"
 %endif
 
 
@@ -1326,7 +1316,7 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
 
 # sudoers.d
-install -m 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
+install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 
 %if 0%{?rhel} >= 8
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@@ -2341,33 +2331,6 @@ exit 0
 %endif
 
 %changelog
-* Thu May 13 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.21-1
-- ceph 14.2.21 GA
-
-* Tue Apr 20 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.20-1
-- ceph 14.2.20 GA
-
-* Tue Mar 30 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.19-1
-- ceph 14.2.19 GA
-
-* Mon Mar 15 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.18-1
-- ceph 14.2.18 GA
-
-* Thu Mar 11 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.17-1
-- ceph 14.2.17 GA
-
-* Tue Feb 2 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.16-2
-- ceph 14.2.16 w/ system rocksdb, w/ npm
-
-* Wed Dec 23 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.16-1
-- ceph 14.2.16 GA
-
-* Tue Nov 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.15-1
-- ceph 14.2.15 GA
-
-* Thu Nov 19 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.14-1
-- ceph 14.2.14 GA
-
 * Fri Nov 6 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.13-2
 - ceph 14.2.13 python-enum34
 
@@ -2400,12 +2363,9 @@ exit 0
 * Sat Feb 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-1
 - ceph 14.2.7 GA
 
-* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
+* Thu Jan 30 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
 - ceph 14.2.6, https://tracker.ceph.com/issues/43649
 
-* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
-- ceph 14.2.6, (temporarily) disable unit tests
-
 * Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
 - ceph 14.2.6, gcc-10, missing includes
 

sources

@@ -1 +1 @@
-SHA512 (ceph-14.2.21.tar.gz) = 39b4a0624dcab2bafa50f51a42155fcf96dad74531a001d75009ad246a8ca80ce81ae538b34c0a1b773691c363626f1d0342f2439b711bd0dd16214592171884
+SHA512 (ceph-14.2.13.tar.gz) = 3d51b729ccf26aa9a40c1320f4051755ec405abc714ae5257ec5433a13549e34fed0945f3091525fd8118d00c36fe4ae793125728d9e17f4221cdd1ee7de5b12