- updated to 8.4p1

diff --git a/openssh-config.patch b/openssh-config.patch
index 915d1d76d7b0a04e481446edb7380db2a3ca7597..799ce2cbe28a0c8b6f365cbd39a52effdac13e55 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -80,9 +80,9 @@
  #   CheckHostIP yes
  #   AddressFamily any
 @@ -42,3 +45,18 @@
- #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
  #   RekeyLimit 1G 1h
+ #   UserKnownHostsFile ~/.ssh/known_hosts.d/%k
 +
 +Host *
 +      GSSAPIAuthentication yes

diff --git a/openssh.spec b/openssh.spec
index 3cfa04a97f0bf457673674f9f06a7b9b5d9c8b49..d20881f8cf47f9857f620f25ca16b026602e17a6 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -43,13 +43,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:       8.3p1
+Version:       8.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: 68d7527bf2672153ca47402f6489a1af
+# Source0-md5: 8f897870404c088e4aa7d1c1c58b526b
 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
@@ -88,8 +88,8 @@ BuildRequires:        automake
 %{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
 %{?with_ldns:BuildRequires:    ldns-devel}
 %{?with_libedit:BuildRequires: libedit-devel}
-BuildRequires: libfido2-devel
-BuildRequires: libseccomp-devel
+BuildRequires: libfido2-devel >= 1.5.0
+%{?with_libseccomp:BuildRequires:      libseccomp-devel}
 %{?with_selinux:BuildRequires: libselinux-devel}
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 1.1.0g
@@ -578,7 +578,11 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
        --with-privsep-user=sshd \
        --with-security-key-builtin \
        %{?with_selinux:--with-selinux} \
+%if %{with libseccomp}
        --with-sandbox=seccomp_filter \
+%else
+       --with-sandbox=rlimit \
+%endif
        --with-xauth=%{_bindir}/xauth
 
 echo '#define LOGIN_PROGRAM               "/bin/login"' >>config.h