- use %service, adapterized

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

diff --git a/openssh-set_12.patch b/openssh-set_12.patch
index ee029389f783b334206273338d89fdbab8bfd678..5aca3c3d032efaa9309c5bc76b4b86c005c30899 100644 (file)
--- a/openssh-set_12.patch
+++ b/openssh-set_12.patch
@@ -1,11 +1,11 @@
---- ./scp.c.org        Sat Sep  8 23:37:22 2001
-+++ ./scp.c    Sun Sep  9 00:07:36 2001
-@@ -244,9 +244,11 @@
-       addargs("-oFallBackToRsh no");
+--- openssh-3.3p1/scp.c.orig   Fri Jun 21 02:41:52 2002
++++ openssh-3.3p1/scp.c        Sun Jun 23 21:29:30 2002
+@@ -233,9 +233,11 @@
+       addargs(&args, "-oClearAllForwardings yes");
  
        fflag = tflag = 0;
--      while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1)
-+      while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:")) != -1)
+-      while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1)
++      while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:F:")) != -1)
                switch (ch) {
                /* User-visible flags. */
 +              case '1':
@@ -13,30 +13,30 @@
                case '4':
                case '6':
                case 'C':
-@@ -958,7 +960,7 @@
- usage()
+@@ -955,7 +957,7 @@
+ usage(void)
  {
-       (void) fprintf(stderr, "usage: scp "
--          "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n"
-+          "[-pqrvBC1246] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n"
-           "   or: scp [options] f1 ... fn directory\n");
+       (void) fprintf(stderr,
+-          "usage: scp [-pqrvBC46] [-F config] [-S program] [-P port]\n"
++          "usage: scp [-pqrvBC1246] [-F config] [-S program] [-P port]\n"
+           "           [-c cipher] [-i identity] [-o option]\n"
+           "           [[user@]host1:]file1 [...] [[user@]host2:]file2\n");
        exit(1);
- }
---- ./scp.1.org        Sun Sep  9 00:03:53 2001
-+++ ./scp.1    Sun Sep  9 00:05:56 2001
+--- openssh-2.9.9p2/scp.1.orig Tue Sep 18 07:56:57 2001
++++ openssh-2.9.9p2/scp.1      Fri Sep 28 05:30:54 2001
 @@ -19,7 +19,7 @@
  .Nd secure copy (remote file copy program)
  .Sh SYNOPSIS
  .Nm scp
--.Op Fl pqrvC46
-+.Op Fl pqrvC1246
+-.Op Fl pqrvBC46
++.Op Fl pqrvBC1246
+ .Op Fl F Ar ssh_config
  .Op Fl S Ar program
  .Op Fl P Ar port
- .Op Fl c Ar cipher
-@@ -110,6 +110,14 @@
- .It Fl o Ar option
- The given option is directly passed to
- .Xr ssh 1 .
+@@ -125,6 +125,14 @@
+ command-line flag.  For example, forcing the use of protocol
+ version 1 is specified using
+ .Ic scp -oProtocol=1 .
 +.It Fl 1
 +Forces
 +.Nm