- updated

Changed files:
    openssh-config.patch -> 1.2
    openssh-pam_misc.patch -> 1.3
    openssh-sigpipe.patch -> 1.9

diff --git a/openssh-config.patch b/openssh-config.patch
index 911a8d631fe84f8db998994db4c12b910aa96026..fd23898e5e10f325cb96a899093a99660d1ef74e 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -1,13 +1,5 @@
 --- openssh-4.6p1/sshd_config~ 2007-10-13 01:37:17.000000000 +0200
 +++ openssh-4.6p1/sshd_config  2007-10-13 01:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- # default value.
- 
- #Port 22
-+Protocol 2
- #Protocol 2,1
- #AddressFamily any
- #ListenAddress 0.0.0.0
 @@ -34,6 +35,7 @@
  
  #LoginGraceTime 2m

diff --git a/openssh-pam_misc.patch b/openssh-pam_misc.patch
index 638c3b15a448f1b04cd6bd26c006e3c5475e9e25..591c47f91c8c9a155cc38b8593f25d0ff2debaf8 100644 (file)
--- a/openssh-pam_misc.patch
+++ b/openssh-pam_misc.patch
@@ -1,11 +1,11 @@
 --- openssh-4.4p1/configure.ac~        2006-09-28 17:40:25.601119384 +0300
 +++ openssh-4.4p1/configure.ac 2006-09-28 17:41:49.162994417 +0300
-@@ -2010,7 +2010,7 @@
+@@ -2056,7 +2056,7 @@
  
                        PAM_MSG="yes"
  
--                      LIBPAM="-lpam"
-+                      LIBPAM="-lpam -lpam_misc"
+-                      SSHDLIBS="$SSHDLIBS -lpam"
++                      SSHDLIBS="$SSHDLIBS -lpam -lpam_misc"
                        AC_DEFINE(USE_PAM, 1,
                                [Define if you want to enable PAM support])
  

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index b533146b3d66d6fca3df93afa61ee8e469c96a9b..3e239bb4157855f92594c586c0796fa50aff0e39 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -37,8 +37,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  .Nd OpenSSH SSH client (remote login program)
  .Sh SYNOPSIS
  .Nm ssh
--.Op Fl 1246AaCfgkMNnqsTtVvXxY
-+.Op Fl 1246AaBCfgkMNnqsTtVvXxY
+-.Op Fl 1246AaCfgKkMNnqsTtVvXxY
++.Op Fl 1246AaBCfgKkMNnqsTtVvXxY
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
  .Oo Fl D\ \&
@@ -69,8 +69,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  usage(void)
  {
        fprintf(stderr,
--"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+-"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfgKkMNnqsTtVvXxY] [-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"
@@ -78,8 +78,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.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:qstvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
+-          "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
++          "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;