- Copy bareos-* to bareos19-* preparing for update bareos to 20.0.0

This commit is contained in:
Jose Alonso Cardenas Marquez 2020-12-27 17:34:40 +00:00
parent 9e3d88f562
commit a73430b8ed
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=559383
38 changed files with 1910 additions and 0 deletions

View File

@ -0,0 +1,25 @@
# $FreeBSD$
PORTNAME= bareos
PKGNAMESUFFIX= 19-client
COMMENT= Backup archiving recovery open sourced (client)
CONFLICTS= bareos18-client-* bareos17-client-* bareos-client-*
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bareos19-server
OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO
CEPHFS_DESC= CEPHFS fd plugin support
GFAPI_DESC= GFAPI fd plugin support
RADOS_DESC= RADOS fd plugin support
LMDB_DESC= Enable build of LMDB support
.include "${MASTERDIR}/Makefile"

View File

@ -0,0 +1,240 @@
# $FreeBSD$
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 19.2.9
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= 19-server
MAINTAINER= acm@FreeBSD.org
COMMENT?= Backup archiving recovery open sourced (server)
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
CONFLICTS?= bacula18*-server bacula17*-server-*
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
USES+= cmake compiler:c++11-lang localbase perl5 pkgconfig readline:port \
shebangfix
USE_GITHUB= yes
USE_PERL5= run
USERS= bareos
GROUPS= ${USERS}
PLIST_SUB+= LIB_VERSION=${PORTVERSION}
USE_LDCONFIG= yes
SHEBANG_LANG= perl
SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFAULT= OPENSSL
OPTIONS_SINGLE= CRYPTO
OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS
OPTIONS_SUB= yes
CRYPTO_DESC= Cryptographic library
MTX_DESC= Install mtx for control of autochanger devices
NDMP_DESC= Enable build of NDMP support
SCSICRYPTO_DESC= Build LTO AME crypto plugin
.if ${PKGNAMESUFFIX} == "19-server"
OPTIONS_GROUP= BACKENDS
OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO
OPTIONS_DEFAULT+= PGSQL SCSICRYPTO
OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
OPTIONS_SINGLE+= DATABASE
BACKENDS_DESC= Storage backends
DATABASE_DESC= Database support
CEPHFS_DESC= CEPHFS backend support
GFAPI_DESC= GFAPI backend support
RADOS_DESC= RADOS backend support
NDMP_CMAKE_ON= -Dndmp=ON
NDMP_CMAKE_OFF= -Dndmp=OFF
.endif
GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE}
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
OPENSSL_USES= ssl
OPENSSL_CMAKE_ON= -Dopenssl=ON
OPENSSL_CMAKE_OFF= -Dopenssl=OFF
SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON
SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF
.if ${PKGNAMESUFFIX} == "19-client" || ${PKGNAMESUFFIX} == "19-server" #Till end of the file
PYTHON_USES= python
PYTHON_CMAKE_ON= -Dpython=ON
PYTHON_CMAKE_OFF= -Dpython=OFF
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
LIB_DEPENDS+= libbareos.so:sysutils/bareos19-client
USE_RC_SUBR?= bareos-dir bareos-sd
.endif
.if defined(WITH_CLIENT_ONLY)
SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client
.else
SUB_FILES+= pkg-message.server
.endif
CMAKE_ARGS+= -Dtcp-wrappers=ON \
-Dsmartalloc=ON \
-Dsysconfdir=${PREFIX}/etc \
-Darchivedir=${BAREOS_DIR}/storage \
-Dworkingdir=${BAREOS_DIR} \
-Dconfdir=${PREFIX}/etc/bareos \
-Dlibdir=${PREFIX}/lib \
-Dlogdir=/var/log/bareos \
-Dincludedir=${PREFIX}/include/bareos \
-Dreadline=ON \
-Ddisable-conio=ON \
-Dbatch-insert=ON \
-Dhave_plugins=ON \
-Dplugindir=${PREFIX}/lib/bareos/plugins \
-Dscriptdir=${PREFIX}/lib/bareos/scripts \
-Dbackenddir=${PREFIX}/lib/bareos/backends \
-Ddump_email=root@localhost \
-Djob_email=root@localhost \
-Ddb_name=bareos \
-Dsbin-perm=755 \
-Ddb_user=bareos \
-Dbaseport=9101 \
-Dpiddir=/var/run/bareos
.if defined(WITH_CLIENT_ONLY)
LMDB_CMAKE_ON= -Dlmdb=ON
LMDB_CMAKE_OFF= -Dlmdb=OFF
LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
CMAKE_ARGS+= -Dfd-user=root \
-Dfd-group=wheel
.else
CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \
-Ddir-group=${BAREOS_GROUP} \
-Dsd-user=${BAREOS_USER} \
-Dsd-group=operator \
-Dlmdb=OFF
.endif
# The user/group IDs below are registered, see
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
#
BAREOS_USER?= bareos
BAREOS_GROUP?= ${BAREOS_USER}
BAREOS_UID?= 997
BAREOS_GID?= ${BAREOS_UID}
BAREOS_DIR?= /var/db/bareos
PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR}
SUB_LIST= BAREOS_USER=${BAREOS_USER} \
BAREOS_GROUP=${BAREOS_GROUP} \
BAREOS_UID=${BAREOS_UID} \
BAREOS_GID=${BAREOS_GID} \
BAREOS_DIR=${BAREOS_DIR}
NLS_USES= gettext
NLS_CMAKE_ON= -Dnls=ON
CEPHFS_CMAKE_ON= -Dcephfs=ON
CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14
GFAPI_CMAKE_ON= -Dgfapi=ON
GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs
RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON
RADOS_LIB_DEPENDS= librados.so:net/ceph14
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES= fd
CMAKE_ARGS+= -Dclient-only=ON
PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client
PKGINSTALL= ${FILESDIR}/pkg-install.client
.else
# Server only Options
CONFFILES= sd dir
CMAKE_ARGS+= -Dbuild-dird=ON \
-Dbuild-stored=ON \
-Dbuild_client_only=OFF
# Server default database
MYSQL_CMAKE_ON= -Dmysql=ON
MYSQL_USES= mysql
SQLITE3_CMAKE_ON= -Dsqlite3=ON
SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
PGSQL_CMAKE_ON= -Dpostgresql=ON
PGSQL_USES= pgsql
MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
DBTYPE= mysql
SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
.elif ${PORT_OPTIONS:MSQLITE3}
DBTYPE= sqlite3
.else
DBTYPE= postgresql
SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
.endif
PLIST_SUB+= DBTYPE=${DBTYPE}
.endif
.if defined(WITH_CLIENT_ONLY)
MP1+= bconsole.1
MP8+= bareos-fd.8
.else
MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
btape.8 btraceback.8 bareos-dbcheck.8
MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
.endif
MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
post-patch:
@${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt
.if ${PKGNAMESUFFIX} == "19-server"
@${REINPLACE_CMD} '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
.endif
post-extract:
.if defined(WITH_CLIENT_ONLY)
. if defined(PYTHON_PLUGIN)
@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
. endif
.endif
@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
.if !target(post-install)
post-install:
.if defined(WITH_CLIENT_ONLY)
${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
.else
${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
.endif
@${MKDIR} ${STAGEDIR}/var/run/bareos
.endif
.else
.include "${MASTERDIR}/Makefile.common"
.endif # 19-client and 19-server are defined
.include <bsd.port.mk>

View File

@ -0,0 +1,33 @@
# Created by: Alonso Cardenas <acm@FreeBSD.org>
# $FreeBSD$
post-patch:
@${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt
post-build:
.if ${PKGNAMEPREFIX} == "nagios-check_"
${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
.endif
pre-install:
.if ${PKGNAMESUFFIX} == "19-traymonitor"
. for d in client director monitor storage
${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
. endfor
.endif
do-install:
.if ${PKGNAMEPREFIX} == "nagios-check_"
@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
${STAGEDIR}${PREFIX}/libexec/nagios
.endif
.if ${PKGNAMESUFFIX} == "19-traymonitor"
# Install config files and preserve existing ones
.for d in client director monitor storage
${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
.endfor
${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
.endif

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1607980168
SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723
SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739

View File

@ -0,0 +1,51 @@
#
# 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

View File

@ -0,0 +1,57 @@
#!/bin/sh
#
# $FreeBSD: head/sysutils/bareos-server/files/bareos-dir.in 323275 2013-07-19 09:44:58Z rm $
#
# 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"

View File

@ -0,0 +1,48 @@
#!/bin/sh
#
# $FreeBSD: head/sysutils/bacula5-server/files/bacula-fd.in 323275 2013-07-19 09:44:58Z rm $
#
# 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"

View File

@ -0,0 +1,39 @@
#!/bin/sh
#
# $FreeBSD: head/sysutils/bacula5-server/files/bacula-sd.in 323486 2013-07-22 17:51:39Z rm $
#
# 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"

View File

@ -0,0 +1,190 @@
#!/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

View File

@ -0,0 +1,34 @@
--- 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

View File

@ -0,0 +1,32 @@
--- 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)

View File

@ -0,0 +1,66 @@
--- 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")

View File

@ -0,0 +1,117 @@
--- 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()

View File

@ -0,0 +1,15 @@
--- 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)

View File

@ -0,0 +1,14 @@
--- 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

View File

@ -0,0 +1,59 @@
--- 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}"

View File

@ -0,0 +1,12 @@
--- 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

View File

@ -0,0 +1,21 @@
--- 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

View File

@ -0,0 +1,25 @@
--- 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 */

View File

@ -0,0 +1,61 @@
--- 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);
}

View File

@ -0,0 +1,49 @@
--- 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()

View File

@ -0,0 +1,24 @@
--- 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 {

View File

@ -0,0 +1,111 @@
--- 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)

View File

@ -0,0 +1,13 @@
--- 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)

View File

@ -0,0 +1,61 @@
--- 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;

View File

@ -0,0 +1,11 @@
--- 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)

View File

@ -0,0 +1,39 @@
--- core/src/stored/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500
+++ core/src/stored/CMakeLists.txt 2020-01-31 16:11:45.064779000 -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)
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)
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)

