rebuild with openssl 3.0.0

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index f40fd600a2292e1e0ef0490c1531d1cb6e2e4be6..f94c19e4ddb886665ffb53c957b7424b60252bc0 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.2p1
-Release:       4
+Version:       8.7p1
+Release:       3
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
-Source0:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 3076e6413e8dbe56d33848c1054ac091
+Source0:       https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
+# Source0-md5: f545230799f131aecca04da56e61990a
 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
@@ -70,7 +70,7 @@ Patch8:               ldap-helper-sigpipe.patch
 Patch9:                %{name}-5.2p1-hpn13v6.diff
 
 Patch11:       %{name}-chroot.patch
-Patch12:       openssh-bug-2905.patch
+
 Patch13:       %{name}-skip-interop-tests.patch
 Patch14:       %{name}-bind.patch
 Patch15:       %{name}-disable_ldap.patch
@@ -84,8 +84,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
@@ -95,7 +95,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 +266,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 +340,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 +528,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
 
 %description -n openldap-schema-openssh-lpk
 This package contains OpenSSH LDAP Public Key schema for openldap.
@@ -540,7 +552,7 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 
 %patch11 -p1
-%patch12 -p1
+
 %patch13 -p1
 
 %patch14 -p1
@@ -561,7 +573,6 @@ grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \
 %{__mv} aclocal.m4 acinclude.m4
 
 %build
-cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -589,7 +600,11 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 %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
 
@@ -793,7 +808,6 @@ fi
 %attr(755,root,root) %{_bindir}/ssh-add
 %attr(755,root,root) %{_bindir}/ssh-copy-id
 %attr(755,root,root) %{_bindir}/scp
-%attr(755,root,root) %{_libexecdir}/ssh-sk-helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssh_config
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/SSH_ASKPASS
 %{_mandir}/man1/scp.1*
@@ -803,7 +817,6 @@ fi
 %{_mandir}/man1/ssh-add.1*
 %{_mandir}/man1/ssh-copy-id.1*
 %{_mandir}/man5/ssh_config.5*
-%{_mandir}/man8/ssh-sk-helper.8*
 %lang(it) %{_mandir}/it/man1/ssh.1*
 %lang(it) %{_mandir}/it/man5/ssh_config.5*
 %lang(pl) %{_mandir}/pl/man1/scp.1*
@@ -822,6 +835,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