- release 3, partial PLD merge

diff --git a/openssh-disable_ldap.patch b/openssh-disable_ldap.patch
index d3eed6ac8d951ab28f2ad70c37210a1cd242922c..b178a77614bc8adaee7aa5fb28a8c06a569aee70 100644 (file)
--- 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 f6fc0de8baa4311e4805642b681f14c5e717de12..28d95d31f71d96720ff1528bbe0d1b62336ad1bb 100644 (file)
--- 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