- up to 6.9p1

diff --git a/openssh-config.patch b/openssh-config.patch
index 80c499508261e5d763d44847bead53a6449573f9..f82be4fd7e3276acb20a2bc02f51dd460334bc39 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -1,13 +1,14 @@
 --- 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
-@@ -34,6 +35,7 @@
+@@ -41,7 +41,7 @@
+ # Authentication:
  
  #LoginGraceTime 2m
- #PermitRootLogin yes
+-#PermitRootLogin no
 +PermitRootLogin no
  #StrictModes yes
  #MaxAuthTries 6
- 
+ #MaxSessions 10
 @@ -50,10 +51,13 @@
  #IgnoreUserKnownHosts no
  # Don't read the user's ~/.rhosts and ~/.shosts files

diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index 994ef59a43af613ac34fc3a0d739ca024bea8a8a..67a7c075976dc370d2fb791865a239c7f14b1e7c 100644 (file)
--- a/openssh-ldap.patch
+++ b/openssh-ldap.patch
@@ -1302,7 +1302,7 @@ diff -up openssh-6.2p2/ldapconf.c.ldap openssh-6.2p2/ldapconf.c
 +              len = snprintf (options.uri, MAXURILEN, "ldap%s://%s:%d",
 +                  (options.ssl == 0) ? "" : "s", options.host, options.port);
 +              options.uri[MAXURILEN - 1] = 0;
-+              options.uri = xrealloc (options.uri, len + 1, 1);
++              options.uri = xreallocarray (options.uri, len + 1, 1);
 +      }
 +      if (options.binddn == NULL)
 +          options.binddn = "";

diff --git a/openssh.spec b/openssh.spec
index 32fe3ee5337ef67fa9ee2621d234f955585e7c95..6c093e529359d95befe7aebad275a3df63eb6870 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -45,13 +45,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:       6.8p1
-Release:       12
+Version:       6.9p1
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 08f72de6751acfbd0892b5f003922701
+# Source0-md5: 0b161c44fc31fbc6b76a6f8ae639f16f
 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