add missing backslash

[packages/openssh.git] / openssh-sigpipe.patch

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index bfae618965ccab4cd6d66880974db678e27a1594..78d72b7f9d1adf9fa4402f235278890c2e2eba1d 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -1,6 +1,6 @@
---- openssh-3.8p1/clientloop.c.orig    2003-12-17 06:33:11.000000000 +0100
-+++ openssh-3.8p1/clientloop.c 2004-02-25 21:25:43.000000000 +0100
-@@ -99,6 +99,9 @@
+--- openssh-4.0p1/clientloop.c.orig    2005-03-01 11:24:33.000000000 +0100
++++ openssh-4.0p1/clientloop.c 2005-03-10 15:10:05.000000000 +0100
+@@ -104,6 +104,9 @@
   */
  extern char *host;
  
@@ -10,30 +10,42 @@
  /*
   * Flag to indicate that we have received a window change signal which has
   * not yet been processed.  This will cause a message indicating the new
-@@ -940,6 +943,8 @@
+@@ -1236,6 +1239,8 @@
                signal(SIGQUIT, signal_handler);
        if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
                signal(SIGTERM, signal_handler);
 +      if (enable_sigpipe)
 +              signal(SIGPIPE, signal_handler);
+       signal(SIGWINCH, window_change_handler);
+ 
        if (have_pty)
-               signal(SIGWINCH, window_change_handler);
+diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
+--- openssh-3.9p1.org/ssh.0    2004-08-17 19:03:29.327565840 +0200
++++ openssh-3.9p1/ssh.0        2004-08-17 19:03:41.809668272 +0200
+@@ -235,6 +235,8 @@
+              that enable them to authenticate using the identities loaded into
+              the agent.
+ 
++     -B      Enable SIGPIPE processing.
++
+      -a      Disables forwarding of the authentication agent connection.
  
---- openssh-3.8p1/ssh.1.orig   2003-12-17 06:33:11.000000000 +0100
-+++ openssh-3.8p1/ssh.1        2004-02-25 21:28:27.000000000 +0100
-@@ -43,7 +43,7 @@
- .Nd OpenSSH SSH client (remote login program)
+      -b bind_address
+--- openssh-5.6p1/ssh.1~       2010-08-24 14:05:48.000000000 +0300
++++ openssh-5.6p1/ssh.1        2010-08-24 14:06:57.879253682 +0300
+@@ -44,7 +44,7 @@
  .Sh SYNOPSIS
  .Nm ssh
--.Op Fl 1246AaCfgkNnqsTtVvXxY
-+.Op Fl 1246ABaCfgkNnqsTtVvXxY
+ .Bk -words
+-.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
++.Op Fl 1246AaBCfGgKkMNnqsTtVvXxYy
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Op Fl D Ar port
-@@ -426,6 +426,10 @@
- .It Fl b Ar bind_address
- Specify the interface to transmit from on machines with multiple
- interfaces or aliased addresses.
+ .Op Fl D Oo Ar bind_address : Oc Ns Ar port
+@@ -425,6 +425,10 @@
+ on the local machine as the source address
+ of the connection.
+ Only useful on systems with more than one address.
 +.It Fl B
 +Enables processing of SIGPIPE. Useful when using ssh output as input for
 +another process, for example in a shell script. Be careful - it may break
@@ -41,8 +53,8 @@
  .It Fl C
  Requests compression of all data (including stdin, stdout, stderr, and
  data for forwarded X11 and TCP/IP connections).
---- openssh-3.8p1/ssh.c.orig   2003-12-17 06:33:11.000000000 +0100
-+++ openssh-3.8p1/ssh.c        2004-02-25 21:30:51.000000000 +0100
+--- openssh-4.0p1/ssh.c.orig   2005-03-02 02:04:33.000000000 +0100
++++ openssh-4.0p1/ssh.c        2005-03-10 15:11:10.000000000 +0100
 @@ -135,6 +135,9 @@
  /* Should we execute a command or invoke a subsystem? */
  int subsystem_flag = 0;
@@ -53,24 +65,25 @@
  /* # of replies received for global requests */
  static int client_global_request_id = 0;
  
-@@ -153,6 +156,7 @@
-       fprintf(stderr, "  -F config   Config file (default: ~/%s).\n",
-            _PATH_SSH_USER_CONFFILE);
-       fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
-+      fprintf(stderr, "  -B          Enable SIGPIPE processing.\n");
-       fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
-       fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
-       fprintf(stderr, "  -Y          Enable trusted X11 connection forwarding.\n");
-@@ -265,7 +269,7 @@
+@@ -199,7 +199,7 @@ static void
+ usage(void)
+ {
+       fprintf(stderr,
+-"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
+ "           [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
+ "           [-F configfile] [-I pkcs11] [-i identity_file]\n"
+ "           [-L [bind_address:]port:host:hostport] [-Q protocol_feature]\n"
+@@ -330,7 +330,7 @@ main(int ac, char **av)
  
- again:
-       while ((opt = getopt(ac, av,
--          "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVXY")) != -1) {
-+          "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:NPR:TVXY")) != -1) {
+  again:
+       while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
+-          "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++          "ABCD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;
-@@ -308,6 +312,9 @@
+@@ -291,6 +294,9 @@
                case 'A':
                        options.forward_agent = 1;
                        break;