Attachment #240139 for bug #269236

Lines 1-6 Link Here

(-)databases/foundationdb/Makefile (-4 / +2 lines)
1	PORTNAME= foundationdb	1	PORTNAME= foundationdb
2	DISTVERSION= 7.1.25	2	DISTVERSION= 7.2.3
3	PORTREVISION= 1
4	CATEGORIES= databases	3	CATEGORIES= databases
5		4
6	# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/	5	# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
Lines 23-30 BUILD_DEPENDS= ${LOCALBASE}/include/msgpack.hpp:devel/msgpack-cxx \ Link Here
23	LIB_DEPENDS= libboost_system.so:devel/boost-libs \	22	LIB_DEPENDS= libboost_system.so:devel/boost-libs \
24	libeio.so:devel/libeio	23	libeio.so:devel/libeio
25		24
26	USES= cmake compiler:c++17-lang mono:build python:build shebangfix \	25	USES= cmake compiler:c++20-lang mono:build python:build shebangfix ssl
27	ssl
28	USE_GITHUB= yes	26	USE_GITHUB= yes
29	GH_ACCOUNT= apple	27	GH_ACCOUNT= apple
30	GH_PROJECT= foundationdb	28	GH_PROJECT= foundationdb

Lines 1-3 Link Here

(-)databases/foundationdb/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1668350492	1	TIMESTAMP = 1674205496
2	SHA256 (apple-foundationdb-7.1.25_GH0.tar.gz) = 0c4679afb982932dfa37cbb7544eee4c8efc2409864af55743345c153407cb2c	2	SHA256 (apple-foundationdb-7.2.3_GH0.tar.gz) = 464f13526f9c79483af1802492ac5c09f32a5a3ed0f5da63b066288836c46485
3	SIZE (apple-foundationdb-7.1.25_GH0.tar.gz) = 11657831	3	SIZE (apple-foundationdb-7.2.3_GH0.tar.gz) = 12490828




--- CMakeLists.txt.orig	2023-01-18 18:54:50 UTC
+++ CMakeLists.txt
@@ -174,7 +174,9 @@ include(GetMsgpack)
 
 include(CompileBoost)
 include(GetMsgpack)
-add_subdirectory(contrib)
+if(WITH_CONTRIB)
+  add_subdirectory(contrib)
+endif()
 add_subdirectory(flow)
 add_subdirectory(fdbrpc)
 add_subdirectory(fdbclient)
@@ -187,7 +189,9 @@ add_subdirectory(tests)
 endif()
 add_subdirectory(fdbbackup)
 add_subdirectory(tests)
-add_subdirectory(flowbench EXCLUDE_FROM_ALL)
+if(WITH_FLOWBENCH)

Lines 1-11 Link Here

(-)databases/foundationdb/files/patch-bindings_c_CMakeLists.txt (-4 / +4 lines)
1	--- bindings/c/CMakeLists.txt.orig 2022-09-19 11:42:41 UTC	1	--- bindings/c/CMakeLists.txt.orig 2023-01-18 18:54:50 UTC
2	+++ bindings/c/CMakeLists.txt	2	+++ bindings/c/CMakeLists.txt
3	@@ -78,7 +78,7 @@ endif()	3	@@ -93,7 +93,7 @@ endif()
4	endif()	4	endif()
5		5
6	# The tests don't build on windows	6	# The tests don't build on windows
7	-if(NOT WIN32)	7	-if(NOT WIN32)
8	+if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")	8	+if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
9	set(MAKO_SRCS	9	set(MAKO_SRCS
10	test/mako/mako.c	10	test/mako/async.hpp
11	test/mako/mako.h	11	test/mako/async.cpp

Lines 1-11 Link Here

(-)databases/foundationdb/files/patch-cmake_CompileBoost.cmake (-5 / +5 lines)
1	--- cmake/CompileBoost.cmake.orig 2022-09-19 11:42:41 UTC	1	--- cmake/CompileBoost.cmake.orig 2023-01-18 18:54:50 UTC
2	+++ cmake/CompileBoost.cmake	2	+++ cmake/CompileBoost.cmake
3	@@ -113,7 +113,7 @@ endif()	3	@@ -141,7 +141,7 @@ endif()
4	return()	4	return()
5	endif()	5	endif()
6		6
7	-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})	7	-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context filesystem iostreams CONFIG PATHS ${BOOST_HINT_PATHS})
8	+find_package(Boost 1.78.0 COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})	8	+find_package(Boost 1.78.0 COMPONENTS context filesystem iostreams CONFIG PATHS ${BOOST_HINT_PATHS})
9	set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")	9	set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")
10		10
11	if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)	11	if(Boost_FOUND AND Boost_filesystem_FOUND AND Boost_context_FOUND AND Boost_iostreams_FOUND AND NOT FORCE_BOOST_BUILD)




--- cmake/FDBComponents.cmake.orig	2023-01-18 18:54:50 UTC
+++ cmake/FDBComponents.cmake
@@ -35,7 +35,7 @@ elseif(USE_OPENSSL)
     message(FATAL_ERROR "Unable to find WolfSSL")
   endif()
 elseif(USE_OPENSSL)
