Initialize git-dpm

1 files changed, 36 insertions, 25 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index a851a91bf..61389cc44 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,24 +1,35 @@
-Description: Various keepalive extensions
- Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut,
- supported in previous versions of Debian's OpenSSH package but since
- superseded by ServerAliveInterval.  (We're probably stuck with this bit for
- compatibility.)
- .
- In batch mode, default ServerAliveInterval to five minutes.
- .
- Adjust documentation to match and to give some more advice on use of
- keepalives.
-Author: Richard Kettlewell <rjk@greenend.org.uk>
+From affb41e3cf23b79a3d165ae0d97689a46a965b6f Mon Sep 17 00:00:00 2001
+From: Richard Kettlewell <rjk@greenend.org.uk>
+Date: Sun, 9 Feb 2014 16:09:52 +0000
+Subject: Various keepalive extensions
+
+Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported
+in previous versions of Debian's OpenSSH package but since superseded by
+ServerAliveInterval.  (We're probably stuck with this bit for
+compatibility.)
+
+In batch mode, default ServerAliveInterval to five minutes.
+
+Adjust documentation to match and to give some more advice on use of
+keepalives.
+
 Author: Ian Jackson <ian@chiark.greenend.org.uk>
 Author: Matthew Vernon <matthew@debian.org>
 Author: Colin Watson <cjwatson@debian.org>
 Last-Update: 2013-09-14
 
-Index: b/readconf.c
-===================================================================
+Patch-Name: keepalive-extensions.patch
+---
+ readconf.c    | 14 ++++++++++++--
+ ssh_config.5  | 21 +++++++++++++++++++--
+ sshd_config.5 |  3 +++
+ 3 files changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/readconf.c b/readconf.c
+index 22e5a3a..2dcbf31 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -141,6 +141,7 @@
+@@ -141,6 +141,7 @@ typedef enum {
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown,
@@ -26,7 +37,7 @@ Index: b/readconf.c
         oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -263,6 +264,8 @@
+@@ -263,6 +264,8 @@ static struct {
         { "ipqos", oIPQoS },
         { "requesttty", oRequestTTY },
         { "ignoreunknown", oIgnoreUnknown },
@@ -35,7 +46,7 @@ Index: b/readconf.c
  
         { NULL, oBadOption }
  };
-@@ -939,6 +942,8 @@
+@@ -939,6 +942,8 @@ parse_int:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -44,7 +55,7 @@ Index: b/readconf.c
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1404,8 +1409,13 @@
+@@ -1404,8 +1409,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -60,11 +71,11 @@ Index: b/readconf.c
         if (options->server_alive_count_max == -1)
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
-Index: b/ssh_config.5
-===================================================================
+diff --git a/ssh_config.5 b/ssh_config.5
+index 89b25cd..135d833 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -136,8 +136,12 @@
+@@ -136,8 +136,12 @@ Valid arguments are
  If set to
  .Dq yes ,
  passphrase/password querying will be disabled.
@@ -78,7 +89,7 @@ Index: b/ssh_config.5
  The argument must be
  .Dq yes
  or
-@@ -1141,8 +1145,15 @@
+@@ -1141,8 +1145,15 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -95,7 +106,7 @@ Index: b/ssh_config.5
  .It Cm StrictHostKeyChecking
  If this flag is set to
  .Dq yes ,
-@@ -1181,6 +1192,12 @@
+@@ -1181,6 +1192,12 @@ Specifies whether the system should send TCP keepalive messages to the
  other side.
  If they are sent, death of the connection or crash of one
  of the machines will be properly noticed.
@@ -108,11 +119,11 @@ Index: b/ssh_config.5
  However, this means that
  connections will die if the route is down temporarily, and some people
  find it annoying.
-Index: b/sshd_config.5
-===================================================================
+diff --git a/sshd_config.5 b/sshd_config.5
+index 18ec81f..510cc7c 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1161,6 +1161,9 @@
+@@ -1161,6 +1161,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .