- rediff with sigpipe patch

Changed files:
    openssh-4.3p1-hpn11-none.patch -> 1.2
    openssh-4.3p1-hpn11.patch -> 1.2

diff --git a/openssh-4.3p1-hpn11-none.patch b/openssh-4.3p1-hpn11-none.patch
index 3adf5b568f8f81d61943ca4fcee2f9ab55ff9ed2..c2b1944e53437de1248896ff514c80fe7530f6ca 100644 (file)
--- a/openssh-4.3p1-hpn11-none.patch
+++ b/openssh-4.3p1-hpn11-none.patch
@@ -264,25 +264,33 @@ diff -r -u -p1 openssh-4.3p1/sftp.c none-openssh-4.3p1/sftp.c
 diff -r -u -p1 openssh-4.3p1/ssh.c none-openssh-4.3p1/ssh.c
 --- openssh-4.3p1/ssh.c        2005-12-31 00:33:37.000000000 -0500
 +++ none-openssh-4.3p1/ssh.c   2006-02-01 08:30:30.000000000 -0500
-@@ -159,3 +159,3 @@ usage(void)
+@@ -160,7 +160,7 @@
+ usage(void)
+ {
        fprintf(stderr,
--"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaCfgkMNnqrsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+-"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfgkMNnqRrsTtVvXxY] [-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"
 @@ -165,2 +165,3 @@ usage(void)
  "           [-w tunnel:tunnel] [user@]hostname [command]\n"
 +"           [-r Receive Buffer Size in K]\n"
        );
-@@ -243,2 +244,4 @@ main(int ac, char **av)
+@@ -246,9 +246,12 @@
+       /* Parse command-line arguments. */
        host = NULL;
+ 
 +      /* need to set options.tcp_rcv_buf to 0 */
 +      options.tcp_rcv_buf = 0;
- 
-@@ -246,3 +249,3 @@ again:
++
+ again:
        while ((opt = getopt(ac, av,
--          "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:qrstvxACD:F:I:L:MNO:PR:S:TVw:XYz")) != -1) {
+-          "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
++          "1246ab:c:e:fgi:kl:m:no:p:qr:stvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
                switch (opt) {
+               case '1':
+                       options.protocol = SSH_PROTO_1;
 @@ -474,2 +477,3 @@ again:
                        no_tty_flag = 1;
 +                      options.none_switch = 0;

diff --git a/openssh-4.3p1-hpn11.patch b/openssh-4.3p1-hpn11.patch
index b7720791d2c047dddedcd010a52e78cec180b47b..1a63876b9801dcc3eb3273651c042adffb31d412 100644 (file)
--- a/openssh-4.3p1-hpn11.patch
+++ b/openssh-4.3p1-hpn11.patch
@@ -160,25 +160,33 @@ diff -r -u -p1 openssh-4.3p1/serverloop.c patch/serverloop.c
 diff -r -u -p1 openssh-4.3p1/ssh.c patch/ssh.c
 --- openssh-4.3p1/ssh.c        2005-12-31 00:33:37.000000000 -0500
 +++ patch/ssh.c        2006-02-01 07:02:41.000000000 -0500
-@@ -159,3 +159,3 @@ usage(void)
+@@ -160,7 +160,7 @@
+ usage(void)
+ {
        fprintf(stderr,
--"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaCfgkMNnqRrsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+-"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfgkMNnqRrsTtVvXxY] [-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"
 @@ -165,2 +165,3 @@ usage(void)
  "           [-w tunnel:tunnel] [user@]hostname [command]\n"
 +"           [-r receive buffer size]\n"
        );
-@@ -244,5 +245,8 @@ main(int ac, char **av)
+@@ -246,9 +246,12 @@
+       /* Parse command-line arguments. */
+       host = NULL;
  
-+        /* need to set options.tcp_rcv_buf to 0 */
-+        options.tcp_rcv_buf = 0;
-+ 
++      /* need to set options.tcp_rcv_buf to 0 */
++      options.tcp_rcv_buf = 0;
++
  again:
        while ((opt = getopt(ac, av,
--          "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:qr:stvxACD: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) {
++          "1246ab:c:e:fgi:kl:m:no:p:qr:stvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
                switch (opt) {
+               case '1':
+                       options.protocol = SSH_PROTO_1;
 @@ -497,2 +501,5 @@ again:
                        break;
 +              case 'r':