diff options
Diffstat (limited to 'sysutils/bareos19-server/files')
29 files changed, 0 insertions, 1345 deletions
diff --git a/sysutils/bareos19-server/files/bareos-barcodes b/sysutils/bareos19-server/files/bareos-barcodes deleted file mode 100644 index f42cb7f7aeea..000000000000 --- a/sysutils/bareos19-server/files/bareos-barcodes +++ /dev/null @@ -1,51 +0,0 @@ -# -# Bacula barcode simulation file -# used by ${PREFIX}/sbin/chio-bareos (FreeBSD) -# -# The volumenames are returned by the "changer list" command -# labeling in the console is done by "label barcodes" -# (then all volumes belog to the default pool). -# All Lines with an "#" at the bedinning are ignored -# -# !!!! If you export an tape and reinsert another one, -# !!!! don't forget to change the volume name in this file! -# -1:Volume1-100 -2:Volume1-101 -3:Volume1-102 -4:Volume1-103 -5:Volume1-104 -6:Volume1-105 -7:Volume1-106 -8:Volume1-107 -9:Volume1-108 -10:Volume1-109 -11:Volume1-110 -12:Volume1-111 -# -# Further volumes exported from the changer -# -# 36GB AIT2 tapes -#Volume1-100 -#Volume1-101 -#Volume1-102 -#Volume1-103 -#Volume1-104 -#Volume1-105 -#Volume1-106 -#Volume1-107 -#Volume1-108 -#Volume1-109 -#Volume1-110 -#Volume1-111 -#Volume1-112 -#Volume1-113 -#Volume1-114 -#Volume1-115 -# -# 50GB AIT2 tapes -#Volume2-200 -#Volume2-201 -#Volume2-202 -#Volume2-203 -#Volume2-204 diff --git a/sysutils/bareos19-server/files/bareos-dir.in b/sysutils/bareos19-server/files/bareos-dir.in deleted file mode 100644 index 86b62370cbb7..000000000000 --- a/sysutils/bareos19-server/files/bareos-dir.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_dir_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_dir. -# bareos_dir_flags (params): Set params used to start bareos_dir. -# bareos_dir_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_dir" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_dir_enable="NO"} -: ${bareos_dir_flags="-u bareos -g bareos -v"} -: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} - -command=%%PREFIX%%/sbin/bareos-dir -command_args="-c ${bareos_dir_config}" -pidfile="${bareos_dir_pidfile}" -bconsole_command=/usr/local/bin/bconsole -start_precmd="bareos_start_precmd" -restart_precmd="bareos_dir_configtest" -reload_precmd="bareos_dir_configtest" -reload_cmd="bareos_dir_reload" -configtest_cmd="bareos_dir_configtest" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} - bareos_dir_configtest -} - -bareos_dir_configtest() { - echo "Performing sanity check on ${bareos_dir_config} configuration:" - eval ${command} -t -} - -bareos_dir_reload() { - echo "Performing a graceful reload" - # bconsole always exits with 0, so we can't check the return status for success. - echo "reload" | ${bconsole_command} -} - -extra_commands="reload configtest" -run_rc_command "$1" diff --git a/sysutils/bareos19-server/files/bareos-fd.in b/sysutils/bareos19-server/files/bareos-fd.in deleted file mode 100644 index 54647786b12c..000000000000 --- a/sysutils/bareos19-server/files/bareos-fd.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_fd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_fd_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_fd. -# bareos_fd_flags (params): Set params used to start bareos_fd. -# bareos_fd_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_fd" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_fd_enable="NO"} -: ${bareos_fd_flags="-u root -g wheel -v"} -: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"} - -command=%%PREFIX%%/sbin/bareos-fd -command_args="-c ${bareos_fd_config}" -pidfile="${bareos_fd_pidfile}" -start_precmd="bareos_start_precmd" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || { - getent passwd bareos > /dev/null 2&>1 - if [ $? -eq 0] ; then - # user bareos exists - install -d -o bareos -g bareos ${pidfile%/*} - else - # bareos_fd as solitair service - install -d -o root -g wheel ${pidfile%/*} - fi - } -} - -run_rc_command "$1" diff --git a/sysutils/bareos19-server/files/bareos-sd.in b/sysutils/bareos19-server/files/bareos-sd.in deleted file mode 100644 index a5efe78e80f7..000000000000 --- a/sysutils/bareos19-server/files/bareos-sd.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_sd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_sd_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_sd. -# bareos_sd_flags (params): Set params used to start bareos_sd. -# bareos_sd_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_sd" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_sd_enable="NO"} -: ${bareos_sd_flags="-u bareos -g bareos -v"} -: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"} - -command=%%PREFIX%%/sbin/bareos-sd -command_args="-c ${bareos_sd_config}" -pidfile="${bareos_sd_pidfile}" -start_precmd="bareos_start_precmd" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} -} - -run_rc_command "$1" diff --git a/sysutils/bareos19-server/files/chio-bareos b/sysutils/bareos19-server/files/chio-bareos deleted file mode 100644 index f006ef78e6ce..000000000000 --- a/sysutils/bareos19-server/files/chio-bareos +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/sh -# -# BAREOS interface to tape libraries and autoloaders for FreeBSD -# (by Rudolf Cejka <cej...@fit.vutbr.cz>, v1.2, 2012/11/14) -# -# If you set in your Device resource -# Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d" -# you will have the following input to this script: -# chio-changer "changer-device" "command" "slot" "tape-device" "drive-index" -# $1 $2 $3 $4 $5 -# for example (on a FreeBSD system): -# chio-changer /dev/ch0 load 1 /dev/nsa0 0 -# -# If you change the script, take care to return either the chio exit -# code or a 0. If the script exits with a non-zero exit code, BAREOS -# will assume the request failed. -# - -PROGNAME=`basename $0` - -# Uncomment the following line, if you want to log debug output. -#DEBUG=/var/run/bareos/${PROGNAME}.log - -# Uncomment the following line, if you need to eject a tape before moving -# it from the drive. -#OFFLINE=yes - -# Uncomment one or more of the following lines, if you need to wait for -# some time (in seconds) after unloading, loading or transferring a tape. -#OFFLINE_SLEEP=10 -#LOAD_SLEEP=10 -#MOVE_SLEEP=10 - -# Uncomment the following line, if you do not have a changer with volume -# reader. -#FAKE_BARCODES=/usr/local/etc/bareos-barcodes - -usage() -{ - cat <<EOF -Usage: ${PROGNAME} <changer-device> <cmd> [slot] [tape-device] [drive-index] - -Commands (<cmd>): - unload Unload a tape into the slot from where it was loaded - load <slot> Load a tape from the slot <slot> (1-based) - transfer <slot> <slotdst> Transfer a tape from the slot <slot> to - the slot <slotdst> (1-based) - list List full storage slots - listall List all storage slots and drives with source information - loaded Give slot from where the tape was loaded (0 = empty drive) - slots Give number of available slots - -Example: - ${PROGNAME} /dev/ch0 load 1 Load a tape from the slot 1 - -EOF - exit 1 -} - -# Default settings -CHANGER=/dev/ch0 -TAPE=/dev/nsa0 -DRIVE=0 - -CHIO=/bin/chio -MT=/usr/bin/mt - -if [ -n "${DEBUG}" ]; then - MSG=$0 - for PAR; do MSG="${MSG} \"${PAR}\""; done - echo `date +"%Y/%m/%d %H:%M:%S"` ${MSG} >> ${DEBUG} -fi - -if [ -n "$1" ]; then - CHANGER=$1; -fi -COMMAND=$2 -SLOT=$3 -SLOTDST=$4 -if [ -n "$4" ]; then - TAPE=$4 -fi -if [ -n "$5" ]; then - DRIVE=$5 -fi - -case ${COMMAND} in -unload) - if [ "${OFFLINE}" = yes ]; then - ${MT} -f ${TAPE} offline - if [ $? = 0 -a -n "${OFFLINE_SLEEP}" ]; then - sleep ${OFFLINE_SLEEP} - fi - fi - if [ -z "${SLOT}" ]; then - ${CHIO} -f ${CHANGER} return drive ${DRIVE} - else - ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT} - 1)) - fi - if [ $? -ne 0 ]; then - # In case of an error, try to unload the cartridge to the first free slot - FREE=`${CHIO} -f ${CHANGER} status slot | \ - sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \ - awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'` - if [ ${FREE} -gt 0 ]; then - ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${FREE} - 1)) - else - exit 1 - fi - fi - ;; -load) - if [ -z "${SLOT}" ]; then - usage - fi - ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) drive ${DRIVE} - if [ $? -ne 0 ]; then - exit 1 - fi - if [ -n "${LOAD_SLEEP}" ]; then - sleep ${LOAD_SLEEP} - fi - ;; -transfer) - if [ -z "${SLOT}" -o -z "${SLOTDST}" ]; then - usage - fi - ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) slot $((${SLOTDST} - 1)) - if [ $? -ne 0 ]; then - exit 1 - fi - if [ -n "${MOVE_SLEEP}" ]; then - sleep ${MOVE_SLEEP} - fi - ;; -list) - if [ -z "${FAKE_BARCODES}" ]; then - ${CHIO} -f ${CHANGER} status -v slot | \ - sed -ne 's/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/\1:\2/p' | \ - awk -F: '{ print $1 + 1 ":" $2 }' - else - if [ -f "${FAKE_BARCODES}" ]; then - grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} - else - echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing" - exit 1 - fi - fi - ;; -listall) - if [ -z "${FAKE_BARCODES}" ]; then - ${CHIO} -f ${CHANGER} status -vS | \ - sed -ne ' - s/^slot *\([0-9]*\):.*ENAB.*FULL.*voltag.*<\([^:]*\):.*/I:\1:F:\2/p;t - s/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/S:\1:F:\2/p;t - s/^drive *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*source.*<[^0-9]*\([0-9]*\)>.*/D:\1:F:\3:\2/p;t - s/^slot *\([0-9]*\):.*ENAB.*voltag.*<\([^:]*\):.*/I:\1:E/p;t - s/^slot *\([0-9]*\):.*voltag.*<\([^:]*\):.*/S:\1:E/p;t - s/^drive *\([0-9]*\):.*voltag.*<\([^:]*\):.*/D:\1:E/p' | \ - awk -F: '{ for (n = 1; n <= NF; n++) printf "%s%s", - (n == ($1 == "D" ? 4 : 2)) ? ($n == "" ? 0 : $n + 1) : $n, - (n == NF) ? "\n" : ":" }' - else - if [ -f "${FAKE_BARCODES}" ]; then - grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} | \ - awk -F: '{ print "S:" $1 (match($2, "^ *$") ? ":E" : ":F:" $2) }' - else - echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing" - exit 1 - fi - fi - ;; -loaded) - # If a tape is loaded, but the source slot is unknown (for example, - # after library reboot), try to report the first free slot - FREE=`${CHIO} -f ${CHANGER} status slot | \ - sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \ - awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'` - ${CHIO} -f ${CHANGER} status -S drive | \ - sed -ne 's/^drive *'${DRIVE}':.*FULL.*source.*<[^0-9]*\([0-9]*\)>.*/\1/p' \ - | awk 'BEGIN { n = 0 } { n = ($1 == "") ? '${FREE}' : $1 + 1 } \ - END { print n }' - ;; -slots) - ${CHIO} -f ${CHANGER} status | grep -c "^slot " - ;; -*) - usage - ;; -esac diff --git a/sysutils/bareos19-server/files/patch-core-CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-CMakeLists.txt deleted file mode 100644 index 955525c77b1c..000000000000 --- a/sysutils/bareos19-server/files/patch-core-CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- core/CMakeLists.txt 2020-01-31 12:45:28.110777000 -0500 -+++ core/CMakeLists.txt 2020-01-31 12:47:41.413976000 -0500 -@@ -249,7 +249,9 @@ - set(PSCMD "ps -ax -o pid,command") - include_directories(/usr/local/include) - link_directories(/usr/local/lib) -- link_libraries(intl) -+ IF(nls) -+ link_libraries(intl) -+ ENDIF() - endif() - - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -@@ -316,8 +318,11 @@ - add_definitions("-D_FILE_OFFSET_BITS=64") - endif() - --include(FindIntl) - -+IF(nls) -+ INCLUDE(FindIntl) -+ENDIF() -+ - if(developer) - add_definitions("-DDEVELOPER=1") - endif() -@@ -746,7 +751,6 @@ - - add_subdirectory(scripts) - add_subdirectory(manpages) --add_subdirectory(platforms) - add_subdirectory(src) - - include(BareosLocalBuildDefinitions OPTIONAL diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake deleted file mode 100644 index e7fe16ff0038..000000000000 --- a/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000 -0500 -@@ -100,21 +100,21 @@ - check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) - check_include_files(api/glfs.h HAVE_API_GLFS_H) - -+if(cephfs) - check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -+check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) -+endif() - --include(CheckSymbolExists) --include(CMakePushCheckState) --cmake_push_check_state() --set(CMAKE_REQUIRED_LIBRARIES cephfs) --check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX) --cmake_pop_check_state() -- -+if(rados) - check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) - check_include_files(radosstriper/libradosstriper.h - HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) -+endif() - - # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) --check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) -+if(gfapi) -+ check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) -+endif() - - check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) - check_include_files(elasto/file.h HAVE_ELASTO_FILE_H) diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake deleted file mode 100644 index fc7d187ea1ca..000000000000 --- a/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake +++ /dev/null @@ -1,66 +0,0 @@ ---- core/cmake/BareosFindAllLibraries.cmake 2020-01-31 11:21:18.000000000 -0500 -+++ core/cmake/BareosFindAllLibraries.cmake 2020-02-03 00:55:59.098603000 -0500 -@@ -23,20 +23,22 @@ - endif() - - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") -- # make sure we get python 2 not 3 -- set( -- Python_ADDITIONAL_VERSIONS -- 2.5 -- 2.6 -- 2.7 -- 2.8 -- 2.9 -- ) -- find_package(PythonInterp) -- include(FindPythonLibs) -+ if (python) -+ # make sure we get python 2 not 3 -+ set( -+ Python_ADDITIONAL_VERSIONS -+ 3.5 -+ 3.6 -+ 3.7 -+ 3.8 -+ 2.9 -+ ) -+ find_package(PythonInterp) -+ include(FindPythonLibs) - -- if(${PYTHONLIBS_FOUND}) -- set(HAVE_PYTHON 1) -+ if(${PYTHONLIBS_FOUND}) -+ set(HAVE_PYTHON 1) -+ endif() - endif() - - include(FindPostgreSQL) -@@ -56,13 +58,22 @@ - include(BareosFindLibraryAndHeaders) - - bareosfindlibraryandheaders("jansson" "jansson.h") --bareosfindlibraryandheaders("rados" "rados/librados.h") --bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") --bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") - bareosfindlibraryandheaders("pthread" "pthread.h") - bareosfindlibraryandheaders("cap" "sys/capability.h") --bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h") --bareosfindlibraryandheaders("droplet" "droplet.h") -+ -+if(rados) -+ bareosfindlibraryandheaders("rados" "rados/librados.h") -+ bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") -+endif() -+if(cephfs) -+ bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") -+endif() -+if(gfapi) -+ bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h") -+endif() -+if(droplet) -+ bareosfindlibraryandheaders("droplet" "droplet.h") -+endif() - - bareosfindlibraryandheaders("pam" "security/pam_appl.h") - diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake deleted file mode 100644 index 3c89b1c8a8f7..000000000000 --- a/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake +++ /dev/null @@ -1,117 +0,0 @@ ---- core/cmake/BareosInstallConfigFiles.cmake 2020-01-31 11:21:18.000000000 -0500 -+++ core/cmake/BareosInstallConfigFiles.cmake 2020-02-03 02:15:35.557127000 -0500 -@@ -60,24 +60,12 @@ - get_filename_component(resname ${resdir} NAME) - foreach(configfile ${configfiles}) - get_filename_component(fname ${configfile} NAME) -- if(EXISTS ${DESTCONFDIR}/${resname}/${fname}) -- message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists") -- message(STATUS "rename ${configfile} to ${configfile}.new") -- file(RENAME "${configfile}" "${configfile}.new") -- -- message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") -- file( -- INSTALL "${configfile}.new" -- DESTINATION "${DESTCONFDIR}/${resname}" -- ) -- file(RENAME "${configfile}.new" "${configfile}") -- else() -- message( -- STATUS -- "${resname}/${fname} as ${resname}/${fname} (new installation)" -- ) -- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") -- endif() -+ message(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)") -+ file(RENAME "${configfile}" "${configfile}.sample") -+ file( -+ COPY "${configfile}.sample" -+ DESTINATION "${DESTCONFDIR}/${resname}" -+ ) - endforeach() - endforeach() - -@@ -114,23 +102,12 @@ - get_filename_component(dir ${configfile} DIRECTORY) - get_filename_component(fname ${configfile} NAME) - -- if(EXISTS ${DESTCONFDIR}/${configfile}) -- message(STATUS "${configfile} as ${configfile}.new (keep existing)") -- file(RENAME "${BackendConfigSrcDir}/${configfile}" -- "${BackendConfigSrcDir}/${configfile}.new") -- file( -- COPY "${BackendConfigSrcDir}/${configfile}.new" -- DESTINATION "${DESTCONFDIR}/${dir}" -- ) -- file(RENAME "${BackendConfigSrcDir}/${configfile}.new" -- "${BackendConfigSrcDir}/${configfile}") -- else() -- message(STATUS "${configfile} as ${configfile}") -- file( -- COPY "${BackendConfigSrcDir}/${configfile}" -- DESTINATION "${DESTCONFDIR}/${dir}" -- ) -- endif() -+ message(STATUS "${configfile} as ${configfile}") -+ file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") -+ file( -+ COPY "${BackendConfigSrcDir}/${configfile}.sample" -+ DESTINATION "${DESTCONFDIR}/${dir}" -+ ) - endforeach() - - file( -@@ -140,7 +117,8 @@ - ) - foreach(configfile ${configfiles}) - get_filename_component(dir ${configfile} DIRECTORY) -- # get_filename_component(fname ${configfile} NAME) -+ get_filename_component(fname ${configfile} NAME) -+ get_filename_component(fsname ${configfile} NAME_WE) - - if(EXISTS ${DESTCONFDIR}/${configfile}) - message(STATUS "overwriting ${configfile}") -@@ -148,9 +126,10 @@ - message(STATUS "${configfile} as ${configfile}") - endif() - -+ file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") - file( -- COPY "${BackendConfigSrcDir}/${configfile}" -- DESTINATION "${DESTCONFDIR}/${dir}" -+ COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" -+ DESTINATION "${DESTCONFDIR}/${dir}" - ) - endforeach() - -@@ -174,22 +153,14 @@ - ) - if(NOT "${IS_INFILE}" STREQUAL ".in") - get_filename_component(fname ${configfile} NAME) -- if(EXISTS ${DESTCONFDIR}/${resname}/${fname}) -- message( -- STATUS -- "${resname}/${fname} as ${resname}/${fname}.new (keep existing)" -- ) -- file(RENAME "${configfile}" "${configfile}.new") -- file( -- COPY "${configfile}.new" -- DESTINATION "${DESTCONFDIR}/${resname}" -- ) -- file(RENAME "${configfile}.new" "${configfile}") -- else() -- message(STATUS "${resname}/${fname} as ${resname}/${fname}") -- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") -- endif() -- else() -+ get_filename_component(fsname ${configfile} NAME_WE) -+ message(STATUS "${resname}/${fname} as ${resname}/${fname}") -+ file(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample") -+ file( -+ COPY "${resdir}/${fsname}.conf.sample" -+ DESTINATION "${DESTCONFDIR}/${resname}" -+ ) -+ else() - message(STATUS "skipping .in file ${configfile}:${IS_INFILE}") - endif() - endforeach() diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake deleted file mode 100644 index 935c5a5b3177..000000000000 --- a/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:21:15.864122000 -0500 -+++ core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:23:58.960984000 -0500 -@@ -641,7 +641,11 @@ - set(PACKAGE_URL "\"\"") - set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") - --set(ENABLE_NLS 1) -+if(nls) -+ SET(ENABLE_NLS 1) -+else() -+ SET(ENABLE_NLS 0) -+endif() - - if(HAVE_WIN32) - diff --git a/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt deleted file mode 100644 index 1a78d64effb1..000000000000 --- a/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- core/manpages/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 -+++ core/manpages/CMakeLists.txt 2020-01-31 15:33:19.205416000 -0500 -@@ -17,9 +17,11 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - # 02110-1301, USA. - -+if(client-only) - set(MAN1 bconsole.1) - - set(MAN8 bareos-fd.8 bareos.8) -+endif() - - if(NOT client-only) - set(MAN1-server diff --git a/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt deleted file mode 100644 index ae7fd0295cdf..000000000000 --- a/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ ---- core/scripts/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 -+++ core/scripts/CMakeLists.txt 2020-01-31 15:37:16.832224000 -0500 -@@ -17,33 +17,35 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - # 02110-1301, USA. - --install( -- FILES bareos btraceback -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${sbindir}" --) -+if(client-only) -+ install( -+ FILES bareos btraceback -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${sbindir}" -+ ) - --install( -- FILES bareos-ctl-fd -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${scriptdir}" -- COMPONENT filedaemon --) -+ install( -+ FILES bareos-ctl-fd -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${scriptdir}" -+ COMPONENT filedaemon -+ ) - --install( -- FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config -- bareos-config-lib.sh bareos-ctl-funcs -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${scriptdir}" --) -+ install( -+ FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config -+ bareos-config-lib.sh bareos-ctl-funcs -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${scriptdir}" -+ ) -+endif() - - if(NOT client-only) - install( - FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper -- bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs -+ bareos-ctl-dir bareos-ctl-sd - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${scriptdir}" diff --git a/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt deleted file mode 100644 index 7871e7d5e0f8..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:35.841314000 -0500 -+++ core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:55.280473000 -0500 -@@ -11,6 +11,9 @@ - bareossql - $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> - ${LMDB_LIBS} -+ ${OPENSSL_LIBRARIES} -+ ${PTHREAD_LIBRARIES} -+ ${JANSSON_LIBRARIES} - ) - - install(TARGETS diff --git a/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt deleted file mode 100644 index a41310367062..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ ---- core/src/dird/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/dird/CMakeLists.txt 2020-01-31 15:41:53.134935000 -0500 -@@ -148,7 +148,8 @@ - add_executable(bareos-dir ${DIRDSRCS}) - - set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind -- ${LMDB_LIBS} ${NDMP_LIBS} -+ ${LMDB_LIBS} ${NDMP_LIBS} ${OPENSSL_LIBRARIES} -+ ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES} - ) - - if(HAVE_WIN32) -@@ -166,7 +167,7 @@ - add_executable(bareos-dbcheck ${DBCHKSRCS}) - set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) - --target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES}) -+target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}) - - # is not built by default - diff --git a/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h deleted file mode 100644 index 00af8c5eff44..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h +++ /dev/null @@ -1,25 +0,0 @@ ---- core/src/include/baconfig.h 2020-02-04 15:53:01.627766000 -0500 -+++ core/src/include/baconfig.h 2020-02-04 15:53:34.762711000 -0500 -@@ -119,11 +119,11 @@ - #define N_(s) (s) - #endif /* N_ */ - #else /* !ENABLE_NLS */ -+#include <locale.h> - #undef _ - #undef N_ - #undef textdomain - #undef bindtextdomain --#undef setlocale - - #ifndef _ - #define _(s) (s) -@@ -136,9 +136,6 @@ - #endif - #ifndef bindtextdomain - #define bindtextdomain(p, d) --#endif --#ifndef setlocale --#define setlocale(p, d) - #endif - #endif /* ENABLE_NLS */ - diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc deleted file mode 100644 index c5a20c421954..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- core/src/plugins/dird/python-dir.cc 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/plugins/dird/python-dir.cc 2020-01-31 15:50:39.024455000 -0500 -@@ -41,6 +41,13 @@ - #error "Need at least Python version 2.6 or newer" - #endif - -+#if (PY_VERSION_HEX > 0x03050000) -+#define PyInt_AsLong PyLong_AsLong -+#define PyInt_FromLong PyLong_FromLong -+#define PyString_AsString PyUnicode_AsUTF8 -+#define PyString_FromString PyUnicode_FromString -+#endif -+ - #include "python-dir.h" - #include "lib/edit.h" - -@@ -121,6 +128,20 @@ - */ - static PyThreadState* mainThreadState; - -+#if (PY_VERSION_HEX > 0x03050000) -+static struct PyModuleDef BareosDIRModuleDef = { -+ PyModuleDef_HEAD_INIT, -+ "bareosdir", -+ NULL, -+ -1, -+ BareosDIRMethods, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -660,7 +681,11 @@ - /* - * Make our callback methods available for Python. - */ -+#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef); -+#else - p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods); -+#endif - } - - /* -@@ -939,7 +964,11 @@ - char* value; - - ctx = PyGetbpContext(pyCtx); -+#if (PY_VERSION_HEX > 0x03050000) -+ value = strdup(PyString_AsString(pyValue)); -+#else - value = PyString_AsString(pyValue); -+#endif - if (value) { - retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value); - } diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt deleted file mode 100644 index 3757a55385cf..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- core/src/plugins/filed/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/plugins/filed/CMakeLists.txt 2020-01-31 15:54:40.841485000 -0500 -@@ -100,24 +100,26 @@ - install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon) - endif() - --set(PYFILES -- bareos-fd.py.template -- bareos-fd-local-fileset.py -- bareos-fd-mock-test.py -- BareosFdPluginBaseclass.py -- BareosFdPluginLocalFileset.py -- BareosFdWrapper.py -- bareos_fd_consts.py -- bareos-fd-ldap.py -- BareosFdPluginLDAP.py -- bareos-fd-ovirt.py -- BareosFdPluginOvirt.py -- bareos-fd-percona-xtrabackup.py -- BareosFdPluginPerconaXtraBackup.py --) -+if(python) -+ set(PYFILES -+ bareos-fd.py.template -+ bareos-fd-local-fileset.py -+ bareos-fd-mock-test.py -+ BareosFdPluginBaseclass.py -+ BareosFdPluginLocalFileset.py -+ BareosFdWrapper.py -+ bareos_fd_consts.py -+ bareos-fd-ldap.py -+ BareosFdPluginLDAP.py -+ bareos-fd-ovirt.py -+ BareosFdPluginOvirt.py -+ bareos-fd-percona-xtrabackup.py -+ BareosFdPluginPerconaXtraBackup.py -+ ) - --install( -- FILES ${PYFILES} -- DESTINATION ${plugindir} -- COMPONENT filedaemon --) -+ install( -+ FILES ${PYFILES} -+ DESTINATION ${plugindir} -+ COMPONENT filedaemon -+ ) -+endif() diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc deleted file mode 100644 index 0375b4c33f7e..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- core/src/plugins/filed/gfapi-fd.cc 2020-02-03 00:50:05.248044000 -0500 -+++ core/src/plugins/filed/gfapi-fd.cc 2020-02-03 00:50:35.639144000 -0500 -@@ -32,7 +32,7 @@ - #include "lib/berrno.h" - #include "lib/edit.h" - --#include <api/glfs.h> -+#include <glusterfs/api/glfs.h> - - - /* avoid missing config.h problem on Debian 8 and Ubuntu 16: -@@ -41,10 +41,10 @@ - */ - #ifndef _CONFIG_H - #define _CONFIG_H --#include <compat-errno.h> -+#include <glusterfs/compat-errno.h> - #undef _CONFIG_H - #else --#include <compat-errno.h> -+#include <glusterfs/compat-errno.h> - #endif - - namespace filedaemon { diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc deleted file mode 100644 index a750dbc3a213..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc +++ /dev/null @@ -1,111 +0,0 @@ ---- core/src/plugins/filed/python-fd.cc 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/plugins/filed/python-fd.cc 2020-01-31 17:58:06.370789000 -0500 -@@ -46,6 +46,14 @@ - #error "Need at least Python version 2.6 or newer" - #endif - -+#if (PY_VERSION_HEX > 0x03050000) -+#define PyInt_AsLong PyLong_AsLong -+#define PyInt_FromLong PyLong_FromLong -+#define PyString_AsString PyUnicode_AsUTF8 -+#define PyString_FromString PyUnicode_FromString -+#define PyString_Check PyBytes_Check -+#endif -+ - static const int debuglevel = 150; - - #define PLUGIN_LICENSE "Bareos AGPLv3" -@@ -154,6 +162,20 @@ - */ - static PyThreadState* mainThreadState; - -+#if (PY_VERSION_HEX > 0x03050000) -+static struct PyModuleDef BareosFDModuleDef = { -+ PyModuleDef_HEAD_INIT, -+ "bareosfd", -+ NULL, -+ -1, -+ BareosFDMethods, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -1148,7 +1170,11 @@ - /* - * Make our callback methods available for Python. - */ -+#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef); -+#else - p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods); -+#endif - - /* - * Fill in the slots of PyRestoreObject -@@ -2587,7 +2613,11 @@ - case bVarFileSeen: { - char* value; - -+#if (PY_VERSION_HEX > 0x03050000) -+ value = strdup(PyString_AsString(pyValue)); -+#else - value = PyString_AsString(pyValue); -+#endif - if (value) { - retval = bfuncs->setBareosValue(ctx, (bVariable)var, value); - } -@@ -2972,7 +3002,11 @@ - sp.type = pSavePkt->type; - if (pSavePkt->fname) { - if (PyString_Check(pSavePkt->fname)) { -+#if (PY_VERSION_HEX > 0x03050000) -+ sp.fname = strdup(PyString_AsString(pSavePkt->fname)); -+#else - sp.fname = PyString_AsString(pSavePkt->fname); -+#endif - } else { - goto bail_out; - } -@@ -2981,7 +3015,11 @@ - } - if (pSavePkt->link) { - if (PyString_Check(pSavePkt->link)) { -+#if (PY_VERSION_HEX > 0x03050000) -+ sp.link = strdup(PyString_AsString(pSavePkt->link)); -+#else - sp.link = PyString_AsString(pSavePkt->link); -+#endif - } else { - goto bail_out; - } -@@ -3025,7 +3063,11 @@ - */ - if (pSavePkt->fname) { - if (PyString_Check(pSavePkt->fname)) { -+#if (PY_VERSION_HEX > 0x03050000) -+ sp.fname = strdup(PyString_AsString(pSavePkt->fname)); -+#else - sp.fname = PyString_AsString(pSavePkt->fname); -+#endif - } else { - goto bail_out; - } -@@ -3101,8 +3143,11 @@ - static inline char* PyGetStringValue(PyObject* object) - { - if (!object || !PyString_Check(object)) { return (char*)""; } -- -+#if (PY_VERSION_HEX > 0x03050000) -+ return strdup(PyString_AsString(object)); -+#else - return PyString_AsString(object); -+#endif - } - - static inline char* PyGetByteArrayValue(PyObject* object) diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt deleted file mode 100644 index 3dc59542df60..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:41:50.658146000 -0500 -+++ core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:43:09.372433000 -0500 -@@ -27,6 +27,10 @@ - ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS} - ) - add_definitions(-DMS_WIN${WINDOWS_BITS}) -+else() -+ include_directories( -+ ${PROJECT_SOURCE_DIR}/src/fastlz/include -+ ) - endif() - - add_library(autoxflate-sd MODULE autoxflate-sd.cc) diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc deleted file mode 100644 index 7cbc0b4816bb..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- core/src/plugins/stored/python-sd.cc 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/plugins/stored/python-sd.cc 2020-01-31 16:07:55.684864000 -0500 -@@ -41,6 +41,13 @@ - #error "Need at least Python version 2.6 or newer" - #endif - -+#if (PY_VERSION_HEX > 0x03050000) -+#define PyInt_AsLong PyLong_AsLong -+#define PyInt_FromLong PyLong_FromLong -+#define PyString_AsString PyUnicode_AsUTF8 -+#define PyString_FromString PyUnicode_FromString -+#endif -+ - static const int debuglevel = 150; - - #define PLUGIN_LICENSE "Bareos AGPLv3" -@@ -119,6 +126,20 @@ - */ - static PyThreadState* mainThreadState; - -+#if (PY_VERSION_HEX > 0x03050000) -+static struct PyModuleDef BareosSDModuleDef = { -+ PyModuleDef_HEAD_INIT, -+ "bareossd", -+ NULL, -+ -1, -+ BareosSDMethods, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -678,7 +699,11 @@ - /* - * Make our callback methods available for Python. - */ -+#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef); -+#else - p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods); -+#endif - } - - /* -@@ -958,7 +983,11 @@ - char* value; - - ctx = PyGetbpContext(pyCtx); -+#if (PY_VERSION_HEX > 0x03050000) -+ value = strdup(PyString_AsString(pyValue)); -+#else - value = PyString_AsString(pyValue); -+#endif - if (value) { bfuncs->setBareosValue(ctx, (bsdwVariable)var, value); } - - break; diff --git a/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h b/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h deleted file mode 100644 index 2bd3b2675904..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h +++ /dev/null @@ -1,11 +0,0 @@ ---- core/src/stored/backends/gfapi_device.h 2020-02-03 01:55:43.902693000 -0500 -+++ core/src/stored/backends/gfapi_device.h 2020-02-03 01:52:28.885974000 -0500 -@@ -28,7 +28,7 @@ - #ifndef BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_ - #define BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_ - --#include <api/glfs.h> -+#include <glusterfs/api/glfs.h> - - #if defined GLFS_FTRUNCATE_HAS_FOUR_ARGS - #define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL) diff --git a/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt deleted file mode 100644 index 311f66b1cb59..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ ---- core/src/stored/CMakeLists.txt 2021-09-13 11:07:41.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2022-03-04 20:43:08.042458000 -0500 -@@ -213,23 +213,23 @@ - list(APPEND BAREOS_SD_LIBRARIES comctl32) - endif() - --target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES}) -+target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - add_executable(bls ${BLSSRCS}) --target_link_libraries(bls bareos bareossd bareosfind) -+target_link_libraries(bls bareos bareossd bareosfind ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - add_executable(bextract ${BEXTRACTSRS}) --target_link_libraries(bextract bareossd bareosfind bareos) -+target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - add_executable(bscan ${BSCANSRCS}) --target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) -+target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - add_executable(btape ${BTAPESRCS}) --target_link_libraries(btape bareossd bareos) -+target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - add_executable(bcopy ${BCOPYSRCS}) - --target_link_libraries(bcopy bareossd bareos) -+target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - - install(TARGETS bareossd DESTINATION ${libdir}) - -@@ -243,7 +243,7 @@ - install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") - install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) - --install(DIRECTORY DESTINATION "../${archivedir}") -+install(DIRECTORY DESTINATION "${archivedir}") - - if(${HAVE_DYNAMIC_SD_BACKENDS}) - add_subdirectory(backends) diff --git a/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt deleted file mode 100644 index f9401574e129..000000000000 --- a/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ ---- core/src/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 -+++ core/src/CMakeLists.txt 2020-02-01 12:33:06.503769000 -0500 -@@ -35,15 +35,18 @@ - add_subdirectory(tests) - endif() - --add_subdirectory(console) --if(${HAVE_LMDB}) -- add_subdirectory(lmdb) -+if(client-only) -+ add_subdirectory(console) -+ if(${HAVE_LMDB}) -+ add_subdirectory(lmdb) -+ endif() -+ add_subdirectory(lib) -+ add_subdirectory(findlib) -+ add_subdirectory(filed) -+ add_subdirectory(fastlz) - endif() --add_subdirectory(lib) --add_subdirectory(findlib) --add_subdirectory(filed) -+ - add_subdirectory(plugins) --add_subdirectory(fastlz) - - if(${traymonitor}) - add_subdirectory(qt-tray-monitor) diff --git a/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake deleted file mode 100644 index 11bfbd7af603..000000000000 --- a/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake +++ /dev/null @@ -1,38 +0,0 @@ ---- core/cmake/bareos-symlink-default-db-backend.cmake.orig 2020-12-11 13:44:43 UTC -+++ core/cmake/bareos-symlink-default-db-backend.cmake -@@ -16,15 +16,33 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - # 02110-1301, USA. -+ -+# The ${libdir} and ${backenddir} are absolute, so figure out -+# a relative path (${backenddir} lives under ${libdir}) instead. -+# Make the link relative, placing the libbareoscats.so in ${libdir}. -+# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see -+# core/src/cats/CMakeLists.txt). - message( - STATUS - "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -+file( -+ RELATIVE_PATH -+ _rel -+ ${libdir} -+ ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} -+) -+message( -+ STATUS -+ ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}" -+) -+ - execute_process( - COMMAND - ${CMAKE_COMMAND} - -E - create_symlink -- ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} -- ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} -+ ${_rel} -+ libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION} -+ WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT - ) diff --git a/sysutils/bareos19-server/files/pkg-deinstall.client.in b/sysutils/bareos19-server/files/pkg-deinstall.client.in deleted file mode 100644 index 3be8c2e4874c..000000000000 --- a/sysutils/bareos19-server/files/pkg-deinstall.client.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/usr/sbin - -# Note how to delete UID/GID -USER=%%BAREOS_USER%% -GROUP=%%BAREOS_GROUP%% -UID=%%BAREOS_UID%% -GID=%%BAREOS_UID%% -BACULA_DIR=%%BAREOS_DIR%% - -TMPFILE=/tmp/services-$RANDOM-$$ - -case "$2" in -"DEINSTALL") - # Delete entries in /etc/services - sed -e '/# Bareos port start/,/# Bareos port end/{' \ - -e 'd' \ - -e '}' /etc/services > $TMPFILE - mv -f $TMPFILE /etc/services - - if [ -d ${BAREOS_DIR} ]; then - echo "Check if ${BAREOS_DIR} is empty and delete it to permanently remove the bareos port." - fi - - if pw groupshow "${USER}" 2>/dev/null 1>&2; then - echo "To delete Bareos group permanently, use 'pw groupdel ${GROUP}'" - fi - ;; -esac diff --git a/sysutils/bareos19-server/files/pkg-install.client.in b/sysutils/bareos19-server/files/pkg-install.client.in deleted file mode 100644 index 70ca57028237..000000000000 --- a/sysutils/bareos19-server/files/pkg-install.client.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/usr/sbin - -# Always add lines in /etc/services -grep -q "bareos-dir" /etc/services -if [ "$?" != "0" ]; then - echo "# Bareos port start -bareos-dir 9101/tcp #Bareos director daemon -bareos-fd 9102/tcp #Bareos file daemon -bareos-sd 9103/tcp #Bareos storage daemon -# Bareos port end" >> /etc/services -fi diff --git a/sysutils/bareos19-server/files/pkg-message.client.in b/sysutils/bareos19-server/files/pkg-message.client.in deleted file mode 100644 index b3e2d5825e13..000000000000 --- a/sysutils/bareos19-server/files/pkg-message.client.in +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -bareos client was installed - -1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and - %%PREFIX%%/etc/bareos/bconsole.d/ - -2) Add bareos_fd_enable="YES" to /etc/rc.conf. - -3) If you want to retain old configuration scheme, you must add the following - to /etc/rc.conf - - bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf" -EOM -} -] diff --git a/sysutils/bareos19-server/files/pkg-message.server.in b/sysutils/bareos19-server/files/pkg-message.server.in deleted file mode 100644 index 3bb0ef535ce1..000000000000 --- a/sysutils/bareos19-server/files/pkg-message.server.in +++ /dev/null @@ -1,74 +0,0 @@ -[ -{ type: install - message: <<EOM -bareos server was installed - -1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and - %%PREFIX%%/etc/bareos/bareos-sd.d/ directories - -2) Add bareos_dir_enable="YES" and bareos_sd_enable="YES" to /etc/rc.conf. - -3) If you want to retain old configuration scheme, you must add the following - to /etc/rc.conf - - bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf" - bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf" - -4) Important information about new version of bareos can be found in the - ReleaseNotes. - - https://github.com/bareos/bareos/blob/master/README.md - -NOTE: - -An auto-changer manipulation script based on FreeBSDs -chio command is included and installed at - - %%PREFIX%%/sbin/chio-bareos - -Please have a look at it if you want to use an -autochanger. You have to configure the usage in - - %%PREFIX%%/etc/bareos/bareos-dir.conf or - %%PREFIX%%/etc/bareos/bareos-dir.d/storage/ - -Take care of correct permissions for changer and -tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e. -they must be accessible by user bareos. - -Due to lack of some features in the FreeBSD tape driver -implementation you MUST add some OS dependent options to -the bareos-sd.conf file: - - Hardware End of Medium = no; - Backward Space Record = no; - Backward Space File = no; - -With 2 filemarks at EOT (see man mt): - Fast Forward Space File = no; - BSF at EOM = yes; - TWO EOF = yes; - -With 1 filemarks at EOT (see man mt): - Fast Forward Space File = yes; - BSF at EOM = no; - TWO EOF = no; - -NOTE: YOU CAN SWITCH EOT model ONLY when starting - from scratch with EMPTY tapes. - -It is also important that all the scripts accessed -by RunBeforeJob and RunAfterJob will be executed by -the user bareos. Check your permissions. - -For USB support read the bareos manual. It could be necessary -to configure/compile a new kernel. - -Look at %%PREFIX%%/lib/bareos/scripts/update_bareos_tables for -database update procedure. - -If you are using sqlite you need to run the make_sqlite_tables script as -the bareos user. Do this using 'sudo su -m bareos'. -EOM -} -] |