-  set(OPENSSL_USE_STATIC_LIBS TRUE)
+  set(OPENSSL_USE_STATIC_LIBS FALSE)
   if(WIN32)
     set(OPENSSL_MSVC_STATIC_RT ON)
   endif()
@@ -212,6 +212,13 @@ endif()
 endif()
 
 ################################################################################

 # Coroutine implementation
 ################################################################################
 
@@ -255,6 +262,8 @@ function(print_components)
   message(STATUS "Build Documentation (make html):      ${WITH_DOCUMENTATION}")
   message(STATUS "Build Python sdist (make package):    ${WITH_PYTHON_BINDING}")
   message(STATUS "Configure CTest (depends on Python):  ${WITH_PYTHON}")

Lines 2-8 Link Here

(-)databases/foundationdb/files/patch-cmake_GetMsgpack.cmake (-1 / +1 lines)
2	+++ cmake/GetMsgpack.cmake	2	+++ cmake/GetMsgpack.cmake
3	@@ -1,20 +1,7 @@	3	@@ -1,20 +1,7 @@
4	-find_package(msgpack 3.3.0 EXACT QUIET CONFIG)	4	-find_package(msgpack 3.3.0 EXACT QUIET CONFIG)
5	+find_package(msgpack REQUIRED QUIET CONFIG)	5	+find_package(msgpackc-cxx REQUIRED QUIET CONFIG)
6		6
7	add_library(msgpack INTERFACE)	7	add_library(msgpack INTERFACE)
8		8




--- fdbserver/FDBExecHelper.actor.cpp.orig	2022-09-19 11:42:41 UTC
+++ fdbserver/FDBExecHelper.actor.cpp
@@ -18,6 +18,14 @@
  * limitations under the License.
  */
 
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
+#define BOOST_SYSTEM_NO_LIB
+#define BOOST_DATE_TIME_NO_LIB
+#define BOOST_REGEX_NO_LIB
+#include <boost/process.hpp>
+#endif
+#include <boost/algorithm/string.hpp>
+
 #include "flow/TLSConfig.actor.h"
 #include "flow/Trace.h"
 #include "flow/Platform.h"
@@ -33,14 +41,6 @@
 #include "fdbserver/FDBExecHelper.actor.h"
 #include "fdbserver/Knobs.h"
 #include "fdbserver/RemoteIKeyValueStore.actor.h"
-
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
-#define BOOST_SYSTEM_NO_LIB
-#define BOOST_DATE_TIME_NO_LIB
-#define BOOST_REGEX_NO_LIB
-#include <boost/process.hpp>
-#endif
-#include <boost/algorithm/string.hpp>
 
 #include "flow/actorcompiler.h" // This must be the last #include.
 




--- fdbserver/fdbserver.actor.cpp.orig	2022-09-19 11:42:41 UTC
+++ fdbserver/fdbserver.actor.cpp
@@ -84,7 +84,11 @@
 #if defined(__linux__) || defined(__FreeBSD__)
 #include <execinfo.h>
 #include <signal.h>
+#if defined(__linux__)
 #include <sys/prctl.h>
+#elif defined(__FreeBSD__)
+#include <sys/procctl.h>
+#endif
 #ifdef ALLOC_INSTRUMENTATION
 #include <cxxabi.h>
 #endif
@@ -2225,9 +2229,14 @@ int main(int argc, char* argv[]) {
 			f = result;
 		} else if (role == ServerRole::FlowProcess) {
 			TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__)
 			prctl(PR_SET_PDEATHSIG, SIGTERM);
 			if (getppid() == 1) /* parent already died before prctl */
+				flushAndExit(FDB_EXIT_SUCCESS);
+#elif defined(__FreeBSD__)
+			const int sig = SIGTERM;
+			procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
+			if (getppid() == 1) /* parent already died before procctl */
 				flushAndExit(FDB_EXIT_SUCCESS);
 #endif
 

Return to bug 269236

Lines 1-13 Link Here

(-)databases/foundationdb/files/patch-CMakeLists.txt (-5 / +11 lines)
1	--- CMakeLists.txt.orig 2022-09-19 11:42:41 UTC	1	--- CMakeLists.txt.orig 2023-01-18 18:54:50 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -183,9 +183,13 @@ add_subdirectory(fdbbackup)	3	@@ -174,7 +174,9 @@ include(GetMsgpack)
4	add_subdirectory(fdbservice)	4
5	endif()	5	include(CompileBoost)
6	add_subdirectory(fdbbackup)	6	include(GetMsgpack)
7	-add_subdirectory(contrib)	7	-add_subdirectory(contrib)
8	+if(WITH_CONTRIB)	8	+if(WITH_CONTRIB)
9	+ add_subdirectory(contrib)	9	+ add_subdirectory(contrib)
10	+endif()	10	+endif()
		11	add_subdirectory(flow)
		12	add_subdirectory(fdbrpc)
		13	add_subdirectory(fdbclient)
		14	@@ -187,7 +189,9 @@ add_subdirectory(tests)
		15	endif()
		16	add_subdirectory(fdbbackup)
