From 37e8102fdb512adbc512b1354ee187facf9d7bf4 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 17 May 2026 01:01:55 +0200 Subject: [PATCH] - merged 10.3p1 from PLD --- openssh-ldap-fixes.patch | 2 +- openssh.spec | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/openssh-ldap-fixes.patch b/openssh-ldap-fixes.patch index cca4e92..936faf4 100644 --- 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) -+ $(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) diff --git a/openssh.spec b/openssh.spec index 14bb789..cfbb9a0 100644 --- 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 -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 -# 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 @@ -50,8 +50,6 @@ Source7: %{name}-lpk.schema 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 @@ -529,8 +527,6 @@ openldap-a. %prep %setup -q -#%%patch -P100 -p1 - %patch -P0 -p1 %patch -P1 -p1 %patch -P2 -p1 -- 2.52.0