Your message dated Sat, 01 Apr 2017 21:00:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#859296: unblock: bup/0.29-3
has caused the Debian Bug report #859296,
regarding unblock: bup/0.29-3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
859296: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859296
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
User: [email protected]
Usertags: unblock
Severity: normal
Hi,
I'd like to request a freeze unblock for bup 0.29-3. This package
contains a targeted fix (recommended by upstream) from the bup 0.29.1
release for RC bug #859295. This bug affects testing and can cause
serious data loss, potentially corrupting a bup backup repository in
certain situations if the 'bup gc' command is used. The source debdiff
is attached.
unblock bup/0.29-3
Thanks!
--
Robert Edmonds
[email protected]
diff -Nru bup-0.29/debian/changelog bup-0.29/debian/changelog
--- bup-0.29/debian/changelog 2017-01-01 14:42:37.000000000 -0500
+++ bup-0.29/debian/changelog 2017-04-01 14:38:19.000000000 -0400
@@ -1,3 +1,11 @@
+bup (0.29-3) unstable; urgency=medium
+
+ [ Tim Riemenschneider ]
+ * Safeguard against deleting new pack-file (f.e. with threshold=0)
+ (Closes: #859295)
+
+ -- Robert Edmonds <[email protected]> Sat, 01 Apr 2017 14:38:19 -0400
+
bup (0.29-2) unstable; urgency=medium
[ James Cowgill ]
diff -Nru bup-0.29/debian/patches/debian-changes
bup-0.29/debian/patches/debian-changes
--- bup-0.29/debian/patches/debian-changes 2017-01-01 14:42:37.000000000
-0500
+++ bup-0.29/debian/patches/debian-changes 2017-04-01 14:38:19.000000000
-0400
@@ -5,15 +5,13 @@
information below has been extracted from the changelog. Adjust it or drop
it.
.
- bup (0.29-2) unstable; urgency=medium
+ bup (0.29-3) unstable; urgency=medium
.
- [ James Cowgill ]
- * Build-Depend on tzdata to fix FTBFS. (Closes: #839498)
- .
- [ Robert Edmonds ]
- * debian/changelog: Acknowledge 0.28.1-1.1 NMU
+ [ Tim Riemenschneider ]
+ * Safeguard against deleting new pack-file (f.e. with threshold=0)
+ (Closes: #859295)
Author: Robert Edmonds <[email protected]>
-Bug-Debian: https://bugs.debian.org/839498
+Bug-Debian: https://bugs.debian.org/859295
---
The information above should follow the Patch Tagging Guidelines, please
@@ -26,7 +24,7 @@
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2017-01-01
+Last-Update: 2017-04-01
--- bup-0.29.orig/Makefile
+++ bup-0.29/Makefile
@@ -63,7 +61,7 @@
+++ bup-0.29/config/config.h.tmp
@@ -0,0 +1,27 @@
+/*
-+ * configuration for bup, generated Sun Jan 1 19:47:37 UTC 2017
++ * configuration for bup, generated Sat Apr 1 18:42:19 UTC 2017
+ * by pbuilder@chase
+ */
+#ifndef __AC_BUP_D
@@ -98,6 +96,43 @@
-COMMIT='$Format:%H$'
-NAMES='$Format:%d$'
-DATE='$Format:%ci$'
-+COMMIT='5c71e0f3540c7950185f2747efce4b7ef5b29980'
-+NAMES=' (HEAD -> branches/0.29, tag: debian/0.29-2)'
-+DATE='2017-01-01 14:43:38 -0500'
++COMMIT='3cf1801c6937bd0b07cd42eadf14dcb684a6f788'
++NAMES=' (HEAD -> branches/0.29, tag: debian/0.29-3)'
++DATE='2017-04-01 14:39:51 -0400'
+--- bup-0.29.orig/lib/bup/gc.py
++++ bup-0.29/lib/bup/gc.py
+@@ -135,6 +135,8 @@ def sweep(live_objects, existing_count,
+ if verbosity and new_pack_prefix:
+ log('created ' + basename(new_pack_prefix) + '\n')
+ for p in ns.stale_files:
++ if new_pack_prefix and p.startswith(new_pack_prefix):
++ continue # Don't remove the new pack file
+ if verbosity:
+ log('removing ' + basename(p) + '\n')
+ os.unlink(p)
+--- bup-0.29.orig/t/test-gc.sh
++++ bup-0.29/t/test-gc.sh
+@@ -219,4 +219,23 @@ WVPASSEQ 1 $(echo "$only_in_before" | wc
+ WVPASSEQ 1 $(echo "$only_in_after" | wc -l)
+ WVPASSEQ 1 $(echo "$in_both" | wc -l)
+
++WVSTART "gc (threshold 0)"
++
++WVPASS rm -rf "$BUP_DIR"
++WVPASS bup init
++WVPASS rm -rf src && mkdir src
++WVPASS echo 0 > src/0
++WVPASS echo 1 > src/1
++
++WVPASS bup index src
++WVPASS bup save -n src-1 src
++
++packs_before="$(ls "$BUP_DIR/objects/pack/"*.pack)" || exit $?
++WVPASS bup gc -v $GC_OPTS --threshold 0 2>&1 | tee gc.log
++packs_after="$(ls "$BUP_DIR/objects/pack/"*.pack)" || exit $?
++# Check that the pack was rewritten, but not removed (since the
++# result-pack is equal to the source pack)
++WVPASSEQ 1 "$(grep -cE '^rewriting ' gc.log)"
++WVPASSEQ "$packs_before" "$packs_after"
++
+ WVPASS rm -rf "$tmpdir"
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Robert Edmonds:
> Package: release.debian.org
> User: [email protected]
> Usertags: unblock
> Severity: normal
>
> Hi,
>
> I'd like to request a freeze unblock for bup 0.29-3. This package
> contains a targeted fix (recommended by upstream) from the bup 0.29.1
> release for RC bug #859295. This bug affects testing and can cause
> serious data loss, potentially corrupting a bup backup repository in
> certain situations if the 'bup gc' command is used. The source debdiff
> is attached.
>
> unblock bup/0.29-3
>
> Thanks!
>
Unblocked, thanks.
~Niels
--- End Message ---
