Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2020-01-14 21:03:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Tue Jan 14 21:03:42 2020 rev:78 rq:763490 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2019-12-18 14:43:43.513812563 +0100 +++ /work/SRC/openSUSE:Factory/.kwallet.new.6675/kwallet.changes 2020-01-14 21:05:38.446717250 +0100 @@ -1,0 +2,12 @@ +Sun Jan 5 09:02:22 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Replace endl by "\n" + flush when it's necessary + * KWallet: Port QRegExp to QRegularExpression + * Update the obsolete projects.kde.org URL + +------------------------------------------------------------------- Old: ---- kwallet-5.65.0.tar.xz kwallet-5.65.0.tar.xz.sig New: ---- kwallet-5.66.0.tar.xz kwallet-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.TOhbVw/_old 2020-01-14 21:05:39.250717623 +0100 +++ /var/tmp/diff_new_pack.TOhbVw/_new 2020-01-14 21:05:39.254717625 +0100 @@ -1,7 +1,7 @@ # # spec file for package kwallet # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define lname libKF5Wallet5 -%define _tar_path 5.65 +%define _tar_path 5.66 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kwallet -Version: 5.65.0 +Version: 5.66.0 Release: 0 Summary: Safe desktop-wide storage for passwords License: LGPL-2.1-or-later ++++++ kwallet-5.65.0.tar.xz -> kwallet-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/CMakeLists.txt new/kwallet-5.66.0/CMakeLists.txt --- old/kwallet-5.65.0/CMakeLists.txt 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/CMakeLists.txt 2020-01-04 11:14:19.000000000 +0100 @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts -set(KF5_DEP_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_DEP_VERSION "5.66.0") # handled by release scripts project(KWallet VERSION ${KF5_VERSION}) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.66.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) include(KDEInstallDirs) @@ -35,7 +35,7 @@ find_package(KF5DocTools ${KF5_DEP_VERSION}) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) add_definitions(-DQT_NO_FOREACH) add_definitions(-DTRANSLATION_DOMAIN=\"kwalletd5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/autotests/blowfishtest.cpp new/kwallet-5.66.0/autotests/blowfishtest.cpp --- old/kwallet-5.65.0/autotests/blowfishtest.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/autotests/blowfishtest.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -18,7 +18,7 @@ #include "backend/blowfish.h" -#include <QtTest> +#include <QTest> #include <QObject> #include <QByteArray> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/po/ml/kwallet-query.po new/kwallet-5.66.0/po/ml/kwallet-query.po --- old/kwallet-5.65.0/po/ml/kwallet-query.po 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/po/ml/kwallet-query.po 2020-01-04 11:14:19.000000000 +0100 @@ -8,8 +8,8 @@ "Project-Id-Version: kwallet\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-11 02:53+0200\n" -"PO-Revision-Date: 2019-08-08 02:43+0200\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2019-12-12 22:10+0000\n" +"Last-Translator: Vivek KJ Pazhedath <[email protected]>\n" "Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc." "org.in>\n" "Language: ml\n" @@ -17,6 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 3.9.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -26,7 +27,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "[email protected],[email protected],[email protected]" #: main.cpp:36 main.cpp:38 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/po/ml/kwalletd5.po new/kwallet-5.66.0/po/ml/kwalletd5.po --- old/kwallet-5.65.0/po/ml/kwalletd5.po 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/po/ml/kwalletd5.po 2020-01-04 11:14:19.000000000 +0100 @@ -9,15 +9,15 @@ "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-27 02:51+0200\n" -"PO-Revision-Date: 2010-06-30 16:26+0530\n" -"Last-Translator: Ershad K <[email protected]>\n" +"PO-Revision-Date: 2019-12-12 21:02+0000\n" +"Last-Translator: Vivek KJ Pazhedath <[email protected]>\n" "Language-Team: Malayalam <[email protected]>\n" "Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 3.9.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -27,7 +27,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected], [email protected], [email protected]" +msgstr "[email protected],[email protected],[email protected]" #: backend/backendpersisthandler.cpp:505 #, kde-format @@ -666,7 +666,7 @@ #: main.cpp:191 #, kde-format msgid "Former maintainer" -msgstr "മുന് പരിപാലകന്" +msgstr "പണ്ടത്തെ പരിപാലകൻ" #: main.cpp:192 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/src/api/KWallet/kwallet.cpp new/kwallet-5.66.0/src/api/KWallet/kwallet.cpp --- old/kwallet-5.65.0/src/api/KWallet/kwallet.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/src/api/KWallet/kwallet.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -176,13 +176,16 @@ attrs[KSS_ATTR_ENTRYFOLDER] = folder; KSecretsService::SearchCollectionItemsJob *searchItemsJob = secretsCollection->searchItems(attrs); if (searchItemsJob->exec()) { - QRegExp re(key, Qt::CaseSensitive, QRegExp::Wildcard); + const QRegularExpression re(QRegularExpression::anchoredPattern( + QRegularExpression::wildcardToRegularExpression(key))); const auto list = searchItemsJob->items(); + QRegularExpressionMatch match; for (KSecretsService::SearchCollectionItemsJob::Item item : list) { KSecretsService::ReadItemPropertyJob *readLabelJob = item->label(); if (readLabelJob->exec()) { QString label = readLabelJob->propertyValue().toString(); - if (re.exactMatch(label)) { + match = re.match(label); + if (match.hasMatch()) { if (verb(this, label, item.data())) { rc = 0; // one successful iteration already produced results, so success return } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/src/runtime/kwalletd/backend/kwalletbackend.cc new/kwallet-5.66.0/src/runtime/kwalletd/backend/kwalletbackend.cc --- old/kwallet-5.65.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2020-01-04 11:14:19.000000000 +0100 @@ -35,7 +35,7 @@ #include <QFile> #include <QFileInfo> #include <QSaveFile> -#include <QRegExp> +#include <QRegularExpression> #include <QCryptographicHash> #include <QStandardPaths> @@ -530,11 +530,14 @@ return rc; } - QRegExp re(key, Qt::CaseSensitive, QRegExp::Wildcard); + QRegularExpression re(QRegularExpression::anchoredPattern( + QRegularExpression::wildcardToRegularExpression(key))); const EntryMap &map = _entries[_folder]; + QRegularExpressionMatch match; for (EntryMap::ConstIterator i = map.begin(); i != map.end(); ++i) { - if (re.exactMatch(i.key())) { + match = re.match(i.key()); + if (match.hasMatch()) { rc.append(i.value()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/src/runtime/kwalletd/kwalletd.cpp new/kwallet-5.66.0/src/runtime/kwalletd/kwalletd.cpp --- old/kwallet-5.65.0/src/runtime/kwalletd/kwalletd.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/src/runtime/kwalletd/kwalletd.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -215,6 +215,8 @@ return qMakePair(-1, static_cast<KWallet::Backend*>(nullptr)); } +const QRegularExpression walletRegex( + QStringLiteral("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\.\\+\\_\\s]+$")); bool KWalletD::_processing = false; void KWalletD::processTransactions() @@ -331,8 +333,7 @@ return -1; } - if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\." - "\\+\\_\\s]+$")).exactMatch(wallet)) { + if (!walletRegex.match(wallet).hasMatch()) { return -1; } @@ -363,8 +364,7 @@ return -1; } - if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\." - "\\+\\_\\s]+$")).exactMatch(wallet)) { + if (!walletRegex.match(wallet).hasMatch()) { return -1; } @@ -1871,8 +1871,7 @@ return -1; } - if (!QRegExp(QString::fromLatin1("^[\\w\\^\\&\\'\\@\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\." - "\\+\\_\\s]+$")).exactMatch(wallet)) { + if (!walletRegex.match(wallet).hasMatch()) { return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/KWallet/kwallettest.cpp new/kwallet-5.66.0/tests/KWallet/kwallettest.cpp --- old/kwallet-5.65.0/tests/KWallet/kwallettest.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/KWallet/kwallettest.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -20,7 +20,7 @@ */ #include "kwallettest.h" -#include <QtTest> +#include <QTest> #include <qglobal.h> #include <kwallet.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/kwalletd/kwalletasync.cpp new/kwallet-5.66.0/tests/kwalletd/kwalletasync.cpp --- old/kwallet-5.65.0/tests/kwalletd/kwalletasync.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/kwalletd/kwalletasync.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -23,7 +23,7 @@ void KWalletAsyncTest::openWallet() { - _out << "About to ask for wallet async" << endl; + _out << "About to ask for wallet async\n"; // we have no wallet: ask for one. KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous); @@ -32,22 +32,25 @@ WalletReceiver r; QVERIFY(r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool)))); - _out << "About to start 30 second event loop" << endl; + _out << "About to start 30 second event loop\n"; QTimer::singleShot(30000, qApp, SLOT(quit())); int ret = qApp->exec(); if (ret == 0) { - _out << "Timed out!" << endl; + _out << "Timed out!\n"; } else { - _out << "Success!" << endl; + _out << "Success!\n"; } + _out.flush(); + QVERIFY2(ret == 1, "Timeout when waiting for wallet open"); } void WalletReceiver::walletOpened(bool got) { - _out << "Got async wallet: " << got << endl; + _out << "Got async wallet: " << got << '\n'; + _out.flush(); qApp->exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/kwalletd/kwalletboth.cpp new/kwallet-5.66.0/tests/kwalletd/kwalletboth.cpp --- old/kwallet-5.65.0/tests/kwalletd/kwalletboth.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/kwalletd/kwalletboth.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -24,7 +24,7 @@ void KWalletBothTest::openWallet() { - _out << "About to ask for wallet async" << endl; + _out << "About to ask for wallet async\n"; // we have no wallet: ask for one. KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous); @@ -33,43 +33,45 @@ WalletReceiver r; r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); - _out << "About to ask for wallet sync" << endl; + _out << "About to ask for wallet sync\n"; wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); QVERIFY(wallet != nullptr); - _out << "Got sync wallet: " << (wallet != nullptr) << endl; - _out << "About to start 30 second event loop" << endl; + _out << "Got sync wallet: " << (wallet != nullptr) << '\n'; + _out << "About to start 30 second event loop\n"; QTimer::singleShot(30000, qApp, SLOT(quit())); int ret = qApp->exec(); if (ret == 0) { - _out << "Timed out!" << endl; + _out << "Timed out!\n"; } else { - _out << "Success!" << endl; + _out << "Success!\n"; } QMap<QString, QString> p; ret = wallet->readPasswordList(QStringLiteral("*"), p); - _out << "readPasswordList returned: " << ret << endl; - _out << "readPasswordList returned " << p.keys().count() << " entries" << endl; + _out << "readPasswordList returned: " << ret << '\n'; + _out << "readPasswordList returned " << p.keys().count() << " entries\n"; QMap<QString, QMap<QString, QString> > q; ret = wallet->readMapList(QStringLiteral("*"), q); - _out << "readMapList returned: " << ret << endl; - _out << "readMapList returned " << q.keys().count() << " entries" << endl; + _out << "readMapList returned: " << ret << '\n'; + _out << "readMapList returned " << q.keys().count() << " entries\n"; QMap<QString, QByteArray> s; ret = wallet->readEntryList(QStringLiteral("*"), s); - _out << "readEntryList returned: " << ret << endl; - _out << "readEntryList returned " << s.keys().count() << " entries" << endl; + _out << "readEntryList returned: " << ret << '\n'; + _out << "readEntryList returned " << s.keys().count() << " entries\n"; + _out.flush(); delete wallet; } void WalletReceiver::walletOpened(bool got) { - _out << "Got async wallet: " << got << endl; + _out << "Got async wallet: " << got << '\n'; + _out.flush(); qApp->exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/kwalletd/kwalletmany.cpp new/kwallet-5.66.0/tests/kwalletd/kwalletmany.cpp --- old/kwallet-5.65.0/tests/kwalletd/kwalletmany.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/kwalletd/kwalletmany.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -51,7 +51,8 @@ void KWalletMany::walletOpened(bool open) { - _out << "Got async wallet: " << (open) << endl; + _out << "Got async wallet: " << (open) << '\n'; + _out.flush(); --_pending; } @@ -60,13 +61,14 @@ // open plenty of wallets in synchronous and asynchronous mode for (int i = 0; i < NUMWALLETS; ++i) { // request asynchronous wallet - _out << "About to ask for wallet async" << endl; + _out << "About to ask for wallet async" << '\n'; Wallet *wallet; wallet = Wallet::openWallet(Wallet::NetworkWallet(), 0, Wallet::Asynchronous); QVERIFY(wallet != nullptr); connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); _wallets.append(wallet); } + _out.flush(); // wait for 30s to receive the wallet opened replies from kwalletd QTRY_VERIFY_WITH_TIMEOUT(_pending == 0, 30000); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/kwalletd/kwalletpath.cpp new/kwallet-5.66.0/tests/kwalletd/kwalletpath.cpp --- old/kwallet-5.65.0/tests/kwalletd/kwalletpath.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/kwalletd/kwalletpath.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -19,17 +19,18 @@ void KWalletPathTest::openWallet() { - _out << "About to ask for wallet /tmp/test.kwl sync" << endl; + _out << "About to ask for wallet /tmp/test.kwl sync\n"; KWallet::Wallet *wallet = KWallet::Wallet::openWallet(QStringLiteral("/tmp/test.kwl"), 0, KWallet::Wallet::Path); QVERIFY(wallet != nullptr); - _out << "Got path wallet: " << (wallet != nullptr) << endl; + _out << "Got path wallet: " << (wallet != nullptr) << '\n'; if (wallet) { - _out << "Closing wallet" << endl; + _out << "Closing wallet\n"; delete wallet; } + _out.flush(); } QTEST_GUILESS_MAIN(KWalletPathTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.65.0/tests/kwalletd/kwalletsync.cpp new/kwallet-5.66.0/tests/kwalletd/kwalletsync.cpp --- old/kwallet-5.65.0/tests/kwalletd/kwalletsync.cpp 2019-12-07 22:48:50.000000000 +0100 +++ new/kwallet-5.66.0/tests/kwalletd/kwalletsync.cpp 2020-01-04 11:14:19.000000000 +0100 @@ -19,12 +19,13 @@ void KWalletSyncTest::openWallet() { - _out << "About to ask for wallet sync" << endl; + _out << "About to ask for wallet sync\n"; KWallet::Wallet *w = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); QVERIFY(w != nullptr); - _out << "Got sync wallet: " << (w != nullptr) << endl; + _out << "Got sync wallet: " << (w != nullptr) << '\n'; + _out.flush(); } QTEST_GUILESS_MAIN(KWalletSyncTest)
