cleanup: Remove expired ports:

2021-12-05 sysutils/bareos17-client: Deprecated, no new release since 2020
2021-12-05 sysutils/bareos17-client-static: Deprecated, no new release since 2020
2021-12-05 sysutils/bareos17-server: Deprecated, no new release since 2020
2021-12-05 www/bareos17-webui: Deprecated, no new release since 2020
This commit is contained in:
Rene Ladan
2021-12-05 11:47:12 +01:00
parent 02227bdd53
commit 75808722b7
39 changed files with 4 additions and 3873 deletions

4
MOVED
View File

@@ -16607,3 +16607,7 @@ games/linux-unigine-valley|benchmarks/linux-unigine-valley|2021-11-21|Moved to a
devel/electron12|devel/electron13|2021-11-24|VSCode update requires a newer major version
mail/gmime24-sharp||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30
mail/gmime24||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30
sysutils/bareos17-client|sysutils/bareos18-client|2021-12-05|Has expired: Deprecated, no new release since 2020
sysutils/bareos17-client-static||2021-12-05|Has expired: Deprecated, no new release since 2020
sysutils/bareos17-server|sysutils/bareos18-server|2021-12-05|Has expired: Deprecated, no new release since 2020
www/bareos17-webui|www/bareos18-webui|2021-12-05|Has expired: Deprecated, no new release since 2020

View File

@@ -95,9 +95,6 @@
SUBDIR += bareos-client
SUBDIR += bareos-server
SUBDIR += bareos-traymonitor
SUBDIR += bareos17-client
SUBDIR += bareos17-client-static
SUBDIR += bareos17-server
SUBDIR += bareos18-client
SUBDIR += bareos18-server
SUBDIR += bareos18-traymonitor

View File

@@ -1,28 +0,0 @@
PORTNAME= bareos
PKGNAMESUFFIX= 17-client-static
COMMENT= Backup archiving recovery open sourced (static client)
BROKEN_aarch64= Fails to link: missing sbrk
BROKEN_riscv64= Fails to link: missing sbrk
CONFLICTS= bareos16-client-static
PLIST= ${.CURDIR}/pkg-plist
MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server
PLIST_FILES= sbin/bareos-fd-static \
sbin/bconsole-static
OPTIONS_DEFINE= NLS LMDB
LMDB_DESC= Enable build of LMDB support
CONFIGURE_ARGS+= --enable-client-only \
--enable-static-fd \
--enable-static-cons \
--disable-libtool \
--disable-build-dird \
--disable-build-stored \
--with-jansson=${LOCALBASE}
.include "${MASTERDIR}/Makefile"

View File

@@ -1,26 +0,0 @@
PORTNAME= bareos
PKGNAMESUFFIX= 17-client
COMMENT= Backup archiving recovery open sourced (client)
BROKEN_aarch64= Fails to link: missing sbrk
BROKEN_riscv64= Fails to link: missing sbrk
CONFLICTS= bareos16-client bareos-client
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-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

