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 @@
 # see git-dpm(1) from git-dpm package
-480b475c69faf9cfa748cc445e36201bc7a81b80
-480b475c69faf9cfa748cc445e36201bc7a81b80
+e95f51a2a4b404bcb04bfdf8d092efb37eef446c
+e95f51a2a4b404bcb04bfdf8d092efb37eef446c
 651211fd4a199b299540c00c54a46e27fadb04be
 651211fd4a199b299540c00c54a46e27fadb04be
 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 @@
 openssh (1:7.1p1-6) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Remove explicit "XS-Testsuite: autopkgtest" from debian/control;
     dpkg-source now figures that out automatically based on the existence of
     debian/tests/control.
 
+  [ Michael Biebl ]
+  * Don't call sd_notify when sshd is re-execed (closes: #809035).
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 04 Jan 2016 13:27:44 +0000
 
 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 @@
-From 480b475c69faf9cfa748cc445e36201bc7a81b80 Mon Sep 17 00:00:00 2001
+From e95f51a2a4b404bcb04bfdf8d092efb37eef446c Mon Sep 17 00:00:00 2001
 From: Damien Miller <djm@mindrot.org>
 Date: Tue, 15 Dec 2015 15:25:04 +0000
 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 @@
-From a466a627b806905df9c7583af7edcf39e9481201 Mon Sep 17 00:00:00 2001
+From 9238867d60dd8f7da598ef3ebdb127cfc5562a91 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 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 @@
-From 818791ef8edf087481bd49eb32335c8d7e1953d6 Mon Sep 17 00:00:00 2001
+From 91be8a1c1f0387c154ac839c54f8fdfbe2d3c3c5 Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl@debian.org>
 Date: Mon, 21 Dec 2015 16:08:47 +0000
 Subject: Add systemd readiness notification support
 
 Bug-Debian: https://bugs.debian.org/778913
 Forwarded: no
-Last-Update: 2015-12-21
+Last-Update: 2016-01-04
 
 Patch-Name: systemd-readiness.patch
 ---
@@ -56,7 +56,7 @@ index 128889a..eec2b72 100644
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
 diff --git a/sshd.c b/sshd.c
-index 7e72b9b..4d28dc0 100644
+index 7e72b9b..19ee92b 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -85,6 +85,10 @@
@@ -70,15 +70,15 @@ index 7e72b9b..4d28dc0 100644
  #include "xmalloc.h"
  #include "ssh.h"
  #include "ssh1.h"
-@@ -2011,6 +2015,11 @@ main(int ac, char **av)
-        /* ignore SIGPIPE */
-        signal(SIGPIPE, SIG_IGN);
+@@ -2052,6 +2056,11 @@ main(int ac, char **av)
+                        unsetenv("SSH_SIGSTOP");
+                }
  
 +#ifdef HAVE_SYSTEMD
-+       /* Signal systemd that we are ready to accept connections */
-+       sd_notify(0, "READY=1");
++               /* Signal systemd that we are ready to accept connections */
++               sd_notify(0, "READY=1");
 +#endif
 +
-        /* Get a connection, either from inetd or a listening TCP socket */
-        if (inetd_flag) {
-                server_accept_inetd(&sock_in, &sock_out);
+                /* Accept a connection and return in a forked child */
+                server_accept_loop(&sock_in, &sock_out,
+                    &newsock, config_s);