svn commit: r501129 - in head/sysutils: bareos-client bareos-docs bareos-server bareos-server/files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Thu May 9 18:30:09 UTC 2019
Author: acm
Date: Thu May 9 18:30:05 2019
New Revision: 501129
URL: https://svnweb.freebsd.org/changeset/ports/501129
Log:
- Update to 18.2.6
Added:
head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake (contents, props changed)
head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt (contents, props changed)
head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt (contents, props changed)
head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt (contents, props changed)
head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt (contents, props changed)
head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt (contents, props changed)
Deleted:
head/sysutils/bareos-server/files/patch-autoconf_Make.common.in
head/sysutils/bareos-server/files/patch-configure
head/sysutils/bareos-server/files/patch-src-console-Makefile.in
head/sysutils/bareos-server/files/patch-src-dird-Makefile.in
head/sysutils/bareos-server/files/patch-src-filed-Makefile.in
head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
head/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in
head/sysutils/bareos-server/files/patch-src-stored-Makefile.in
head/sysutils/bareos-server/files/patch-src-tools_Makefile.in
Modified:
head/sysutils/bareos-client/Makefile
head/sysutils/bareos-docs/Makefile
head/sysutils/bareos-docs/distinfo
head/sysutils/bareos-server/Makefile
head/sysutils/bareos-server/Makefile.common
head/sysutils/bareos-server/distinfo
head/sysutils/bareos-server/pkg-plist
head/sysutils/bareos-server/pkg-plist.client
Modified: head/sysutils/bareos-client/Makefile
==============================================================================
--- head/sysutils/bareos-client/Makefile Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-client/Makefile Thu May 9 18:30:05 2019 (r501129)
@@ -7,7 +7,7 @@ COMMENT= Backup archiving recovery open sourced (clien
BROKEN_aarch64= Fails to link: missing sbrk
-CONFLICTS= bareos16-client-*
+CONFLICTS= bareos16-client-* bareos17-client-*
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
Modified: head/sysutils/bareos-docs/Makefile
==============================================================================
--- head/sysutils/bareos-docs/Makefile Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-docs/Makefile Thu May 9 18:30:05 2019 (r501129)
@@ -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
Modified: head/sysutils/bareos-docs/distinfo
==============================================================================
--- head/sysutils/bareos-docs/distinfo Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-docs/distinfo Thu May 9 18:30:05 2019 (r501129)
@@ -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
Modified: head/sysutils/bareos-server/Makefile
==============================================================================
--- head/sysutils/bareos-server/Makefile Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-server/Makefile Thu May 9 18:30:05 2019 (r501129)
@@ -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 (serv
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 pk
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 at localhost \
- --with-job-email=root at 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 at localhost \
+ -Djob_email=root at 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:
Modified: head/sysutils/bareos-server/Makefile.common
==============================================================================
--- head/sysutils/bareos-server/Makefile.common Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-server/Makefile.common Thu May 9 18:30:05 2019 (r501129)
@@ -1,10 +1,6 @@
# Created by: Alonso Cardenas <acm at 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
Modified: head/sysutils/bareos-server/distinfo
==============================================================================
--- head/sysutils/bareos-server/distinfo Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-server/distinfo Thu May 9 18:30:05 2019 (r501129)
@@ -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
Added: head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake Thu May 9 18:30:05 2019 (r501129)
@@ -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()
Added: head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt Thu May 9 18:30:05 2019 (r501129)
@@ -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
Added: head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt Thu May 9 18:30:05 2019 (r501129)
@@ -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
Added: head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt Thu May 9 18:30:05 2019 (r501129)
@@ -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
+
Added: head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt Thu May 9 18:30:05 2019 (r501129)
@@ -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)
Added: head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt Thu May 9 18:30:05 2019 (r501129)
@@ -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})
Modified: head/sysutils/bareos-server/pkg-plist
==============================================================================
--- head/sysutils/bareos-server/pkg-plist Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-server/pkg-plist Thu May 9 18:30:05 2019 (r501129)
@@ -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
- at 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
+ at 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
+ at sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.example.sample
+ at 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
+ at sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.example.sample
+ at sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.example.sample
+ at sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
+ at sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.example.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
+ at sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.example.sample
+ at 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
+ at dir(,bareos,750) %%ETCDIR%%/bareos-dir-export
+ at 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%%
+ at dir(bareos,bareos,) %%BAREOS_DIR%%/storage
@dir(bareos,bareos,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos
Modified: head/sysutils/bareos-server/pkg-plist.client
==============================================================================
--- head/sysutils/bareos-server/pkg-plist.client Thu May 9 18:18:57 2019 (r501128)
+++ head/sysutils/bareos-server/pkg-plist.client Thu May 9 18:30:05 2019 (r501129)
@@ -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
- at group wheel
-%%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample
-bin/bconsole
+ at 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
+ at group bareos
sbin/bareos-fd
@group bareos
sbin/bconsole
@group wheel
+sbin/btraceback
+ at 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
- at dir lib/bareos/plugins
- at dir lib/bareos/scripts
@dir(bareos,bareos,) /var/log/bareos
@dir(bareos,bareos,) /var/run/bareos
More information about the svn-ports-all
mailing list