!25 Update to 8.5.4

From: @wu-leilei 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

rocksdb-6.8.1-install_path.patch

@@ -1,57 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a6c8c64..5276f96 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1720,33 +1720,35 @@ defer_test: util/defer_test.o $(LIBOBJECTS) $(TESTHARNESS)
- 
- #-------------------------------------------------
- # make install related stuff
--INSTALL_PATH ?= /usr/local
-+INSTALL_PREFIX ?= /
-+INCLUDE_INSTAL_DIR ?= /usr/local/include/
-+LIB_INSTALL_DIR ?= /usr/local/lib/
- 
- uninstall:
--	rm -rf $(INSTALL_PATH)/include/rocksdb \
--	  $(INSTALL_PATH)/lib/$(LIBRARY) \
--	  $(INSTALL_PATH)/lib/$(SHARED4) \
--	  $(INSTALL_PATH)/lib/$(SHARED3) \
--	  $(INSTALL_PATH)/lib/$(SHARED2) \
--	  $(INSTALL_PATH)/lib/$(SHARED1)
-+	rm -rf $(INSTALL_PREFIX)/$(INCLUDE_INSTALL_DIR)/rocksdb \
-+	  $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(LIBRARY) \
-+	  $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED4) \
-+	  $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED3) \
-+	  $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED2) \
-+	  $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED1)
- 
- install-headers:
--	install -d $(INSTALL_PATH)/lib
--	for header_dir in `$(FIND) "include/rocksdb" -type d`; do \
--		install -d $(INSTALL_PATH)/$$header_dir; \
-+	install -d $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)
-+	for header_dir in $$(find "include/rocksdb" -type d|sed -r 's/^([^\/]*\/)//'); do \
-+		install -d $(INSTALL_PREFIX)/$(INCLUDE_INSTALL_DIR)/$$header_dir; \
- 	done
--	for header in `$(FIND) "include/rocksdb" -type f -name *.h`; do \
--		install -C -m 644 $$header $(INSTALL_PATH)/$$header; \
-+	for header in $$(find "include/rocksdb" -type f -name *.h|sed -r 's/^([^\/]*\/)//'); do \
-+                install -C -m 644 "include/$$header" $(INSTALL_PREFIX)/$(INCLUDE_INSTALL_DIR)/$$header; \
- 	done
- 
- install-static: install-headers $(LIBRARY)
--	install -C -m 755 $(LIBRARY) $(INSTALL_PATH)/lib
-+	install -C -m 755 $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)
- 
- install-shared: install-headers $(SHARED4)
--	install -C -m 755 $(SHARED4) $(INSTALL_PATH)/lib && \
--		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED3) && \
--		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED2) && \
--		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED1)
-+	install -C -m 755 $(SHARED4) $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR) && \
-+		ln -fs $(SHARED4) $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED3) && \
-+		ln -fs $(SHARED4) $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED2) && \
-+		ln -fs $(SHARED4) $(INSTALL_PREFIX)/$(LIB_INSTALL_DIR)/$(SHARED1)
- 
- # install static by default + install shared if it exists
- install: install-static

rocksdb.spec

@@ -1,6 +1,6 @@
 Name:          rocksdb
-Version:       6.8.1
+Version:       8.5.4
-Release:       7
+Release:       1
 Summary:       A Persistent Key-Value Store for Flash and RAM Storage
  
 License:       GPLv2 and Apache 2.0 License
@@ -16,12 +16,13 @@ BuildRequires: snappy snappy-devel zlib zlib-devel bzip2 bzip2-devel lz4 lz4-dev
 
 Requires:      snappy snappy-devel zlib zlib-devel bzip2 bzip2-devel lz4 lz4-devel zstd zstd-devel gflags gflags-devel
  
