summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-06-25 13:54:19 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-06-25 13:54:30 +0000
commit507e28d4748ee016e090806cac40c074e98ca52e (patch)
tree8ac90ce2882e5782b6b53751420c52200d31faa0
parentReleasing progress-linux version 1:7.4p1-10dschinn1. (diff)
downloadopenssh-507e28d4748ee016e090806cac40c074e98ca52e.zip
openssh-507e28d4748ee016e090806cac40c074e98ca52e.tar.xz
Merging debian version 1:7.4p1-10+deb9u1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/fix-incoming-compression-statistics.patch27
-rw-r--r--debian/patches/series1
4 files changed, 37 insertions, 2 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 6c8df34..d9e2d54 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -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 --git a/debian/changelog b/debian/changelog
index 88d3e8e..482f678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.4p1-10+deb9u1) stretch; urgency=medium
+
+ * Fix incoming compression statistics (thanks, Russell Coker; closes:
+ #797964).
+
+ -- Colin Watson <cjwatson@debian.org> Sun, 18 Jun 2017 01:11:26 +0100
+
openssh (1:7.4p1-10dschinn1) dschinn; urgency=medium
* Uploading to dschinn, remaining changes:
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
new file mode 100644
index 0000000..39367ce
--- /dev/null
+++ b/debian/patches/fix-incoming-compression-statistics.patch
@@ -0,0 +1,27 @@
+From 1fbd56e33d641c08a8f573406cf27f9adf667763 Mon Sep 17 00:00:00 2001
+From: Russell Coker <russell@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 --git a/debian/patches/series b/debian/patches/series
index 9dbc4f4..ff2a577 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,6 +34,7 @@ ssh-keygen-hash-corruption.patch
ssh-keyscan-hash-port.patch
ssh-keygen-null-deref.patch
unbreak-unix-forwarding-for-root.patch
+fix-incoming-compression-statistics.patch
progress-linux/0001-ssh-keygen-rsa-size.patch
progress-linux/0002-ssh-keygen-ecdsa-size.patch
progress-linux/0003-ssh-config-protocol-1-removals.patch