Hello community,
here is the log from the commit of package libqt5-qtnetworkauth for
openSUSE:Factory checked in at 2017-12-31 01:14:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtnetworkauth (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtnetworkauth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtnetworkauth"
Sun Dec 31 01:14:33 2017 rev:6 rq:560653 version:5.10.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtnetworkauth/libqt5-qtnetworkauth.changes
2017-12-23 12:13:16.997730803 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtnetworkauth.new/libqt5-qtnetworkauth.changes
2017-12-31 01:14:34.058113168 +0100
@@ -1,0 +2,6 @@
+Fri Dec 22 19:40:24 UTC 2017 - [email protected]
+
+- Add 0001-Fix-QOAuth1-tokenSecret-return-value.patch. Fixes a
+ regression in Qt 5.10 which made QOAuth1 unusable. (kde#387446)
+
+-------------------------------------------------------------------
New:
----
0001-Fix-QOAuth1-tokenSecret-return-value.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtnetworkauth.spec ++++++
--- /var/tmp/diff_new_pack.a0VmWC/_old 2017-12-31 01:14:34.589935734 +0100
+++ /var/tmp/diff_new_pack.a0VmWC/_new 2017-12-31 01:14:34.593934400 +0100
@@ -33,6 +33,8 @@
%define tar_version qtnetworkauth-everywhere-src-5.10.0
Source:
https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
+# PATCH-FIX-UPSTREAM 0001-Fix-QOAuth1-tokenSecret-return-value.patch
+Patch0: 0001-Fix-QOAuth1-tokenSecret-return-value.patch
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libqt5-qtbase-devel >= %{version}
%if %qt5_snapshot
@@ -51,6 +53,7 @@
%prep
%setup -q -n %{tar_version}
+%patch0 -p1
%package -n %{libname}
Summary: Qt 5 NetworkAuth Library
++++++ 0001-Fix-QOAuth1-tokenSecret-return-value.patch ++++++
>From f6aedc74c4a95440e649b625b6272f29e7f5fa71 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <[email protected]>
Date: Thu, 21 Dec 2017 21:28:29 +0100
Subject: [PATCH] Fix QOAuth1::tokenSecret() return value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit c071b588ce2b4d474845d553aa83120747dc46da broke QOAuth1::tokenSecret(),
in fact, it were returning the clientIdentifierSharedKey instead.
[ChangeLog][QOAuth1] Fix tokenSecret() return value.
Task-number: QTBUG-65422
Change-Id: I72d6783220e7a030eac65e5c22e4421a1d6b106e
Reviewed-by: Mårten Nordheim <[email protected]>
Reviewed-by: Jesus Fernandez <[email protected]>
---
src/oauth/qoauth1.cpp | 2 +-
tests/auto/oauth1/tst_oauth1.cpp | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp
index 581ce4a..fcff92e 100644
--- a/src/oauth/qoauth1.cpp
+++ b/src/oauth/qoauth1.cpp
@@ -391,7 +391,7 @@ void QOAuth1::setClientCredentials(const QString
&clientIdentifier,
QString QOAuth1::tokenSecret() const
{
Q_D(const QOAuth1);
- return d->clientIdentifierSharedKey;
+ return d->tokenSecret;
}
/*!
Sets \a tokenSecret as the current token secret used to sign
diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp
index 50822bd..7bfc628 100644
--- a/tests/auto/oauth1/tst_oauth1.cpp
+++ b/tests/auto/oauth1/tst_oauth1.cpp
@@ -145,6 +145,7 @@ public Q_SLOTS:
private Q_SLOTS:
void clientIdentifierSignal();
void clientSharedSecretSignal();
+ void tokenSignal();
void tokenSecretSignal();
void temporaryCredentialsUrlSignal();
void temporaryTokenCredentialsUrlSignal();
@@ -252,7 +253,7 @@ void tst_OAuth1::clientSharedSecretSignal()
PropertyTester::run(&QOAuth1::clientSharedSecretChanged, setters);
}
-void tst_OAuth1::tokenSecretSignal()
+void tst_OAuth1::tokenSignal()
{
using PropertyTester = PropertyTester<QString>;
PropertyTester::SetterFunctions setters {
@@ -268,6 +269,22 @@ void tst_OAuth1::tokenSecretSignal()
PropertyTester::run(&QOAuth1::tokenChanged, setters);
}
+void tst_OAuth1::tokenSecretSignal()
+{
+ using PropertyTester = PropertyTester<QString>;
+ PropertyTester::SetterFunctions setters {
+ [](QString *expectedValue, QOAuth1 *object) {
+ *expectedValue = "setTokenSecret";
+ object->setTokenSecret(*expectedValue);
+ },
+ [](QString *expectedValue, QOAuth1 *object) {
+ *expectedValue = "setTokenCredentials";
+ object->setTokenCredentials(qMakePair(QString(), *expectedValue));
+ }
+ };
+ PropertyTester::run(&QOAuth1::tokenSecretChanged, setters);
+}
+
void tst_OAuth1::temporaryCredentialsUrlSignal()
{
using PropertyTester = PropertyTester<QUrl>;
--
2.15.1
