cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/bareos-[client|server]: update to 1.7.10

Browse Source 
* It will be the last 17.x version. Please try to update to 18.x, 19.x or 20.x
  as soon as possible
* Add CEPHFS, GfAPI, RADOS plugin support
This commit is contained in:
Jose Alonso Cardenas Marquez 2021-08-05 15:28:21 -05:00
parent 52e1b4be6d
commit 917d403884
8 changed files with 167 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/bareos17-client/Makefile
View File

@ -14,7 +14,13 @@ USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server
OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO
CEPHFS_DESC= CEPHFS fd plugin support
GFAPI_DESC= GFAPI fd plugin support
RADOS_DESC= RADOS fd plugin support
LMDB_DESC= Enable build of LMDB support
.include "${MASTERDIR}/Makefile"

28
sysutils/bareos17-server/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 17.2.9
DISTVERSION= 17.2.10
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
@ -43,11 +43,16 @@ NDMP_DESC= Enable build of NDMP support
SCSICRYPTO_DESC= Build LTO AME crypto plugin
.if ${PKGNAMESUFFIX} == "17-server"
OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO
OPTIONS_DEFAULT+= PGSQL SCSICRYPTO
OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
OPTIONS_SINGLE+= DATABASE
DATABASE_DESC= Database support
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_CONFIGURE_ON= --enable-ndmp=yes
NDMP_CONFIGURE_OFF= --enable-ndmp=no
@ -135,6 +140,17 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
CEPHFS_CONFIGURE_ON= --with-cephfs=yes
CEPHFS_CONFIGURE_OFF= --with-cephfs=no
CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14
GFAPI_CONFIGURE_ON= --with-glusterfs=${LOCALBASE}
GFAPI_CONFIGURE_OFF= --with-glusterfs=no
GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs
RADOS_CONFIGURE_ON= --with-rados=yes \
--with-cephfs=yes
RADOS_CONFIGURE_OFF= --with-rados=no \
--with-cephfs=no
RADOS_LIB_DEPENDS= librados.so:net/ceph14
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)

6
sysutils/bareos17-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1589322594
SHA256 (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 617b88902710c2581470df54c45d2411a11f1d63554b935f308877a9510f9347
SIZE (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 4190637
TIMESTAMP = 1624924837
SHA256 (bareos-bareos-Release-17.2.10_GH0.tar.gz) = f6e2526b180e2ef17bcd72f7e27517dbdd0053675b8aef7147e9b24c0b0d7d10
SIZE (bareos-bareos-Release-17.2.10_GH0.tar.gz) = 4190783

29
sysutils/bareos17-server/files/patch-configure
View File

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

18
sysutils/bareos17-server/files/patch-src-lib_bsnprintf.c Normal file
View File

@ -0,0 +1,18 @@
--- src/lib/bsnprintf.c 2021-08-04 23:06:43.246164000 -0500
+++ src/lib/bsnprintf.c 2021-08-04 23:07:16.549429000 -0500
@@ -618,6 +618,7 @@
return result;
}
+#if !defined __FreeBSD__
static int64_t round(LDOUBLE value)
{
int64_t intpart;
@@ -629,6 +630,7 @@
return intpart;
}
+#endif
static int32_t fmtfp(char *buffer, int32_t currlen, int32_t maxlen,
LDOUBLE fvalue, int min, int max, int flags)

14
sysutils/bareos17-server/files/patch-src-plugins-filed_Makefile.in
View File

@ -1,5 +1,5 @@
--- 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
--- src/plugins/filed/Makefile.in 2020-07-09 12:30:11.000000000 -0500
+++ src/plugins/filed/Makefile.in 2021-08-05 02:19:31.479394000 -0500
@@ -93,7 +93,8 @@
install: all
@ -10,7 +10,15 @@
$(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 @@
@@ -104,14 +105,14 @@
if [ -d "$$CONF" ]; then \
for i in `find "$$CONF/" \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
$(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \
- $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/$$i; \
+ $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/`echo $$i | sed -e 's|example|sample|g'`; \
done; \
fi; \
if [ "$$plugin" = "python-fd.la" ]; then \
$(CP) *.py *.py.template $(DESTDIR)$(plugindir); \
for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
$(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \

62
sysutils/bareos17-server/files/patch-src-tests_cats_test.c Normal file
View File

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

37
sysutils/bareos17-server/pkg-plist.client
View File

@ -1,20 +1,20 @@
@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
@group bareos
@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
@group bareos
%%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
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bconsole.d/bconsole.conf.sample
bin/bconsole
%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
@ -26,6 +26,9 @@ bin/bconsole
%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
lib/bareos/plugins/bpipe-fd.so
%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
%%RADOS%%lib/bareos/plugins/rados-fd.so
%%PYTHON%%lib/bareos/plugins/python-fd.so
lib/libbareos-%%LIB_VERSION%%.so
lib/libbareos.la