Bug#904196: stretch-pu: package subversion/1.9.5-1+deb9u3
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
The SHA1/shattered fixes in the previous upload introduced a small
regression where the commit fails if the delta is a multiple of 16K. I
had meant to include the upstream patch for this last time but
accidentally overlooked it.
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.17.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diffstat for subversion_1.9.5-1+deb9u2 subversion_1.9.5-1+deb9u3
debian/patches/shattered_r1827688 | 26 ++++++++++++++++++++++++++
subversion-1.9.5/debian/changelog | 8 ++++++++
subversion-1.9.5/debian/patches/series | 1 +
3 files changed, 35 insertions(+)
diff -u subversion-1.9.5/debian/changelog subversion-1.9.5/debian/changelog
--- subversion-1.9.5/debian/changelog
+++ subversion-1.9.5/debian/changelog
@@ -1,3 +1,11 @@
+subversion (1.9.5-1+deb9u3) stretch; urgency=medium
+
+ * Backport r1827688, fixing a regression introduced in the fixes for SHA1
+ collisions, where commits would incorrectly fail with a "Filesystem is
+ corrupt" error if the delta length is a multiple of 16K.
+
+ -- James McCoy <jamessan@debian.org> Fri, 20 Jul 2018 22:35:40 -0400
+
subversion (1.9.5-1+deb9u2) stretch; urgency=medium
* Backport r1759116, working around an issue in APR's trunc API. This is a
diff -u subversion-1.9.5/debian/patches/series subversion-1.9.5/debian/patches/series
--- subversion-1.9.5/debian/patches/series
+++ subversion-1.9.5/debian/patches/series
@@ -21,0 +22 @@
+shattered_r1827688
only in patch2:
unchanged:
--- subversion-1.9.5.orig/debian/patches/shattered_r1827688
+++ subversion-1.9.5/debian/patches/shattered_r1827688
@@ -0,0 +1,26 @@
+------------------------------------------------------------------------
+r1827688 | svn-role | 2018-03-25 00:00:08 -0400 (Sun, 25 Mar 2018) | 10 lines
+
+Merge the 1.9.x-issue4722 branch:
+
+ * r1826272
+ Fix issue #4722: commits that fail when a file DELTA is a multiple of 16K.
+ Justification:
+ Commits fail with a false "Filesystem is corrupt" error.
+ Branch: ^/subversion/branches/1.9.x-issue4722
+ Votes:
+ +1: philip, stsp, stefan2
+
+
+Index: 1.9.x/subversion/libsvn_fs_fs/cached_data.c
+===================================================================
+--- 1.9.x/subversion/libsvn_fs_fs/cached_data.c (revision 1827687)
++++ 1.9.x/subversion/libsvn_fs_fs/cached_data.c (revision 1827688)
+@@ -2199,6 +2199,7 @@
+ next_rep.revision = rh->base_revision;
+ next_rep.item_index = rh->base_item_index;
+ next_rep.size = rh->base_length;
++ next_rep.expanded_size = rep->expanded_size;
+ svn_fs_fs__id_txn_reset(&next_rep.txn_id);
+
+ SVN_ERR(build_rep_list(&rb->rs_list, &rb->base_window,
Reply to: