X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssh-sigpipe.patch;h=3d60ddf2a6eaed207eaaa7dafd4a8838d3563a09;hb=048795bff78e5e4541f7c1e6d02aaae3476ebcb8;hp=78d72b7f9d1adf9fa4402f235278890c2e2eba1d;hpb=7b4786a5e122e004b31208a93d076ef0bf2dcddc;p=packages%2Fopenssh.git

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 78d72b7..3d60ddf 100644
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -22,37 +22,38 @@
 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.
+@@ -433,6 +433,8 @@ DESCRIPTION
+      -y      Send log information using the syslog(3) system module.  By
+              default this information is sent to stderr.
  
-+     -B      Enable SIGPIPE processing.
++     -Z      Enable SIGPIPE processing.
 +
-      -a      Disables forwarding of the authentication agent connection.
- 
-      -b bind_address
+      ssh may additionally obtain configuration data from a per-user
+      configuration file and a system-wide configuration file.  The file format
+      and configuration options are described in ssh_config(5).
 --- 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 @@
+@@ -42,7 +42,7 @@
+ .Nd OpenSSH SSH client (remote login program)
  .Sh SYNOPSIS
  .Nm ssh
- .Bk -words
--.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
-+.Op Fl 1246AaBCfGgKkMNnqsTtVvXxYy
+-.Op Fl 46AaCfGgKkMNnqsTtVvXxYy
++.Op Fl 46AaCfGgKkMNnqsTtVvXxYyZ
+ .Op Fl B Ar bind_interface
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Op Fl D Oo Ar bind_address : Oc Ns Ar port
-@@ -425,6 +425,10 @@
- on the local machine as the source address
+@@ -138,6 +138,11 @@ on the local machine as the source addre
  of the connection.
  Only useful on systems with more than one address.
-+.It Fl B
+ .Pp
++.It Fl Z
 +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
- 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 @@
@@ -65,31 +66,32 @@ 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;
  
-@@ -199,7 +199,7 @@ static void
+@@ -204,7 +204,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)
+-"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYy] [-B bind_interface]\n"
++"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYyZ] [-B bind_interface]\n"
+ "           [-b bind_address] [-c cipher_spec] [-D [bind_address:]port]\n"
+ "           [-E log_file] [-e escape_char] [-F configfile] [-I pkcs11]\n"
+ "           [-i identity_file] [-J [user@]host[:port]] [-L address]\n"
+@@ -666,7 +666,7 @@ main(int ac, char **av)
  
   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) {
+-	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYyZ")) != -1) {
  		switch (opt) {
  		case '1':
- 			options.protocol = SSH_PROTO_1;
-@@ -291,6 +294,9 @@
- 		case 'A':
- 			options.forward_agent = 1;
+ 			fatal("SSH protocol v.1 is no longer supported");
+@@ -985,6 +985,9 @@ main(int ac, char **av)
+ 		case 'F':
+ 			config = optarg;
  			break;
-+		case 'B':
++		case 'Z':
 +			enable_sigpipe = 1;
 +			break;
- 		case 'k':
- 			options.gss_deleg_creds = 0;
- 			break;
+ 		default:
+ 			usage();
+ 		}
+