-Source0:       https://codeload.github.com/facebook/%{name}/tar.gz/v%{version}
+Source0:       https://github.com/facebook/rocksdb/archive/refs/tags/v%{version}.tar.gz
-Source1:       https://repo1.maven.org/maven2/org/assertj/assertj-core/1.7.1/assertj-core-1.7.1.jar
+Source1:       https://repo1.maven.org/maven2/org/assertj/assertj-core/2.9.0/assertj-core-2.9.0.jar
-Source2:       https://repo1.maven.org/maven2/cglib/cglib/2.2.2/cglib-2.2.2.jar
+Source2:       https://repo1.maven.org/maven2/cglib/cglib/3.3.0/cglib-3.3.0.jar
 Source3:       https://repo1.maven.org/maven2/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar
-Patch0:        rocksdb-6.8.1-install_path.patch
+Source4:       https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar
-Patch1:        some-jar-packs-should-provides-local.patch
+Source5:       https://repo1.maven.org/maven2/junit/junit/4.13.1/junit-4.13.1.jar
+Patch0:        some-jar-packs-should-provides-local.patch
  
 %description
 Rocksdb is a library that forms the core building block for a fast key value
@@ -53,12 +54,12 @@ embeddable persistent key-value store for fast storage.
 rm java/benchmark/src/main/java/org/rocksdb/benchmark/DbBenchmark.java
 rm build_tools/gnu_parallel
 mkdir -p java/test-libs
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} java/test-libs
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} java/test-libs
  
 %build
 export CFLAGS="%{optflags}"
 # librocksdb*.so* has undefined symbols dlopen and so on, “-ldl” needs to be added here
-export EXTRA_CXXFLAGS=" -std=c++11 %{optflags} -ldl"
+export EXTRA_CXXFLAGS=" -std=c++17 %{optflags} -ldl"
 export DISABLE_WARNING_AS_ERROR=1
 %ifnarch riscv64
 %make_build shared_lib
@@ -74,9 +75,9 @@ PORTABLE=1 %make_build rocksdbjava
  
 %install
 make install-shared \
-         INSTALL_PREFIX=%{buildroot}\
+         PREFIX=%{_prefix}\
-         LIB_INSTALL_DIR=%{_libdir}\
+         LIBDIR=%{_libdir}\
-         INCLUDE_INSTALL_DIR=%{_includedir}
+         DESTDIR=%{buildroot}
 
 # install rocksdbjni
 install -d -p -m 0755 %{buildroot}%{_javadir}/%{name}jni
@@ -88,14 +89,15 @@ install -D -m 0644 java/target/%{name}jni-%{version}-linux$(getconf LONG_BIT).ja
  
  
 %files
-%{_libdir}/librocksdb.so.6
+%{_libdir}/librocksdb.so.8
-%{_libdir}/librocksdb.so.6.8
+%{_libdir}/librocksdb.so.8.5
-%{_libdir}/librocksdb.so.6.8.1
+%{_libdir}/librocksdb.so.8.5.4
 %license COPYING LICENSE.Apache LICENSE.leveldb
 
  
 %files devel
 %{_libdir}/librocksdb.so
