commit 52f772a66c46a35bb94fe8a0ca5c2591ee5a4b9b
Author: Adam Gołębiowski <ad...@pld-linux.org>
Date: Tue Oct 4 11:18:10 2022 +0000
- updated to 9.1p1
openssh-ldap-fixes.patch | 4 ++--
openssh-ldap.patch | 6 +++---
openssh.spec | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index 8453840..5b0d3c2 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: 9.0p1
-Release: 4
+Version: 9.1p1
+Release: 1
Epoch: 2
License: BSD
Group: Applications/Networking
Source0:
https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 5ed8252a0ee379c0f7c9e0d25d32424d
+# Source0-md5: 471912038124285c96918882ee190a22
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
@@ -541,7 +541,7 @@ openldap-a.
%prep
%setup -q
-%patch100 -p1
+#%%patch100 -p1
%patch0 -p1
%patch1 -p1
diff --git a/openssh-ldap-fixes.patch b/openssh-ldap-fixes.patch
index 0b42df4..cca4e92 100644
--- a/openssh-ldap-fixes.patch
+++ b/openssh-ldap-fixes.patch
@@ -2,14 +2,14 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
--- openssh-8.4p1.org/Makefile.in 2021-03-01 11:29:52.615391132 +0100
+++ openssh-8.4p1/Makefile.in 2021-03-01 11:29:52.908739606 +0100
@@ -234,7 +234,7 @@ ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) lib
- $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
-lopenbsd-compat $(LIBS) $(LIBFIDO2)
+ $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
-lopenbsd-compat $(LIBS) $(LIBFIDO2) $(CHANNELLIBS)
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)
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
- $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
$(LIBS)
+ $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
$(LIBS) $(CHANNELLIBS)
diff -urNp -x '*.orig' openssh-8.4p1.org/ldap-helper.c
openssh-8.4p1/ldap-helper.c
--- openssh-8.4p1.org/ldap-helper.c 2021-03-01 11:29:52.615391132 +0100
+++ openssh-8.4p1/ldap-helper.c 2021-03-01 11:29:52.908739606 +0100
diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index 86a7089..cfc7615 100644
--- a/openssh-ldap.patch
+++ b/openssh-ldap.patch
@@ -137,7 +137,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
ssh-xmss.o \
@@ -150,8 +153,8 @@ SFTPSERVER_OBJS=sftp-common.o sftp-serve
- SFTP_OBJS= sftp.o progressmeter.o $(SFTP_CLIENT_OBJS)
+ SFTP_OBJS= sftp.o sftp-usergroup.o progressmeter.o $(SFTP_CLIENT_OBJS)
-MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out
ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out
sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-sk-helper.8.out
sshd_config.5.out ssh_config.5.out
-MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1
ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8
ssh-pkcs11-helper.8 ssh-sk-helper.8 sshd_config.5 ssh_config.5
@@ -148,13 +148,13 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
@@ -230,6 +233,9 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT)
ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS)
- $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
-lopenbsd-compat $(LIBS) $(LIBFIDO2)
+ $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
-lopenbsd-compat $(LIBS) $(LIBFIDO2) $(CHANNELLIBS)
+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-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
- $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
$(LIBS)
+ $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
$(LIBS) $(CHANNELLIBS)
@@ -395,6 +401,10 @@ install-files:
$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT)
$(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/52f772a66c46a35bb94fe8a0ca5c2591ee5a4b9b
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
