diff options
Diffstat (limited to 'filesystems/lizardfs/files')
-rw-r--r-- | filesystems/lizardfs/files/mfscgiserv.in | 29 | ||||
-rw-r--r-- | filesystems/lizardfs/files/mfschunkserver.in | 30 | ||||
-rw-r--r-- | filesystems/lizardfs/files/mfsmaster.in | 30 | ||||
-rw-r--r-- | filesystems/lizardfs/files/mfsmetalogger.in | 30 | ||||
-rw-r--r-- | filesystems/lizardfs/files/mfspingserv.in | 29 | ||||
-rw-r--r-- | filesystems/lizardfs/files/patch-CMakeLists.txt | 37 | ||||
-rw-r--r-- | filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake | 13 | ||||
-rw-r--r-- | filesystems/lizardfs/files/patch-cmake__Libraries.cmake | 14 | ||||
-rw-r--r-- | filesystems/lizardfs/files/patch-src_common_slogger.cc | 11 | ||||
-rw-r--r-- | filesystems/lizardfs/files/patch-src_common_slogger.h | 12 |
10 files changed, 235 insertions, 0 deletions
diff --git a/filesystems/lizardfs/files/mfscgiserv.in b/filesystems/lizardfs/files/mfscgiserv.in new file mode 100644 index 000000000000..0876470c2221 --- /dev/null +++ b/filesystems/lizardfs/files/mfscgiserv.in @@ -0,0 +1,29 @@ +#!/bin/sh + +# PROVIDE: mfscgiserv +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable mfscgiserv: +# +# mfscgiserv_enable="YES" +# + +. /etc/rc.subr + +name=mfscgiserv +rcvar=mfscgiserv_enable + +command=%%PREFIX%%/sbin/${name} +pid_file=/var/mfs/.${name}.lock +procname="python" + +stop_cmd="$command stop" +status_cmd="$command test" + +load_rc_config $name + +# set defaults +: ${mfscgiserv_enable="NO"} + +run_rc_command "$1" diff --git a/filesystems/lizardfs/files/mfschunkserver.in b/filesystems/lizardfs/files/mfschunkserver.in new file mode 100644 index 000000000000..b4dbe0baae4a --- /dev/null +++ b/filesystems/lizardfs/files/mfschunkserver.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# PROVIDE: mfschunkserver +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfschunkserver: +# +# mfschunkserver_enable="YES" +# + +. /etc/rc.subr + +name=mfschunkserver +rcvar=mfschunkserver_enable + +config_file=%%PREFIX%%/etc/mfs/${name}.cfg + +required_files=${config_file} + +command=%%PREFIX%%/sbin/${name} +pid_file=/var/mfs/.${name}.lock +command_args="-c $config_file" + +load_rc_config $name + +# set defaults +: ${mfschunkserver_enable="NO"} + +run_rc_command "$1" diff --git a/filesystems/lizardfs/files/mfsmaster.in b/filesystems/lizardfs/files/mfsmaster.in new file mode 100644 index 000000000000..3a3bc49bdefd --- /dev/null +++ b/filesystems/lizardfs/files/mfsmaster.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# PROVIDE: mfsmaster +# REQUIRE: DAEMON +# KEYWORD: nostart shutdown +# +# Add the following lines to /etc/rc.conf to enable mfsmaster: +# +# mfsmaster_enable="YES" +# + +. /etc/rc.subr + +name=mfsmaster +rcvar=mfsmaster_enable + +config_file=%%PREFIX%%/etc/mfs/${name}.cfg + +required_files=${config_file} + +command=%%PREFIX%%/sbin/${name} +pid_file=/var/mfs/.${name}.lock +command_args="-c $config_file" + +load_rc_config $name + +# set defaults +: ${mfsmaster_enable="NO"} + +run_rc_command "$1" diff --git a/filesystems/lizardfs/files/mfsmetalogger.in b/filesystems/lizardfs/files/mfsmetalogger.in new file mode 100644 index 000000000000..e1fae34ddb88 --- /dev/null +++ b/filesystems/lizardfs/files/mfsmetalogger.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# PROVIDE: mfsmetalogger +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable mfsmetalogger: +# +# mfsmetalogger_enable="YES" +# + +. /etc/rc.subr + +name=mfsmetalogger +rcvar=mfsmetalogger_enable + +config_file=%%PREFIX%%/etc/mfs/${name}.cfg + +required_files=${config_file} + +command=%%PREFIX%%/sbin/${name} +pid_file=/var/mfs/.${name}.lock +command_args="-c $config_file" + +load_rc_config $name + +# set defaults +: ${mfsmetalogger_enable="NO"} + +run_rc_command "$1" diff --git a/filesystems/lizardfs/files/mfspingserv.in b/filesystems/lizardfs/files/mfspingserv.in new file mode 100644 index 000000000000..625628e37fd6 --- /dev/null +++ b/filesystems/lizardfs/files/mfspingserv.in @@ -0,0 +1,29 @@ +#!/bin/sh + +# PROVIDE: mfspingserv +# REQUIRE: DAEMON +# KEYWORD: nostart shutdown +# +# Add the following lines to /etc/rc.conf to enable mfspingserv: +# +# mfspingserv_enable="YES" +# +# mfspingserv_port="" +# + +. /etc/rc.subr + +name=mfspingserv +rcvar=mfspingserv_enable + +command=%%PREFIX%%/sbin/${name} +pid_file=/var/mfs/.${name}.lock +command_args="${mfspingserv_port}" + +load_rc_config $name + +# set defaults +: ${mfspingserv_enable="NO"} +: ${mfspingserv_port="19042"} + +run_rc_command "$1" diff --git a/filesystems/lizardfs/files/patch-CMakeLists.txt b/filesystems/lizardfs/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..fd2d4079393b --- /dev/null +++ b/filesystems/lizardfs/files/patch-CMakeLists.txt @@ -0,0 +1,37 @@ +--- CMakeLists.txt.orig 2017-12-20 09:59:37 UTC ++++ CMakeLists.txt +@@ -167,13 +167,7 @@ endif() + message(STATUS "THROW_INSTEAD_OF_ABORT: ${THROW_INSTEAD_OF_ABORT}") + endif() + +-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) +-if (LIB64) +- set(LIBSUFFIX "64") +-else() +- set(LIBSUFFIX "") +-endif() +-message(STATUS "LIB64: ${LIB64}") ++set(LIBSUFFIX "") + + if(ENABLE_DEBIAN_PATHS) + if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/") +@@ -193,8 +187,8 @@ else() + set(SBIN_SUBDIR "sbin") + set(LIB_SUBDIR "lib${LIBSUFFIX}") + set(ETC_SUBDIR "etc/mfs") +- set(RUN_SUBDIR "var/run/mfs") +- set(DATA_SUBDIR "var/lib/mfs") ++ set(RUN_SUBDIR "/var/run/mfs") ++ set(DATA_SUBDIR "/var/mfs") + set(MAN_SUBDIR "share/man") + set(CGI_SUBDIR "share/mfscgi") + set(INCL_SUBDIR "include/lizardfs") +@@ -205,8 +199,6 @@ set(ETC_PATH ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR + set(SBIN_PATH ${INSTALL_PREFIX_NO_SLASH}/${SBIN_SUBDIR}) + set(LIB_PATH ${INSTALL_PREFIX_NO_SLASH}/${LIB_SUBDIR}) + set(ETC_PATH ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR}) +-set(RUN_PATH ${INSTALL_PREFIX_NO_SLASH}/${RUN_SUBDIR}) +-set(DATA_PATH ${INSTALL_PREFIX_NO_SLASH}/${DATA_SUBDIR}) + set(MAN_PATH ${INSTALL_PREFIX_NO_SLASH}/${MAN_SUBDIR}) + set(CGI_PATH ${INSTALL_PREFIX_NO_SLASH}/${CGI_SUBDIR}) + set(INCL_PATH ${INSTALL_PREFIX_NO_SLASH}/${INCL_SUBDIR}) diff --git a/filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake b/filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake new file mode 100644 index 000000000000..0dfe41ad59fb --- /dev/null +++ b/filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake @@ -0,0 +1,13 @@ +--- cmake/CheckIncludes.cmake.orig 2022-12-24 21:43:32 UTC ++++ cmake/CheckIncludes.cmake +@@ -3,7 +3,9 @@ include(CheckIncludeFiles) + function(check_includes INCLUDES) + set(INCLUDE_MISSING FALSE) + foreach(INCLUDE_FILE ${INCLUDES}) +- check_include_files(${INCLUDE_FILE} ${INCLUDE_FILE}_FOUND) ++ string(MAKE_C_IDENTIFIER "${INCLUDE_FILE}" c_include) ++ check_include_files(${INCLUDE_FILE} ${c_include}_FOUND) ++ set(${INCLUDE_FILE}_FOUND ${${c_include}_FOUND}) + if(NOT ${INCLUDE_FILE}_FOUND) + set(INCLUDE_MISSING TRUE) + set(MISSING_INCLUDES ${MISSING_INCLUDES} ${INCLUDE_FILE}) diff --git a/filesystems/lizardfs/files/patch-cmake__Libraries.cmake b/filesystems/lizardfs/files/patch-cmake__Libraries.cmake new file mode 100644 index 000000000000..95dbb0c4a80a --- /dev/null +++ b/filesystems/lizardfs/files/patch-cmake__Libraries.cmake @@ -0,0 +1,14 @@ +--- cmake/Libraries.cmake.orig 2017-12-20 09:59:37 UTC ++++ cmake/Libraries.cmake +@@ -7,11 +7,6 @@ if(ENABLE_TESTS) + "ef5e700c8a0f3ee123e2e0209b8b4961") + endif() + +-download_external(SPDLOG "spdlog-0.14.0" +- "https://github.com/gabime/spdlog/archive/v0.14.0.zip" +- "f213d83c466aa7044a132e2488d71b11" +- "spdlog-1") +- + # Find standard libraries + find_package(Socket REQUIRED) + find_package(Threads REQUIRED) diff --git a/filesystems/lizardfs/files/patch-src_common_slogger.cc b/filesystems/lizardfs/files/patch-src_common_slogger.cc new file mode 100644 index 000000000000..02566193f6ea --- /dev/null +++ b/filesystems/lizardfs/files/patch-src_common_slogger.cc @@ -0,0 +1,11 @@ +--- src/common/slogger.cc.orig 2019-01-28 19:24:32 UTC ++++ src/common/slogger.cc +@@ -86,7 +86,7 @@ void lzfs::drop_all_logs() { + bool lzfs::add_log_syslog() { + #ifndef _WIN32 + try { +- spdlog::syslog_logger("syslog"); ++ spdlog::syslog_logger_mt("syslog"); + return true; + } catch (const spdlog::spdlog_ex &e) { + lzfs_pretty_syslog(LOG_ERR, "Adding syslog log failed: %s", e.what()); diff --git a/filesystems/lizardfs/files/patch-src_common_slogger.h b/filesystems/lizardfs/files/patch-src_common_slogger.h new file mode 100644 index 000000000000..2d5a7367b467 --- /dev/null +++ b/filesystems/lizardfs/files/patch-src_common_slogger.h @@ -0,0 +1,12 @@ +--- src/common/slogger.h.orig 2017-12-20 09:59:37 UTC ++++ src/common/slogger.h +@@ -27,6 +27,9 @@ + #endif + #include "common/small_vector.h" + #include "spdlog/spdlog.h" ++#include "spdlog/sinks/syslog_sink.h" ++#include "spdlog/sinks/stdout_color_sinks.h" ++#include "spdlog/sinks/rotating_file_sink.h" + + typedef std::shared_ptr<spdlog::logger> LoggerPtr; + |