require %{_isa} variant of openssl

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 9914d268366aa4e2e84bc3b804f1a914f065600f..2506df2dc98adb89480baa8944a57e1a17b4ed10 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.4p1
-Release:       4
+Version:       9.3p2
+Release:       2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 8f897870404c088e4aa7d1c1c58b526b
+# Source0-md5: e21180e7c902e596b047b5520842c2e1
 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:        eb723cc4f21efc32752161d539c9c5e9
 Patch0:                %{name}-no-pty-tests.patch
 Patch1:                %{name}-tests-reuseport.patch
 Patch2:                %{name}-pam_misc.patch
@@ -70,11 +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:       allow_pselect6_time64.patch
+Patch16:       openssl3.0.patch
 URL:           http://www.openssh.com/portable.html
 BuildRequires: %{__perl}
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -107,14 +109,6 @@ BuildRequires:     %{name}-server
 BuildRequires: uname(release) >= 3.5
 %endif
 Requires:      zlib >= 1.2.3
-%if "%{pld_release}" == "ac"
-Requires:      filesystem >= 2.0-1
-Requires:      pam >= 0.79.0
-%else
-Requires:      filesystem >= 3.0-11
-Requires:      pam >= %{pam_ver}
-Suggests:      xorg-app-xauth
-%endif
 Obsoletes:     ssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -270,7 +264,7 @@ Requires:   %{name}
 Suggests:      %{name}-clients-helper-fido = %{epoch}:%{version}-%{release}
 Provides:      ssh-clients
 Obsoletes:     ssh-clients
-%requires_eq_to        openssl openssl-devel
+%requires_eq_to        openssl%{?_isa} openssl-devel
 
 %description clients
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -374,7 +368,14 @@ Requires(pre):     /bin/id
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+%if "%{pld_release}" == "ac"
+Requires:      filesystem >= 2.0-1
+Requires:      pam >= 0.79.0
+%else
+Requires:      filesystem >= 3.0-11
 Requires:      pam >= %{pam_ver}
+Suggests:      xorg-app-xauth
+%endif
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      systemd-units >= 38
 %{?with_libseccomp:Requires:   uname(release) >= 3.5}
@@ -384,7 +385,7 @@ Suggests:   /bin/login
 Suggests:      xorg-app-xauth
 Provides:      ssh-server
 Provides:      user(sshd)
-%requires_eq_to        openssl openssl-devel
+%requires_eq_to        openssl%{?_isa} openssl-devel
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -529,7 +530,7 @@ Summary(pl.UTF-8):  Schemat klucza publicznego LDAP dla OpenSSH
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n openldap-schema-openssh-lpk
 This package contains OpenSSH LDAP Public Key schema for openldap.
@@ -540,6 +541,8 @@ openldap-a.
 
 %prep
 %setup -q
+#%%patch100 -p1
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -553,7 +556,7 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 
 %patch11 -p1
-%patch12 -p1
+
 %patch13 -p1
 
 %patch14 -p1
@@ -591,7 +594,7 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
        --with-ldap%{!?with_ldap:=no} \
        %{?with_ldns:--with-ldns} \
        %{?with_libedit:--with-libedit} \
-       --with-mantype=man \
+       --with-mantype=doc \
        --with-md5-passwords \
        --with-pam \
        --with-pid-dir=%{_localstatedir}/run \
@@ -810,6 +813,7 @@ 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-pkcs11-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*
@@ -819,6 +823,7 @@ fi
 %{_mandir}/man1/ssh-add.1*
 %{_mandir}/man1/ssh-copy-id.1*
 %{_mandir}/man5/ssh_config.5*
+%{_mandir}/man8/ssh-pkcs11-helper.8*
 %lang(it) %{_mandir}/it/man1/ssh.1*
 %lang(it) %{_mandir}/it/man5/ssh_config.5*
 %lang(pl) %{_mandir}/pl/man1/scp.1*
@@ -847,12 +852,10 @@ fi
 %attr(755,root,root) %{_sbindir}/sshd
 %attr(755,root,root) %{_libexecdir}/sftp-server
 %attr(755,root,root) %{_libexecdir}/ssh-keysign
-%attr(755,root,root) %{_libexecdir}/ssh-pkcs11-helper
 %attr(755,root,root) %{_libexecdir}/sshd-keygen
 %{_mandir}/man8/sshd.8*
 %{_mandir}/man8/sftp-server.8*
 %{_mandir}/man8/ssh-keysign.8*
-%{_mandir}/man8/ssh-pkcs11-helper.8*
 %{_mandir}/man5/sshd_config.5*
 %{_mandir}/man5/moduli.5*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sshd_config