- updated to 7.4p1

diff --git a/openssh-kuserok.patch b/openssh-kuserok.patch
index 6955b886fca2e5ab07e7301a52d5488c1b11f764..38df2ed01ad0bb5196c33add99e61fc33142f055 100644 (file)
--- a/openssh-kuserok.patch
+++ b/openssh-kuserok.patch
@@ -135,10 +135,10 @@ diff -up openssh-5.8p1/servconf.h.kuserok openssh-5.8p1/servconf.h
 diff -up openssh-5.8p1/sshd_config.5.kuserok openssh-5.8p1/sshd_config.5
 --- openssh-5.8p1/sshd_config.5.kuserok        2011-02-14 09:15:12.000000000 +0100
 +++ openssh-5.8p1/sshd_config.5        2011-02-14 09:17:11.000000000 +0100
-@@ -574,6 +574,10 @@ Specifies whether to automatically destr
+@@ -836,6 +836,10 @@
  file on logout.
  The default is
- .Dq yes .
+ .Cm yes .
 +.It Cm KerberosUseKuserok
 +Specifies whether to look at .k5login file for user's aliases.
 +The default is
@@ -146,8 +146,8 @@ diff -up openssh-5.8p1/sshd_config.5.kuserok openssh-5.8p1/sshd_config.5
  .It Cm KexAlgorithms
  Specifies the available KEX (Key Exchange) algorithms.
  Multiple algorithms must be comma-separated.
-@@ -715,6 +719,7 @@ Available keywords are
- .Cm HostbasedUsesNameFromPacketOnly ,
+@@ -1064,6 +1068,7 @@
+ .Cm IPQoS ,
  .Cm KbdInteractiveAuthentication ,
  .Cm KerberosAuthentication ,
 +.Cm KerberosUseKuserok ,

diff --git a/openssh.spec b/openssh.spec
index e7f1d901c88f6c954e589c1c1733ee5cecd45bb7..ce1e52ca3dba8fd856b5a15d047644de93b079a0 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -41,13 +41,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:       7.3p1
-Release:       2
+Version:       7.4p1
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: dfadd9f035d38ce5d58a3bf130b86d08
+# Source0-md5: b2db2a83caf66a208bb78d6d287cdaa3
 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