Initialize git-dpm

1 files changed, 18 insertions, 9 deletions

diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch
index de61e1dd9..e563bda7c 100644
--- a/debian/patches/ssh1-keepalive.patch
+++ b/debian/patches/ssh1-keepalive.patch
@@ -1,13 +1,22 @@
-Description: Partial server keep-alive implementation for SSH1
-Author: Colin Watson <cjwatson@debian.org>
+From 4c7ed5c80e5f67277620ac973317cc516b67d0e7 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Sun, 9 Feb 2014 16:09:51 +0000
+Subject: Partial server keep-alive implementation for SSH1
+
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1712
 Last-Update: 2013-09-14
 
-Index: b/clientloop.c
-===================================================================
+Patch-Name: ssh1-keepalive.patch
+---
+ clientloop.c | 25 +++++++++++++++----------
+ ssh_config.5 |  5 ++++-
+ 2 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/clientloop.c b/clientloop.c
+index 311dc13..dc76d69 100644
 --- a/clientloop.c
 +++ b/clientloop.c
-@@ -563,16 +563,21 @@
+@@ -563,16 +563,21 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
  static void
  server_alive_check(void)
  {
@@ -38,7 +47,7 @@ Index: b/clientloop.c
  }
  
  /*
-@@ -634,7 +639,7 @@
+@@ -634,7 +639,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
          */
  
         timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */
@@ -47,11 +56,11 @@ Index: b/clientloop.c
                 timeout_secs = options.server_alive_interval;
                 server_alive_time = now + options.server_alive_interval;
         }
-Index: b/ssh_config.5
-===================================================================
+diff --git a/ssh_config.5 b/ssh_config.5
+index 8d806c7..89b25cd 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1130,7 +1130,10 @@
+@@ -1130,7 +1130,10 @@ If, for example,
  .Cm ServerAliveCountMax
  is left at the default, if the server becomes unresponsive,
  ssh will disconnect after approximately 45 seconds.