- Update to 18.2.6

This commit is contained in:
Jose Alonso Cardenas Marquez
2019-05-09 18:30:05 +00:00
parent 9521141eb6
commit a3331376c1
23 changed files with 353 additions and 429 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ COMMENT= Backup archiving recovery open sourced (client)
BROKEN_aarch64= Fails to link: missing sbrk
CONFLICTS= bareos16-client-*
CONFLICTS= bareos16-client-* bareos17-client-*
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
+1 -1
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bareos
PORTVERSION= 17.2.5
PORTVERSION= 18.2.6
CATEGORIES= sysutils
MASTER_SITES= http://doc.bareos.org/master/
PKGNAMESUFFIX= -docs
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1542749547
SHA256 (bareos-manual-main-reference.pdf) = 5e23682cae0fa2d3f8d5c6f67d2bc340f5a60b22c48e12b027554ca2df73902a
SIZE (bareos-manual-main-reference.pdf) = 3937438
TIMESTAMP = 1557378994
SHA256 (bareos-manual-main-reference.pdf) = 442525744a64da2281bfa732909434bfc2f8dadabea1b2925136b122a8ce19a4
SIZE (bareos-manual-main-reference.pdf) = 3943162
+62 -70
View File
@@ -2,8 +2,8 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 17.2.7
PORTREVISION?= 2
DISTVERSION= 18.2.6
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
@@ -14,12 +14,12 @@ COMMENT?= Backup archiving recovery open sourced (server)
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
CONFLICTS?= bacula*-server-* bareos16-server-*
CONFLICTS?= bacula17*-server-* bareos16-server-*
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
USES+= libtool:keepla pkgconfig readline:port shebangfix
USES+= cmake:insource pkgconfig readline:port shebangfix
USE_GITHUB= yes
USERS= bareos
@@ -27,10 +27,9 @@ 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
SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -51,24 +50,24 @@ OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
OPTIONS_SINGLE+= DATABASE
DATABASE_DESC= Database support
NDMP_CONFIGURE_ON= --enable-ndmp=yes
NDMP_CONFIGURE_OFF= --enable-ndmp=no
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_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
OPENSSL_CONFIGURE_OFF= --with-openssl="no"
OPENSSL_CMAKE_ON= -Dopenssl=ON
OPENSSL_CMAKE_OFF= -Dopenssl=OFF
SCSICRYPTO_CONFIGURE_ON= --enable-scsi-crypto=yes
SCSICRYPTO_CONFIGURE_OFF= --enable-scsi-crypto=no
SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON
SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF
.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
PYTHON_USES= python
PYTHON_CONFIGURE_ON= --with-python=yes
PYTHON_CONFIGURE_OFF= --with-python=no
PYTHON_CMAKE_ON= -Dpython=yes
PYTHON_CMAKE_OFF= -Dpython=no
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
@@ -82,39 +81,43 @@ SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client
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}
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_CONFIGURE_ON= --enable-lmdb=yes
LMDB_CONFIGURE_OFF= --enable-lmdb=no
LMDB_CFLAGS= -DMDB_DSYNC=O_SYNC
LMDB_CMAKE_ON= -Dlmdb=ON
LMDB_CMAKE_OFF= -Dlmdb=OFF
LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
CONFIGURE_ARGS+=--with-fd-user=root \
--with-fd-group=wheel
CMAKE_ARGS+= -Dfd-user=root \
-Dfd-group=wheel
.else
CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \
--with-dir-group=${BAREOS_GROUP} \
--with-sd-user=${BAREOS_USER} \
--with-sd-group=operator
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
@@ -135,25 +138,28 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \
BAREOS_DIR=${BAREOS_DIR}
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
NLS_CMAKE_ON= -DENABLE_NLS=1
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES= fd
CONFIGURE_ARGS+= --enable-client-only
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_CONFIGURE_ON= --with-mysql=yes
MYSQL_CMAKE_ON= -Dmysql=ON
MYSQL_USE= MYSQL=yes
SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
SQLITE3_CMAKE_ON= -Dsqlite3=ON
SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
PGSQL_CONFIGURE_ON= --with-postgresql=yes
PGSQL_CMAKE_ON= -Dpostgresql=ON
PGSQL_USES= pgsql
MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx
@@ -185,35 +191,21 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
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
.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
@${REINPLACE_CMD} '21d' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} '579d' ${WRKSRC}/core/CMakeLists.txt
.if ${PKGNAMESUFFIX} == "-server"
@${REINPLACE_CMD} '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
.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
@${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}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
@${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:
+5 -9
View File
@@ -1,10 +1,6 @@
# Created by: Alonso Cardenas <acm@FreeBSD.org>
# $FreeBSD$
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
@@ -14,7 +10,7 @@ pre-install:
.if ${PKGNAMESUFFIX} == "-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 \;
${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
. endfor
.endif
@@ -31,9 +27,9 @@ do-install:
.if ${PKGNAMESUFFIX} == "-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}/
${INSTALL_SCRIPT} ${WRKSRC}/core/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}
${INSTALL_PROGRAM} ${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
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1535610174
SHA256 (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 99a5f907e3422532c783ee254dcf5c737d2b1b53522c00924d3e1009289d2fd2
SIZE (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 4184028
TIMESTAMP = 1556169589
SHA256 (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 43ff0546d4d5486bc70db90ccb7fb1f6a3ac3f9b7293de010d2c300b548056d8
SIZE (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 9991951
@@ -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
@@ -1,20 +0,0 @@
--- configure 2015-08-08 15:47:12.347184000 -0500
+++ configure 2015-08-08 15:48:11.164437000 -0500
@@ -18626,7 +18626,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
@@ -21466,7 +21466,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
@@ -0,0 +1,72 @@
--- core/cmake/BareosInstallConfigFiles.cmake 2019-02-13 09:25:55.000000000 -0500
+++ core/cmake/BareosInstallConfigFiles.cmake 2019-05-08 22:47:21.128268000 -0500
@@ -43,18 +43,9 @@
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()
@@ -82,15 +73,9 @@
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(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example")
@@ -104,7 +89,8 @@
MESSAGE(STATUS "${configfile} as ${configfile}")
endif()
- FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}")
+ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
+ FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}")
endforeach()
ENDFOREACH()
@@ -122,15 +108,9 @@
STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
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()
+ MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}")
+ FILE (RENAME "${configfile}" "${configfile}.sample")
+ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}")
else()
MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
endif()
@@ -0,0 +1,19 @@
--- core/manpages/CMakeLists.txt 2019-05-08 21:16:29.369799000 -0500
+++ core/manpages/CMakeLists.txt 2019-05-08 21:17:28.526607000 -0500
@@ -17,6 +17,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
+IF(client-only)
set (MAN1
bconsole.1
)
@@ -25,7 +26,7 @@
bareos-fd.8
bareos.8
)
-
+ENDIF()
IF(NOT client-only)
set ( MAN1-server
@@ -0,0 +1,60 @@
--- core/scripts/CMakeLists.txt 2019-05-08 19:49:45.595270000 -0500
+++ core/scripts/CMakeLists.txt 2019-05-08 19:51:39.443730000 -0500
@@ -17,28 +17,29 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
+IF(client-only)
+ INSTALL(FILES
+ btraceback
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+ DESTINATION "${sbindir}")
-INSTALL(FILES
- bareos btraceback
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
- DESTINATION "${sbindir}")
+ INSTALL(FILES
+ bareos
+ btraceback.gdb
+ btraceback.dbx
+ btraceback.mdb
+ bareos-config
+ bareos-config-lib.sh
+ bareos-ctl-fd
+ bareos-ctl-funcs
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+ DESTINATION "${scriptdir}")
+ENDIF()
-INSTALL(FILES
- bareos
- btraceback.gdb
- btraceback.dbx
- btraceback.mdb
- bareos-config
- bareos-config-lib.sh
- bareos-ctl-fd
- bareos-ctl-funcs
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
- DESTINATION "${scriptdir}")
-
IF(NOT client-only)
INSTALL(FILES
mtx-changer
@@ -47,7 +48,6 @@
bareos-glusterfind-wrapper
bareos-ctl-dir
bareos-ctl-sd
- bareos-ctl-funcs
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
@@ -0,0 +1,21 @@
--- core/src/dird/CMakeLists.txt 2019-05-08 21:45:45.893113000 -0500
+++ core/src/dird/CMakeLists.txt 2019-05-08 21:47:00.616203000 -0500
@@ -77,6 +77,9 @@
bareosfind
${LMDB_LIBS}
${NDMP_LIBS}
+ ${OPENSSL_LIBRARIES}
+ ${PTHREAD_LIBRARIES}
+ ${JANSSON_LIBRARIES}
)
IF(HAVE_WIN32)
@@ -92,7 +95,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
@@ -0,0 +1,20 @@
--- core/src/stored/CMakeLists.txt 2019-02-13 09:25:55.000000000 -0500
+++ core/src/stored/CMakeLists.txt 2019-05-09 00:06:43.118374000 -0500
@@ -192,6 +192,8 @@
target_link_libraries(bareos-sd
stored_objects
${BAREOS_SD_LIBRARIES}
+ ${JANSSON_LIBRARIES}
+ ${PTHREAD_LIBRARIES}
)
add_executable(bls ${BLSSRCS})
@@ -231,7 +233,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)
@@ -0,0 +1,25 @@
--- core/src/CMakeLists.txt 2019-05-08 21:29:08.173605000 -0500
+++ core/src/CMakeLists.txt 2019-05-08 21:42:27.597876000 -0500
@@ -30,13 +30,16 @@
add_subdirectory(stored)
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)
ENDIF()
-add_subdirectory(lib)
-add_subdirectory(findlib)
-add_subdirectory(filed)
+
add_subdirectory(plugins)
if (${traymonitor})
@@ -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; \
@@ -1,60 +0,0 @@
--- src/dird/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/dird/Makefile.in 2016-11-09 15:47:36.135752000 -0500
@@ -52,6 +52,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
@@ -83,7 +84,7 @@
$(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) \
@@ -94,7 +95,7 @@
@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) \
@@ -105,7 +106,7 @@
@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) \
@@ -160,8 +161,8 @@
destconf="$$RESDIR/$$RES.new"; \
echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
fi; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${dir_group}" != "x"; then \
@@ -170,11 +171,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; \
@@ -1,39 +0,0 @@
--- src/files/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/filed/Makefile.in 2016-11-10 01:33:16.120709000 -0500
@@ -25,6 +25,7 @@
GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
first_rule: all
@@ -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_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(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
@@ -137,8 +138,8 @@
destconf="$$RESDIR/$$RES.new"; \
echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
fi; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${fd_group}" != "x"; then \
@@ -1,21 +0,0 @@
--- src/plugins/filed/Makefile.in 2018-05-17 15:34:21.796332000 -0500
+++ src/plugins/filed/Makefile.in 2018-05-17 15:35:50.843157000 -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 \
@@ -111,7 +112,7 @@
$(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;\
@@ -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)
@@ -1,73 +0,0 @@
--- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500
@@ -93,6 +93,7 @@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
DEBUG = @DEBUG@
GETTEXT_LIBS = @LIBINTL@
@@ -170,7 +171,7 @@
@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) \
@@ -192,7 +193,7 @@
@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)
bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -201,7 +202,7 @@
@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)
bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -210,7 +211,7 @@
@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)
bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -220,13 +221,13 @@
@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)
@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)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
@@ -259,8 +260,8 @@
destconf="$$RESDIR/$$RES.new"; \
echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
fi; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${sd_group}" != "x"; then \
@@ -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
+36 -34
View File
@@ -1,6 +1,8 @@
bin/bregex
bin/bsmtp
bin/bwild
bin/timelimit
@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
@@ -9,9 +11,12 @@
@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/fileset/plugin-ldap.conf.example.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/job/backup-ldap.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.example.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
@@ -23,15 +28,25 @@
@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-dir.d/storage/NULL.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.example.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
%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
etc/logrotate.d/bareos-dir
etc/rc.d/bareos-dir
etc/rc.d/bareos-sd
lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
lib/bareos/backends/libbareossd-fifo.so
lib/bareos/backends/libbareossd-gentape.so
lib/bareos/backends/libbareossd-tape.so
lib/bareos/plugins/BareosDirPluginBaseclass.py
lib/bareos/plugins/BareosDirWrapper.py
lib/bareos/plugins/BareosSdPluginBaseclass.py
@@ -47,28 +62,20 @@ lib/bareos/plugins/bareos_sd_consts.py
%%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/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
%%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
@@ -90,20 +97,16 @@ 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
lib/libbareoscats.so.18
lib/libbareoscats.so.%%LIB_VERSION%%
%%NDMP%%lib/libbareosndmp.so
lib/libbareossd-%%LIB_VERSION%%.so
lib/libbareossd.la
%%NDMP%%lib/libbareosndmp.so.18
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
lib/libbareossd.so
lib/libbareossql-%%LIB_VERSION%%.so
lib/libbareossql.la
lib/libbareossql.so
lib/libbareossql.so.18
lib/libbareossql.so.%%LIB_VERSION%%
man/man1/bareos-tray-monitor.1.gz
man/man1/bregex.1.gz
man/man1/bsmtp.1.gz
@@ -111,33 +114,29 @@ 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/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
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/btestls
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
@@ -153,6 +152,8 @@ sbin/timelimit
@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-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
@@ -161,5 +162,6 @@ sbin/timelimit
@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
+25 -25
View File
@@ -1,3 +1,4 @@
bin/bconsole
@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
@@ -6,16 +7,17 @@
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
@group bareos
%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
%%PYTHON%%@group bareos
%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
%%PYTHON%%@group bareos
%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
%%PYTHON%%@group bareos
@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
@group wheel
%%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample
bin/bconsole
@group bareos
lib/libbareos.so
lib/libbareos.so.18
lib/libbareos.so.%%LIB_VERSION%%
lib/libbareosfind.so
lib/libbareosfind.so.18
lib/libbareosfind.so.%%LIB_VERSION%%
%%LMDB%%lib/libbareoslmdb.so
%%LMDB%%lib/libbareoslmdb.so.18
%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
@@ -27,28 +29,26 @@ bin/bconsole
%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
lib/bareos/plugins/bpipe-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
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-fd
@group bareos
sbin/bconsole
@group wheel
sbin/btraceback
@group bareos
%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
@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