- merged 10.3p1 from PLD

diff --git a/openssh-ldap-fixes.patch b/openssh-ldap-fixes.patch
index cca4e92b58e6002ebbbe65ad281fb9766ac2ed5b..936faf46b1daef9a08861827c0abec5d2a2e6f10 100644 (file)
--- a/openssh-ldap-fixes.patch
+++ b/openssh-ldap-fixes.patch
@@ -6,7 +6,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in openssh-8.4p1/Makefile.in
  
  ssh-ldap-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o
 -      $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
  
  ssh-ldap-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o
 -      $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)

-+      $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++      $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(CHANNELLIBS)

  
  ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
        $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) $(CHANNELLIBS)
  
  ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
        $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) $(CHANNELLIBS)

diff --git a/openssh.spec b/openssh.spec
index 14bb789fb6ef7ab1f8394091be2625da797c314b..cfbb9a0c1a5b42833363db4d1f7d19a31e62822e 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -32,13 +32,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
 Summary(ru.UTF-8):     OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh

-Version:       10.2p1
-Release:       4
+Version:       10.3p1
+Release:       2

 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz

-# Source0-md5: 801b5ad6da38e0045de20dd5dd2f6a80
+# Source0-md5: 0b5662e0aa255c8d20f18dcca1bda65c

 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
 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


@@ -50,8 +50,6 @@ Source7:      %{name}-lpk.schema
 Source10:      sshd-keygen
 Source13:       tld_ssh_config
 Source14:       tld_sshd_config
 Source10:      sshd-keygen
 Source13:       tld_ssh_config
 Source14:       tld_sshd_config

-Patch100:      %{name}-git.patch
-# Patch100-md5:        eb723cc4f21efc32752161d539c9c5e9

 Patch0:                %{name}-no-pty-tests.patch
 Patch1:                %{name}-tests-reuseport.patch
 Patch2:                %{name}-pam_misc.patch
 Patch0:                %{name}-no-pty-tests.patch
 Patch1:                %{name}-tests-reuseport.patch
 Patch2:                %{name}-pam_misc.patch


@@ -529,8 +527,6 @@ openldap-a.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-#%%patch -P100 -p1
-

 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1