summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/auth-log-verbosity.patch8
-rw-r--r--debian/patches/authorized-keys-man-symlink.patch2
-rw-r--r--debian/patches/consolekit.patch22
-rw-r--r--debian/patches/debian-banner.patch8
-rw-r--r--debian/patches/debian-config.patch12
-rw-r--r--debian/patches/dnssec-sshfp.patch6
-rw-r--r--debian/patches/doc-hash-tab-completion.patch2
-rw-r--r--debian/patches/doc-upstart.patch2
-rw-r--r--debian/patches/gnome-ssh-askpass2-icon.patch2
-rw-r--r--debian/patches/gssapi.patch66
-rw-r--r--debian/patches/helpful-wait-terminate.patch2
-rw-r--r--debian/patches/keepalive-extensions.patch6
-rw-r--r--debian/patches/lintian-symlink-pickiness.patch2
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch2
-rw-r--r--debian/patches/no-openssl-version-check.patch2
-rw-r--r--debian/patches/openbsd-docs.patch10
-rw-r--r--debian/patches/package-versioning.patch6
-rw-r--r--debian/patches/quieter-signals.patch2
-rw-r--r--debian/patches/scp-quoting.patch2
-rw-r--r--debian/patches/selinux-role.patch32
-rw-r--r--debian/patches/shell-path.patch2
-rw-r--r--debian/patches/sigstop.patch21
-rw-r--r--debian/patches/ssh-agent-setgid.patch2
-rw-r--r--debian/patches/ssh-argv0.patch2
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch4
-rw-r--r--debian/patches/ssh1-keepalive.patch4
-rw-r--r--debian/patches/sshfp_with_server_cert_upstr4
-rw-r--r--debian/patches/syslog-level-silent.patch4
-rw-r--r--debian/patches/user-group-modes.patch16
31 files changed, 135 insertions, 126 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 6b27e0a3f..db6725726 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
263d5fa28e16d96db6bac2dbe3fcecb65328f8966 208a63152deb5deda168aaef870bdb9f56425acb3
363d5fa28e16d96db6bac2dbe3fcecb65328f8966 308a63152deb5deda168aaef870bdb9f56425acb3
4796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 4796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7
5796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 5796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7
6openssh_6.6p1.orig.tar.gz 6openssh_6.6p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index b3e01db12..aa3b98262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.6p1-3) UNRELEASED; urgency=medium
2 2
3 * Debconf translations: 3 * Debconf translations:
4 - French (thanks, Étienne Gilli; closes: #743242). 4 - French (thanks, Étienne Gilli; closes: #743242).
5 * Never signal the service supervisor with SIGSTOP more than once, to
6 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
5 7
6 -- Colin Watson <cjwatson@debian.org> Tue, 01 Apr 2014 11:58:52 +0100 8 -- Colin Watson <cjwatson@debian.org> Tue, 01 Apr 2014 11:58:52 +0100
7 9
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
index 96632057b..8d26d7b6f 100644
--- a/debian/patches/auth-log-verbosity.patch
+++ b/debian/patches/auth-log-verbosity.patch
@@ -9,10 +9,10 @@ Last-Update: 2013-09-14
9 9
10Patch-Name: auth-log-verbosity.patch 10Patch-Name: auth-log-verbosity.patch
11--- 11---
12 auth-options.c | 35 ++++++++++++++++++++++++++--------- 12 auth-options.c | 35 ++++++++++++++++++++++++++---------
13 auth-options.h | 1 + 13 auth-options.h | 1 +
14 auth-rsa.c | 2 ++ 14 auth-rsa.c | 2 ++
15 auth2-pubkey.c | 3 +++ 15 auth2-pubkey.c | 3 +++
16 4 files changed, 32 insertions(+), 9 deletions(-) 16 4 files changed, 32 insertions(+), 9 deletions(-)
17 17
18diff --git a/auth-options.c b/auth-options.c 18diff --git a/auth-options.c b/auth-options.c
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
index fbe7b40c0..74bfb46e6 100644
--- a/debian/patches/authorized-keys-man-symlink.patch
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -9,7 +9,7 @@ Last-Update: 2013-09-14
9 9
10Patch-Name: authorized-keys-man-symlink.patch 10Patch-Name: authorized-keys-man-symlink.patch
11--- 11---
12 Makefile.in | 1 + 12 Makefile.in | 1 +
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/Makefile.in b/Makefile.in 15diff --git a/Makefile.in b/Makefile.in
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index 938bd6baa..e3ff4d7e4 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -8,17 +8,17 @@ Last-Updated: 2014-03-20
8 8
9Patch-Name: consolekit.patch 9Patch-Name: consolekit.patch
10--- 10---
11 Makefile.in | 3 +- 11 Makefile.in | 3 +-
12 configure | 132 +++++++++++++++++++++++++++++++ 12 configure | 132 +++++++++++++++++++++++++++++++
13 configure.ac | 25 ++++++ 13 configure.ac | 25 ++++++
14 consolekit.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 14 consolekit.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
15 consolekit.h | 24 ++++++ 15 consolekit.h | 24 ++++++
16 monitor.c | 42 ++++++++++ 16 monitor.c | 42 ++++++++++
17 monitor.h | 2 + 17 monitor.h | 2 +
18 monitor_wrap.c | 30 +++++++ 18 monitor_wrap.c | 30 ++++++++
19 monitor_wrap.h | 4 + 19 monitor_wrap.h | 4 +
20 session.c | 13 +++ 20 session.c | 13 ++++
21 session.h | 6 ++ 21 session.h | 6 ++
22 11 files changed, 520 insertions(+), 1 deletion(-) 22 11 files changed, 520 insertions(+), 1 deletion(-)
23 create mode 100644 consolekit.c 23 create mode 100644 consolekit.c
24 create mode 100644 consolekit.h 24 create mode 100644 consolekit.h
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 14e6a5d54..49219cf93 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -12,10 +12,10 @@ Last-Update: 2013-09-14
12 12
13Patch-Name: debian-banner.patch 13Patch-Name: debian-banner.patch
14--- 14---
15 servconf.c | 9 +++++++++ 15 servconf.c | 9 +++++++++
16 servconf.h | 2 ++ 16 servconf.h | 2 ++
17 sshd.c | 3 ++- 17 sshd.c | 3 ++-
18 sshd_config.5 | 5 +++++ 18 sshd_config.5 | 5 +++++
19 4 files changed, 18 insertions(+), 1 deletion(-) 19 4 files changed, 18 insertions(+), 1 deletion(-)
20 20
21diff --git a/servconf.c b/servconf.c 21diff --git a/servconf.c b/servconf.c
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index ac15d90e0..9ada04a10 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
1From 9cbb60f5e4932634db04c330c88abc49cc5567bd Mon Sep 17 00:00:00 2001 1From df5c8d109fb3d9ec16a487107a44300ed3006849 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
@@ -26,11 +26,11 @@ Last-Update: 2014-02-12
26 26
27Patch-Name: debian-config.patch 27Patch-Name: debian-config.patch
28--- 28---
29 readconf.c | 2 +- 29 readconf.c | 2 +-
30 ssh_config | 7 ++++++- 30 ssh_config | 7 ++++++-
31 ssh_config.5 | 19 ++++++++++++++++++- 31 ssh_config.5 | 19 ++++++++++++++++++-
32 sshd_config | 1 + 32 sshd_config | 1 +
33 sshd_config.5 | 25 +++++++++++++++++++++++++ 33 sshd_config.5 | 25 +++++++++++++++++++++++++
34 5 files changed, 51 insertions(+), 3 deletions(-) 34 5 files changed, 51 insertions(+), 3 deletions(-)
35 35
36diff --git a/readconf.c b/readconf.c 36diff --git a/readconf.c b/readconf.c
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index b3889ba0e..bc89c50fc 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -12,9 +12,9 @@ Last-Update: 2010-04-06
12 12
13Patch-Name: dnssec-sshfp.patch 13Patch-Name: dnssec-sshfp.patch
14--- 14---
15 dns.c | 14 +++++++++++++- 15 dns.c | 14 +++++++++++++-
16 openbsd-compat/getrrsetbyname.c | 10 +++++----- 16 openbsd-compat/getrrsetbyname.c | 10 +++++-----
17 openbsd-compat/getrrsetbyname.h | 3 +++ 17 openbsd-compat/getrrsetbyname.h | 3 +++
18 3 files changed, 21 insertions(+), 6 deletions(-) 18 3 files changed, 21 insertions(+), 6 deletions(-)
19 19
20diff --git a/dns.c b/dns.c 20diff --git a/dns.c b/dns.c
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
index 73ca79c6b..16c40b05f 100644
--- a/debian/patches/doc-hash-tab-completion.patch
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -9,7 +9,7 @@ Last-Update: 2013-09-14
9 9
10Patch-Name: doc-hash-tab-completion.patch 10Patch-Name: doc-hash-tab-completion.patch
11--- 11---
12 ssh_config.5 | 3 +++ 12 ssh_config.5 | 3 +++
13 1 file changed, 3 insertions(+) 13 1 file changed, 3 insertions(+)
14 14
15diff --git a/ssh_config.5 b/ssh_config.5 15diff --git a/ssh_config.5 b/ssh_config.5
diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch
index 873869869..da8fc7ed4 100644
--- a/debian/patches/doc-upstart.patch
+++ b/debian/patches/doc-upstart.patch
@@ -8,7 +8,7 @@ Last-Update: 2013-09-14
8 8
9Patch-Name: doc-upstart.patch 9Patch-Name: doc-upstart.patch
10--- 10---
11 sshd.8 | 5 ++++- 11 sshd.8 | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-) 12 1 file changed, 4 insertions(+), 1 deletion(-)
13 13
14diff --git a/sshd.8 b/sshd.8 14diff --git a/sshd.8 b/sshd.8
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index 7503cc172..dab518f65 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -8,7 +8,7 @@ Last-Update: 2010-02-28
8 8
9Patch-Name: gnome-ssh-askpass2-icon.patch 9Patch-Name: gnome-ssh-askpass2-icon.patch
10--- 10---
11 contrib/gnome-ssh-askpass2.c | 2 ++ 11 contrib/gnome-ssh-askpass2.c | 2 ++
12 1 file changed, 2 insertions(+) 12 1 file changed, 2 insertions(+)
13 13
14diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c 14diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index cf0ad8cad..d8439bf03 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -21,39 +21,39 @@ Last-Updated: 2014-03-19
21 21
22Patch-Name: gssapi.patch 22Patch-Name: gssapi.patch
23--- 23---
24 ChangeLog.gssapi | 113 +++++++++++++++++++ 24 ChangeLog.gssapi | 113 +++++++++++++++++++
25 Makefile.in | 3 +- 25 Makefile.in | 3 +-
26 auth-krb5.c | 17 ++- 26 auth-krb5.c | 17 ++-
27 auth2-gss.c | 48 +++++++- 27 auth2-gss.c | 48 +++++++-
28 auth2.c | 2 + 28 auth2.c | 2 +
29 clientloop.c | 13 +++ 29 clientloop.c | 13 +++
30 config.h.in | 6 + 30 config.h.in | 6 +
31 configure | 57 ++++++++++ 31 configure | 57 ++++++++++
32 configure.ac | 24 ++++ 32 configure.ac | 24 ++++
33 gss-genr.c | 275 +++++++++++++++++++++++++++++++++++++++++++- 33 gss-genr.c | 275 ++++++++++++++++++++++++++++++++++++++++++++-
34 gss-serv-krb5.c | 85 ++++++++++++-- 34 gss-serv-krb5.c | 85 ++++++++++++--
35 gss-serv.c | 221 +++++++++++++++++++++++++++++++----- 35 gss-serv.c | 221 +++++++++++++++++++++++++++++++-----
36 kex.c | 16 +++ 36 kex.c | 16 +++
37 kex.h | 14 +++ 37 kex.h | 14 +++
38 kexgssc.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 38 kexgssc.c | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
39 kexgsss.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++ 39 kexgsss.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++
40 key.c | 3 +- 40 key.c | 3 +-
41 key.h | 1 + 41 key.h | 1 +
42 monitor.c | 108 +++++++++++++++++- 42 monitor.c | 108 +++++++++++++++++-
43 monitor.h | 3 + 43 monitor.h | 3 +
44 monitor_wrap.c | 47 +++++++- 44 monitor_wrap.c | 47 +++++++-
45 monitor_wrap.h | 4 +- 45 monitor_wrap.h | 4 +-
46 readconf.c | 42 +++++++ 46 readconf.c | 42 +++++++
47 readconf.h | 5 + 47 readconf.h | 5 +
48 servconf.c | 38 ++++++- 48 servconf.c | 38 ++++++-
49 servconf.h | 3 + 49 servconf.h | 3 +
50 ssh-gss.h | 41 ++++++- 50 ssh-gss.h | 41 ++++++-
51 ssh_config | 2 + 51 ssh_config | 2 +
52 ssh_config.5 | 34 +++++- 52 ssh_config.5 | 34 +++++-
53 sshconnect2.c | 124 +++++++++++++++++++- 53 sshconnect2.c | 124 ++++++++++++++++++++-
54 sshd.c | 110 ++++++++++++++++++ 54 sshd.c | 110 ++++++++++++++++++
55 sshd_config | 2 + 55 sshd_config | 2 +
56 sshd_config.5 | 28 +++++ 56 sshd_config.5 | 28 +++++
57 33 files changed, 2051 insertions(+), 59 deletions(-) 57 33 files changed, 2051 insertions(+), 59 deletions(-)
58 create mode 100644 ChangeLog.gssapi 58 create mode 100644 ChangeLog.gssapi
59 create mode 100644 kexgssc.c 59 create mode 100644 kexgssc.c
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch
index bcfc13c99..e79f4990f 100644
--- a/debian/patches/helpful-wait-terminate.patch
+++ b/debian/patches/helpful-wait-terminate.patch
@@ -8,7 +8,7 @@ Last-Update: 2010-02-27
8 8
9Patch-Name: helpful-wait-terminate.patch 9Patch-Name: helpful-wait-terminate.patch
10--- 10---
11 serverloop.c | 2 +- 11 serverloop.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/serverloop.c b/serverloop.c 14diff --git a/serverloop.c b/serverloop.c
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 00066c220..680701f3d 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -20,9 +20,9 @@ Last-Update: 2013-09-14
20 20
21Patch-Name: keepalive-extensions.patch 21Patch-Name: keepalive-extensions.patch
22--- 22---
23 readconf.c | 14 ++++++++++++-- 23 readconf.c | 14 ++++++++++++--
24 ssh_config.5 | 21 +++++++++++++++++++-- 24 ssh_config.5 | 21 +++++++++++++++++++--
25 sshd_config.5 | 3 +++ 25 sshd_config.5 | 3 +++
26 3 files changed, 34 insertions(+), 4 deletions(-) 26 3 files changed, 34 insertions(+), 4 deletions(-)
27 27
28diff --git a/readconf.c b/readconf.c 28diff --git a/readconf.c b/readconf.c
diff --git a/debian/patches/lintian-symlink-pickiness.patch b/debian/patches/lintian-symlink-pickiness.patch
index 2cd0c0bb5..09e09ecf8 100644
--- a/debian/patches/lintian-symlink-pickiness.patch
+++ b/debian/patches/lintian-symlink-pickiness.patch
@@ -11,7 +11,7 @@ Last-Update: 2013-09-14
11 11
12Patch-Name: lintian-symlink-pickiness.patch 12Patch-Name: lintian-symlink-pickiness.patch
13--- 13---
14 Makefile.in | 4 ++-- 14 Makefile.in | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/Makefile.in b/Makefile.in 17diff --git a/Makefile.in b/Makefile.in
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index 261a28f38..e00b6c345 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -9,7 +9,7 @@ Last-Update: 2013-09-14
9 9
10Patch-Name: mention-ssh-keygen-on-keychange.patch 10Patch-Name: mention-ssh-keygen-on-keychange.patch
11--- 11---
12 sshconnect.c | 7 ++++++- 12 sshconnect.c | 7 ++++++-
13 1 file changed, 6 insertions(+), 1 deletion(-) 13 1 file changed, 6 insertions(+), 1 deletion(-)
14 14
15diff --git a/sshconnect.c b/sshconnect.c 15diff --git a/sshconnect.c b/sshconnect.c
diff --git a/debian/patches/no-openssl-version-check.patch b/debian/patches/no-openssl-version-check.patch
index 67b24c80c..56fa46aac 100644
--- a/debian/patches/no-openssl-version-check.patch
+++ b/debian/patches/no-openssl-version-check.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-12-23
13 13
14Patch-Name: no-openssl-version-check.patch 14Patch-Name: no-openssl-version-check.patch
15--- 15---
16 entropy.c | 12 ------------ 16 entropy.c | 12 ------------
17 1 file changed, 12 deletions(-) 17 1 file changed, 12 deletions(-)
18 18
19diff --git a/entropy.c b/entropy.c 19diff --git a/entropy.c b/entropy.c
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 88c0241ec..9a34a4182 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -14,11 +14,11 @@ Last-Update: 2013-09-14
14 14
15Patch-Name: openbsd-docs.patch 15Patch-Name: openbsd-docs.patch
16--- 16---
17 moduli.5 | 4 ++-- 17 moduli.5 | 4 ++--
18 ssh-keygen.1 | 12 ++++-------- 18 ssh-keygen.1 | 12 ++++--------
19 ssh.1 | 4 ++++ 19 ssh.1 | 4 ++++
20 sshd.8 | 5 ++--- 20 sshd.8 | 5 ++---
21 sshd_config.5 | 3 +-- 21 sshd_config.5 | 3 +--
22 5 files changed, 13 insertions(+), 15 deletions(-) 22 5 files changed, 13 insertions(+), 15 deletions(-)
23 23
24diff --git a/moduli.5 b/moduli.5 24diff --git a/moduli.5 b/moduli.5
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 49a3b17a6..c9c20d1c0 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -13,9 +13,9 @@ Last-Update: 2013-09-14
13 13
14Patch-Name: package-versioning.patch 14Patch-Name: package-versioning.patch
15--- 15---
16 sshconnect.c | 4 ++-- 16 sshconnect.c | 4 ++--
17 sshd.c | 2 +- 17 sshd.c | 2 +-
18 version.h | 7 ++++++- 18 version.h | 7 ++++++-
19 3 files changed, 9 insertions(+), 4 deletions(-) 19 3 files changed, 9 insertions(+), 4 deletions(-)
20 20
21diff --git a/sshconnect.c b/sshconnect.c 21diff --git a/sshconnect.c b/sshconnect.c
diff --git a/debian/patches/quieter-signals.patch b/debian/patches/quieter-signals.patch
index ca713dfc3..075b59823 100644
--- a/debian/patches/quieter-signals.patch
+++ b/debian/patches/quieter-signals.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-09-14
18 18
19Patch-Name: quieter-signals.patch 19Patch-Name: quieter-signals.patch
20--- 20---
21 clientloop.c | 6 ++++-- 21 clientloop.c | 6 ++++--
22 1 file changed, 4 insertions(+), 2 deletions(-) 22 1 file changed, 4 insertions(+), 2 deletions(-)
23 23
24diff --git a/clientloop.c b/clientloop.c 24diff --git a/clientloop.c b/clientloop.c
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
index 7749c8ea3..ff037a43a 100644
--- a/debian/patches/scp-quoting.patch
+++ b/debian/patches/scp-quoting.patch
@@ -13,7 +13,7 @@ Last-Update: 2010-02-27
13 13
14Patch-Name: scp-quoting.patch 14Patch-Name: scp-quoting.patch
15--- 15---
16 scp.c | 12 ++++++++++-- 16 scp.c | 12 ++++++++++--
17 1 file changed, 10 insertions(+), 2 deletions(-) 17 1 file changed, 10 insertions(+), 2 deletions(-)
18 18
19diff --git a/scp.c b/scp.c 19diff --git a/scp.c b/scp.c
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
index 48f901c02..e0ca12fb0 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -13,22 +13,22 @@ Last-Update: 2013-09-14
13 13
14Patch-Name: selinux-role.patch 14Patch-Name: selinux-role.patch
15--- 15---
16 auth.h | 1 + 16 auth.h | 1 +
17 auth1.c | 8 +++++++- 17 auth1.c | 8 +++++++-
18 auth2.c | 10 ++++++++-- 18 auth2.c | 10 ++++++++--
19 monitor.c | 32 +++++++++++++++++++++++++++++--- 19 monitor.c | 32 +++++++++++++++++++++++++++++---
20 monitor.h | 2 ++ 20 monitor.h | 2 ++
21 monitor_wrap.c | 22 ++++++++++++++++++++-- 21 monitor_wrap.c | 22 ++++++++++++++++++++--
22 monitor_wrap.h | 3 ++- 22 monitor_wrap.h | 3 ++-
23 openbsd-compat/port-linux.c | 27 ++++++++++++++++++++------- 23 openbsd-compat/port-linux.c | 27 ++++++++++++++++++++-------
24 openbsd-compat/port-linux.h | 4 ++-- 24 openbsd-compat/port-linux.h | 4 ++--
25 platform.c | 4 ++-- 25 platform.c | 4 ++--
26 platform.h | 2 +- 26 platform.h | 2 +-
27 session.c | 10 +++++----- 27 session.c | 10 +++++-----
28 session.h | 2 +- 28 session.h | 2 +-
29 sshd.c | 2 +- 29 sshd.c | 2 +-
30 sshpty.c | 4 ++-- 30 sshpty.c | 4 ++--
31 sshpty.h | 2 +- 31 sshpty.h | 2 +-
32 16 files changed, 104 insertions(+), 31 deletions(-) 32 16 files changed, 104 insertions(+), 31 deletions(-)
33 33
34diff --git a/auth.h b/auth.h 34diff --git a/auth.h b/auth.h
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
index c67d55002..48c16d2a2 100644
--- a/debian/patches/shell-path.patch
+++ b/debian/patches/shell-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-09-14
12 12
13Patch-Name: shell-path.patch 13Patch-Name: shell-path.patch
14--- 14---
15 sshconnect.c | 4 ++-- 15 sshconnect.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/sshconnect.c b/sshconnect.c 18diff --git a/sshconnect.c b/sshconnect.c
diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch
index 91c9d5434..6a15e0dc5 100644
--- a/debian/patches/sigstop.patch
+++ b/debian/patches/sigstop.patch
@@ -1,27 +1,34 @@
1From d9ac4d127f53d92cf3426fba28ff351e5e165ae2 Mon Sep 17 00:00:00 2001 1From cfeaa0ba2ce2859573f7e980be09ef05511f56a2 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:17 +0000 3Date: Sun, 9 Feb 2014 16:10:17 +0000
4Subject: Support synchronisation with service supervisor using SIGSTOP 4Subject: Support synchronisation with service supervisor using SIGSTOP
5 5
6Author: Robie Basak <robie.basak@ubuntu.com>
6Forwarded: no 7Forwarded: no
7Last-Update: 2013-09-14 8Last-Update: 2014-04-14
8 9
9Patch-Name: sigstop.patch 10Patch-Name: sigstop.patch
10--- 11---
11 sshd.c | 4 ++++ 12 sshd.c | 10 ++++++++++
12 1 file changed, 4 insertions(+) 13 1 file changed, 10 insertions(+)
13 14
14diff --git a/sshd.c b/sshd.c 15diff --git a/sshd.c b/sshd.c
15index 665c0b9..ffe360c 100644 16index 665c0b9..0964491 100644
16--- a/sshd.c 17--- a/sshd.c
17+++ b/sshd.c 18+++ b/sshd.c
18@@ -1931,6 +1931,10 @@ main(int ac, char **av) 19@@ -1931,6 +1931,16 @@ main(int ac, char **av)
19 } 20 }
20 } 21 }
21 22
22+ if (getenv("SSH_SIGSTOP")) 23+ if (getenv("SSH_SIGSTOP")) {
23+ /* Tell service supervisor that we are ready. */ 24+ /* Tell service supervisor that we are ready. */
24+ kill(getpid(), SIGSTOP); 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+ }
25+ 32+
26 /* Accept a connection and return in a forked child */ 33 /* Accept a connection and return in a forked child */
27 server_accept_loop(&sock_in, &sock_out, 34 server_accept_loop(&sock_in, &sock_out,
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
index 5df77f45d..af23075b3 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -9,7 +9,7 @@ Last-Update: 2013-06-08
9 9
10Patch-Name: ssh-agent-setgid.patch 10Patch-Name: ssh-agent-setgid.patch
11--- 11---
12 ssh-agent.1 | 15 +++++++++++++++ 12 ssh-agent.1 | 15 +++++++++++++++
13 1 file changed, 15 insertions(+) 13 1 file changed, 15 insertions(+)
14 14
15diff --git a/ssh-agent.1 b/ssh-agent.1 15diff --git a/ssh-agent.1 b/ssh-agent.1
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
index 2a54cd8e2..d456facea 100644
--- a/debian/patches/ssh-argv0.patch
+++ b/debian/patches/ssh-argv0.patch
@@ -14,7 +14,7 @@ Last-Update: 2013-09-14
14 14
15Patch-Name: ssh-argv0.patch 15Patch-Name: ssh-argv0.patch
16--- 16---
17 ssh.1 | 1 + 17 ssh.1 | 1 +
18 1 file changed, 1 insertion(+) 18 1 file changed, 1 insertion(+)
19 19
20diff --git a/ssh.1 b/ssh.1 20diff --git a/ssh.1 b/ssh.1
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch
index 30f5056f2..fa738b084 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -12,8 +12,8 @@ Last-Update: 2014-02-09
12 12
13Patch-Name: ssh-vulnkey-compat.patch 13Patch-Name: ssh-vulnkey-compat.patch
14--- 14---
15 readconf.c | 1 + 15 readconf.c | 1 +
16 servconf.c | 1 + 16 servconf.c | 1 +
17 2 files changed, 2 insertions(+) 17 2 files changed, 2 insertions(+)
18 18
19diff --git a/readconf.c b/readconf.c 19diff --git a/readconf.c b/readconf.c
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch
index 60537323a..ded7c122a 100644
--- a/debian/patches/ssh1-keepalive.patch
+++ b/debian/patches/ssh1-keepalive.patch
@@ -8,8 +8,8 @@ Last-Update: 2013-09-14
8 8
9Patch-Name: ssh1-keepalive.patch 9Patch-Name: ssh1-keepalive.patch
10--- 10---
11 clientloop.c | 25 +++++++++++++++---------- 11 clientloop.c | 25 +++++++++++++++----------
12 ssh_config.5 | 5 ++++- 12 ssh_config.5 | 5 ++++-
13 2 files changed, 19 insertions(+), 11 deletions(-) 13 2 files changed, 19 insertions(+), 11 deletions(-)
14 14
15diff --git a/clientloop.c b/clientloop.c 15diff --git a/clientloop.c b/clientloop.c
diff --git a/debian/patches/sshfp_with_server_cert_upstr b/debian/patches/sshfp_with_server_cert_upstr
index dd642d2a3..b453081c5 100644
--- a/debian/patches/sshfp_with_server_cert_upstr
+++ b/debian/patches/sshfp_with_server_cert_upstr
@@ -1,4 +1,4 @@
1From 63d5fa28e16d96db6bac2dbe3fcecb65328f8966 Mon Sep 17 00:00:00 2001 1From 08a63152deb5deda168aaef870bdb9f56425acb3 Mon Sep 17 00:00:00 2001
2From: Matthew Vernon <mcv21@cam.ac.uk> 2From: Matthew Vernon <mcv21@cam.ac.uk>
3Date: Wed, 26 Mar 2014 15:32:23 +0000 3Date: Wed, 26 Mar 2014 15:32:23 +0000
4Subject: Attempt SSHFP lookup even if server presents a certificate 4Subject: Attempt SSHFP lookup even if server presents a certificate
@@ -18,7 +18,7 @@ Signed-off-by: Matthew Vernon <matthew@debian.org>
18Bug-Debian: http://bugs.debian.org/742513 18Bug-Debian: http://bugs.debian.org/742513
19Patch-Name: sshfp_with_server_cert_upstr 19Patch-Name: sshfp_with_server_cert_upstr
20--- 20---
21 sshconnect.c | 42 ++++++++++++++++++++++++++---------------- 21 sshconnect.c | 42 ++++++++++++++++++++++++++----------------
22 1 file changed, 26 insertions(+), 16 deletions(-) 22 1 file changed, 26 insertions(+), 16 deletions(-)
23 23
24diff --git a/sshconnect.c b/sshconnect.c 24diff --git a/sshconnect.c b/sshconnect.c
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index 01f7307de..7cbd3a7e3 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -16,8 +16,8 @@ Last-Update: 2013-09-14
16 16
17Patch-Name: syslog-level-silent.patch 17Patch-Name: syslog-level-silent.patch
18--- 18---
19 log.c | 1 + 19 log.c | 1 +
20 ssh.c | 2 +- 20 ssh.c | 2 +-
21 2 files changed, 2 insertions(+), 1 deletion(-) 21 2 files changed, 2 insertions(+), 1 deletion(-)
22 22
23diff --git a/log.c b/log.c 23diff --git a/log.c b/log.c
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index 107f15a23..3cdb9d8a1 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -17,14 +17,14 @@ Last-Update: 2013-09-14
17 17
18Patch-Name: user-group-modes.patch 18Patch-Name: user-group-modes.patch
19--- 19---
20 auth-rhosts.c | 6 ++--- 20 auth-rhosts.c | 6 ++----
21 auth.c | 9 +++----- 21 auth.c | 9 +++-----
22 misc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 22 misc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
23 misc.h | 2 ++ 23 misc.h | 2 ++
24 platform.c | 16 ------------- 24 platform.c | 16 --------------
25 readconf.c | 5 +++-- 25 readconf.c | 5 +++--
26 ssh.1 | 2 ++ 26 ssh.1 | 2 ++
27 ssh_config.5 | 2 ++ 27 ssh_config.5 | 2 ++
28 8 files changed, 82 insertions(+), 29 deletions(-) 28 8 files changed, 82 insertions(+), 29 deletions(-)
29 29
30diff --git a/auth-rhosts.c b/auth-rhosts.c 30diff --git a/auth-rhosts.c b/auth-rhosts.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 04:25:29 +0000