1 files changed, 17 insertions, 8 deletions

diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
index a1c6efc8d..8f09b936a 100644
--- a/debian/patches/shell-path.patch
+++ b/debian/patches/shell-path.patch
@@ -1,16 +1,25 @@
-Description: Look for $SHELL on the path for ProxyCommand/LocalCommand
- There's some debate on the upstream bug about whether POSIX requires this.
- I (Colin Watson) agree with Vincent and think it does.
-Author: Colin Watson <cjwatson@debian.org>
+From b5f3be892e6d7150e7885133228fd03af69a11bc Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Sun, 9 Feb 2014 16:10:00 +0000
+Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand
+
+There's some debate on the upstream bug about whether POSIX requires this.
+I (Colin Watson) agree with Vincent and think it does.
+
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494
 Bug-Debian: http://bugs.debian.org/492728
 Last-Update: 2013-09-14
 
-Index: b/sshconnect.c
-===================================================================
+Patch-Name: shell-path.patch
+---
+ sshconnect.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sshconnect.c b/sshconnect.c
+index 483eb85..91fd59a 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
                 /* Execute the proxy command.  Note that we gave up any
                    extra privileges above. */
                 signal(SIGPIPE, SIG_DFL);
@@ -19,7 +28,7 @@ Index: b/sshconnect.c
                 perror(argv[0]);
                 exit(1);
         }
-@@ -1298,7 +1298,7 @@
+@@ -1298,7 +1298,7 @@ ssh_local_cmd(const char *args)
         if (pid == 0) {
                 signal(SIGPIPE, SIG_DFL);
                 debug3("Executing %s -c \"%s\"", shell, args);