From d73f4ea8b127039511598a4ef4b4d7f69046ee92 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 29 Oct 2018 07:57:06 -0400
Subject: [PATCH] Fedora 30 python3. Note ceph-mgr subpackage,
 ceph-detect-init, ceph-disk,   ceph-volume, and ceph-volume-systemd are
 missing in this build

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 0001-blobstore.patch | 44 ++++++++++++++++++++++++++++++++++++++++++--
 ceph.spec            | 12 +++++++++---
 sources              |  2 +-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/0001-blobstore.patch b/0001-blobstore.patch
index 97462f0..eb32e19 100644
--- a/0001-blobstore.patch
+++ b/0001-blobstore.patch
@@ -1,5 +1,14 @@
---- ceph-13.1.0/src/spdk/lib/blob/blobstore.c.orig	2018-05-08 16:04:30.329933925 -0400
-+++ ceph-13.1.0/src/spdk/lib/blob/blobstore.c	2018-05-08 16:04:55.240933925 -0400
+--- ceph-13.2.1/src/spdk/lib/blob/blobstore.c.orig	2018-07-30 08:31:05.138254900 -0400
++++ ceph-13.2.1/src/spdk/lib/blob/blobstore.c	2018-07-30 08:32:05.314254900 -0400
+@@ -393,7 +393,7 @@
+ 	 * happen for example if a bogus blobid is passed in through open.
+ 	 */
+ 	if (blob->id != pages[0].id) {
+-		SPDK_ERRLOG("Blobid (%lu) doesn't match what's in metadata (%lu)\n",
++		SPDK_ERRLOG("Blobid (%llu) doesn't match what's in metadata (%llu)\n",
+ 			    blob->id, pages[0].id);
+ 		return -ENOENT;
+ 	}
 @@ -2947,7 +2947,7 @@
  
  /* START spdk_blob_resize */
@@ -9,3 +18,34 @@
  {
  	struct spdk_blob_data	*blob = __blob_to_data(_blob);
  	int			rc;
+--- ceph-13.2.1/src/spdk/lib/lvol/lvol.c.orig	2018-07-30 09:08:38.137254900 -0400
++++ ceph-13.2.1/src/spdk/lib/lvol/lvol.c	2018-07-30 09:10:09.642254900 -0400
+@@ -970,7 +970,7 @@
+ 	num_clusters = divide_round_up(sz, spdk_bs_get_cluster_size(bs));
+ 	free_clusters = spdk_bs_free_cluster_count(bs);
+ 	if (num_clusters > free_clusters) {
+-		SPDK_ERRLOG("Not enough free clusters left (%zu) on lvol store to add lvol %zu clusters\n",
++		SPDK_ERRLOG("Not enough free clusters left (%llu) on lvol store to add lvol %llu clusters\n",
+ 			    free_clusters, num_clusters);
+ 		return -ENOMEM;
+ 	}
+@@ -1026,7 +1026,7 @@
+ 	if (new_clusters > used_clusters) {
+ 		/* Check if there is enough clusters left to resize */
+ 		if (new_clusters - used_clusters > free_clusters) {
+-			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %zu clusters\n", sz);
++			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %llu clusters\n", sz);
+ 			return -ENOMEM;
+ 		}
+ 	}
+--- ceph-13.2.1/src/spdk/lib/event/reactor.c.orig	2018-07-30 09:44:01.514254900 -0400
++++ ceph-13.2.1/src/spdk/lib/event/reactor.c	2018-07-30 09:45:02.291254900 -0400
+@@ -651,7 +651,7 @@
+ 	char mempool_name[32];
+ 
+ 	socket_mask = spdk_reactor_get_socket_mask();
+-	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%lx\n", socket_mask);
++	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%" PRIx64 "\n", socket_mask);
+ 
+ 	for (i = 0; i < SPDK_MAX_SOCKET; i++) {
+ 		if ((1ULL << i) & socket_mask) {
diff --git a/ceph.spec b/ceph.spec
index 59c8f25..4f7c197 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -63,7 +63,7 @@
 
 %if %{with selinux}
 # get selinux policy version
-%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
+%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0}
 %endif
 
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
@@ -91,8 +91,8 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.2.8
-Release:	2%{?dist}
+Version:	12.2.9
+Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
 %endif
@@ -162,8 +162,13 @@ BuildRequires:	fuse-devel
 BuildRequires:	gcc-c++
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: gperftools-devel >= 2.6.1
+%endif
+%if 0%{?suse_version}
 BuildRequires:	gperftools-devel >= 2.4
 %endif
+%endif
 BuildRequires:  jq
 BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
@@ -290,6 +295,7 @@ Requires:      python%{_pythonver}-requests
 Requires:      python%{_pythonver}-setuptools
 Requires:      grep
 Requires:      xfsprogs
+Requires:      e2fsprogs
 Requires:      logrotate
 Requires:      util-linux
 Requires:      cryptsetup
diff --git a/sources b/sources
index e781e91..dfda964 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.2.8.tar.gz) = 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
+SHA512 (ceph-12.2.9.tar.gz) = 93da6f9012fdb65e74dc1917f54839cb19a25672d53e7ee253553e93abb1a2afb51cd18b27bc82559108e2085e463a3b46003b03627e06a6e2e2312b54d86e92