On Tue, Jun 06, 2017 at 05:27:00PM +0000, Niels Thykier wrote: > Colin Watson: > > Please unblock openssh 1:7.4p1-11, which contains a one-line patch for > > compression statistics. This fell through the cracks, but is apparently > > a significant issue for some users tracking data transfers. It was a > > regression in OpenSSH 6.8 (i.e. since jessie). > > Hi Colin, > > Thanks, it definitely looks worth fixing. > > Unfortunately, d-i is closed for updates except where KiBi has already > committed himself, so I think we should defer this to Debian 9.1 - which > I should have done with this mail. :)
OK, reuploaded to stretch. Here's the updated diff. diff -Nru openssh-7.4p1/debian/.git-dpm openssh-7.4p1/debian/.git-dpm --- openssh-7.4p1/debian/.git-dpm 2017-03-30 11:18:22.000000000 +0100 +++ openssh-7.4p1/debian/.git-dpm 2017-06-18 01:08:18.000000000 +0100 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -904bc482ad87648a2c799c441dc6a8449f24e15a -904bc482ad87648a2c799c441dc6a8449f24e15a +1fbd56e33d641c08a8f573406cf27f9adf667763 +1fbd56e33d641c08a8f573406cf27f9adf667763 971a7653746a6972b907dfe0ce139c06e4a6f482 971a7653746a6972b907dfe0ce139c06e4a6f482 openssh_7.4p1.orig.tar.gz diff -Nru openssh-7.4p1/debian/changelog openssh-7.4p1/debian/changelog --- openssh-7.4p1/debian/changelog 2017-03-30 11:19:04.000000000 +0100 +++ openssh-7.4p1/debian/changelog 2017-06-18 01:11:26.000000000 +0100 @@ -1,3 +1,10 @@ +openssh (1:7.4p1-10+deb9u1) stretch; urgency=medium + + * Fix incoming compression statistics (thanks, Russell Coker; closes: + #797964). + + -- Colin Watson <cjwat...@debian.org> Sun, 18 Jun 2017 01:11:26 +0100 + openssh (1:7.4p1-10) unstable; urgency=medium * Move privilege separation directory and PID file from /var/run/ to /run/ diff -Nru openssh-7.4p1/debian/patches/fix-incoming-compression-statistics.patch openssh-7.4p1/debian/patches/fix-incoming-compression-statistics.patch --- openssh-7.4p1/debian/patches/fix-incoming-compression-statistics.patch 1970-01-01 01:00:00.000000000 +0100 +++ openssh-7.4p1/debian/patches/fix-incoming-compression-statistics.patch 2017-06-18 01:08:18.000000000 +0100 @@ -0,0 +1,27 @@ +From 1fbd56e33d641c08a8f573406cf27f9adf667763 Mon Sep 17 00:00:00 2001 +From: Russell Coker <russ...@coker.com.au> +Date: Tue, 6 Jun 2017 15:00:20 +0100 +Subject: Fix incoming compression statistics + +Bug-Debian: https://bugs.debian.org/797964 +Forwarded: https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-June/036077.html +Last-Update: 2017-06-06 + +Patch-Name: fix-incoming-compression-statistics.patch +--- + packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packet.c b/packet.c +index ad1f6b49..afcde6f3 100644 +--- a/packet.c ++++ b/packet.c +@@ -587,7 +587,7 @@ ssh_packet_close(struct ssh *ssh) + deflateEnd(stream); + } + if (state->compression_in_started) { +- z_streamp stream = &state->compression_out_stream; ++ z_streamp stream = &state->compression_in_stream; + debug("compress incoming: " + "raw data %llu, compressed %llu, factor %.2f", + (unsigned long long)stream->total_out, diff -Nru openssh-7.4p1/debian/patches/series openssh-7.4p1/debian/patches/series --- openssh-7.4p1/debian/patches/series 2017-03-30 11:18:21.000000000 +0100 +++ openssh-7.4p1/debian/patches/series 2017-06-18 01:08:18.000000000 +0100 @@ -34,3 +34,4 @@ ssh-keyscan-hash-port.patch ssh-keygen-null-deref.patch unbreak-unix-forwarding-for-root.patch +fix-incoming-compression-statistics.patch -- Colin Watson [cjwat...@debian.org]
