do not uncomment default values, as this suggests altering these params

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

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 2f292bd8b944efd48887e7d2ef107c637dbd4cc0..fccaf42de18a66bc53e12730b70c76f416c6139e 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -31,28 +31,29 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
       -a      Disables forwarding of the authentication agent connection.
  
       -b bind_address
       -a      Disables forwarding of the authentication agent connection.
  
       -b bind_address

---- openssh-4.0p1/ssh.1.orig   2005-03-09 01:00:06.000000000 +0100
-+++ openssh-4.0p1/ssh.1        2005-03-10 15:10:40.000000000 +0100
-@@ -43,7 +43,7 @@
- .Nd OpenSSH SSH client (remote login program)
+--- 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
  .Sh SYNOPSIS
  .Nm ssh

--.Op Fl 1246AaCfgKkMNnqsTtVvXxY
-+.Op Fl 1246AaBCfgKkMNnqsTtVvXxY
+ .Bk -words
+-.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
++.Op Fl 1246AaBCfGgKkMNnqsTtVvXxYy

  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec

- .Oo Fl D\ \&
-@@ -425,6 +425,10 @@
- on the local machine as the source address
+ .Op Fl D Oo Ar bind_address : Oc Ns Ar port
+@@ -138,6 +138,11 @@ on the local machine as the source addre

  of the connection.
  Only useful on systems with more than one address.
  of the connection.
  Only useful on systems with more than one address.

+ .Pp

 +.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
 +port/X11 forwarding when used.
 +.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
 +port/X11 forwarding when used.

++.Pp

  .It Fl C
  Requests compression of all data (including stdin, stdout, stderr, and
  .It Fl C
  Requests compression of all data (including stdin, stdout, stderr, and

- data for forwarded X11 and TCP/IP connections).
+ data for forwarded X11, TCP and

 --- 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 @@
 --- 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 @@


@@ -65,21 +66,21 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  /* # of replies received for global requests */
  static int client_global_request_id = 0;
  
  /* # of replies received for global requests */
  static int client_global_request_id = 0;
  

-@@ -157,7 +160,7 @@
+@@ -199,7 +199,7 @@ static void

  usage(void)
  {
        fprintf(stderr,
  usage(void)
  {
        fprintf(stderr,

--"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaBCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
- "           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
- "           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
- "           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
-@@ -275,7 +275,7 @@
+-"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:qstvx"
  
   again:
        while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"

--          "ACD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
-+          "ABCD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
+-          "ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++          "ABCD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {

                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;