diff -Nru bacula-7.4.4+dfsg/debian/changelog bacula-7.4.4+dfsg/debian/changelog --- bacula-7.4.4+dfsg/debian/changelog 2017-01-19 10:14:44.000000000 +0000 +++ bacula-7.4.4+dfsg/debian/changelog 2017-02-26 12:39:25.000000000 +0000 @@ -1,3 +1,10 @@ +bacula (7.4.4+dfsg-6) unstable; urgency=medium + + [Sven Hartge] + * Backport fix for btape fill test from 7.4.5 (Closes: #855645) + + -- Carsten Leonhardt Sun, 26 Feb 2017 13:39:25 +0100 + bacula (7.4.4+dfsg-5) unstable; urgency=medium * Fix FTBS for build-indep diff -Nru bacula-7.4.4+dfsg/debian/patches/fix-btape-fill.patch bacula-7.4.4+dfsg/debian/patches/fix-btape-fill.patch --- bacula-7.4.4+dfsg/debian/patches/fix-btape-fill.patch 1970-01-01 00:00:00.000000000 +0000 +++ bacula-7.4.4+dfsg/debian/patches/fix-btape-fill.patch 2017-02-26 12:39:25.000000000 +0000 @@ -0,0 +1,33 @@ +Origin: http://www.bacula.org/git/cgit.cgi/bacula/commit/?id=991d8a595657086eca1d2cd1f69246c68ef15511 +Date: Sat, 28 Jan 2017 14:08:05 +0100 +Description: Remove debug code that breaks btape fill +Bug-Debian: 855645 + +--- + 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 -Nru bacula-7.4.4+dfsg/debian/patches/series bacula-7.4.4+dfsg/debian/patches/series --- bacula-7.4.4+dfsg/debian/patches/series 2017-01-17 16:56:01.000000000 +0000 +++ bacula-7.4.4+dfsg/debian/patches/series 2017-02-26 12:32:21.000000000 +0000 @@ -8,3 +8,4 @@ fix-scriptdir-examples-devices.patch enable-hardening-for-bat.patch non-forking-systemd-units.patch +fix-btape-fill.patch