+%{_libdir}/pkgconfig/rocksdb.pc
 %{_includedir}/*
  
 %files -n %{name}jni
@@ -103,6 +105,9 @@ install -D -m 0644 java/target/%{name}jni-%{version}-linux$(getconf LONG_BIT).ja
 %{_javadir}/%{name}jni/%{name}jni.jar
 
 %changelog
+* Sat Oct 07 2023 wulei <wu_lei@hoperun.com> - 8.5.4-1
+- Update to 8.5.4
+
 * Wed Sep 27 2023 wangkai <13474090681@163.com> - 6.8.1-7
 - Resolving build error using internal gtest build
 

some-jar-packs-should-provides-local.patch

@@ -1,27 +1,53 @@
-From 3e387b07fd23960f566dee7209f0779791df4094 Mon Sep 17 00:00:00 2001
+diff -Nur a/java/Makefile b/java/Makefile
-From: si-gui <sunguoshuai@huawei.com>
+--- a/java/Makefile	2023-09-27 10:47:02.000000000 +0800
-Date: Wed, 30 Jun 2021 17:16:28 +0800
++++ b/java/Makefile	2023-10-08 11:15:06.557154861 +0800
-Subject: [PATCH] some jar packs should provides local
+@@ -373,8 +373,7 @@
+ 	mkdir -p "$(JAVA_TEST_LIBDIR)"
  
----
+ $(JAVA_JUNIT_JAR_PATH): $(JAVA_TEST_LIBDIR)
- java/Makefile | 4 ++--
+-ifneq (,$(wildcard $(MVN_LOCAL)/junit/junit/$(JAVA_JUNIT_VER)/$(JAVA_JUNIT_JAR)))
- 1 file changed, 2 insertions(+), 2 deletions(-)
+-	cp -v $(MVN_LOCAL)/junit/junit/$(JAVA_JUNIT_VER)/$(JAVA_JUNIT_JAR) $(JAVA_TEST_LIBDIR)
++ifneq (,$(wildcard $(JAVA_JUNIT_JAR_PATH)))
+ else
+ 	curl --fail --insecure --output $(JAVA_JUNIT_JAR_PATH) --location $(DEPS_URL)/$(JAVA_JUNIT_JAR)
+ 	JAVA_JUNIT_SHA256_ACTUAL=`$(SHA256_CMD) $(JAVA_JUNIT_JAR_PATH) | cut -d ' ' -f 1`; \
+@@ -385,8 +384,7 @@
+ endif
  
-diff --git a/java/Makefile b/java/Makefile
+ $(JAVA_HAMCREST_JAR_PATH): $(JAVA_TEST_LIBDIR)
-index 155db69..0c835ae 100644
+-ifneq (,$(wildcard $(MVN_LOCAL)/org/hamcrest/hamcrest/$(JAVA_HAMCREST_VER)/$(JAVA_HAMCREST_JAR)))
---- a/java/Makefile
+-	cp -v $(MVN_LOCAL)/org/hamcrest/hamcrest/$(JAVA_HAMCREST_VER)/$(JAVA_HAMCREST_JAR) $(JAVA_TEST_LIBDIR)
-+++ b/java/Makefile
++ifneq (,$(wildcard $(JAVA_HAMCREST_JAR_PATH)))
-@@ -288,8 +288,8 @@ optimistic_transaction_sample: java
+ else
+ 	curl --fail --insecure --output $(JAVA_HAMCREST_JAR_PATH) --location $(DEPS_URL)/$(JAVA_HAMCREST_JAR)
+ 	JAVA_HAMCREST_SHA256_ACTUAL=`$(SHA256_CMD) $(JAVA_HAMCREST_JAR_PATH) | cut -d ' ' -f 1`; \
+@@ -397,8 +395,7 @@
+ endif
  
- resolve_test_deps:
+ $(JAVA_MOCKITO_JAR_PATH): $(JAVA_TEST_LIBDIR)
- 	test -d "$(JAVA_TEST_LIBDIR)" || mkdir -p "$(JAVA_TEST_LIBDIR)"
+-ifneq (,$(wildcard $(MVN_LOCAL)/org/mockito/mockito-all/$(JAVA_MOCKITO_VER)/$(JAVA_MOCKITO_JAR)))
--	test -s "$(JAVA_JUNIT_JAR)" || cp $(MVN_LOCAL)/junit/junit/4.12/junit-4.12.jar $(JAVA_TEST_LIBDIR) || curl --fail --insecure --output $(JAVA_JUNIT_JAR) --location $(DEPS_URL)/junit-4.12.jar
+-	cp -v $(MVN_LOCAL)/org/mockito/mockito-all/$(JAVA_MOCKITO_VER)/$(JAVA_MOCKITO_JAR) $(JAVA_TEST_LIBDIR)
--	test -s "$(JAVA_HAMCR_JAR)" || cp $(MVN_LOCAL)/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar $(JAVA_TEST_LIBDIR) || curl --fail --insecure --output $(JAVA_HAMCR_JAR) --location $(DEPS_URL)/hamcrest-core-1.3.jar
++ifneq (,$(wildcard $(JAVA_MOCKITO_JAR_PATH)))
-+	test -s "$(JAVA_JUNIT_JAR)" || cp /usr/share/java/junit.jar $(JAVA_TEST_LIBDIR)/junit-4.12.jar || curl --fail --insecure --output $(JAVA_JUNIT_JAR) --location $(DEPS_URL)/junit-4.12.jar
+ else
-+	test -s "$(JAVA_HAMCR_JAR)" || cp /usr/share/java/hamcrest/core.jar $(JAVA_TEST_LIBDIR)/hamcrest-core-1.3.jar || curl --fail --insecure --output $(JAVA_HAMCR_JAR) --location $(DEPS_URL)/hamcrest-core-1.3.jar
+ 	curl --fail --insecure --output "$(JAVA_MOCKITO_JAR_PATH)" --location $(DEPS_URL)/$(JAVA_MOCKITO_JAR)
- 	test -s "$(JAVA_MOCKITO_JAR)" || cp $(MVN_LOCAL)/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar $(JAVA_TEST_LIBDIR) || curl --fail --insecure --output "$(JAVA_MOCKITO_JAR)" --location $(DEPS_URL)/mockito-all-1.10.19.jar
+ 	JAVA_MOCKITO_SHA256_ACTUAL=`$(SHA256_CMD) $(JAVA_MOCKITO_JAR_PATH) | cut -d ' ' -f 1`; \
- 	test -s "$(JAVA_CGLIB_JAR)" || cp $(MVN_LOCAL)/cglib/cglib/2.2.2/cglib-2.2.2.jar $(JAVA_TEST_LIBDIR) || curl --fail --insecure --output "$(JAVA_CGLIB_JAR)" --location $(DEPS_URL)/cglib-2.2.2.jar
+@@ -409,8 +406,7 @@
- 	test -s "$(JAVA_ASSERTJ_JAR)" || cp $(MVN_LOCAL)/org/assertj/assertj-core/1.7.1/assertj-core-1.7.1.jar $(JAVA_TEST_LIBDIR) || curl --fail --insecure --output "$(JAVA_ASSERTJ_JAR)" --location $(DEPS_URL)/assertj-core-1.7.1.jar
+ endif
--- 
-2.30.0
  
+ $(JAVA_CGLIB_JAR_PATH): $(JAVA_TEST_LIBDIR)
+-ifneq (,$(wildcard $(MVN_LOCAL)/cglib/cglib/$(JAVA_CGLIB_VER)/$(JAVA_CGLIB_JAR)))
+-	cp -v $(MVN_LOCAL)/cglib/cglib/$(JAVA_CGLIB_VER)/$(JAVA_CGLIB_JAR) $(JAVA_TEST_LIBDIR)
++ifneq (,$(wildcard $(JAVA_CGLIB_JAR_PATH)))
+ else
+ 	curl --fail --insecure --output "$(JAVA_CGLIB_JAR_PATH)" --location $(DEPS_URL)/$(JAVA_CGLIB_JAR)
+ 	JAVA_CGLIB_SHA256_ACTUAL=`$(SHA256_CMD) $(JAVA_CGLIB_JAR_PATH) | cut -d ' ' -f 1`; \
+@@ -421,8 +417,7 @@
+ endif
+ 
+ $(JAVA_ASSERTJ_JAR_PATH): $(JAVA_TEST_LIBDIR)
+-ifneq (,$(wildcard $(MVN_LOCAL)/org/assertj/assertj-core/$(JAVA_ASSERTJ_VER)/$(JAVA_ASSERTJ_JAR)))
+-	cp -v $(MVN_LOCAL)/org/assertj/assertj-core/$(JAVA_ASSERTJ_VER)/$(JAVA_ASSERTJ_JAR) $(JAVA_TEST_LIBDIR)
++ifneq (,$(wildcard $(JAVA_ASSERTJ_JAR_PATH)))
+ else
+ 	curl --fail --insecure --output "$(JAVA_ASSERTJ_JAR_PATH)" --location $(DEPS_URL)/$(JAVA_ASSERTJ_JAR)
+ 	JAVA_ASSERTJ_SHA256_ACTUAL=`$(SHA256_CMD) $(JAVA_ASSERTJ_JAR_PATH) | cut -d ' ' -f 1`; \