Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2012-03-12 20:11:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2012-02-03 10:21:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2012-03-12 20:11:41.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:11:41 CET 2012 - [email protected] + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- ark-4.8.0.tar.bz2 New: ---- ark-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.q2whV6/_old 2012-03-12 20:11:43.000000000 +0100 +++ /var/tmp/diff_new_pack.q2whV6/_new 2012-03-12 20:11:43.000000000 +0100 @@ -15,22 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ark -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: KDE Archiver Tool -Url: http://www.kde.org +License: GPL-2.0+ Group: Productivity/Other +Url: http://www.kde.org Source0: ark-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff BuildRequires: kdebase4-workspace-devel BuildRequires: libarchive-devel BuildRequires: libkonq-devel BuildRequires: libqjson-devel -BuildRequires: xz-devel BuildRequires: libzip-devel BuildRequires: oxygen-icon-theme-large +BuildRequires: xz-devel Provides: kde4-ark = 4.3.0 Obsoletes: kde4-ark < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,15 +41,15 @@ This is a KDE application to work with compressed archives. %package -n libkerfuffle4 -Group: System/Libraries Summary: KDE Archiver Tool +Group: System/Libraries %description -n libkerfuffle4 This is a KDE application to work with compressed archives. %package devel -Group: Development/Libraries/C and C++ Summary: KDE Archiver Tool +Group: Development/Libraries/C and C++ Requires: libkerfuffle4 %description devel ++++++ ark-4.8.0.tar.bz2 -> ark-4.8.1.tar.bz2 ++++++ Files old/ark-4.8.0/doc/index.cache.bz2 and new/ark-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.8.0/doc/index.docbook new/ark-4.8.1/doc/index.docbook --- old/ark-4.8.0/doc/index.docbook 2011-08-22 15:26:04.000000000 +0200 +++ new/ark-4.8.1/doc/index.docbook 2012-02-29 23:57:35.000000000 +0100 @@ -249,7 +249,7 @@ <itemizedlist> <title>Authors:</title> <listitem><para>Raphael Kubo da Costa -<email>[email protected]</email></para></listitem> +<email>[email protected]</email></para></listitem> <listitem><para>Harald Hvaal <email>[email protected]</email></para></listitem> <listitem><para>Helio Chissini de Castro diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.8.0/kerfuffle/cliinterface.cpp new/ark-4.8.1/kerfuffle/cliinterface.cpp --- old/ark-4.8.0/kerfuffle/cliinterface.cpp 2011-10-11 16:48:03.000000000 +0200 +++ new/ark-4.8.1/kerfuffle/cliinterface.cpp 2012-02-29 23:57:35.000000000 +0100 @@ -340,9 +340,8 @@ m_process->setPtyChannels(KPtyProcess::StdinChannel); #endif - m_process->setTextModeEnabled(true); m_process->setOutputChannelMode(KProcess::MergedChannels); - m_process->setNextOpenMode(QIODevice::ReadWrite | QIODevice::Unbuffered); + m_process->setNextOpenMode(QIODevice::ReadWrite | QIODevice::Unbuffered | QIODevice::Text); m_process->setProgram(programPath, arguments); connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(readStdout()), Qt::DirectConnection); @@ -486,6 +485,26 @@ } if (m_operationMode == Copy) { + if (checkForPasswordPromptMessage(line)) { + kDebug() << "Found a password prompt"; + + Kerfuffle::PasswordNeededQuery query(filename()); + userQuery(&query); + query.waitForResponse(); + + if (query.responseCancelled()) { + failOperation(); + return; + } + + setPassword(query.password()); + + const QString response(password() + QLatin1Char('\n')); + writeToProcess(response.toLocal8Bit()); + + return; + } + if (checkForErrorMessage(line, WrongPasswordPatterns)) { kDebug() << "Wrong password!"; error(i18n("Incorrect password.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.8.0/kerfuffle/queries.cpp new/ark-4.8.1/kerfuffle/queries.cpp --- old/ark-4.8.0/kerfuffle/queries.cpp 2011-08-22 15:26:04.000000000 +0200 +++ new/ark-4.8.1/kerfuffle/queries.cpp 2012-02-29 23:57:35.000000000 +0100 @@ -181,12 +181,11 @@ dlg.data()->showErrorMessage(i18n("Incorrect password, please try again."), KPasswordDialog::PasswordError); } - if (!dlg.data()->exec()) { - setResponse(false); - } else { - m_data[QLatin1String("password")] = dlg.data()->password(); - setResponse(true); - } + const bool notCancelled = dlg.data()->exec(); + const QString password = dlg.data()->password(); + + m_data[QLatin1String("password")] = password; + setResponse(notCancelled && !password.isEmpty()); QApplication::restoreOverrideCursor(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.8.0/plugins/clizipplugin/cliplugin.cpp new/ark-4.8.1/plugins/clizipplugin/cliplugin.cpp --- old/ark-4.8.0/plugins/clizipplugin/cliplugin.cpp 2011-10-11 16:48:03.000000000 +0200 +++ new/ark-4.8.1/plugins/clizipplugin/cliplugin.cpp 2012-02-29 23:57:35.000000000 +0100 @@ -94,6 +94,7 @@ p[AddArgs] = QStringList() << QLatin1String( "-r" ) << QLatin1String( "$Archive" ) << QLatin1String( "$Files" ); + p[PasswordPromptPattern] = QLatin1String(" password: "); p[WrongPasswordPatterns] = QStringList() << QLatin1String( "incorrect password" ); //p[ExtractionFailedPatterns] = QStringList() << "CRC failed"; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
