Hi Kern,
thanks for the new release!
While looking through the changes since v9.4 I noticed a few issues:
These files say they have non-free licenses:
bacula/src/plugins/fd/docker/baculatar/Dockerfile
regress/scripts/regress-utils.sh
These files have "Copyright (C) (...) Bacula Systems SA" and don't
mention the BSD 2-Clause license like the other files there:
bacula/platforms/rpms/suse/bacula-aligned.spec.in
bacula/platforms/rpms/redhat/bacula-cloud.spec.in
bacula/platforms/rpms/redhat/bacula-aligned.spec.in
The file "bacula/scripts/manual_prune.pl" contradicts itself: the header
says (c) Kern Sibbald and BSD 2-Clause, but the included man page says
(c) Bacula Systems SA and "only for personal use".
The new makefiles don't specify "$(CFLAGS)" in the target for
.c.lo. Debian's QA tools are unhappy about that, I attached a patch.
Some spelling errors, found by Debian QA tools, I attached another
patch.
Especially fixing the license issues would help us preparing Bacula 9.6
for Debian.
Best regards,
Carsten
diff --git a/bacula/src/plugins/dir/Makefile.in b/bacula/src/plugins/dir/Makefile.in
index 6ba512138d..c20b204769 100644
--- a/bacula/src/plugins/dir/Makefile.in
+++ b/bacula/src/plugins/dir/Makefile.in
@@ -16,7 +16,7 @@ LIBDIR=../../lib
.SUFFIXES: .c .o .lo
.c.lo:
- $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c $<
+ $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c $<
all: example-plugin-dir.la
diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in
index 8ea8f61447..b1098565d2 100644
--- a/bacula/src/plugins/fd/Makefile.in
+++ b/bacula/src/plugins/fd/Makefile.in
@@ -20,7 +20,7 @@ thisdir = src/plugins/fd
.SUFFIXES: .c .lo
.c.lo:
- $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $<
+ $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $<
all: bpipe-fd.la test-plugin-fd.la test-deltaseq-fd.la pluglib.lo
diff --git a/bacula/src/plugins/fd/docker/Makefile.in b/bacula/src/plugins/fd/docker/Makefile.in
index 6774e7d9d6..0370f08eb0 100644
--- a/bacula/src/plugins/fd/docker/Makefile.in
+++ b/bacula/src/plugins/fd/docker/Makefile.in
@@ -28,7 +28,7 @@ all: docker-fd.la
.c.lo:
@echo "Compiling $< ..."
- $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $<
+ $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $<
%.lo: %.c %.h Makefile
@echo "Compiling $< ..."
diff --git a/bacula/src/plugins/sd/Makefile.in b/bacula/src/plugins/sd/Makefile.in
index ef5797d839..09187d9281 100644
--- a/bacula/src/plugins/sd/Makefile.in
+++ b/bacula/src/plugins/sd/Makefile.in
@@ -16,7 +16,7 @@ LIBDIR=../../lib
.SUFFIXES: .c .lo
.c.lo:
- $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${SDDIR} -DTEST_PROGRAM -c $<
+ $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${SDDIR} -DTEST_PROGRAM -c $<
all: example-plugin-sd.la
diff --git a/bacula/po/es_AR.po b/bacula/po/es_AR.po
index 4ca7b06f16..64fae79aac 100644
--- a/bacula/po/es_AR.po
+++ b/bacula/po/es_AR.po
@@ -8658,7 +8658,7 @@ msgstr ""
#: src/stored/append.c:265 src/stored/btape.c:1976
#, c-format
-msgid "Error writting end session label. ERR=%s\n"
+msgid "Error writing end session label. ERR=%s\n"
msgstr ""
#: src/stored/append.c:278
@@ -9783,7 +9783,7 @@ msgstr ""
#: src/stored/btape.c:600
msgid ""
-"Test writting larger and larger records.\n"
+"Test writing larger and larger records.\n"
"This is a torture test for records.\n"
"I am going to write\n"
"larger and larger records. It will stop when the record size\n"
diff --git a/bacula/po/fi.po b/bacula/po/fi.po
index 62887e934c..48458015f8 100644
--- a/bacula/po/fi.po
+++ b/bacula/po/fi.po
@@ -9712,7 +9712,7 @@ msgstr ""
#: src/stored/append.c:292 src/stored/btape.c:2013
#, c-format
-msgid "Error writting end session label. ERR=%s\n"
+msgid "Error writing end session label. ERR=%s\n"
msgstr ""
#: src/stored/append.c:303 src/stored/mac.c:124 src/stored/mac.c:220
@@ -10907,7 +10907,7 @@ msgstr ""
#: src/stored/btape.c:632
msgid ""
-"Test writting larger and larger records.\n"
+"Test writing larger and larger records.\n"
"This is a torture test for records.\n"
"I am going to write\n"
"larger and larger records. It will stop when the record size\n"
diff --git a/bacula/po/it.po b/bacula/po/it.po
index a49ad035ca..1de1daf926 100644
--- a/bacula/po/it.po
+++ b/bacula/po/it.po
@@ -9316,7 +9316,7 @@ msgstr ""
#: src/stored/append.c:292 src/stored/btape.c:2013
#, c-format
-msgid "Error writting end session label. ERR=%s\n"
+msgid "Error writing end session label. ERR=%s\n"
msgstr ""
#: src/stored/append.c:303 src/stored/mac.c:124 src/stored/mac.c:220
@@ -10511,7 +10511,7 @@ msgstr ""
#: src/stored/btape.c:632
msgid ""
-"Test writting larger and larger records.\n"
+"Test writing larger and larger records.\n"
"This is a torture test for records.\n"
"I am going to write\n"
"larger and larger records. It will stop when the record size\n"
diff --git a/bacula/src/lib/bstat.c b/bacula/src/lib/bstat.c
index c22e17b2ab..44143b405a 100644
--- a/bacula/src/lib/bstat.c
+++ b/bacula/src/lib/bstat.c
@@ -194,7 +194,7 @@ const char *bstatmetric::metric_unit_str()
case METRIC_UNIT_SEC:
return "Seconds";
case METRIC_UNIT_MSEC:
- return "miliSeconds";
+ return "milliseconds";
case METRIC_UNIT_NUMBER:
return "Number";
case METRIC_UNIT_PERCENT:
diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 6da1fc5b41..f579c77839 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -1126,7 +1126,7 @@ void DEVICE::register_metrics(bstatcollect *collector)
Mmsg(met, "bacula.storage.%s.device.%s.writetime", me->hdr.name, name());
devstatmetrics.bacula_storage_device_writetime =
devstatcollector->registration(met.c_str(), METRIC_INT, METRIC_UNIT_MSEC,
- (char*)"Time spent writting to device.");
+ (char*)"Time spent writing to device.");
/* total and free space metrics registration */
Mmsg(met, "bacula.storage.%s.device.%s.freespace", me->hdr.name, name());
devstatmetrics.bacula_storage_device_freespace =
diff --git a/gui/baculum/framework/pradosoft/prado/framework/I18N/core/MessageSource.php b/gui/baculum/framework/pradosoft/prado/framework/I18N/core/MessageSource.php
index 96ed45216b..b5df56c84e 100644
--- a/gui/baculum/framework/pradosoft/prado/framework/I18N/core/MessageSource.php
+++ b/gui/baculum/framework/pradosoft/prado/framework/I18N/core/MessageSource.php
@@ -48,7 +48,7 @@ require_once(__DIR__ . '/MessageCache.php');
* $source = MessageSource::factory('MySource', $resource, $classfile);
* </code>
*
- * If you are writting your own message sources, pay attention to the
+ * If you are writing your own message sources, pay attention to the
* loadCatalogue method. It details how the resources are loaded and cached.
* See also the existing message source types as examples.
*
diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js
index 020dff3ce3..ba2dc8a49f 100644
--- a/gui/baculum/protected/Web/JavaScript/misc.js
+++ b/gui/baculum/protected/Web/JavaScript/misc.js
@@ -214,7 +214,7 @@ function set_formatters() {
}
var Cookies = {
- default_exipration_time: 31536000000, // 1 year in miliseconds
+ default_exipration_time: 31536000000, // 1 year in milliseconds
set_cookie: function(name, value, expiration) {
var date = new Date();
date.setTime(date.getTime() + this.default_exipration_time);
_______________________________________________
Bacula-devel mailing list
Bacula-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-devel
