From c3d6a97af49b88341658f033f4e8e863a6b6fb20 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Mar 01 2022 17:22:23 +0000
Subject: ceph 17.1.0 RC1, revised patch


---

diff --git a/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch b/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch
index 9be5877..99510da 100644
--- a/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch
+++ b/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch
@@ -1,37 +1,20 @@
---- ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt.orig	2022-02-28 14:11:49.987077811 -0500
-+++ ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt	2022-02-28 14:12:19.576542037 -0500
-@@ -38,6 +38,7 @@
- 
- # add pthread library
- set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} pthread)
-+set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} global)
- 
- find_package(gtest QUIET)
- if(WITH_TESTS)
---- ceph-17.1.0/src/rgw/CMakeLists.txt.orig	2022-02-28 16:21:08.430487482 -0500
-+++ ceph-17.1.0/src/rgw/CMakeLists.txt	2022-02-28 16:25:01.893245213 -0500
-@@ -254,10 +254,6 @@
-   target_link_libraries(rgw_common PUBLIC ${jaeger_base})
+--- ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/CMakeLists.txt.orig	2022-02-12 08:17:16.038116513 -0500
++++ ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/CMakeLists.txt	2022-02-12 08:40:43.564440428 -0500
+@@ -47,7 +47,7 @@
  endif()
  
--if(WITH_RADOSGW_DBSTORE)
--  target_link_libraries(rgw_common PRIVATE global dbstore)
--endif()
--
- set(rgw_a_srcs
-   rgw_auth_keystone.cc
-   rgw_client_io.cc
-@@ -308,8 +304,13 @@
-   find_package(RDKafka 0.9.2 REQUIRED)
- endif()
+ include_directories(${CMAKE_INCLUDE_DIR})
+-add_library(dbstore ${dbstore_mgr_srcs})
++add_library(dbstore STATIC ${dbstore_mgr_srcs})
+ target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES})
+ 
+ # testing purpose
+--- ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/sqlite/CMakeLists.txt.orig	2022-02-12 08:18:04.843227147 -0500
++++ ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/sqlite/CMakeLists.txt	2022-02-12 08:18:17.871989500 -0500
+@@ -12,5 +12,5 @@
+ set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}")
  
-+if(WITH_RADOSGW_DBSTORE)
-+set (DBSTORE_LIB dbstore)
-+endif()
-+
- target_link_libraries(rgw_a
-   PRIVATE
-+    ${DBSTORE_LIB}
-     common_utf8 global
-     ${CRYPTO_LIBS}
-     ${LUA_LIBRARIES}
+-add_library(sqlite_db ${sqlite_db_srcs})
++add_library(sqlite_db STATIC ${sqlite_db_srcs})
+ target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common)
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 97911f6..ab352d5 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -150,7 +150,7 @@
 #################################################################################
 Name:		ceph
 Version:	17.1.0
-Release:	0.1.rc1%{?dist}
+Release:	0.2.rc1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -2548,6 +2548,9 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Tue Mar 1 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.2.rc1
+- 17.1.0 revised patch
+
 * Mon Feb 28 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.1.rc1
 - 17.1.0 RC1