1 files changed, 84 insertions, 0 deletions
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
new file mode 100644
index 000000000..4914cd6f5
--- /dev/null
+++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
+From 0aff7ca980bc54be68f7479a016d7779f99cf06e 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: 2016-01-04
+Patch-Name: systemd-readiness.patch
+---
+ configure.ac | 24 ++++++++++++++++++++++++
+ sshd.c       |  9 +++++++++
+ 2 files changed, 33 insertions(+)
+diff --git a/configure.ac b/configure.ac
+index 128889a..eec2b72 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -4213,6 +4213,29 @@ AC_ARG_WITH([kerberos5],
+ AC_SUBST([GSSLIBS])
+ AC_SUBST([K5LIBS])
+ 
+# Check whether user wants systemd support
+SYSTEMD_MSG="no"
+AC_ARG_WITH(systemd,
+       [  --with-systemd          Enable systemd support],
+       [ if test "x$withval" != "xno" ; then
+               AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
+               if test "$PKGCONFIG" != "no"; then
+                       AC_MSG_CHECKING([for libsystemd])
+                       if $PKGCONFIG --exists libsystemd; then
+                               SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd`
+                               SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
+                               CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS"
+                               SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS"
+                               AC_MSG_RESULT([yes])
+                               AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.])
+                               SYSTEMD_MSG="yes"
+                       else
+                               AC_MSG_RESULT([no])
+                       fi
+               fi
+       fi ]
+)
+
+ # Looking for programs, paths and files
+ 
+ PRIVSEP_PATH=/var/empty
+@@ -5014,6 +5037,7 @@ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+ echo "           Solaris project support: $SP_MSG"
+echo "                   systemd support: $SYSTEMD_MSG"
+ echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
+ 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..19ee92b 100644
+--- a/sshd.c
+++ b/sshd.c
+@@ -85,6 +85,10 @@
+ #include <prot.h>
+ #endif
+ 
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
+ #include "xmalloc.h"
+ #include "ssh.h"
+ #include "ssh1.h"
+@@ -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");
+#endif
+
+                /* Accept a connection and return in a forked child */
+                server_accept_loop(&sock_in, &sock_out,
+                    &newsock, config_s);

diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch new file mode 100644 index 000000000..4914cd6f5 --- /dev/null +++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
	1	From 0aff7ca980bc54be68f7479a016d7779f99cf06e Mon Sep 17 00:00:00 2001
	2	From: Michael Biebl <biebl@debian.org>
	3	Date: Mon, 21 Dec 2015 16:08:47 +0000
	4	Subject: Add systemd readiness notification support
	5
	6	Bug-Debian: https://bugs.debian.org/778913
	7	Forwarded: no
	8	Last-Update: 2016-01-04
	9
	10	Patch-Name: systemd-readiness.patch
	11	---
	12	configure.ac \| 24 ++++++++++++++++++++++++
	13	sshd.c \| 9 +++++++++
	14	2 files changed, 33 insertions(+)
	15
	16	diff --git a/configure.ac b/configure.ac
	17	index 128889a..eec2b72 100644
	18	--- a/configure.ac
	19	+++ b/configure.ac
	20	@@ -4213,6 +4213,29 @@ AC_ARG_WITH([kerberos5],
	21	AC_SUBST([GSSLIBS])
	22	AC_SUBST([K5LIBS])
	23
	24	+# Check whether user wants systemd support
	25	+SYSTEMD_MSG="no"
	26	+AC_ARG_WITH(systemd,
	27	+ [ --with-systemd Enable systemd support],
	28	+ [ if test "x$withval" != "xno" ; then
	29	+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
	30	+ if test "$PKGCONFIG" != "no"; then
	31	+ AC_MSG_CHECKING([for libsystemd])
	32	+ if $PKGCONFIG --exists libsystemd; then
	33	+ SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd`
	34	+ SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
	35	+ CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS"
	36	+ SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS"
	37	+ AC_MSG_RESULT([yes])
	38	+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.])
	39	+ SYSTEMD_MSG="yes"
	40	+ else
	41	+ AC_MSG_RESULT([no])
	42	+ fi
	43	+ fi
	44	+ fi ]
	45	+)
	46	+
	47	# Looking for programs, paths and files
	48
	49	PRIVSEP_PATH=/var/empty
	50	@@ -5014,6 +5037,7 @@ echo " MD5 password support: $MD5_MSG"
	51	echo " libedit support: $LIBEDIT_MSG"
	52	echo " Solaris process contract support: $SPC_MSG"
	53	echo " Solaris project support: $SP_MSG"
	54	+echo " systemd support: $SYSTEMD_MSG"
	55	echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
	56	echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
	57	echo " BSD Auth support: $BSD_AUTH_MSG"
	58	diff --git a/sshd.c b/sshd.c
	59	index 7e72b9b..19ee92b 100644
	60	--- a/sshd.c
	61	+++ b/sshd.c
	62	@@ -85,6 +85,10 @@
	63	#include <prot.h>
	64	#endif
	65
	66	+#ifdef HAVE_SYSTEMD
	67	+#include <systemd/sd-daemon.h>
	68	+#endif
	69	+
	70	#include "xmalloc.h"
	71	#include "ssh.h"
	72	#include "ssh1.h"
	73	@@ -2052,6 +2056,11 @@ main(int ac, char **av)
	74	unsetenv("SSH_SIGSTOP");
	75	}
	76
	77	+#ifdef HAVE_SYSTEMD
	78	+ /* Signal systemd that we are ready to accept connections */
	79	+ sd_notify(0, "READY=1");
	80	+#endif
	81	+
	82	/* Accept a connection and return in a forked child */
	83	server_accept_loop(&sock_in, &sock_out,
	84	&newsock, config_s);