[pkg-bacula-commits] [bacula] 01/02: Import patch to fix btape fill test

[Sven Hartge]

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

hartge-guest pushed a commit to branch master-fix-btape
in repository bacula.

commit 12850b711eefbef5a25a6d9e760e675cc6e09fb3
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Feb 25 20:55:49 2017 +0100

    Import patch to fix btape fill test
    
    Import upstream patch from
    http://bacula.org/git/cgit.cgi/bacula/commit/?id=991d8a595657086eca1d2cd1f69246c68ef15511
    to fix the btape fill test.
    
    Closes: #855645
---
 debian/patches/fix-btape-fill.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/fix-btape-fill.patch b/debian/patches/fix-btape-fill.patch
new file mode 100644
index 0000000..0c61c55
--- /dev/null
+++ b/debian/patches/fix-btape-fill.patch
@@ -0,0 +1,34 @@
+From 991d8a595657086eca1d2cd1f69246c68ef15511 Mon Sep 17 00:00:00 2001
+From: Kern Sibbald <kern at sibbald.com>
+Date: Sat, 28 Jan 2017 14:08:05 +0100
+Subject: Remove debug code that breaks btape fill
+
+---
+ src/stored/block_util.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/stored/block_util.c b/src/stored/block_util.c
+index 3d67de9..657e9b1 100644
+--- a/src/stored/block_util.c
++++ b/src/stored/block_util.c
+@@ -1,7 +1,7 @@
+ /*
+    Bacula(R) - The Network Backup Solution
+ 
+-   Copyright (C) 2000-2016 Kern Sibbald
++   Copyright (C) 2000-2017 Kern Sibbald
+ 
+    The original author of Bacula is Kern Sibbald, with contributions
+    from many others, a complete list can be found in the file AUTHORS.
+@@ -205,8 +205,6 @@ void empty_block(DEV_BLOCK *block)
+    Dmsg3(200, "empty len=%d block=%p set binbuf=%d\n",
+          block->buf_len, block, block->binbuf);
+    block->bufp = block->buf + block->binbuf;
+-   block->buf[0] = 0;        /* clear for debugging */
+-   block->bufp[0] = 0;       /* clear for debugging */
+    block->read_len = 0;
+    block->write_failed = false;
+    block->block_read = false;
+-- 
+cgit v0.11.2
+
diff --git a/debian/patches/series b/debian/patches/series
index a58866a..0873fd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix-libbaccats-rpath.patch
 fix-scriptdir-examples-devices.patch
 enable-hardening-for-bat.patch
 non-forking-systemd-units.patch
+fix-btape-fill.patch

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