summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/debian-config.patch2
-rw-r--r--debian/patches/doc-upstart.patch29
-rw-r--r--debian/patches/fix-incoming-compression-statistics.patch2
-rw-r--r--debian/patches/gnome-ssh-askpass2-icon.patch2
-rw-r--r--debian/patches/no-dsa-host-key-by-default.patch6
-rw-r--r--debian/patches/no-openssl-version-status.patch2
-rw-r--r--debian/patches/regress-integrity-robust.patch2
-rw-r--r--debian/patches/restore-authorized_keys2.patch2
-rw-r--r--debian/patches/s390-missing-header.patch2
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/sigstop.patch35
-rw-r--r--debian/patches/ssh-agent-setgid.patch2
-rw-r--r--debian/patches/systemd-readiness.patch10
-rw-r--r--debian/patches/x32-syntax-error.patch2
15 files changed, 19 insertions, 85 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index abee53f0a..d096efccd 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
1# see git-dpm(1) from git-dpm package 1# see git-dpm(1) from git-dpm package
26111c39a4ae8f1c62a9312a5f8d8b23adb5f727a 2f62d1568c95ad1ad193b95d61e6e93baf8b935a0
36111c39a4ae8f1c62a9312a5f8d8b23adb5f727a 3f62d1568c95ad1ad193b95d61e6e93baf8b935a0
46fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 46fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
56fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 56fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
6openssh_7.5p1.orig.tar.gz 6openssh_7.5p1.orig.tar.gz
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index b8483b4e9..9cac5ba1c 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
1From 78fc8282e021b0236697caedb612cab78831755f Mon Sep 17 00:00:00 2001 1From 2a56febeeeb301ce75748d175e35268f45790377 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:18 +0000 3Date: Sun, 9 Feb 2014 16:10:18 +0000
4Subject: Various Debian-specific configuration changes 4Subject: Various Debian-specific configuration changes
diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch
deleted file mode 100644
index 37e9b09d6..000000000
--- a/debian/patches/doc-upstart.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From d35329b23dd567076999470e346f49ef6e56f367 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:12 +0000
4Subject: Refer to ssh's Upstart job as well as its init script
5
6Forwarded: not-needed
7Last-Update: 2013-09-14
8
9Patch-Name: doc-upstart.patch
10---
11 sshd.8 | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14diff --git a/sshd.8 b/sshd.8
15index 6355178f..dd4b8fc3 100644
16--- a/sshd.8
17+++ b/sshd.8
18@@ -65,7 +65,10 @@ over an insecure network.
19 .Nm
20 listens for connections from clients.
21 It is normally started at boot from
22-.Pa /etc/init.d/ssh .
23+.Pa /etc/init.d/ssh
24+(or
25+.Pa /etc/init/ssh.conf
26+on systems using the Upstart init daemon).
27 It forks a new
28 daemon for each incoming connection.
29 The forked daemons handle
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
index 42ebef3fb..482787e82 100644
--- a/debian/patches/fix-incoming-compression-statistics.patch
+++ b/debian/patches/fix-incoming-compression-statistics.patch
@@ -1,4 +1,4 @@
1From 6111c39a4ae8f1c62a9312a5f8d8b23adb5f727a Mon Sep 17 00:00:00 2001 1From f62d1568c95ad1ad193b95d61e6e93baf8b935a0 Mon Sep 17 00:00:00 2001
2From: Russell Coker <russell@coker.com.au> 2From: Russell Coker <russell@coker.com.au>
3Date: Tue, 6 Jun 2017 15:00:20 +0100 3Date: Tue, 6 Jun 2017 15:00:20 +0100
4Subject: Fix incoming compression statistics 4Subject: Fix incoming compression statistics
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index 079169d5f..f4047c43b 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -1,4 +1,4 @@
1From abf7f03362e0cc4855355a7b7c9b76b6963a75cd Mon Sep 17 00:00:00 2001 1From fb48aada85eeeca2c0c90dcfd126463b6e77a441 Mon Sep 17 00:00:00 2001
2From: Vincent Untz <vuntz@ubuntu.com> 2From: Vincent Untz <vuntz@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:16 +0000 3Date: Sun, 9 Feb 2014 16:10:16 +0000
4Subject: Give the ssh-askpass-gnome window a default icon 4Subject: Give the ssh-askpass-gnome window a default icon
diff --git a/debian/patches/no-dsa-host-key-by-default.patch b/debian/patches/no-dsa-host-key-by-default.patch
index b20cb22d5..d301e387a 100644
--- a/debian/patches/no-dsa-host-key-by-default.patch
+++ b/debian/patches/no-dsa-host-key-by-default.patch
@@ -1,4 +1,4 @@
1From 417f561eac9f391661ad23a27f1d711f56566176 Mon Sep 17 00:00:00 2001 1From 12b741fba8a8430c32b8b48e5427504e97d48625 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 16 Jan 2017 13:53:04 +0000 3Date: Mon, 16 Jan 2017 13:53:04 +0000
4Subject: Remove ssh_host_dsa_key from HostKey default 4Subject: Remove ssh_host_dsa_key from HostKey default
@@ -32,10 +32,10 @@ index a391cf4b..1a7a5f18 100644
32 options->host_key_files[options->num_host_key_files++] = 32 options->host_key_files[options->num_host_key_files++] =
33 _PATH_HOST_ECDSA_KEY_FILE; 33 _PATH_HOST_ECDSA_KEY_FILE;
34diff --git a/sshd.8 b/sshd.8 34diff --git a/sshd.8 b/sshd.8
35index dd4b8fc3..79a7e080 100644 35index 6355178f..f038fb82 100644
36--- a/sshd.8 36--- a/sshd.8
37+++ b/sshd.8 37+++ b/sshd.8
38@@ -167,11 +167,10 @@ This option must be given if 38@@ -164,11 +164,10 @@ This option must be given if
39 is not run as root (as the normal 39 is not run as root (as the normal
40 host key files are normally not readable by anyone but root). 40 host key files are normally not readable by anyone but root).
41 The default is 41 The default is
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
index 0c12e2acf..03d1dbd59 100644
--- a/debian/patches/no-openssl-version-status.patch
+++ b/debian/patches/no-openssl-version-status.patch
@@ -1,4 +1,4 @@
1From 3ccc29568299d597b2753a4a04ad082814b9c8e8 Mon Sep 17 00:00:00 2001 1From a4fa272fdeee5d56d94e0a6aac5c5b3ee4f73ce2 Mon Sep 17 00:00:00 2001
2From: Kurt Roeckx <kurt@roeckx.be> 2From: Kurt Roeckx <kurt@roeckx.be>
3Date: Sun, 9 Feb 2014 16:10:14 +0000 3Date: Sun, 9 Feb 2014 16:10:14 +0000
4Subject: Don't check the status field of the OpenSSL version 4Subject: Don't check the status field of the OpenSSL version
diff --git a/debian/patches/regress-integrity-robust.patch b/debian/patches/regress-integrity-robust.patch
index 2c515e317..4ef0f1b5f 100644
--- a/debian/patches/regress-integrity-robust.patch
+++ b/debian/patches/regress-integrity-robust.patch
@@ -1,4 +1,4 @@
1From c210daa1ae77904f57478315e75af3f82a5d69f2 Mon Sep 17 00:00:00 2001 1From 989ce98a71063acb2a13f35977b962125c07d1b2 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 1 Jan 2017 15:21:10 +0000 3Date: Sun, 1 Jan 2017 15:21:10 +0000
4Subject: Make integrity tests more robust against timeouts 4Subject: Make integrity tests more robust against timeouts
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
index 4aec2ddc9..888f45489 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
1From ec338656a3d6b21bb87f3b6367b232d297f601e5 Mon Sep 17 00:00:00 2001 1From b24b239b07ee05d677141592921e74fadbdd16b2 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 5 Mar 2017 02:02:11 +0000 3Date: Sun, 5 Mar 2017 02:02:11 +0000
4Subject: Restore reading authorized_keys2 by default 4Subject: Restore reading authorized_keys2 by default
diff --git a/debian/patches/s390-missing-header.patch b/debian/patches/s390-missing-header.patch
index d83ad3075..3789d650f 100644
--- a/debian/patches/s390-missing-header.patch
+++ b/debian/patches/s390-missing-header.patch
@@ -1,4 +1,4 @@
1From 326d5114682d8ddbb64dead273d7738aea10e30a Mon Sep 17 00:00:00 2001 1From 8f69d359e39fef44d60c12ac105ed5f398ad2599 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org> 2From: Damien Miller <djm@mindrot.org>
3Date: Wed, 22 Mar 2017 12:43:02 +1100 3Date: Wed, 22 Mar 2017 12:43:02 +1100
4Subject: Missing header on Linux/s390 4Subject: Missing header on Linux/s390
diff --git a/debian/patches/series b/debian/patches/series
index 80ad5ec2b..a46f3a408 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,11 +17,9 @@ authorized-keys-man-symlink.patch
17openbsd-docs.patch 17openbsd-docs.patch
18ssh-argv0.patch 18ssh-argv0.patch
19doc-hash-tab-completion.patch 19doc-hash-tab-completion.patch
20doc-upstart.patch
21ssh-agent-setgid.patch 20ssh-agent-setgid.patch
22no-openssl-version-status.patch 21no-openssl-version-status.patch
23gnome-ssh-askpass2-icon.patch 22gnome-ssh-askpass2-icon.patch
24sigstop.patch
25systemd-readiness.patch 23systemd-readiness.patch
26debian-config.patch 24debian-config.patch
27regress-integrity-robust.patch 25regress-integrity-robust.patch
diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch
deleted file mode 100644
index 43d3937e5..000000000
--- a/debian/patches/sigstop.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From a91715df66fc2a0b7792e87a864c334f4cb15043 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:17 +0000
4Subject: Support synchronisation with service supervisor using SIGSTOP
5
6Author: Robie Basak <robie.basak@ubuntu.com>
7Forwarded: no
8Last-Update: 2014-04-14
9
10Patch-Name: sigstop.patch
11---
12 sshd.c | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15diff --git a/sshd.c b/sshd.c
16index f2f54b51..a2ca2d3e 100644
17--- a/sshd.c
18+++ b/sshd.c
19@@ -1892,6 +1892,16 @@ main(int ac, char **av)
20 }
21 }
22
23+ if (getenv("SSH_SIGSTOP")) {
24+ /* Tell service supervisor that we are ready. */
25+ kill(getpid(), SIGSTOP);
26+ /* The service supervisor only ever expects a single
27+ * STOP signal, so do not ever signal it again, even
28+ * in the case of a re-exec or future children.
29+ */
30+ unsetenv("SSH_SIGSTOP");
31+ }
32+
33 /* Accept a connection and return in a forked child */
34 server_accept_loop(&sock_in, &sock_out,
35 &newsock, config_s);
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
index 472eb2fa7..72ee695be 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -1,4 +1,4 @@
1From 583919799c3946c5fa89f8907349c1443639b6bd Mon Sep 17 00:00:00 2001 1From c001f571bd899e59ae81fba7bb8dd69da2b55059 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:13 +0000 3Date: Sun, 9 Feb 2014 16:10:13 +0000
4Subject: Document consequences of ssh-agent being setgid in ssh-agent(1) 4Subject: Document consequences of ssh-agent being setgid in ssh-agent(1)
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
index 1d7a14168..e7511110f 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,11 +1,11 @@
1From bd5c1cc302550e4caf8c3a6942f48a784f347b58 Mon Sep 17 00:00:00 2001 1From 92415b13be2ce917028d1327fb9bb50208d0139e Mon Sep 17 00:00:00 2001
2From: Michael Biebl <biebl@debian.org> 2From: Michael Biebl <biebl@debian.org>
3Date: Mon, 21 Dec 2015 16:08:47 +0000 3Date: Mon, 21 Dec 2015 16:08:47 +0000
4Subject: Add systemd readiness notification support 4Subject: Add systemd readiness notification support
5 5
6Bug-Debian: https://bugs.debian.org/778913 6Bug-Debian: https://bugs.debian.org/778913
7Forwarded: no 7Forwarded: no
8Last-Update: 2016-01-04 8Last-Update: 2017-08-22
9 9
10Patch-Name: systemd-readiness.patch 10Patch-Name: systemd-readiness.patch
11--- 11---
@@ -56,7 +56,7 @@ index a92425db..9d89bc35 100644
56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" 56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
57 echo " BSD Auth support: $BSD_AUTH_MSG" 57 echo " BSD Auth support: $BSD_AUTH_MSG"
58diff --git a/sshd.c b/sshd.c 58diff --git a/sshd.c b/sshd.c
59index a2ca2d3e..8996e0e8 100644 59index f2f54b51..44772c6d 100644
60--- a/sshd.c 60--- a/sshd.c
61+++ b/sshd.c 61+++ b/sshd.c
62@@ -85,6 +85,10 @@ 62@@ -85,6 +85,10 @@
@@ -70,8 +70,8 @@ index a2ca2d3e..8996e0e8 100644
70 #include "xmalloc.h" 70 #include "xmalloc.h"
71 #include "ssh.h" 71 #include "ssh.h"
72 #include "ssh2.h" 72 #include "ssh2.h"
73@@ -1902,6 +1906,11 @@ main(int ac, char **av) 73@@ -1892,6 +1896,11 @@ main(int ac, char **av)
74 unsetenv("SSH_SIGSTOP"); 74 }
75 } 75 }
76 76
77+#ifdef HAVE_SYSTEMD 77+#ifdef HAVE_SYSTEMD
diff --git a/debian/patches/x32-syntax-error.patch b/debian/patches/x32-syntax-error.patch
index e78003fed..7399bb0d1 100644
--- a/debian/patches/x32-syntax-error.patch
+++ b/debian/patches/x32-syntax-error.patch
@@ -1,4 +1,4 @@
1From 93563703c3acd94883e89baa7fcbf666318e2704 Mon Sep 17 00:00:00 2001 1From 59b1519ddb11cc2393037e97ae806656c6276020 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org> 2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 21 Mar 2017 08:47:55 +1100 3Date: Tue, 21 Mar 2017 08:47:55 +1100
4Subject: Fix syntax error on Linux/X32 4Subject: Fix syntax error on Linux/X32