Commit e4befa16 authored by Carsten Leonhardt's avatar Carsten Leonhardt

Note new upstream version in changelog, drop patches applied upstream

parent 47f17554
Pipeline #35203 passed with stages
in 39 minutes and 43 seconds
bacula (9.4.1-3) UNRELEASED; urgency=medium
bacula (9.4.2-1) UNRELEASED; urgency=medium
[ Carsten Leonhardt ]
*
* New upstream version 9.4.2
* Drop patches applied upstream:
gigaslam-cppflags
multiarch-library-path-detection
fix-spelling
fix-endblock-signedness-to-unsigned
[ Sven Hartge ]
* Set systemd.unit as Type=exec to better catch startup errors.
-- Sven Hartge <sven@svenhartge.de> Wed, 09 Jan 2019 23:13:06 +0100
-- Carsten Leonhardt <leo@debian.org> Mon, 04 Feb 2019 23:30:47 +0100
bacula (9.4.1-2) unstable; urgency=medium
......
upstream/tray-monitor-installation
upstream/fix-update_sqlite3_tables
upstream/gigaslam-cppflags
upstream/multiarch-library-path-detection
upstream/relative-dirs-for-reproduceability
upstream/fix-spelling
upstream/fix-pkg-config-autoconf-macro
upstream/add-libs3-checks
upstream/fix-endblock-signedness-to-unsigned
debian/fix-default-config
debian/fix-default-dbtype
debian/fix-sql-bindir
......
commit 25164d42dbb8a238608dcc72c9c2ef99b73b2080
Author: Kern Sibbald <kern@sibbald.com>
Date: Mon Dec 31 20:34:35 2018 +0100
Change endblock edit to unsigned -- suggested by Martin Simmons
diff --git a/src/cats/sql_update.c b/src/cats/sql_update.c
index 7a8bb4ee0..b01ed7ad8 100644
--- a/src/cats/sql_update.c
+++ b/src/cats/sql_update.c
@@ -375,7 +375,7 @@ int BDB::bdb_update_media_record(JCR *jcr, MEDIA_DBR *mr)
"LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
"MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
"ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,"
- "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d"
+ "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u"
" WHERE VolumeName='%s'",
mr->VolJobs, mr->VolFiles, mr->VolBlocks,
edit_uint64(mr->VolBytes, ed1),
Description: Fix spelling errors found by lintian and myself
Author: Carsten Leonhardt <leo@debian.org>
Bug: https://bugs.bacula.org/view.php?id=2436
Last-Update: 2018-12-10
--- a/src/qt-console/tray-monitor/task.cpp
+++ b/src/qt-console/tray-monitor/task.cpp
@@ -83,7 +83,7 @@
break;
}
}
- Dmsg0(dbglvl, "Worker stoped\n");
+ Dmsg0(dbglvl, "Worker stopped\n");
lmgr_cleanup_thread();
return NULL;
}
--- a/src/stored/read_records.c
+++ b/src/stored/read_records.c
@@ -164,7 +164,7 @@
display_tape_error_status(jcr, dev);
if (forge_on || jcr->ignore_label_errors) {
dev->fsr(1); /* try skipping bad record */
- Pmsg0(000, _("Did fsr in attemp to skip bad record.\n"));
+ Pmsg0(000, _("Did fsr in attempt to skip bad record.\n"));
continue; /* try to continue */
}
ok = false; /* stop everything */
--- a/src/stored/tape_alert_msgs.h
+++ b/src/stored/tape_alert_msgs.h
@@ -149,7 +149,7 @@
"A hardware failure of the tape drive is predicted. Call the tape drive supplier helpline. Predictive failure of drive hardware.",
"The tape drive may have a fault. Check for availability of diagnostic information and run extended diagnostics if applicable. The drive may have had a failure which may be identified by stored diagnostic information or by running extended diagnostics (eg Send Diagnostic). Check the tape drive users manual for instructions on running extended diagnostic tests and retrieving diagnostic data.",
/* 40 */ "The changer mechanism is having difficulty communicating with the tape drive: Loader mech. is having trouble communicating with the tape drive.\n 1. Turn the autoloader off then on.\n 2. Restart the operation.\n 3. If problem persists, call the tape drive supplier helpline.",
- "A tape has been left in the autoloader by a previous hardware fault: Stray tape left in loader after pervious error recovery.\n 1. Insert an empty magazine to clear the fault.\n 2. If the fault does not clear, turn the autoloader off and then on again.\n 3. If the problem persists, call the tape drive supplier helpline.",
+ "A tape has been left in the autoloader by a previous hardware fault: Stray tape left in loader after previous error recovery.\n 1. Insert an empty magazine to clear the fault.\n 2. If the fault does not clear, turn the autoloader off and then on again.\n 3. If the problem persists, call the tape drive supplier helpline.",
"There is a problem with the autoloader mechanism. Loader mech. has a hardware fault.",
"The operation has failed because the autoloader door is open: Tape changer door open:\n 1. Clear any obstructions from the autoloader door.\n 2. Eject the magazine and then insert it again.\n 3. If the fault does not clear, turn the autoloader off and then on again.\n 4. If the problem persists, call the tape drive supplier helpline.",
"The autoloader has a hardware fault: The loader mechanism has a hardware fault that is not mechanically related.\n 1. Turn the autoloader off and then on again.\n 2. Restart the operation.\n 3. If the problem persists, call the tape drive supplier helpline.\n Check the autoloader users manual for device specific instructions on turning the device power on and off.",
--- a/src/dird/newvol.c
+++ b/src/dird/newvol.c
@@ -60,7 +60,7 @@
if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
Mmsg(errmsg, "Maximum Volumes exceeded for Pool %s", pr.Name);
- Dmsg1(90, "Too much volumes for Pool %s\n", pr.Name);
+ Dmsg1(90, "Too many volumes for Pool %s\n", pr.Name);
goto bail_out;
}
Description: Honour CPPFLAGS when building gigaslam
Author: Carsten Leonhardt <leo@debian.org>
Bug: https://bugs.bacula.org/view.php?id=2438
Last-Update: 2018-11-14
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -130,7 +130,7 @@
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
- $(CXX) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $(CPPFLAGS) $<
gigaslam: gigaslam.o
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
Description: Fix multiarch library path detection
Author: Carsten Leonhardt <leo@debian.org>
Bug: https://bugs.bacula.org/view.php?id=2437
Last-Update: 2018-11-17
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -122,6 +122,13 @@
fi
dnl -------------------------------------------------------
+dnl Check for multiarch.
+dnl ------------------------------------------------------
+AC_MSG_CHECKING(for multiarch system)
+multiarch=`$CC $CFLAGS -print-multiarch 2>/dev/null`
+AC_MSG_RESULT($multiarch)
+
+dnl -------------------------------------------------------
dnl Check for programs.
dnl ------------------------------------------------------
AC_PROG_INSTALL
--- a/autoconf/bacula-macros/db.m4
+++ b/autoconf/bacula-macros/db.m4
@@ -763,7 +763,9 @@
SQLITE_BINDIR=/usr/local/bin
elif test -f /usr/include/sqlite3.h; then
SQLITE_INCDIR=/usr/include
- if test -d /usr/lib64; then
+ if test -n $multiarch -a -d /usr/lib/$multiarch; then
+ SQLITE_LIBDIR=/usr/lib/$multiarch
+ elif test -d /usr/lib64; then
SQLITE_LIBDIR=/usr/lib64
else
SQLITE_LIBDIR=/usr/lib
......@@ -4,7 +4,7 @@ Last-Update: 2018-11-19
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -3406,6 +3406,7 @@
@@ -3413,6 +3413,7 @@
src/qt-console/tray-monitor/tray-monitor.pro \
src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
......@@ -12,7 +12,7 @@ Last-Update: 2018-11-19
src/dird/Makefile \
src/dird/bacula-dir.conf \
src/lib/Makefile \
@@ -3511,6 +3512,8 @@
@@ -3518,6 +3519,8 @@
cd src/qt-console
chmod 755 install_conf_file build-depkgs-qt-console
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment