Up to 9.0p1.

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 93d0f90a940f810d489361205b5514dc8b123a81..827ab5a390b8f951284d7b2ece0a3961d079364f 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:       5
+Version:       9.0p1
+Release:       1
 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: 5ed8252a0ee379c0f7c9e0d25d32424d
 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
@@ -55,6 +55,8 @@ Source9:      sshd.service
 Source10:      sshd-keygen
 Source11:      sshd.socket
 Source12:      sshd@.service
+#Patch100:     %{name}-git.patch
+## Patch100-md5:       d41d8cd98f00b204e9800998ecf8427e
 Patch0:                %{name}-no-pty-tests.patch
 Patch1:                %{name}-tests-reuseport.patch
 Patch2:                %{name}-pam_misc.patch
@@ -70,10 +72,11 @@ 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
+Patch16:       openssl3.0.patch
 URL:           http://www.openssh.com/portable.html
 BuildRequires: %{__perl}
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -84,8 +87,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 +98,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 $?)
@@ -345,6 +348,7 @@ 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.
@@ -527,9 +531,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,6 +542,8 @@ openldap-a.
 
 %prep
 %setup -q
+#%patch100 -p1
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -553,11 +557,12 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 
 %patch11 -p1
-%patch12 -p1
+
 %patch13 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
+%patch16 -p1
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
@@ -574,7 +579,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}
@@ -602,7 +606,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