Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package knewstuff for openSUSE:Factory checked in at 2021-10-04 18:38:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knewstuff (Old) and /work/SRC/openSUSE:Factory/.knewstuff.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knewstuff" Mon Oct 4 18:38:58 2021 rev:94 rq:922640 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knewstuff/knewstuff.changes 2021-09-16 23:16:03.651884600 +0200 +++ /work/SRC/openSUSE:Factory/.knewstuff.new.2443/knewstuff.changes 2021-10-04 18:39:05.517972436 +0200 @@ -1,0 +2,12 @@ +Fri Oct 1 18:32:36 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch: + * 0001-Include-a-user-agent-on-KNS-requests.patch + +------------------------------------------------------------------- +Tue Sep 28 05:31:54 UTC 2021 - Paolo Stivanin <[email protected]> + +- Add fix-crash.patch. This patch fixes a crash in DownloadWidget. + (kde#443025) + +------------------------------------------------------------------- New: ---- 0001-Include-a-user-agent-on-KNS-requests.patch fix-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knewstuff.spec ++++++ --- /var/tmp/diff_new_pack.R8gV5f/_old 2021-10-04 18:39:06.401973872 +0200 +++ /var/tmp/diff_new_pack.R8gV5f/_new 2021-10-04 18:39:06.405973879 +0200 @@ -35,6 +35,10 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: fix-crash.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Include-a-user-agent-on-KNS-requests.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ 0001-Include-a-user-agent-on-KNS-requests.patch ++++++ >From a2743d44468dd56623da79e8d95422549ec371f9 Mon Sep 17 00:00:00 2001 From: Aleix Pol <[email protected]> Date: Fri, 24 Sep 2021 14:31:05 +0200 Subject: [PATCH] Include a user agent on KNS requests --- src/core/jobs/httpworker.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp index 4c218b0..b81edd2 100644 --- a/src/core/jobs/httpworker.cpp +++ b/src/core/jobs/httpworker.cpp @@ -7,7 +7,9 @@ #include "httpworker.h" #include "knewstuffcore_debug.h" +#include "knewstuffcore_version.h" +#include <QCoreApplication> #include <QFile> #include <QMutex> #include <QMutexLocker> @@ -93,6 +95,15 @@ void HTTPWorker::setUrl(const QUrl &url) d->source = url; } +static void addUserAgent(QNetworkRequest &request) +{ + QString agentHeader = QStringLiteral("KNewStuff/%1").arg(QLatin1String(KNEWSTUFFCORE_VERSION_STRING)); + if (QCoreApplication::instance()) { + agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion()); + } + request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader); +} + void HTTPWorker::startRequest() { if (d->reply) { @@ -101,6 +112,7 @@ void HTTPWorker::startRequest() } QNetworkRequest request(d->source); + addUserAgent(request); d->reply = s_httpWorkerNAM->get(request); connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead); connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished); @@ -144,6 +156,7 @@ void HTTPWorker::handleFinished() << d->reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); d->reply->deleteLater(); QNetworkRequest request(d->redirectUrl); + addUserAgent(request); d->reply = s_httpWorkerNAM->get(request); connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead); connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished); -- 2.33.0 ++++++ fix-crash.patch ++++++ >From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <[email protected]> Date: Mon, 27 Sep 2021 20:05:09 +0200 Subject: [PATCH] Fix crash in DownloadWidget BUGS: 443025 --- src/downloadwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp index 40df2e8c..36cfde37 100644 --- a/src/downloadwidget.cpp +++ b/src/downloadwidget.cpp @@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries() } DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq) - : q(q) + : q(qq) , engine(new KNSCore::Engine) , model(new KNSCore::ItemsModel(engine)) , messageTimer(nullptr) -- GitLab
