remove openssh-5.8p1-authorized-keys-command.patch

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 065eb67466d1e8c76997b0e23dc15a28d9d64c8d..a8dd922c0d79cf5f7eab52c30e2dd9ee2e86245f 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -36,13 +36,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.1p1
-Release:       4
+Version:       8.4p1
+Release:       3
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 513694343631a99841e815306806edf0
+# 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
@@ -68,13 +68,13 @@ Patch8:             ldap-helper-sigpipe.patch
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz
 Patch9:                %{name}-5.2p1-hpn13v6.diff
-Patch10:       %{name}-include.patch
+
 Patch11:       %{name}-chroot.patch
 Patch12:       openssh-bug-2905.patch
 Patch13:       %{name}-skip-interop-tests.patch
 Patch14:       %{name}-bind.patch
 Patch15:       %{name}-disable_ldap.patch
-Patch16:       ossh-bug-3093.patch
+Patch16:       allow_pselect6_time64.patch
 URL:           http://www.openssh.com/portable.html
 BuildRequires: %{__perl}
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -85,7 +85,8 @@ BuildRequires:        automake
 %{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
 %{?with_ldns:BuildRequires:    ldns-devel}
 %{?with_libedit:BuildRequires: libedit-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
@@ -95,7 +96,7 @@ BuildRequires:        pam-devel
 BuildRequires: python-TwistedConch
 %endif
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.627
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel >= 1.2.3
 %if %{with tests} && 0%(id -u sshd >/dev/null 2>&1; echo $?)
@@ -266,6 +267,7 @@ Summary(ru.UTF-8):  OpenSSH - клиенты протокола Secure Shell
 Summary(uk.UTF-8):     OpenSSH - клієнти протоколу Secure Shell
 Group:         Applications/Networking
 Requires:      %{name}
+Suggests:      %{name}-clients-helper-fido = %{epoch}:%{version}-%{release}
 Provides:      ssh-clients
 Obsoletes:     ssh-clients
 %requires_eq_to        openssl openssl-devel
@@ -339,6 +341,19 @@ xinitrc scripts for starting SSH agent.
 %description clients-agent-xinitrc -l pl.UTF-8
 Skrypty xinitrc do uruchamiania agenta SSH.
 
+%package clients-helper-fido
+Summary:       OpenSSH helper for FIDO authenticator
+Summary(pl.UTF-8):     OpenSSH helper obsługujący klucz autoryzujący FIDO
+Group:         Applications/Networking
+Requires:      %{name}-clients = %{epoch}:%{version}-%{release}
+Requires:      libfido2 >= 1.5.0
+
+%description clients-helper-fido
+OpenSSH helper for FIDO authenticator.
+
+%description clients-helper-fido -l pl.UTF-8
+OpenSSH helper obsługujący klucz autoryzujący FIDO.
+
 %package server
 Summary:       OpenSSH Secure Shell protocol server (sshd)
 Summary(de.UTF-8):     OpenSSH Secure Shell Protocol-Server (sshd)
@@ -514,9 +529,7 @@ Summary(pl.UTF-8):  Schemat klucza publicznego LDAP dla OpenSSH
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description -n openldap-schema-openssh-lpk
 This package contains OpenSSH LDAP Public Key schema for openldap.
@@ -538,21 +551,20 @@ openldap-a.
 %patch8 -p1
 
 %{?with_hpn:%patch9 -p1}
-%patch10 -p1
+
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
+%patch16 -p1
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
 %{__sed} -i -e 's/\(`$(PKG_CONFIG) --libs gtk+-2.0\) x11`/\1` -lX11/' contrib/Makefile
 %endif
 
-%patch16 -p1
-
 # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
 sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh -lopenbsd-compat#g' Makefile*
 
@@ -586,11 +598,16 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
        --with-pid-dir=%{_localstatedir}/run \
        --with-privsep-path=%{_privsepdir} \
        --with-privsep-user=sshd \
+       --with-security-key-builtin \
        %{?with_selinux:--with-selinux} \
 %if "%{pld_release}" == "ac"
        --with-xauth=/usr/X11R6/bin/xauth
 %else
+%if %{with libseccomp}
        --with-sandbox=seccomp_filter \
+%else
+       --with-sandbox=rlimit \
+%endif
        --with-xauth=%{_bindir}/xauth
 %endif
 
@@ -821,6 +838,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/ssh-agent.sh
 
+%files clients-helper-fido
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/ssh-sk-helper
+%{_mandir}/man8/ssh-sk-helper.8*
+
 %files server
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/sshd