Hello community, here is the log from the commit of package lxqt-sudo for openSUSE:Factory checked in at 2018-07-14 20:24:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-sudo (Old) and /work/SRC/openSUSE:Factory/.lxqt-sudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-sudo" Sat Jul 14 20:24:15 2018 rev:6 rq:622435 version:0.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-sudo/lxqt-sudo.changes 2018-06-29 22:31:19.338259240 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-sudo.new/lxqt-sudo.changes 2018-07-14 20:24:16.836041157 +0200 @@ -1,0 +2,7 @@ +Thu Jul 12 16:13:40 CEST 2018 - [email protected] + +- Fix the missing capture of the prompt line without the space + letter at the end of line (boo#1100871): + lxqt-sudo-prompt-fix.patch + +------------------------------------------------------------------- New: ---- lxqt-sudo-prompt-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-sudo.spec ++++++ --- /var/tmp/diff_new_pack.yJDO2g/_old 2018-07-14 20:24:17.960044046 +0200 +++ /var/tmp/diff_new_pack.yJDO2g/_new 2018-07-14 20:24:17.964044056 +0200 @@ -26,6 +26,7 @@ Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch1: lxqt-sudo-prompt-fix.patch BuildRequires: cmake >= 3.0.2 BuildRequires: gcc-c++ BuildRequires: lxqt-build-tools-devel >= 0.5.0 @@ -45,6 +46,7 @@ %prep %setup -q +%patch1 -p1 %build %cmake -DPULL_TRANSLATIONS=No ++++++ lxqt-sudo-prompt-fix.patch ++++++ --- sudo.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/sudo.cpp +++ b/sudo.cpp @@ -52,7 +52,8 @@ namespace const QString su_prog{QStringLiteral(LXQTSUDO_SU)}; const QString sudo_prog{QStringLiteral(LXQTSUDO_SUDO)}; - const QString pwd_prompt_end{QStringLiteral(": ")}; + const QString pwd_prompt_end{QStringLiteral(":")}; + const QString pwd_prompt_end_with_space{QStringLiteral(": ")}; const QChar nl{QLatin1Char('\n')}; void usage(QString const & err = QString()) @@ -277,7 +278,8 @@ int Sudo::parent() lxqtApp->quit(); } else { - if (line.endsWith(pwd_prompt_end)) + if (line.endsWith(pwd_prompt_end) || + line.endsWith(pwd_prompt_end_with_space)) { //if now echo is turned off, su/sudo requests password struct termios tios;
