diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index c83ff0b1efbc..060af656f49e 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,237 +1,237 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 21.0.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bareos20-server bareos19-server bareos18-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson USES+= cmake compiler:c++11-lang cpe localbase perl5 pkgconfig readline \ shebangfix USE_GITHUB= yes USE_PERL5= run USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SUB= yes CRYPTO_DESC= Cryptographic library MTX_DESC= Install mtx for control of autochanger devices NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "-server" OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= PGSQL OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support LMDB_DESC= Enable faster accurate backup support RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CMAKE_ON= -Dopenssl=ON OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dsmartalloc=ON \ -Dsysconfdir=${PREFIX}/etc \ -Darchivedir=${BAREOS_DIR}/storage \ -Dworkingdir=${BAREOS_DIR} \ -Dconfdir=${PREFIX}/etc/bareos \ -Dlibdir=${PREFIX}/lib \ -Dlogdir=/var/log/bareos \ -Dincludedir=${PREFIX}/include/bareos \ -Dreadline=ON \ -Ddisable-conio=ON \ -Dbatch-insert=ON \ -Dhave_plugins=ON \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos .if defined(WITH_CLIENT_ONLY) CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel \ -Dlmdb=ON .else LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-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_CMAKE_ON= -Dnls=ON CEPHFS_CMAKE_ON= -Dcephfs=ON CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild-stored=ON \ -Dbuild_client_only=OFF # Server default database PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '120,123d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" @${REINPLACE_CMD} '45d' ${WRKSRC}/core/src/CMakeLists.txt @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined .include diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in index 86b62370cbb7..22272cf86231 100644 --- a/sysutils/bareos-server/files/bareos-dir.in +++ b/sysutils/bareos-server/files/bareos-dir.in @@ -1,55 +1,55 @@ #!/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}" +command_args="-c ${bareos_dir_config} -p ${bareos_dir_pidfile}" pidfile="${bareos_dir_pidfile}" bconsole_command=/usr/local/bin/bconsole start_precmd="bareos_start_precmd" restart_precmd="bareos_dir_configtest" reload_precmd="bareos_dir_configtest" reload_cmd="bareos_dir_reload" configtest_cmd="bareos_dir_configtest" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} bareos_dir_configtest } bareos_dir_configtest() { echo "Performing sanity check on ${bareos_dir_config} configuration:" eval ${command} -t } bareos_dir_reload() { echo "Performing a graceful reload" # bconsole always exits with 0, so we can't check the return status for success. echo "reload" | ${bconsole_command} } extra_commands="reload configtest" run_rc_command "$1" diff --git a/sysutils/bareos-server/files/bareos-fd.in b/sysutils/bareos-server/files/bareos-fd.in index 54647786b12c..8d57c3c858bc 100644 --- a/sysutils/bareos-server/files/bareos-fd.in +++ b/sysutils/bareos-server/files/bareos-fd.in @@ -1,46 +1,46 @@ #!/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}" +command_args="-c ${bareos_fd_config} -p ${bareos_fd_pidfile}" pidfile="${bareos_fd_pidfile}" start_precmd="bareos_start_precmd" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || { getent passwd bareos > /dev/null 2&>1 if [ $? -eq 0] ; then # user bareos exists install -d -o bareos -g bareos ${pidfile%/*} else # bareos_fd as solitair service install -d -o root -g wheel ${pidfile%/*} fi } } run_rc_command "$1" diff --git a/sysutils/bareos-server/files/bareos-sd.in b/sysutils/bareos-server/files/bareos-sd.in index a5efe78e80f7..529cf55140c0 100644 --- a/sysutils/bareos-server/files/bareos-sd.in +++ b/sysutils/bareos-server/files/bareos-sd.in @@ -1,37 +1,37 @@ #!/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}" +command_args="-c ${bareos_sd_config} -p ${bareos_sd_pidfile}" pidfile="${bareos_sd_pidfile}" start_precmd="bareos_start_precmd" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} } run_rc_command "$1" diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt new file mode 100644 index 000000000000..64ee102c21f5 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt @@ -0,0 +1,20 @@ +--- core/src/stored/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2022-03-04 20:56:52.809609000 -0500 +@@ -219,7 +219,7 @@ + add_executable(bareos-sd stored.cc) + + target_link_libraries( +- bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ++ bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ${JANSSON_LIBRARIES} + ) + + if(HAVE_WIN32) +@@ -228,7 +228,7 @@ + endif() + if(HAVE_NDMP) + target_link_libraries(stored_objects PRIVATE bareosndmp) +- target_link_libraries(bareos-sd PRIVATE bareosndmp) ++ target_link_libraries(bareos-sd PRIVATE bareosndmp ${JANSSON_LIBRARIES}) + endif() + + add_executable(bls ${BLSSRCS}) diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile index 9e57e9c01510..19f1354962d8 100644 --- a/sysutils/bareos18-server/Makefile +++ b/sysutils/bareos18-server/Makefile @@ -1,243 +1,243 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 18.2.12 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 18-server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bareos17-server bareos16-server bareos-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson USES+= cmake:insource compiler:c++11-lang cpe localbase perl5 pkgconfig \ readline shebangfix USE_GITHUB= yes USE_PERL5= run USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SUB= yes CRYPTO_DESC= Cryptographic library MTX_DESC= Install mtx for control of autochanger devices NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "18-server" OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE+= DATABASE DATABASE_DESC= Database support CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CMAKE_ON= -Dopenssl=ON OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "18-client" || ${PKGNAMESUFFIX} == "18-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos18-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dsmartalloc=OFF \ -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 \ -Dtest-plugin=OFF \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos \ .if defined(WITH_CLIENT_ONLY) LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel .else CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-group=operator \ -Dlmdb=OFF .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BAREOS_USER?= bareos BAREOS_GROUP?= ${BAREOS_USER} BAREOS_UID?= 997 BAREOS_GID?= ${BAREOS_UID} BAREOS_DIR?= /var/db/bareos PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} SUB_LIST= BAREOS_USER=${BAREOS_USER} \ BAREOS_GROUP=${BAREOS_GROUP} \ BAREOS_UID=${BAREOS_UID} \ BAREOS_GID=${BAREOS_GID} \ BAREOS_DIR=${BAREOS_DIR} NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON CEPHFS_CMAKE_ON= -Dcephfs=ON CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild-stored=ON \ -Dbuild_client_only=OFF # Server default database MYSQL_CMAKE_ON= -Dmysql=ON MYSQL_USES= mysql SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '42d' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|api/glfs.h|glusterfs/api/glfs.h|g' \ ${WRKSRC}/core/src/stored/backends/gfapi_device.h @${REINPLACE_CMD} -e 's|sm_dump(false)|sm_dump(jcr,false)|g' \ ${WRKSRC}/core/src/tools/btestls.cc .if ${PKGNAMESUFFIX} == "18-server" @${REINPLACE_CMD} '23d' ${WRKSRC}/core/src/CMakeLists.txt @${REINPLACE_CMD} '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # 18-client and 18-server are defined .include diff --git a/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt index 2b2618ef7ada..30ea5dd024d0 100644 --- a/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt +++ b/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt @@ -1,55 +1,56 @@ ---- core/src/stored/CMakeLists.txt 2020-12-11 10:27:01.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2021-02-19 18:05:23.992747000 -0500 -@@ -193,26 +193,34 @@ +--- core/src/stored/CMakeLists.txt 2021-09-13 03:57:27.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2022-03-04 20:39:26.209621000 -0500 +@@ -193,26 +193,35 @@ target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} + ${JANSSON_LIBRARIES} + ${PTHREAD_LIBRARIES} ) add_executable(bls ${BLSSRCS}) target_link_libraries(bls bareos bareossd bareosfind ++ ${JANSSON_LIBRARIES} + ${PTHREAD_LIBRARIES} ) add_executable(bextract ${BEXTRACTSRS}) target_link_libraries(bextract bareossd bareosfind bareos + ${JANSSON_LIBRARIES} + ${PTHREAD_LIBRARIES} ) add_executable(bscan ${BSCANSRCS}) target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats + ${PTHREAD_LIBRARIES} ) add_executable(btape ${BTAPESRCS}) target_link_libraries(btape bareossd bareos + ${JANSSON_LIBRARIES} + ${PTHREAD_LIBRARIES} ) add_executable(bcopy ${BCOPYSRCS}) -@@ -220,6 +228,8 @@ +@@ -220,6 +229,8 @@ target_link_libraries(bcopy bareossd bareos + ${JANSSON_LIBRARIES} + ${PTHREAD_LIBRARIES} ) INSTALL(TARGETS bareossd DESTINATION ${libdir}) -@@ -232,7 +242,7 @@ +@@ -232,7 +243,7 @@ install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) -INSTALL(DIRECTORY DESTINATION "../${archivedir}") +INSTALL(DIRECTORY DESTINATION "${archivedir}") IF(${HAVE_DYNAMIC_SD_BACKENDS}) add_subdirectory(backends) diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile index d0e74e571070..6c0206544a0c 100644 --- a/sysutils/bareos19-server/Makefile +++ b/sysutils/bareos19-server/Makefile @@ -1,239 +1,239 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 19.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 19-server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson USES+= cmake compiler:c++11-lang cpe localbase perl5 pkgconfig readline \ shebangfix USE_GITHUB= yes USE_PERL5= run USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SUB= yes CRYPTO_DESC= Cryptographic library MTX_DESC= Install mtx for control of autochanger devices NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "19-server" OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX NDMP NLS PYTHON SCSICRYPTO OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= MYSQL PGSQL SQLITE3 OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CMAKE_ON= -Dopenssl=ON OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "19-client" || ${PKGNAMESUFFIX} == "19-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos19-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dsmartalloc=ON \ -Dsysconfdir=${PREFIX}/etc \ -Darchivedir=${BAREOS_DIR}/storage \ -Dworkingdir=${BAREOS_DIR} \ -Dconfdir=${PREFIX}/etc/bareos \ -Dlibdir=${PREFIX}/lib \ -Dlogdir=/var/log/bareos \ -Dincludedir=${PREFIX}/include/bareos \ -Dreadline=ON \ -Ddisable-conio=ON \ -Dbatch-insert=ON \ -Dhave_plugins=ON \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos .if defined(WITH_CLIENT_ONLY) LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel .else CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-group=operator \ -Dlmdb=OFF .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BAREOS_USER?= bareos BAREOS_GROUP?= ${BAREOS_USER} BAREOS_UID?= 997 BAREOS_GID?= ${BAREOS_UID} BAREOS_DIR?= /var/db/bareos PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} SUB_LIST= BAREOS_USER=${BAREOS_USER} \ BAREOS_GROUP=${BAREOS_GROUP} \ BAREOS_UID=${BAREOS_UID} \ BAREOS_GID=${BAREOS_GID} \ BAREOS_DIR=${BAREOS_DIR} NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON CEPHFS_CMAKE_ON= -Dcephfs=ON CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild-stored=ON \ -Dbuild_client_only=OFF # Server default database MYSQL_CMAKE_ON= -Dmysql=ON MYSQL_USES= mysql SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "19-server" @${REINPLACE_CMD} '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt @${REINPLACE_CMD} '35d' ${WRKSRC}/core/src/CMakeLists.txt .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # 19-client and 19-server are defined .include diff --git a/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt index 63cff21da895..a20aba01e3f2 100644 --- a/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt +++ b/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt @@ -1,41 +1,41 @@ ---- core/src/stored/CMakeLists.txt 2020-12-11 08:44:43.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2021-02-19 17:45:53.384978000 -0500 +--- core/src/stored/CMakeLists.txt 2021-09-13 11:07:41.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2022-03-04 20:43:08.042458000 -0500 @@ -213,23 +213,23 @@ list(APPEND BAREOS_SD_LIBRARIES comctl32) endif() -target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES}) +target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bls ${BLSSRCS}) -target_link_libraries(bls bareos bareossd bareosfind) -+target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES}) ++target_link_libraries(bls bareos bareossd bareosfind ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bextract ${BEXTRACTSRS}) -target_link_libraries(bextract bareossd bareosfind bareos) +target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bscan ${BSCANSRCS}) -target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) +target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES}) add_executable(btape ${BTAPESRCS}) -target_link_libraries(btape bareossd bareos) +target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bcopy ${BCOPYSRCS}) -target_link_libraries(bcopy bareossd bareos) +target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) install(TARGETS bareossd DESTINATION ${libdir}) @@ -243,7 +243,7 @@ install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) -install(DIRECTORY DESTINATION "../${archivedir}") +install(DIRECTORY DESTINATION "${archivedir}") if(${HAVE_DYNAMIC_SD_BACKENDS}) add_subdirectory(backends)