From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 10 May 2020 11:53:55 +0000 (+0200)
Subject: - release 3, partial PLD merge
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b12a82a0cae7099a4b4a686753772dfd750b5f77;p=packages%2Fopenssh.git

- release 3, partial PLD merge
---

diff --git a/openssh-disable_ldap.patch b/openssh-disable_ldap.patch
index d3eed6a..b178a77 100644
--- a/openssh-disable_ldap.patch
+++ b/openssh-disable_ldap.patch
@@ -2,11 +2,11 @@ diff -durN openssh-6.5p1.orig/Makefile.in openssh-6.5p1/Makefile.in
 --- openssh-6.5p1.orig/Makefile.in	2014-03-06 12:51:06.000000000 +0100
 +++ openssh-6.5p1/Makefile.in	2014-03-06 12:52:02.000000000 +0100
 @@ -64,7 +64,7 @@
- MANFMT=@MANFMT@
- INSTALL_SSH_LDAP_HELPER=@INSTALL_SSH_LDAP_HELPER@
  
--TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-ldap-helper$(EXEEXT)
+ .SUFFIXES: .lo
+ 
+-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-sk-helper$(EXEEXT) ssh-ldap-helper$(EXEEXT)
 +TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
  
- LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
- 	canohost.o channels.o cipher.o cipher-aes.o \
+ XMSS_OBJS=\
+ 	ssh-xmss.o \
diff --git a/openssh.spec b/openssh.spec
index f6fc0de..28d95d3 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -44,7 +44,7 @@ Summary(ru.UTF-8):	OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	8.2p1
-Release:	2
+Release:	3
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking