X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssh-sigpipe.patch;h=fccaf42de18a66bc53e12730b70c76f416c6139e;hb=0b809ebfe387a5dbbf7509adc675729cd2da3495;hp=8879561344d5fbc2c44bc9fe0763d71775b66982;hpb=469312700d47a9c884396b347db08ffcb4f8322f;p=packages%2Fopenssh.git

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 8879561..fccaf42 100644
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -1,7 +1,6 @@
-diff -urN openssh-3.8.1p1.org/clientloop.c openssh-3.8.1p1/clientloop.c
---- openssh-3.8.1p1.org/clientloop.c	2004-04-29 01:37:05.496553160 +0200
-+++ openssh-3.8.1p1/clientloop.c	2004-04-29 01:37:29.691874912 +0200
-@@ -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;
  
@@ -11,19 +10,19 @@ diff -urN openssh-3.8.1p1.org/clientloop.c openssh-3.8.1p1/clientloop.c
  /*
   * 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);
- 	if (have_pty)
- 		signal(SIGWINCH, window_change_handler);
+ 	signal(SIGWINCH, window_change_handler);
  
-diff -urN openssh-3.8.1p1.org/ssh.0 openssh-3.8.1p1/ssh.0
---- openssh-3.8.1p1.org/ssh.0	2004-04-29 01:37:06.122458008 +0200
-+++ openssh-3.8.1p1/ssh.0	2004-04-29 01:39:29.069726720 +0200
-@@ -228,6 +228,8 @@
+ 	if (have_pty)
+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.
  
@@ -32,32 +31,31 @@ diff -urN openssh-3.8.1p1.org/ssh.0 openssh-3.8.1p1/ssh.0
       -a      Disables forwarding of the authentication agent connection.
  
       -b bind_address
-diff -urN openssh-3.8.1p1.org/ssh.1 openssh-3.8.1p1/ssh.1
---- openssh-3.8.1p1.org/ssh.1	2004-04-29 01:37:05.604536744 +0200
-+++ openssh-3.8.1p1/ssh.1	2004-04-29 01:37:29.693874608 +0200
-@@ -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
--.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
+@@ -138,6 +138,11 @@ on the local machine as the source addre
+ 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.
++.Pp
  .It Fl C
  Requests compression of all data (including stdin, stdout, stderr, and
- data for forwarded X11 and TCP/IP connections).
-diff -urN openssh-3.8.1p1.org/ssh.c openssh-3.8.1p1/ssh.c
---- openssh-3.8.1p1.org/ssh.c	2004-04-29 01:37:05.651529600 +0200
-+++ openssh-3.8.1p1/ssh.c	2004-04-29 01:37:29.699873696 +0200
+ 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 @@
  /* Should we execute a command or invoke a subsystem? */
  int subsystem_flag = 0;
@@ -68,16 +66,25 @@ diff -urN openssh-3.8.1p1.org/ssh.c openssh-3.8.1p1/ssh.c
  /* # of replies received for global requests */
  static int client_global_request_id = 0;
  
-@@ -228,7 +231,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: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;
-@@ -271,6 +274,9 @@
+@@ -291,6 +294,9 @@
  		case 'A':
  			options.forward_agent = 1;
  			break;