diff options
Diffstat (limited to 'sysutils/bareos-server/files')
| -rw-r--r-- | sysutils/bareos-server/files/bareos-dir.in | 2 | ||||
| -rw-r--r-- | sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt | 26 |
2 files changed, 18 insertions, 10 deletions
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in index 658865b50b67..875bf87066a9 100644 --- a/sysutils/bareos-server/files/bareos-dir.in +++ b/sysutils/bareos-server/files/bareos-dir.in @@ -42,7 +42,7 @@ bareos_start_precmd() { bareos_dir_configtest() { echo "Performing sanity check on ${bareos_dir_config} configuration:" - eval ${command} -t + eval ${command} -c ${bareos_dir_config} -t } bareos_dir_reload() { diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt index 35853f9c59bf..9d0c9f02dc58 100644 --- a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt @@ -1,15 +1,23 @@ ---- core/src/plugins/stored/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 -+++ core/src/plugins/stored/CMakeLists.txt 2024-12-22 19:50:39.154511000 -0800 -@@ -33,6 +33,12 @@ - endif() - endif() +--- core/src/plugins/stored/CMakeLists.txt 2025-09-02 01:09:07.000000000 -0700 ++++ core/src/plugins/stored/CMakeLists.txt 2025-11-17 13:54:37.845349000 -0800 +@@ -16,6 +16,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + # 02110-1301, USA. ++include(BareosPlugins) + message("Entering ${CMAKE_CURRENT_SOURCE_DIR}") + if(HAVE_WIN32) +@@ -31,6 +32,12 @@ + # work around https://bugs.python.org/issue4709 + add_definitions(-DMS_WIN64) + endif() ++endif() ++ +if(HAVE_FREEBSD_OS) + include_directories( + ${PROJECT_SOURCE_DIR}/src/fastlz/include + ) -+endif() -+ - if(ENABLE_PYTHON) - add_subdirectory(python) endif() + + if(ENABLE_PYTHON) |