Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Remove obsolete patch files - Remove obsolete options
- Loading branch information
Showing
15 changed files
with
145 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1668638096 | ||
| SHA256 (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 2bdae1c7b0667e49b62cea236c96c108a5b663b379170ab273a96f07494b01f0 | ||
| SIZE (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 11655244 | ||
| TIMESTAMP = 1680719160 | ||
| SHA256 (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 3ea98d4ca78e4451ce4f4e2990547de0872330ab115eb27e1471c3af34380404 | ||
| SIZE (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 14529338 |
11 changes: 11 additions & 0 deletions
11
sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:32:44.243346000 -0500 | ||
| +++ contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:33:04.594841000 -0500 | ||
| @@ -27,7 +27,7 @@ | ||
| ) | ||
|
|
||
| install( | ||
| - FILES etc/bareos/bsmc.conf | ||
| + FILES etc/bareos/bsmc.conf.sample | ||
| PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ | ||
| DESTINATION "${confdir}" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- contrib/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 | ||
| +++ contrib/CMakeLists.txt 2023-04-07 17:52:51.095371000 -0500 | ||
| @@ -24,10 +24,18 @@ | ||
| include(GNUInstallDirs) | ||
| include(BareosSetVariableDefaults) | ||
|
|
||
| -add_subdirectory(fd-plugins) | ||
| -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") | ||
| - add_subdirectory(misc) | ||
| -endif() | ||
| -if(NOT client-only) | ||
| - add_subdirectory(dir-plugins) | ||
| +if(python) | ||
| + if(client-only) | ||
| + add_subdirectory(fd-plugins) | ||
| + endif() | ||
| + | ||
| + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") | ||
| + if(client-only) | ||
| + add_subdirectory(misc) | ||
| + endif() | ||
| + endif() | ||
| + | ||
| + if(NOT client-only) | ||
| + add_subdirectory(dir-plugins) | ||
| + endif() | ||
| endif() |
37 changes: 5 additions & 32 deletions
37
sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 4 additions & 17 deletions
21
sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
This file was deleted.
Oops, something went wrong.
26 changes: 17 additions & 9 deletions
26
sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,28 @@ | ||
| --- core/src/dird/CMakeLists.txt 2022-01-16 10:44:41.285876000 -0500 | ||
| +++ core/src/dird/CMakeLists.txt 2022-01-16 10:46:30.370557000 -0500 | ||
| @@ -158,7 +158,7 @@ | ||
| add_executable(bareos-dir) | ||
| --- core/src/dird/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 | ||
| +++ core/src/dird/CMakeLists.txt 2023-04-07 16:16:48.539301000 -0500 | ||
| @@ -160,7 +160,7 @@ | ||
| target_sources(bareos-dir PRIVATE dird.cc) | ||
|
|
||
| -target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind) | ||
| +target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind ${JANSSON_LIBRARIES}) | ||
| target_link_libraries( | ||
| - bareos-dir PRIVATE dird_objects bareossql bareosfind CLI11::CLI11 | ||
| + bareos-dir PRIVATE ${JANSSON_LIBRARIES} dird_objects bareossql bareosfind CLI11::CLI11 | ||
| ) | ||
|
|
||
| if(HAVE_WIN32) | ||
| target_sources( | ||
| @@ -184,7 +184,7 @@ | ||
| @@ -187,14 +187,14 @@ | ||
| add_executable(bareos-dbcheck ${DBCHKSRCS}) | ||
|
|
||
| target_link_libraries( | ||
| - bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} | ||
| + bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} ${JANSSON_LIBRARIES} | ||
| + bareos-dbcheck PRIVATE ${JANSSON_LIBRARIES} bareossql bareos bareosfind ${OPENSSL_LIBRARIES} | ||
| CLI11::CLI11 | ||
| ) | ||
|
|
||
| # is not built by default | ||
| if(NOT client-only) | ||
| add_executable(testfind ${TSTFNDSRCS}) | ||
| - target_link_libraries(testfind dird_objects bareosfind) | ||
| + target_link_libraries(testfind ${JANSSON_LIBRARIES} dird_objects bareosfind) | ||
| endif() | ||
| install(TARGETS bareos-dir bareos-dbcheck testfind DESTINATION "${sbindir}") | ||
|
|
29 changes: 0 additions & 29 deletions
29
sysutils/bareos-server/files/patch-core-src-dird_catreq.cc
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
sysutils/bareos-server/files/patch-core-src-dird_vbackup.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- core/src/dird/vbackup.cc 2023-04-07 16:02:23.780510000 -0500 | ||
| +++ core/src/dird/vbackup.cc 2023-04-07 16:10:20.351116000 -0500 | ||
| @@ -77,7 +77,7 @@ | ||
| std::vector<std::string> JobList; | ||
| std::vector<std::string> JobsWithPurgedFiles; | ||
|
|
||
| - bool operator()(int num_fields, char** row) | ||
| + bool operator()([[maybe_unused]] int num_fields, char** row) | ||
| { | ||
| assert(num_fields == 5); | ||
| JobList.push_back(row[col_JobId]); |
16 changes: 8 additions & 8 deletions
16
sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| --- core/src/stored/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 | ||
| +++ core/src/stored/CMakeLists.txt 2022-03-04 20:56:52.809609000 -0500 | ||
| @@ -219,7 +219,7 @@ | ||
| add_executable(bareos-sd stored.cc) | ||
| --- core/src/stored/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 | ||
| +++ core/src/stored/CMakeLists.txt 2023-04-05 16:36:35.928423000 -0500 | ||
| @@ -168,7 +168,7 @@ | ||
|
|
||
| target_link_libraries(stored_objects PRIVATE Threads::Threads) | ||
| target_link_libraries( | ||
| - bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads | ||
| + bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ${JANSSON_LIBRARIES} | ||
| - bareos-sd PRIVATE stored_objects bareos bareossd bareosfind CLI11::CLI11 | ||
| + bareos-sd PRIVATE ${JANSSON_LIBRARIES} stored_objects bareos bareossd bareosfind CLI11::CLI11 | ||
| ) | ||
|
|
||
| if(HAVE_WIN32) | ||
| @@ -228,7 +228,7 @@ | ||
| @@ -177,7 +177,7 @@ | ||
| endif() | ||
| if(HAVE_NDMP) | ||
| target_link_libraries(stored_objects PRIVATE bareosndmp) | ||
| - target_link_libraries(bareos-sd PRIVATE bareosndmp) | ||
| + target_link_libraries(bareos-sd PRIVATE bareosndmp ${JANSSON_LIBRARIES}) | ||
| + target_link_libraries(bareos-sd PRIVATE ${JANSSON_LIBRARIES} bareosndmp) | ||
| endif() | ||
|
|
||
| add_executable(bls ${BLSSRCS}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.