From 4a2470822f3be173cf7aed16070fb6f81a3c3b9e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 8 Feb 2023 18:52:28 +0100 Subject: [PATCH] - updated to 9.2p1 --- openssh-chroot.patch | 4 ++-- openssh-ldap-fixes.patch | 4 ++-- openssh-ldap.patch | 6 +++--- openssh.spec | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openssh-chroot.patch b/openssh-chroot.patch index 75a2f07..e166515 100644 --- a/openssh-chroot.patch +++ b/openssh-chroot.patch @@ -126,8 +126,8 @@ diff -urNp -x '*.orig' openssh-8.8p1.org/sshd_config.0 openssh-8.8p1/sshd_config --- openssh-8.8p1.org/sshd_config.0 2021-09-26 16:06:42.000000000 +0200 +++ openssh-8.8p1/sshd_config.0 2021-12-09 20:13:16.489919836 +0100 @@ -1053,6 +1053,16 @@ DESCRIPTION - TrustedUserCAKeys. For more details on certificates, see the - CERTIFICATES section in ssh-keygen(1). + open channels. This option may be useful in conjunction with + ChannelTimeout. + UseChroot + Specifies whether to use chroot-jail environment with ssh/sftp, 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) diff --git a/openssh.spec b/openssh.spec index 8e8bf5c..576278c 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: 9.0p1 -Release: 2 +Version: 9.2p1 +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: f78b2acac4bb299629a8c58ddc3fac63 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 @@ -527,7 +527,7 @@ openldap-a. %prep %setup -q -%patch100 -p1 +#%%patch100 -p1 %patch0 -p1 %patch1 -p1 -- 2.52.0