- up to 5.6p1

Changed files:
    openssh-blacklist.diff -> 1.8
    openssh-lpk.patch -> 1.5
    openssh-sigpipe.patch -> 1.13
    openssh.spec -> 1.341

diff --git a/openssh-blacklist.diff b/openssh-blacklist.diff
index 8d7d0a296cf0bd77ba7485f9629a773aaa245d48..1925afa219a9298356d5b5230d7771c2c2528f78 100644 (file)
--- a/openssh-blacklist.diff
+++ b/openssh-blacklist.diff
@@ -419,8 +419,8 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
 +of processing
 +.Xr ssh-keyscan 1
 +output.
---- openssh-4.7p1.orig/auth2-hostbased.c
-+++ openssh-4.7p1/auth2-hostbased.c
+--- openssh-5.6p1/auth2-hostbased.c~   2010-08-24 14:10:03.000000000 +0300
++++ openssh-5.6p1/auth2-hostbased.c    2010-08-24 14:12:10.632553591 +0300
 @@ -40,6 +40,7 @@
  #include "compat.h"
  #include "key.h"
@@ -429,14 +429,9 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
  #include "auth.h"
  #include "canohost.h"
  #ifdef GSSAPI
-@@ -141,10 +142,24 @@
- hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
-     Key *key)
- {
-+      char *fp;
-       const char *resolvedname, *ipaddr, *lookup;
-       HostStatus host_status;
+@@ -147,6 +147,19 @@
        int len;
+       char *fp;
  
 +      if (blacklisted_key(key)) {
 +              fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);

diff --git a/openssh-lpk.patch b/openssh-lpk.patch
index 2a3ccafa2e2ccd61c10fc300b9facaa998f326e2..f87e4000690aaf2ffea0d42b25cb0de08869bb4c 100644 (file)
--- a/openssh-lpk.patch
+++ b/openssh-lpk.patch
@@ -1533,9 +1533,8 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/README.lpk op
 +- CONTACT :
 +  - Eric AUGE <eau@phear.org>
 +  - Andrea Barisani <andrea@inversepath.com>
-diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c openssh-5.1p1+lpk/servconf.c
---- openssh-5.1p1.orig/servconf.c      2008-07-03 20:51:12.000000000 -0700
-+++ openssh-5.1p1+lpk/servconf.c       2008-08-23 15:02:47.000000000 -0700
+--- openssh-5.6p1/servconf.c~  2010-08-24 14:07:30.000000000 +0300
++++ openssh-5.6p1/servconf.c   2010-08-24 14:09:08.999656164 +0300
 @@ -42,6 +42,10 @@
  #include "channels.h"
  #include "groupaccess.h"
@@ -1547,10 +1546,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
  static void add_listen_addr(ServerOptions *, char *, int);
  static void add_one_listen_addr(ServerOptions *, char *, int);
  
-@@ -127,6 +131,25 @@
-       options->zero_knowledge_password_authentication = -1;
+@@ -136,6 +136,24 @@
        options->revoked_keys_file = NULL;
        options->trusted_user_ca_keys = NULL;
+       options->authorized_principals_file = NULL;
 +#ifdef WITH_LDAP_PUBKEY
 +      /* XXX dirty */
 +      options->lpk.ld = NULL;
@@ -1569,7 +1568,6 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
 +      options->lpk.s_timeout.tv_sec = -1;
 +      options->lpk.flags = FLAG_EMPTY;
 +#endif
-+
  }
  
  void
@@ -1619,10 +1617,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
  } ServerOpCodes;
  
  #define SSHCFG_GLOBAL 0x01    /* allowed in main section of sshd_config */
-@@ -408,6 +463,20 @@
+@@ -459,6 +477,20 @@
        { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
-       { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
-       { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
+       { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
+       { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
 +#ifdef WITH_LDAP_PUBKEY
 +      { _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
 +      { _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
@@ -1639,7 +1637,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
 +#endif
        { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
        { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
-       { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
+       { "permittunnel", sPermitTunnel, SSHCFG_ALL },
 @@ -1294,6 +1363,107 @@
                while (arg)
                    arg = strdelim(&cp);

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 22a0de2ea601bc0a2c022c637fefdd5df106ceef..6df04c7f125831d29961c9fa9332c46a9d7314b3 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -31,17 +31,17 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
       -a      Disables forwarding of the authentication agent connection.
  
       -b bind_address
---- openssh-4.0p1/ssh.1.orig   2005-03-09 01:00:06.000000000 +0100
-+++ openssh-4.0p1/ssh.1        2005-03-10 15:10:40.000000000 +0100
-@@ -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
+ .Bk -words
 -.Op Fl 1246AaCfgKkMNnqsTtVvXxYy
 +.Op Fl 1246AaBCfgKkMNnqsTtVvXxYy
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Oo Fl D\ \&
+ .Op Fl D Oo Ar bind_address : Oc Ns Ar port
 @@ -425,6 +425,10 @@
  on the local machine as the source address
  of the connection.

diff --git a/openssh.spec b/openssh.spec
index 0b37c37df4385d949c0bf49d5e461b7b551137d3..6a543d8c2de5e97041c29743c38c128f8b579bf1 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -30,13 +30,13 @@ Summary(pt_BR.UTF-8):       Implementação livre do SSH
 Summary(ru.UTF-8):     OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
-Version:       5.5p1
-Release:       6
+Version:       5.6p1
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 88633408f4cb1eb11ec7e2ec58b519eb
+# Source0-md5: e6ee52e47c768bf0ec42a232b5d18fb0
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 66943d481cc422512b537bcc2c7400d1
 Source2:       %{name}d.init