X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssh-sigpipe.patch;h=67631f7c64143b1d890519dc106eae7ea053c88b;hb=0fab2cabb21ce97f99ead369144d02cdf315decf;hp=6df04c7f125831d29961c9fa9332c46a9d7314b3;hpb=d63b3d02048574fb241077db2e3e22371f22ce0f;p=packages%2Fopenssh.git

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 6df04c7..67631f7 100644
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -65,21 +65,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;
  
-@@ -157,7 +160,7 @@
+@@ -199,7 +199,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
 +"usage: ssh [-1246AaBCfgKkMNnqsTtVvXxYy] [-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 @@
+ "           [-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"
--	    "ACD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) {
-+	    "ABCD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) {
+-	    "ACD:E:F:I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++	    "ABCD:E:F:I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
  		switch (opt) {
  		case '1':
  			options.protocol = SSH_PROTO_1;