@@ -1,254 +0,0 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 17.2.10
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= 17-server
MAINTAINER= acm@FreeBSD.org
COMMENT?= Backup archiving recovery open sourced (server)
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
DEPRECATED= Deprecated, no new release since 2020
EXPIRATION_DATE=2021-12-05
CONFLICTS?= bacula*-server bareos16-server
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
USES+= cpe libtool:keepla pkgconfig readline shebangfix
USE_GITHUB= yes
USERS= bareos
GROUPS= ${USERS}
PLIST_SUB+= LIB_VERSION=${PORTVERSION}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
SHEBANG_LANG= perl
SHEBANG_FILES= ${WRKSRC}/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} == "17-server"
OPTIONS_GROUP= BACKENDS
OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= MTX NDMP NLS PYTHON SCSICRYPTO
OPTIONS_DEFAULT+= PGSQL SCSICRYPTO
OPTIONS_SINGLE_DATABASE= MYSQL PGSQL SQLITE3
OPTIONS_SINGLE+= DATABASE
DATABASE_DESC= Database support
CEPHFS_DESC= CEPHFS backend support
GFAPI_DESC= GFAPI backend support
RADOS_DESC= RADOS backend support
NDMP_CONFIGURE_ON= --enable-ndmp=yes
NDMP_CONFIGURE_OFF= --enable-ndmp=no
.endif
GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE}
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
OPENSSL_USES= ssl
OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
OPENSSL_CONFIGURE_OFF= --with-openssl="no"
SCSICRYPTO_CONFIGURE_ON= --enable-scsi-crypto=yes
SCSICRYPTO_CONFIGURE_OFF= --enable-scsi-crypto=no
.if ${PKGNAMESUFFIX} == "17-client" || ${PKGNAMESUFFIX} == "17-server" #Till end of the file
PYTHON_USES= python
PYTHON_CONFIGURE_ON= --with-python=yes
PYTHON_CONFIGURE_OFF= --with-python=no
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
LIB_DEPENDS+= libbareos.so:sysutils/bareos17-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
CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
--enable-libtool \
--enable-smartalloc \
--sysconfdir=${PREFIX}/etc \
--with-working-dir=${BAREOS_DIR} \
--with-scriptdir=${PREFIX}/share/${PORTNAME} \
--with-logdir=/var/log/bareos \
--with-readline=${LOCALBASE} \
--disable-conio \
--enable-batch-insert \
--with-plugindir=${PREFIX}/lib/bareos/plugins \
--with-scriptdir=${PREFIX}/lib/bareos/scripts \
--with-dump-email=root@localhost \
--with-job-email=root@localhost \
--with-db-name=bareos \
--with-sbin-perm=755 \
--with-db-user=bareos \
--with-baseport=9101 \
--with-pid-dir=/var/run/bareos \
--with-jansson=${LOCALBASE}
.if defined(WITH_CLIENT_ONLY)
LMDB_CONFIGURE_ON= --enable-lmdb=yes
LMDB_CONFIGURE_OFF= --enable-lmdb=no
LMDB_CFLAGS= -DMDB_DSYNC=O_SYNC \
-DMDB_USE_POSIX_MUTEX=1
CONFIGURE_ARGS+=--with-fd-user=root \
--with-fd-group=wheel
.else
CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \
--with-dir-group=${BAREOS_GROUP} \
--with-sd-user=${BAREOS_USER} \
--with-sd-group=operator
.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_CONFIGURE_ENABLE= nls
CEPHFS_CONFIGURE_ON= --with-cephfs=yes
CEPHFS_CONFIGURE_OFF= --with-cephfs=no
CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14
GFAPI_CONFIGURE_ON= --with-glusterfs=${LOCALBASE}
GFAPI_CONFIGURE_OFF= --with-glusterfs=no
GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs
RADOS_CONFIGURE_ON= --with-rados=yes \
--with-cephfs=yes
RADOS_CONFIGURE_OFF= --with-rados=no \
--with-cephfs=no
RADOS_LIB_DEPENDS= librados.so:net/ceph14
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES= fd
CONFIGURE_ARGS+= --enable-client-only
PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client
PKGINSTALL= ${FILESDIR}/pkg-install.client
.else
# Server only Options
CONFFILES= sd dir
# Server default database
MYSQL_CONFIGURE_ON= --with-mysql=yes
MYSQL_USES= mysql
SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
PGSQL_CONFIGURE_ON= --with-postgresql=yes
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:
# This port does not install docs. See bareos-docs for that
${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
# Default bconsole.conf is in ${ETCDIR}
@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/bin/python-config|${PYTHON_CMD}-config|g' ${WRKSRC}/configure
.if defined(WITH_CLIENT_ONLY)
@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
# In server port don't install filed
@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|\.\./lib/|$$(LOCALBASE)/lib/|g' -e 's|\.\./findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in ${WRKSRC}/src/tests/Makefile.in
@${REINPLACE_CMD} -e 's|\.\./\.\./lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in
@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
${WRKSRC}/src/tools/bpluginfo.c
@${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in
.endif
post-extract:
.if defined(WITH_CLIENT_ONLY)
. if defined(PYTHON_PLUGIN)
@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/fileset
@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/job
. endif
.endif
@${MV} ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
${WRKSRC}/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 # 17-client and 17-server are defined
.include <bsd.port.mk>

View File

@@ -1,38 +0,0 @@
# Created by: Alonso Cardenas <acm@FreeBSD.org>
post-patch:
@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
@${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in
post-build:
.if ${PKGNAMEPREFIX} == "nagios-check_"
${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
.endif
pre-install:
.if ${PKGNAMESUFFIX} == "17-traymonitor"
. for d in client director monitor storage
${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
${FIND} ${WRKSRC}/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} == "17-client-static"
${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
.endif
.if ${PKGNAMESUFFIX} == "17-traymonitor"
# Install config files and preserve existing ones
.for d in client director monitor storage
${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
.endif

View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1624924837
SHA256 (bareos-bareos-Release-17.2.10_GH0.tar.gz) = f6e2526b180e2ef17bcd72f7e27517dbdd0053675b8aef7147e9b24c0b0d7d10
SIZE (bareos-bareos-Release-17.2.10_GH0.tar.gz) = 4190783

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -1,13 +0,0 @@
--- autoconf/Make.common.in 2016-11-09 23:17:41.055746000 -0500
+++ autoconf/Make.common.in 2016-11-09 23:17:59.647897000 -0500
@@ -62,8 +62,8 @@
MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs
INSTALL = @INSTALL@
# add the -s to the following in PRODUCTION mode
-INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@
-INSTALL_LIB = $(INSTALL) -m 755
+INSTALL_PROGRAM = $(INSTALL) -s -m @SBINPERM@
+INSTALL_LIB = $(INSTALL) -s -m 755
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@
INSTALL_CONFIG = $(INSTALL) -m 640

View File

@@ -1,41 +0,0 @@
--- configure 2020-07-09 12:30:11.000000000 -0500
+++ configure 2021-08-04 23:04:48.496040000 -0500
@@ -18642,7 +18642,7 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
found_dir="$additional_libdir"
found_so="$additional_libdir/lib$name.$shlibext"
if test -f "$additional_libdir/lib$name.la"; then
@@ -22122,7 +22122,7 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
found_dir="$additional_libdir"
found_so="$additional_libdir/lib$name.$shlibext"
if test -f "$additional_libdir/lib$name.la"; then
@@ -23610,7 +23610,7 @@
done
-ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_statx.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_ll_client.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default"
if test "x$ac_cv_header_cephfs_ceph_statx_h" = xyes; then :
$as_echo "#define HAVE_CEPHFS_CEPH_STATX_H 1" >>confdefs.h
@@ -32518,9 +32518,9 @@
#
# Make sure the $with_glusterfs_directory also makes sense
#
- if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include"; then
+ if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include/glusterfs"; then
GLUSTER_LIBS="-L${with_glusterfs_directory}/lib ${GLUSTER_LIBS}"
- GLUSTER_INC="-I${with_glusterfs_directory}/include ${GLUSTER_INC}"
+ GLUSTER_INC="-I${with_glusterfs_directory}/include/glusterfs ${GLUSTER_INC}"
fi
else
GLUSTER_INC="-I/usr/include/glusterfs"

View File

@@ -1,35 +0,0 @@
--- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500
@@ -28,6 +28,7 @@
CONS_LIBS = @CONS_LIBS@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
@@ -51,12 +52,12 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
$(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
strip $@
@@ -93,7 +94,7 @@
$(MKDIR) $(DESTDIR)$(bindir)
$(MKDIR) $(DESTDIR)$(sbindir)
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole;
- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
+ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
@srcconf=bconsole.conf; \
if test -f ${DESTDIR}${confdir}/$$srcconf; then \
destconf=$$srcconf.new; \

View File

@@ -1,100 +0,0 @@
--- src/dird/Makefile.in 2018-07-12 07:38:58.000000000 -0500
+++ src/dird/Makefile.in 2019-05-09 09:40:05.828917000 -0500
@@ -56,6 +56,7 @@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
DIRD_RESTYPES = catalog client console counter director fileset job jobdefs messages pool profile schedule storage
@@ -77,46 +78,46 @@
$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(JANSSON_CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
bareos-dir: Makefile $(SVROBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@NDMP_DEPS@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
$(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \
$(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) $(JANSSON_LDFLAGS)
bareos-dbcheck: Makefile $(DBCHKOBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \
-lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
testfind: Makefile $(TSTFNDOBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \
-lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
static-bareos-dir: Makefile $(SVROBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@NDMP_DEPS@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
@@ -160,13 +161,8 @@
if test -f "$$f"; then \
RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
RES=`basename "$$f"`; \
- if test -f "$$RESDIR/$$RES"; then \
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
- fi; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${dir_group}" != "x"; then \
chgrp -f ${dir_group} $$destconf || true; \
@@ -174,11 +170,6 @@
fi; \
done; \
done
- $(MKDIR) ${DESTDIR}${confdir}/bareos-dir-export/client/
- @if test -f ${DESTDIR}${scriptdir}/query.sql; then \
- echo " ==> Saving existing query.sql to query.sql.old"; \
- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
- fi
${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
@if test -f static-bareos-dir; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-dir $(DESTDIR)$(sbindir)/static-bareos-dir; \

View File

@@ -1,69 +0,0 @@
--- src/filed/Makefile.in 2018-07-12 07:38:58.000000000 -0500
+++ src/filed/Makefile.in 2019-05-09 09:43:00.397777000 -0500
@@ -21,10 +21,11 @@
DEBUG=@DEBUG@
GETTEXT_LIBS = @LIBINTL@
-OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@
-GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+GNUTLS_LIBS = @GNUTLS_LIBS@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
first_rule: all
@@ -39,12 +40,12 @@
FDLIBS += @LMDB_LIBS@
FDLIBS += @CAP_LIBS@
-FDLIBS += @ZLIB_LIBS_NONSHARED@
-FDLIBS += @LZO_LIBS_NONSHARED@
-FDLIBS += @FASTLZ_LIBS_NONSHARED@
-FDLIBS += @AFS_LIBS_NONSHARED@
-FDLIBS += @ACL_LIBS_NONSHARED@
-FDLIBS += @XATTR_LIBS_NONSHARED@
+FDLIBS += @ZLIB_LIBS@
+FDLIBS += @LZO_LIBS@
+FDLIBS += @FASTLZ_LIBS@
+FDLIBS += @AFS_LIBS@
+FDLIBS += @ACL_LIBS@
+FDLIBS += @XATTR_LIBS@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb
@@ -78,7 +79,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
static-bareos-fd: Makefile $(SVROBJS) \
../findlib/libbareosfind.a \
@@ -87,7 +88,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_STATIC_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -133,13 +134,8 @@
if test -f "$$f"; then \
RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
RES=`basename "$$f"`; \
- if test -f "$$RESDIR/$$RES"; then \
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
- fi; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${fd_group}" != "x"; then \
chgrp -f ${fd_group} $$destconf || true; \

View File

@@ -1,20 +0,0 @@
--- src/lib/bsnprintf.c.orig 2021-11-18 14:05:23 UTC
+++ src/lib/bsnprintf.c
@@ -618,6 +618,7 @@ static LDOUBLE pow10(int exp)
return result;
}
+#if !defined __FreeBSD__
static int64_t round(LDOUBLE value)
{
int64_t intpart;
@@ -629,6 +630,9 @@ static int64_t round(LDOUBLE value)
return intpart;
}
+#else
+#include <math.h>
+#endif
static int32_t fmtfp(char *buffer, int32_t currlen, int32_t maxlen,
LDOUBLE fvalue, int min, int max, int flags)

View File

@@ -1,61 +0,0 @@
--- src/plugins/dird/python-dir.c 2019-12-29 01:43:39.125609000 -0500
+++ src/plugins/dird/python-dir.c 2019-12-29 01:48:30.581353000 -0500
@@ -34,6 +34,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 dbglvl = 150;
#define PLUGIN_LICENSE "Bareos AGPLv3"
@@ -114,6 +121,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
@@ -675,7 +696,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
}
/*
@@ -955,7 +980,11 @@
char *value;
ctx = PyGetbpContext(pyCtx);
+#if (PY_VERSION_HEX > 0x03050000)
+ value = bstrdup(PyString_AsString(pyValue));
+#else
value = PyString_AsString(pyValue);
+#endif
if (value) {
retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value);
}

View File

@@ -1,29 +0,0 @@
--- src/plugins/filed/Makefile.in 2020-07-09 12:30:11.000000000 -0500
+++ src/plugins/filed/Makefile.in 2021-08-05 02:19:31.479394000 -0500
@@ -93,7 +93,8 @@
install: all
$(MKDIR) $(DESTDIR)$(plugindir)
- $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/
+ $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/fileset
+ $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/job
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
if test "x$(BUILD_PLUGINS)" != "x" ; then \
@@ -104,14 +105,14 @@
if [ -d "$$CONF" ]; then \
for i in `find "$$CONF/" \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
$(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \
- $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/$$i; \
+ $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/`echo $$i | sed -e 's|example|sample|g'`; \
done; \
fi; \
if [ "$$plugin" = "python-fd.la" ]; then \
$(CP) *.py *.py.template $(DESTDIR)$(plugindir); \
for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
$(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \
- $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${configtemplatedir}/$$i; \
+ $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \
done; \
fi; \
done;\

View File

@@ -1,111 +0,0 @@
--- src/plugins/filed/python-fd.c 2019-12-29 01:20:40.033054000 -0500
+++ src/plugins/filed/python-fd.c 2019-12-29 01:27:28.921617000 -0500
@@ -37,6 +37,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 dbglvl = 150;
#define PLUGIN_LICENSE "Bareos AGPLv3"
@@ -162,6 +170,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
@@ -1225,7 +1247,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
@@ -2702,8 +2728,11 @@
}
case bVarFileSeen: {
char *value;
-
+#if (PY_VERSION_HEX > 0x03050000)
+ value = bstrdup(PyString_AsString(pyValue));
+#else
value = PyString_AsString(pyValue);
+#endif
if (value) {
retval = bfuncs->setBareosValue(ctx, (bVariable)var, value);
}
@@ -3090,7 +3119,11 @@
sp.type = pSavePkt->type;
if (pSavePkt->fname) {
if (PyString_Check(pSavePkt->fname)) {
+#if (PY_VERSION_HEX > 0x03050000)
+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
+#else
sp.fname = PyString_AsString(pSavePkt->fname);
+#endif
} else {
goto bail_out;
}
@@ -3099,7 +3132,11 @@
}
if (pSavePkt->link) {
if (PyString_Check(pSavePkt->link)) {
+#if (PY_VERSION_HEX > 0x03050000)
+ sp.link = bstrdup(PyString_AsString(pSavePkt->link));
+#else
sp.link = PyString_AsString(pSavePkt->link);
+#endif
} else {
goto bail_out;
}
@@ -3142,7 +3179,11 @@
*/
if (pSavePkt->fname) {
if (PyString_Check(pSavePkt->fname)) {
+#if (PY_VERSION_HEX > 0x03050000)
+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
+#else
sp.fname = PyString_AsString(pSavePkt->fname);
+#endif
} else {
goto bail_out;
}
@@ -3219,7 +3260,11 @@
return (char *)"";
}
+#if (PY_VERSION_HEX > 0x03050000)
+ return bstrdup(PyString_AsString(object));
+#else
return PyString_AsString(object);
+#endif
}
static inline char *PyGetByteArrayValue(PyObject *object)

View File

@@ -1,11 +0,0 @@
--- src/plugins/stored/Makefile.in 2015-07-23 18:04:28.275396000 -0500
+++ src/plugins/stored/Makefile.in 2015-07-23 18:05:09.508399000 -0500
@@ -39,7 +39,7 @@
autoxflate-sd.la: Makefile \
autoxflate-sd$(DEFAULT_OBJECT_TYPE) \
- ../../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared autoxflate-sd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version -L../../lib -lbareos
example-plugin-sd.la: Makefile example-plugin-sd$(DEFAULT_OBJECT_TYPE)

View File

@@ -1,61 +0,0 @@
--- src/plugins/stored/python-sd.c 2019-12-29 01:43:28.821366000 -0500
+++ src/plugins/stored/python-sd.c 2019-12-29 01:45:39.796709000 -0500
@@ -34,6 +34,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 dbglvl = 150;
#define PLUGIN_LICENSE "Bareos AGPLv3"
@@ -114,6 +121,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
@@ -695,7 +716,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
}
/*
@@ -976,7 +1001,11 @@
char *value;
ctx = PyGetbpContext(pyCtx);
+#if (PY_VERSION_HEX > 0x03050000)
+ value = bstrdup(PyString_AsString(pyValue));
+#else
value = PyString_AsString(pyValue);
+#endif
if (value) {
bfuncs->setBareosValue(ctx, (bsdwVariable)var, value);
}

View File

@@ -1,112 +0,0 @@
--- src/stored/Makefile.in 2018-07-12 07:38:58.000000000 -0500
+++ src/stored/Makefile.in 2019-05-09 09:44:40.049928000 -0500
@@ -94,6 +94,7 @@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
DEBUG = @DEBUG@
GETTEXT_LIBS = @LIBINTL@
@@ -165,17 +166,17 @@
$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(JANSSON_CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
@NDMP_DEPS@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \
$(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
@NDMP_DEPS@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L. -L../lib -o $@ $(SDOBJS) \
@@ -188,46 +189,46 @@
$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I../lib $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
btape: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(TAPEOBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
-lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
-lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
-lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
-lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \
- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
@@ -256,13 +257,8 @@
if test -f "$$f"; then \
RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
RES=`basename "$$f"`; \
- if test -f "$$RESDIR/$$RES"; then \
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
- fi; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${sd_group}" != "x"; then \
chgrp -f ${sd_group} $$destconf || true; \

View File

@@ -1,62 +0,0 @@
--- src/tests/cats_test.c 2020-07-09 12:30:11.000000000 -0500
+++ src/tests/cats_test.c 2021-08-05 12:45:09.726640000 -0500
@@ -388,11 +388,11 @@
ok(db_sql_query(db, "SELECT VersionId FROM Version",
db_int_handler, &j), "SELECT VersionId");
- ok(UPDATE_DB(jcr, db, (char*)"UPDATE Version SET VersionId = 1"),
+ ok(UPDATE_DB(jcr, (char*)"UPDATE Version SET VersionId = 1"),
"Update VersionId");
nok(check_tables_version(jcr, db), "Check table version");
Mmsg(buf, "UPDATE Version SET VersionId = %d", j);
- ok(UPDATE_DB(jcr, db, buf), "Restore VersionId");
+ ok(UPDATE_DB(jcr, db), "Restore VersionId");
if (dbtype != SQL_TYPE_SQLITE3) {
ok(db_check_max_connections(jcr, db, 1), "Test min Max Connexion");
@@ -444,34 +444,34 @@
ok(db_sql_query(db, buf, NULL, NULL), "CREATE query");
Mmsg(buf, "INSERT INTO %s (a) VALUES (1)", temp);
- ok(INSERT_DB(jcr, db, buf), "INSERT query");
- ok(INSERT_DB(jcr, db, buf), "INSERT query");
+ ok(INSERT_DB(jcr, buf), "INSERT query");
+ ok(INSERT_DB(jcr, buf), "INSERT query");
ok(sql_affected_rows(db) == 1, "Check sql_affected_rows");
Mmsg(buf, "INSERT INTO aaa%s (a) VALUES (1)", temp);
- nok(INSERT_DB(jcr, db, buf), "Bad INSERT query");
+ nok(INSERT_DB(jcr, buf), "Bad INSERT query");
ok(sql_affected_rows(db) == 0, "Check sql_affected_rows");
Mmsg(buf, "UPDATE %s SET a = 2", temp);
- ok(UPDATE_DB(jcr, db, buf), "UPDATE query");
+ ok(UPDATE_DB(jcr, buf), "UPDATE query");
ok(sql_affected_rows(db) == 2, "Check sql_affected_rows");
Mmsg(buf, "UPDATE %s SET a = 2 WHERE a = 1", temp);
- nok(UPDATE_DB(jcr, db, buf), "Empty UPDATE query");
+ nok(UPDATE_DB(jcr, buf), "Empty UPDATE query");
Mmsg(buf, "UPDATE aaa%s SET a = 2", temp);
- nok(UPDATE_DB(jcr, db, buf), "Bad UPDATE query");
+ nok(UPDATE_DB(jcr, buf), "Bad UPDATE query");
Mmsg(buf, "DELETE FROM %s", temp);
- ok(DELETE_DB(jcr, db, buf), "DELETE query");
- nok(DELETE_DB(jcr, db, buf), "Empty DELETE query"); /* TODO bug ? */
+ ok(DELETE_DB(jcr, buf), "DELETE query");
+ nok(DELETE_DB(jcr, buf), "Empty DELETE query"); /* TODO bug ? */
Mmsg(buf, "DELETE FROM aaa%s", temp);
- ok(DELETE_DB(jcr, db, buf), "Bad DELETE query"); /* TODO bug ? */
+ ok(DELETE_DB(jcr, buf), "Bad DELETE query"); /* TODO bug ? */
Mmsg(buf, "DROP TABLE %s", temp);
- ok(QUERY_DB(jcr, db, buf), "DROP query");
- nok(QUERY_DB(jcr, db, buf), "Empty DROP query");
+ ok(QUERY_DB(jcr, buf), "DROP query");
+ nok(QUERY_DB(jcr, buf), "Empty DROP query");
/* ---------------------------------------------------------------- */

View File

@@ -1,11 +0,0 @@
--- src/tools/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/tools/Makefile.in 2016-11-09 22:56:53.069629000 -0500
@@ -130,7 +130,7 @@
$(MKDIR) $(DESTDIR)$(sbindir)
@for tool in ${TOOLS_BIN} ; do \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(bindir)/$$tool ; \
- if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) $(bindir)/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \
+ if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) ../bin/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \
done
# Allow non-root execution of bsmtp for non-root Directors
chmod 755 $(DESTDIR)$(bindir)/bsmtp

View File

@@ -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

View File

@@ -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

View File

@@ -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
}
]

View File

@@ -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
}
]

View File

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

@@ -1,165 +0,0 @@
@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.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
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.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
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.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
bin/bregex
bin/bsmtp
bin/bwild
bin/timelimit
lib/bareos/plugins/BareosDirPluginBaseclass.py
lib/bareos/plugins/BareosDirWrapper.py
lib/bareos/plugins/BareosSdPluginBaseclass.py
lib/bareos/plugins/BareosSdWrapper.py
lib/bareos/plugins/autoxflate-sd.so
lib/bareos/plugins/bareos-dir-class-plugin.py
lib/bareos/plugins/bareos-dir.py.template
lib/bareos/plugins/bareos-sd-class-plugin.py
lib/bareos/plugins/bareos-sd.py.template
lib/bareos/plugins/bareos_dir_consts.py
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
lib/bareos/scripts/bareos-config
lib/bareos/scripts/bareos-config-lib.sh
lib/bareos/scripts/bareos-ctl-dir
lib/bareos/scripts/bareos-ctl-fd
lib/bareos/scripts/bareos-ctl-funcs
lib/bareos/scripts/bareos-ctl-sd
lib/bareos/scripts/bareos-explorer
lib/bareos/scripts/bareos-glusterfind-wrapper
lib/bareos/scripts/bareos_config
lib/bareos/scripts/btraceback.dbx
lib/bareos/scripts/btraceback.gdb
lib/bareos/scripts/btraceback.mdb
lib/bareos/scripts/create_bareos_database
lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.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
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.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
%%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-%%LIB_VERSION%%.so
lib/libbareoscats-%%DBTYPE%%-%%LIB_VERSION%%.so
lib/libbareoscats-%%DBTYPE%%.so
lib/libbareoscats.la
lib/libbareoscats.so
%%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so
%%NDMP%%lib/libbareosndmp.la
%%NDMP%%lib/libbareosndmp.so
lib/libbareossd-%%LIB_VERSION%%.so
lib/libbareossd.la
lib/libbareossd.so
lib/libbareossql-%%LIB_VERSION%%.so
lib/libbareossql.la
lib/libbareossql.so
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-dir.8.gz
man/man8/bareos-sd.8.gz
man/man8/bareos.8.gz
man/man8/bcopy.8.gz
man/man8/bextract.8.gz
man/man8/bls.8.gz
man/man8/bscan.8.gz
man/man8/btape.8.gz
man/man8/btraceback.8.gz
sbin/bareos
sbin/bareos-dbcheck
sbin/bareos-dir
sbin/bareos-sd
sbin/bbatch
sbin/bcopy
sbin/bextract
sbin/bls
sbin/bpluginfo
sbin/bregex
sbin/bregtest
sbin/bscan
sbin/bscrypto
sbin/bsmtp
sbin/btape
sbin/btraceback
sbin/bwild
sbin/chio-bareos
sbin/grow
sbin/testls
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-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,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos

View File

@@ -1,57 +0,0 @@
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/messages/Standard.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
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.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
%%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
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bconsole.d/bconsole.conf.sample
bin/bconsole
%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.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.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
%%RADOS%%lib/bareos/plugins/rados-fd.so
%%PYTHON%%lib/bareos/plugins/python-fd.so
lib/libbareos-%%LIB_VERSION%%.so
lib/libbareos.la
lib/libbareos.so
lib/libbareoscfg-%%LIB_VERSION%%.so
lib/libbareoscfg.la
lib/libbareoscfg.so
lib/libbareosfind-%%LIB_VERSION%%.so
lib/libbareosfind.la
lib/libbareosfind.so
%%LMDB%%lib/libbareoslmdb-%%LIB_VERSION%%.so
%%LMDB%%lib/libbareoslmdb.la
%%LMDB%%lib/libbareoslmdb.so
man/man1/bconsole.1.gz
man/man8/bareos-fd.8.gz
sbin/bareos-fd
@group bareos
sbin/bconsole
@group wheel
@dir(bareos,bareos,) %%BAREOS_DIR%%
%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
@dir lib/bareos/plugins
@dir lib/bareos/scripts
@dir(bareos,bareos,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos

View File

@@ -41,7 +41,6 @@
SUBDIR += bacula-web
SUBDIR += baikal
SUBDIR += bareos-webui
SUBDIR += bareos17-webui
SUBDIR += bareos18-webui
SUBDIR += bareos19-webui
SUBDIR += beehive

View File

@@ -1,63 +0,0 @@
PORTNAME= bareos17-webui
PORTVERSION= 17.2.5
PORTREVISION= 2
DISTVERSIONPREFIX= Release/
CATEGORIES= www sysutils
MAINTAINER= acm@FreeBSD.org
COMMENT= PHP-Frontend to manage Bareos over the web
LICENSE= AGPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Deprecated, no new release since 2020
EXPIRATION_DATE=2021-12-05
USE_GITHUB= yes
GH_ACCOUNT= bareos
GH_PROJECT= bareos-webui
USES= cpe php
CPE_PRODUCT= bareos
USE_PHP= openssl gettext ctype hash json session iconv
NO_BUILD= yes
NO_ARCH= yes
SUB_FILES= pkg-message
PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
SUB_LIST= BAREOSWEBUIDIR=${WWWDIR}
OPTIONS_DEFINE= MYSQL PGSQL ZENDFRAMEWORK
OPTIONS_DEFAULT= PGSQL
ZENDFRAMEWORK_DESC= Install zend framework
MYSQL_USE= PHP=pdo_mysql
PGSQL_USE= PHP=pdo_pgsql
ZENDFRAMEWORK_RUN_DEPENDS= ${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
post-extract:
${RM} ${WRKSRC}/config/autoload/.gitignore
${RM} ${WRKSRC}/data/cache/.gitignore
${RM} ${WRKSRC}/vendor/.gitignore
post-patch:
@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' ${WRKSRC}/config/autoload/global.php
do-install:
@${ECHO} "Installing in ${WWWDIR}"
@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
cd ${WRKSRC} && ${COPYTREE_SHARE} "config data module public vendor" \
${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/composer* ${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/phpunit.xml ${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/install/directors.ini ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/install/configuration.ini ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
${INSTALL_DATA} ${WRKSRC}/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
${INSTALL_DATA} ${WRKSRC}/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
.include <bsd.port.mk>

View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1526592137
SHA256 (bareos-bareos-webui-Release-17.2.5_GH0.tar.gz) = 3ebac295c2cc5b4b0c33c5fe7737c0d5b43c76709687f615db16ca900053265d
SIZE (bareos-bareos-webui-Release-17.2.5_GH0.tar.gz) = 2592123

View File

@@ -1,15 +0,0 @@
[
{ type: install
message: <<EOM
bareos webui was installed
Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
look bareos-webui installation/configuration instructions at:
https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
1) Configuration files are stored at %%ETCDIR%%
2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
EOM
}
]

View File

@@ -1,10 +0,0 @@
The bareos-webui is a free software tool written in PHP, intended to monitor
and manage Bareos over the web.
The webui is based on Zend Framework 2, an open source framework for developing
web applications and services using PHP 5.3+ and makes extensive use of the
Twitter Bootstrap front-end framework.
The bareos-webui is licensed under AGPL Version 3.
WWW: http://www.bareos.org/

File diff suppressed because it is too large Load Diff