[pkg-bacula-commits] [bacula] 01/02: Added debian/patches/upstream-fix-sqlite-update.patch

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 8fb7dbef1298026b1e5279ec1d1cdb2b1d941277
Author: Carsten Leonhardt <leo at debian.org>
Date:   Fri Aug 25 14:09:51 2017 +0200

    Added debian/patches/upstream-fix-sqlite-update.patch
    
    Fixes broken src/cats/update_sqlite3_tables.in.
    Needs testing.
---
 debian/TODO                                     |  4 ++--
 debian/changelog                                |  1 +
 debian/patches/series                           |  1 +
 debian/patches/upstream-fix-sqlite-update.patch | 27 +++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 23ca47c..5298824 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -3,8 +3,8 @@ Before next upload:
  * fix debian/scripts/install-dbconfig pending input from
    http://bugs.bacula.org/view.php?id=2305
    otherwise fresh installs with sqlite3 will not work
- * wait for resolution to http://bugs.bacula.org/view.php?id=2305
-   otherwise updates with sqlite3 will not work
+ * test fix for sqlite3 updates, submitted as
+   http://bugs.bacula.org/view.php?id=2305
 
 Very High:
 
diff --git a/debian/changelog b/debian/changelog
index 60d8b00..61160c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ bacula (9.0.3+dfsg-1) unstable; urgency=low
     warn that we no longer support the make_catalog_backup_awk scripts and
     that they will be removed after the next debian release
   * Implemented try-restart in init scripts
+  * Added debian/patches/upstream-fix-sqlite-update.patch
 
  --
 
diff --git a/debian/patches/series b/debian/patches/series
index 448c428..25ae5b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix-scriptdir-examples-devices.patch
 enable-hardening-for-bat.patch
 non-forking-systemd-units.patch
 fix-bring-back-tmpfiles-configuration.patch
+upstream-fix-sqlite-update.patch
diff --git a/debian/patches/upstream-fix-sqlite-update.patch b/debian/patches/upstream-fix-sqlite-update.patch
new file mode 100644
index 0000000..d829c5f
--- /dev/null
+++ b/debian/patches/upstream-fix-sqlite-update.patch
@@ -0,0 +1,27 @@
+Description: Fix sqlite3 update script
+Author: Carsten Leonhardt <leo at debian.org>
+Bug: http://bugs.bacula.org/view.php?id=2306
+Last-Update: 2017-08-25
+--- a/src/cats/update_sqlite3_tables.in
++++ b/src/cats/update_sqlite3_tables.in
+@@ -156,7 +156,12 @@
+ CREATE INDEX jobtdate_idx on JobHisto (JobTDate);
+ 
+ UPDATE Version SET VersionId=15;
++commit;
++END-OF-DATA
+ 
++DBVERSION=15
++
++fi
+ 
+ if [ "$DBVERSION" -eq 15 ] ; then
+     if psql -f - -d ${db_name} $* <<END-OF-DATA
+@@ -180,6 +185,7 @@
+ 
+ ALTER TABLE Media RENAME COLUMN VolParts TO VolType;
+ ALTER TABLE Media ADD COLUMN VolParts INTEGER DEFAULT 0;
++ALTER TABLE media ADD COLUMN VolCloudParts INTEGER DEFAULT 0;
+ ALTER TABLE Media ADD COLUMN LastPartBytes BIGINT DEFAULT 0;
+ ALTER TABLE Media ADD COLUMN CacheRetention BIGINT DEFAULT 0;
+ ALTER TABLE Pool ADD COLUMN CacheRetention BIGINT DEFAULT 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git