11	add_subdirectory(tests)	17	add_subdirectory(tests)
12	-add_subdirectory(flowbench EXCLUDE_FROM_ALL)	18	-add_subdirectory(flowbench EXCLUDE_FROM_ALL)
13	+if(WITH_FLOWBENCH)	19	+if(WITH_FLOWBENCH)

Lines 1-15 Link Here

(-)databases/foundationdb/files/patch-cmake_FDBComponents.cmake (-7 / +7 lines)
1	--- cmake/FDBComponents.cmake.orig 2022-09-19 11:42:41 UTC	1	--- cmake/FDBComponents.cmake.orig 2023-01-18 18:54:50 UTC
2	+++ cmake/FDBComponents.cmake	2	+++ cmake/FDBComponents.cmake
3	@@ -24,7 +24,7 @@ else()	3	@@ -35,7 +35,7 @@ elseif(USE_OPENSSL)
4	if(DISABLE_TLS)	4	message(FATAL_ERROR "Unable to find WolfSSL")
5	set(WITH_TLS OFF)	5	endif()
6	else()	6	elseif(USE_OPENSSL)
7	- set(OPENSSL_USE_STATIC_LIBS TRUE)	7	- set(OPENSSL_USE_STATIC_LIBS TRUE)
8	+ set(OPENSSL_USE_STATIC_LIBS FALSE)	8	+ set(OPENSSL_USE_STATIC_LIBS FALSE)
9	if(WIN32)	9	if(WIN32)
10	set(OPENSSL_MSVC_STATIC_RT ON)	10	set(OPENSSL_MSVC_STATIC_RT ON)
11	endif()	11	endif()
12	@@ -198,6 +198,13 @@ endif()	12	@@ -212,6 +212,13 @@ endif()
13	endif()	13	endif()
14		14
15	################################################################################	15	################################################################################
Lines 23-29 Link Here
23	# Coroutine implementation	23	# Coroutine implementation
24	################################################################################	24	################################################################################
25		25
26	@@ -242,6 +249,8 @@ function(print_components)	26	@@ -255,6 +262,8 @@ function(print_components)
27	message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}")	27	message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}")
28	message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}")	28	message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}")
29	message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}")	29	message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}")

Removed Link Here

(-)databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp (-32 lines)
1	--- fdbserver/FDBExecHelper.actor.cpp.orig 2022-09-19 11:42:41 UTC
2	+++ fdbserver/FDBExecHelper.actor.cpp
3	@@ -18,6 +18,14 @@
4	* limitations under the License.
5	*/
6
7	+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
8	+#define BOOST_SYSTEM_NO_LIB
9	+#define BOOST_DATE_TIME_NO_LIB
10	+#define BOOST_REGEX_NO_LIB
11	+#include <boost/process.hpp>
12	+#endif
13	+#include <boost/algorithm/string.hpp>
14	+
15	#include "flow/TLSConfig.actor.h"
16	#include "flow/Trace.h"
17	#include "flow/Platform.h"
18	@@ -33,14 +41,6 @@
19	#include "fdbserver/FDBExecHelper.actor.h"
20	#include "fdbserver/Knobs.h"
21	#include "fdbserver/RemoteIKeyValueStore.actor.h"
22	-
23	-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
24	-#define BOOST_SYSTEM_NO_LIB
25	-#define BOOST_DATE_TIME_NO_LIB
26	-#define BOOST_REGEX_NO_LIB
27	-#include <boost/process.hpp>
28	-#endif
29	-#include <boost/algorithm/string.hpp>
30
31	#include "flow/actorcompiler.h" // This must be the last #include.
32

Removed Link Here

(-)databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp (-30 lines)
1	--- fdbserver/fdbserver.actor.cpp.orig 2022-09-19 11:42:41 UTC
2	+++ fdbserver/fdbserver.actor.cpp
3	@@ -84,7 +84,11 @@
4	#if defined(__linux__) \|\| defined(__FreeBSD__)
5	#include <execinfo.h>
6	#include <signal.h>
7	+#if defined(__linux__)
8	#include <sys/prctl.h>
9	+#elif defined(__FreeBSD__)
10	+#include <sys/procctl.h>
11	+#endif
12	#ifdef ALLOC_INSTRUMENTATION
13	#include <cxxabi.h>
14	#endif
15	@@ -2225,9 +2229,14 @@ int main(int argc, char* argv[]) {
16	f = result;
17	} else if (role == ServerRole::FlowProcess) {
18	TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
19	-#if defined(__linux__) \|\| defined(__FreeBSD__)
20	+#if defined(__linux__)
21	prctl(PR_SET_PDEATHSIG, SIGTERM);
22	if (getppid() == 1) /* parent already died before prctl */
23	+ flushAndExit(FDB_EXIT_SUCCESS);
24	+#elif defined(__FreeBSD__)
25	+ const int sig = SIGTERM;
26	+ procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
27	+ if (getppid() == 1) /* parent already died before procctl */
28	flushAndExit(FDB_EXIT_SUCCESS);
29	#endif
30