Hello community, here is the log from the commit of package kldap for openSUSE:Factory checked in at 2018-05-16 11:30:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kldap (Old) and /work/SRC/openSUSE:Factory/.kldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kldap" Wed May 16 11:30:22 2018 rev:33 rq:607190 version:18.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kldap/kldap.changes 2018-04-25 09:50:42.590263801 +0200 +++ /work/SRC/openSUSE:Factory/.kldap.new/kldap.changes 2018-05-16 11:30:23.940729508 +0200 @@ -1,0 +2,11 @@ +Fri May 11 05:17:57 UTC 2018 - [email protected] + +- Update to 18.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.1.php +- Changes since 18.04.0: + * LdapUrl: remove ctor code which made the QUrl invalid. + * LdapUrl: fix LDAP queries broken with non-ascii search strings. + +------------------------------------------------------------------- Old: ---- kldap-18.04.0.tar.xz New: ---- kldap-18.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kldap.spec ++++++ --- /var/tmp/diff_new_pack.cj0yv8/_old 2018-05-16 11:30:24.744700282 +0200 +++ /var/tmp/diff_new_pack.cj0yv8/_new 2018-05-16 11:30:24.744700282 +0200 @@ -20,7 +20,7 @@ %define kf5_version 5.19.0 Name: kldap -Version: 18.04.0 +Version: 18.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ kldap-18.04.0.tar.xz -> kldap-18.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/CMakeLists.txt new/kldap-18.04.1/CMakeLists.txt --- old/kldap-18.04.0/CMakeLists.txt 2018-04-13 02:13:59.000000000 +0200 +++ new/kldap-18.04.1/CMakeLists.txt 2018-05-08 02:21:04.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.0") +set(PIM_VERSION "5.8.1") project(KLdap VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/autotests/testkldap.cpp new/kldap-18.04.1/autotests/testkldap.cpp --- old/kldap-18.04.0/autotests/testkldap.cpp 2018-04-07 11:13:18.000000000 +0200 +++ new/kldap-18.04.1/autotests/testkldap.cpp 2018-04-21 15:57:39.000000000 +0200 @@ -49,9 +49,6 @@ The specified server should not be a production server in case we break anything here. You have been warned! */ - m_search = nullptr; - m_model = nullptr; - QString filename(QStringLiteral("testurl.txt")); QFile file(filename); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -59,8 +56,6 @@ stream >> m_url; file.close(); } -// else -// QCOMPARE( 0, 1 ); m_search = new LdapSearch; @@ -166,6 +161,31 @@ QCOMPARE(url.filter(), QStringLiteral("(objectClass=*)")); QCOMPARE(url.extension(QStringLiteral("x-dir"), critical), QStringLiteral("base")); + QCOMPARE(url.query(), QStringLiteral("?cn,mail?sub??x-dir=base")); + // For some reason the code removes the filter if it's (objectClass=*)... + QCOMPARE(url.toString(), QStringLiteral("ldap://cn=manager,dc=kde,dc=org:password@localhost:3999/"; + "dc=kde,dc=org??cn,mail?sub??x-dir=base")); + + // Now set a different filter + url.setFilter(QStringLiteral("(objectclass=person)")); + QCOMPARE(url.toDisplayString(), QStringLiteral("ldap://cn=manager,dc=kde,dc=org@localhost:3999/"; + "dc=kde,dc=org??cn,mail?sub?%28objectclass%3Dperson%29?x-dir=base")); + QCOMPARE(url.filter(), QStringLiteral("(objectclass=person)")); + + // And now a filter with non-ascii letters + url.setFilter(QString::fromUtf8("(givenName=Valérie *)")); + QCOMPARE(url.toDisplayString(), QString::fromUtf8("ldap://cn=manager,dc=kde,dc=org@localhost:3999/"; + "dc=kde,dc=org??cn,mail?sub?%28givenName%3DValérie %2A%29?x-dir=base")); + QCOMPARE(url.filter(), QStringLiteral("(givenName=Valérie *)")); + + // Test roundtrip via QUrl, as happens when sending it to kio_ldap + const QUrl qurl(url); + QCOMPARE(qurl.toDisplayString(), url.toDisplayString()); + + const LdapUrl kiourl(qurl); + QCOMPARE(kiourl.toString(), url.toString()); + QCOMPARE(kiourl.toDisplayString(), url.toDisplayString()); + QCOMPARE(kiourl.filter(), QStringLiteral("(givenName=Valérie *)")); } void KLdapTest::testLdapConnection() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/po/gl/kio_ldap.po new/kldap-18.04.1/po/gl/kio_ldap.po --- old/kldap-18.04.0/po/gl/kio_ldap.po 2018-04-13 02:13:58.000000000 +0200 +++ new/kldap-18.04.1/po/gl/kio_ldap.po 2018-05-08 02:21:03.000000000 +0200 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # mvillarino <[email protected]>, 2007, 2008. -# Adrián Chaves (Gallaecio) <[email protected]>, 2017. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kio_ldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-24 03:15+0200\n" -"PO-Revision-Date: 2017-09-09 12:23+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" +"PO-Revision-Date: 2018-04-28 20:43+0100\n" +"Last-Translator: Adrian Chaves <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ #: kio_ldap.cpp:369 #, kde-format msgid "LDAP connection canceled." -msgstr "A conexión LDAP foi cancelada." +msgstr "Cancelouse a conexión LDAP." #: kio_ldap.cpp:633 kio_ldap.cpp:704 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/po/gl/libkldap5.po new/kldap-18.04.1/po/gl/libkldap5.po --- old/kldap-18.04.0/po/gl/libkldap5.po 2018-04-13 02:13:58.000000000 +0200 +++ new/kldap-18.04.1/po/gl/libkldap5.po 2018-05-08 02:21:03.000000000 +0200 @@ -5,14 +5,14 @@ # mvillarino <[email protected]>, 2007, 2008. # marce villarino <[email protected]>, 2009. # Adrián Chaves Fernández <[email protected]>, 2015, 2017. -# Adrián Chaves (Gallaecio) <[email protected]>, 2017. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-14 03:19+0100\n" -"PO-Revision-Date: 2017-11-05 15:04+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" +"PO-Revision-Date: 2018-04-20 18:56+0100\n" +"Last-Translator: Adrian Chaves <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -177,7 +177,7 @@ #: ldapconfigwidget.cpp:355 #, kde-format msgid "Check server" -msgstr "" +msgstr "Comprobar o servidor" #: ldapconfigwidget.cpp:361 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/po/zh_CN/kio_ldap.po new/kldap-18.04.1/po/zh_CN/kio_ldap.po --- old/kldap-18.04.0/po/zh_CN/kio_ldap.po 2018-04-13 02:13:58.000000000 +0200 +++ new/kldap-18.04.1/po/zh_CN/kio_ldap.po 2018-05-08 02:21:03.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-24 03:15+0200\n" -"PO-Revision-Date: 2018-04-05 09:39-0400\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/po/zh_CN/libkldap5.po new/kldap-18.04.1/po/zh_CN/libkldap5.po --- old/kldap-18.04.0/po/zh_CN/libkldap5.po 2018-04-13 02:13:58.000000000 +0200 +++ new/kldap-18.04.1/po/zh_CN/libkldap5.po 2018-05-08 02:21:03.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-14 03:19+0100\n" -"PO-Revision-Date: 2018-04-05 09:39-0400\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-18.04.0/src/ldapurl.cpp new/kldap-18.04.1/src/ldapurl.cpp --- old/kldap-18.04.0/src/ldapurl.cpp 2018-04-07 11:13:18.000000000 +0200 +++ new/kldap-18.04.1/src/ldapurl.cpp 2018-04-21 15:57:39.000000000 +0200 @@ -48,11 +48,6 @@ LdapUrl::LdapUrl(const QUrl &_url) : QUrl(_url), d(new LdapUrlPrivate) { - QString tmp = path(); - if (tmp.startsWith(QLatin1Char('/'))) { - tmp = tmp.mid(1); - } - setPath(tmp); parseQuery(); } @@ -243,7 +238,7 @@ { Extension ext; QStringList extensions; - QString q = query(); + QString q = query(QUrl::FullyEncoded); // remove first ? if (q.startsWith(QLatin1Char('?'))) { q.remove(0, 1);
