- original from http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.3p1-hpn11...

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

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 139fb312ac8ea58ff8765bdd4e10b94a4ab2a7ee..b533146b3d66d6fca3df93afa61ee8e469c96a9b 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -33,15 +33,15 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
       -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
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
+ .Nd OpenSSH SSH client (remote login program)
  .Sh SYNOPSIS
  .Nm ssh
- .Bk -words
 -.Op Fl 1246AaCfgkMNnqsTtVvXxY
 +.Op Fl 1246AaBCfgkMNnqsTtVvXxY
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Op Fl D Ar port
+ .Oo Fl D\ \&
 @@ -425,6 +425,10 @@
  on the local machine as the source address
  of the connection.
@@ -71,15 +71,15 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
        fprintf(stderr,
 -"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
 +"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
- "           [-D port] [-e escape_char] [-F configfile]\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"
-@@ -240,7 +243,7 @@
+@@ -244,7 +247,7 @@
  
  again:
        while ((opt = getopt(ac, av,
--          "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVXY")) != -1) {
-+          "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVXY")) != -1) {
+-          "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
++          "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;