diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/.git-dpm | 4 | ||||
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/patches/backport-fix-first-kex-follows.patch | 2 | ||||
-rw-r--r-- | debian/patches/debian-config.patch | 2 | ||||
-rw-r--r-- | debian/patches/systemd-readiness.patch | 22 |
5 files changed, 19 insertions, 15 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index b74a96d43..ea438d028 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 |
2 | 480b475c69faf9cfa748cc445e36201bc7a81b80 | 2 | e95f51a2a4b404bcb04bfdf8d092efb37eef446c |
3 | 480b475c69faf9cfa748cc445e36201bc7a81b80 | 3 | e95f51a2a4b404bcb04bfdf8d092efb37eef446c |
4 | 651211fd4a199b299540c00c54a46e27fadb04be | 4 | 651211fd4a199b299540c00c54a46e27fadb04be |
5 | 651211fd4a199b299540c00c54a46e27fadb04be | 5 | 651211fd4a199b299540c00c54a46e27fadb04be |
6 | openssh_7.1p1.orig.tar.gz | 6 | openssh_7.1p1.orig.tar.gz |
diff --git a/debian/changelog b/debian/changelog index fc4b8e6c8..d8d7a5b19 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,9 +1,13 @@ | |||
1 | openssh (1:7.1p1-6) UNRELEASED; urgency=medium | 1 | openssh (1:7.1p1-6) UNRELEASED; urgency=medium |
2 | 2 | ||
3 | [ Colin Watson ] | ||
3 | * Remove explicit "XS-Testsuite: autopkgtest" from debian/control; | 4 | * Remove explicit "XS-Testsuite: autopkgtest" from debian/control; |
4 | dpkg-source now figures that out automatically based on the existence of | 5 | dpkg-source now figures that out automatically based on the existence of |
5 | debian/tests/control. | 6 | debian/tests/control. |
6 | 7 | ||
8 | [ Michael Biebl ] | ||
9 | * Don't call sd_notify when sshd is re-execed (closes: #809035). | ||
10 | |||
7 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 13:27:44 +0000 | 11 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 13:27:44 +0000 |
8 | 12 | ||
9 | openssh (1:7.1p1-5) unstable; urgency=medium | 13 | openssh (1:7.1p1-5) unstable; urgency=medium |
diff --git a/debian/patches/backport-fix-first-kex-follows.patch b/debian/patches/backport-fix-first-kex-follows.patch index 07c86b948..08be9de8a 100644 --- a/debian/patches/backport-fix-first-kex-follows.patch +++ b/debian/patches/backport-fix-first-kex-follows.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 480b475c69faf9cfa748cc445e36201bc7a81b80 Mon Sep 17 00:00:00 2001 | 1 | From e95f51a2a4b404bcb04bfdf8d092efb37eef446c Mon Sep 17 00:00:00 2001 |
2 | From: Damien Miller <djm@mindrot.org> | 2 | From: Damien Miller <djm@mindrot.org> |
3 | Date: Tue, 15 Dec 2015 15:25:04 +0000 | 3 | Date: Tue, 15 Dec 2015 15:25:04 +0000 |
4 | Subject: upstream commit | 4 | Subject: upstream commit |
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 6bd50eaad..09c252607 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a466a627b806905df9c7583af7edcf39e9481201 Mon Sep 17 00:00:00 2001 | 1 | From 9238867d60dd8f7da598ef3ebdb127cfc5562a91 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 |
4 | Subject: Various Debian-specific configuration changes | 4 | Subject: Various Debian-specific configuration changes |
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch index bbe3b2cd5..24d186ee5 100644 --- a/debian/patches/systemd-readiness.patch +++ b/debian/patches/systemd-readiness.patch | |||
@@ -1,11 +1,11 @@ | |||
1 | From 818791ef8edf087481bd49eb32335c8d7e1953d6 Mon Sep 17 00:00:00 2001 | 1 | From 91be8a1c1f0387c154ac839c54f8fdfbe2d3c3c5 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Biebl <biebl@debian.org> | 2 | From: Michael Biebl <biebl@debian.org> |
3 | Date: Mon, 21 Dec 2015 16:08:47 +0000 | 3 | Date: Mon, 21 Dec 2015 16:08:47 +0000 |
4 | Subject: Add systemd readiness notification support | 4 | Subject: Add systemd readiness notification support |
5 | 5 | ||
6 | Bug-Debian: https://bugs.debian.org/778913 | 6 | Bug-Debian: https://bugs.debian.org/778913 |
7 | Forwarded: no | 7 | Forwarded: no |
8 | Last-Update: 2015-12-21 | 8 | Last-Update: 2016-01-04 |
9 | 9 | ||
10 | Patch-Name: systemd-readiness.patch | 10 | Patch-Name: systemd-readiness.patch |
11 | --- | 11 | --- |
@@ -56,7 +56,7 @@ index 128889a..eec2b72 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" |
58 | diff --git a/sshd.c b/sshd.c | 58 | diff --git a/sshd.c b/sshd.c |
59 | index 7e72b9b..4d28dc0 100644 | 59 | index 7e72b9b..19ee92b 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,15 +70,15 @@ index 7e72b9b..4d28dc0 100644 | |||
70 | #include "xmalloc.h" | 70 | #include "xmalloc.h" |
71 | #include "ssh.h" | 71 | #include "ssh.h" |
72 | #include "ssh1.h" | 72 | #include "ssh1.h" |
73 | @@ -2011,6 +2015,11 @@ main(int ac, char **av) | 73 | @@ -2052,6 +2056,11 @@ main(int ac, char **av) |
74 | /* ignore SIGPIPE */ | 74 | unsetenv("SSH_SIGSTOP"); |
75 | signal(SIGPIPE, SIG_IGN); | 75 | } |
76 | 76 | ||
77 | +#ifdef HAVE_SYSTEMD | 77 | +#ifdef HAVE_SYSTEMD |
78 | + /* Signal systemd that we are ready to accept connections */ | 78 | + /* Signal systemd that we are ready to accept connections */ |
79 | + sd_notify(0, "READY=1"); | 79 | + sd_notify(0, "READY=1"); |
80 | +#endif | 80 | +#endif |
81 | + | 81 | + |
82 | /* Get a connection, either from inetd or a listening TCP socket */ | 82 | /* Accept a connection and return in a forked child */ |
83 | if (inetd_flag) { | 83 | server_accept_loop(&sock_in, &sock_out, |
84 | server_accept_inetd(&sock_in, &sock_out); | 84 | &newsock, config_s); |