View File

@ -0,0 +1,28 @@
--- 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)

View File

@ -0,0 +1,30 @@
#!/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

View File

@ -0,0 +1,13 @@
#!/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

View File

@ -0,0 +1,17 @@
[
{ 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
}
]

View File

@ -0,0 +1,74 @@
[
{ 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
}
]

View File

@ -0,0 +1,6 @@
Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
software to backup, archive and restore files from all major operating systems.
The fork was founded 2010 out of the bacula.org project. The fork has been
actively developed and many new features have been added.
WWW: http://www.bareos.org/

View File

@ -0,0 +1,185 @@
bin/bregex
bin/bsmtp
bin/bwild
bin/timelimit
@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
etc/logrotate.d/bareos-dir
lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
lib/bareos/backends/libbareossd-fifo.so
lib/bareos/backends/libbareossd-gentape.so
%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so
%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
%%RADOS%%lib/bareos/backends/libbareossd-rados.so
lib/bareos/backends/libbareossd-tape.so
%%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
%%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
lib/bareos/plugins/autoxflate-sd.so
%%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
%%PYTHON%%lib/bareos/plugins/bareos-dir.py.template
%%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template
%%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py
%%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py
%%PYTHON%%lib/bareos/plugins/python-dir.so
%%PYTHON%%lib/bareos/plugins/python-sd.so
%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
lib/bareos/scripts/bareos-ctl-dir
lib/bareos/scripts/bareos-ctl-sd
lib/bareos/scripts/bareos-explorer
lib/bareos/scripts/bareos-glusterfind-wrapper
lib/bareos/scripts/create_bareos_database
%%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
lib/bareos/scripts/ddl/versions.map
lib/bareos/scripts/delete_catalog_backup
lib/bareos/scripts/disk-changer
lib/bareos/scripts/drop_bareos_database
lib/bareos/scripts/drop_bareos_tables
lib/bareos/scripts/grant_bareos_privileges
lib/bareos/scripts/make_bareos_tables
lib/bareos/scripts/make_catalog_backup
lib/bareos/scripts/make_catalog_backup.pl
lib/bareos/scripts/mtx-changer
lib/bareos/scripts/query.sql
lib/bareos/scripts/update_bareos_tables
lib/libbareoscats.so
lib/libbareoscats.so.19
lib/libbareoscats.so.%%LIB_VERSION%%
%%NDMP%%lib/libbareosndmp.so
%%NDMP%%lib/libbareosndmp.so.19
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
lib/libbareossd.so
lib/libbareossql.so
lib/libbareossql.so.19
lib/libbareossql.so.%%LIB_VERSION%%
man/man1/bareos-tray-monitor.1.gz
man/man1/bregex.1.gz
man/man1/bsmtp.1.gz
man/man1/bwild.1.gz
man/man8/bareos-dbcheck.8.gz
man/man8/bareos-dbcopy.8.gz
man/man8/bareos-dir.8.gz
man/man8/bareos-sd.8.gz
man/man8/bcopy.8.gz
man/man8/bextract.8.gz
man/man8/bls.8.gz
man/man8/bpluginfo.8.gz
man/man8/bscan.8.gz
man/man8/bscrypto.8.gz
man/man8/btape.8.gz
man/man8/btraceback.8.gz
sbin/bareos-dbcheck
sbin/bareos-dbcopy
sbin/bareos-dir
sbin/bareos-sd
sbin/bcopy
sbin/bextract
sbin/bls
sbin/bpluginfo
sbin/bregex
sbin/bscan
sbin/bscrypto
sbin/bsmtp
sbin/btape
sbin/btestls
sbin/bwild
sbin/chio-bareos
sbin/timelimit
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user
@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export
@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
@dir(bareos,bareos,) %%BAREOS_DIR%%
@dir(bareos,bareos,) %%BAREOS_DIR%%/storage
@dir(bareos,bareos,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos

View File

@ -0,0 +1,64 @@
bin/bconsole
@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
@group bareos
@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
@group bareos
lib/libbareos.so
lib/libbareos.so.19
lib/libbareos.so.%%LIB_VERSION%%
lib/libbareosfastlz.so
lib/libbareosfastlz.so.19
lib/libbareosfastlz.so.%%LIB_VERSION%%
lib/libbareosfind.so
lib/libbareosfind.so.19
lib/libbareosfind.so.%%LIB_VERSION%%
%%LMDB%%lib/libbareoslmdb.so
%%LMDB%%lib/libbareoslmdb.so.19
%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
%%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py
%%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
lib/bareos/plugins/bpipe-fd.so
%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
%%PYTHON%%lib/bareos/plugins/python-fd.so
%%RADOS%%lib/bareos/plugins/rados-fd.so
lib/bareos/scripts/bareos
lib/bareos/scripts/bareos-config
lib/bareos/scripts/bareos-config-lib.sh
lib/bareos/scripts/bareos-ctl-fd
lib/bareos/scripts/bareos-ctl-funcs
lib/bareos/scripts/btraceback.dbx
lib/bareos/scripts/btraceback.gdb
lib/bareos/scripts/btraceback.mdb
man/man1/bconsole.1.gz
man/man8/bareos-fd.8.gz
man/man8/bareos.8.gz
@group bareos
sbin/bareos
@group bareos
sbin/bareos-fd
@group bareos
sbin/bconsole
@group wheel
sbin/btraceback
@group bareos
@dir(bareos,bareos,) %%BAREOS_DIR%%
@dir(bareos,bareos,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos

View File

@ -0,0 +1,28 @@
# $FreeBSD$
PORTNAME= bareos
PKGNAMESUFFIX= 19-traymonitor
COMMENT= Backup archiving recovery open sourced (traymonitor)
LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
libbareos.so:sysutils/bareos19-client
CONFLICTS= bareos18-traymonitor-* bareos17-traymonitor-* bareos-traymonitor-*
USES= desktop-file-utils gettext-runtime pkgconfig qt:5
USE_QT= buildtools_build qmake_build uitools_build gui core
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
MASTERDIR= ${.CURDIR}/../../sysutils/bareos19-server
CMAKE_ARGS+= -Dtraymonitor=yes \
-Dbuild-dird=no \
-Dbuild-stored=no \
-Dclient-only=yes \
-Dnls=ON
.include "${MASTERDIR}/Makefile"

View File

@ -0,0 +1,8 @@
traymonitor inteface for Bareos.
Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
software to backup, archive and restore files from all major operating systems.
The fork was founded 2010 out of the bacula.org project. The fork has been
actively developed and many new features have been added.
WWW: http://www.bareos.org/

View File

@ -0,0 +1,7 @@
bin/bareos-tray-monitor
@sample %%ETCDIR%%/tray-monitor.d/client/FileDaemon-local.conf.sample
@sample %%ETCDIR%%/tray-monitor.d/director/Director-local.conf.sample
@sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample
@sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
share/applications/bareos-tray-monitor.desktop
share/pixmaps/bareos-tray-monitor.xpm