X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=8a415996914050f3c3eaa93a7f97e79498698a52;hb=cf41b13a30e37968932e6b4dba3621b93ee2aca1;hp=17673c6c9ecca0daa617251eec68abd087433032;hpb=35fc38a3cc76cfafb154b702b0f45293aeae10ca;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index 17673c6..8a41599 100644
--- 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:	2
+Version:	8.5p1
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
-Source0:	http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	8f897870404c088e4aa7d1c1c58b526b
+Source0:	https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
+# Source0-md5:	9eb9420cf587edc26f8998ab679ad390
 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
@@ -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 $?)
@@ -528,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
+%{?noarchpackage}
 
 %description -n openldap-schema-openssh-lpk
 This package contains OpenSSH LDAP Public Key schema for openldap.
@@ -554,7 +552,7 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 
 %patch11 -p1
-%patch12 -p1
+
 %patch13 -p1
 
 %patch14 -p1
@@ -575,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}