Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2019-02-28 21:44:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lftp (Old) and /work/SRC/openSUSE:Factory/.lftp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp" Thu Feb 28 21:44:29 2019 rev:73 rq:679948 version:4.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2018-10-08 17:46:16.946418281 +0200 +++ /work/SRC/openSUSE:Factory/.lftp.new.28833/lftp.changes 2019-02-28 21:44:33.137495662 +0100 @@ -1,0 +2,7 @@ +Wed Feb 27 19:32:06 UTC 2019 - Peter Simons <[email protected]> + +- Add "relax-ssh-password-prompt-recognition.patch" to make sure + the SSH login handling code detects password prompts more + reliably. [bsc#1120946] + +------------------------------------------------------------------- New: ---- relax-ssh-password-prompt-recognition.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.oSGCue/_old 2019-02-28 21:44:33.773495391 +0100 +++ /var/tmp/diff_new_pack.oSGCue/_new 2019-02-28 21:44:33.777495389 +0100 @@ -1,7 +1,7 @@ # # spec file for package lftp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -29,12 +29,13 @@ Source3: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz.asc # PATCH-FEATURE-OPENSUSE lftp-ssl-cipher.patch [email protected] -- use stronger cipher [bnc#857148] Patch0: lftp-default-ssl-cipher.patch -# PATCH-FEATURE-OPENSUSE patch2-patch6 [email protected] -- maintained at https://github.com/opensuse/lftp [bsc#1083331] +# PATCH-FEATURE-OPENSUSE patch1-patch6 [email protected] -- maintained at https://github.com/opensuse/lftp [bsc#1083331] Patch1: 0001-Add-content-of-the-SUSE-lftp-vi-1.1-archive.patch Patch2: 0002-Add-content-of-lftp-compat-addfiles.patch.patch Patch3: 0003-Add-content-of-lftp-completion.patch.patch Patch4: 0004-Include-config.h-to-detect-gnulib-macros.patch Patch5: 0005-Add-the-wrapper-code-to-the-Makefile-in-order-to-bui.patch +Patch6: relax-ssh-password-prompt-recognition.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ ++++++ relax-ssh-password-prompt-recognition.patch ++++++ diff -Naur lftp-4.7.4/src/SSH_Access.cc lftp-4.7.4.new/src/SSH_Access.cc --- lftp-4.7.4/src/SSH_Access.cc 2016-09-08 14:38:15.000000000 +0200 +++ lftp-4.7.4.new/src/SSH_Access.cc 2019-01-07 15:32:39.151156788 +0100 @@ -44,6 +44,11 @@ return (e-b>=len && !strncasecmp(b,suffix,len)); } +static bool contains(const char *b, const char *e) +{ + return (1 && strcasestr(b,e)); +} + int SSH_Access::HandleSSHMessage() { int m=STALL; @@ -55,9 +60,7 @@ { if(s>0 && b[s-1]==' ') s--; - if(ends_with(b,b+s,"password:") - || (ends_with(b,b+s,"':") && s>10) - || (begins_with(b,b+s,"password for ") && b[s-1]==':')) + if(contains(b,"password") && b[s-1]==':') { if(!pass) {
