From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42157158018 for ; Sat, 2 Oct 2021 13:35:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E996E08BB; Sat, 2 Oct 2021 13:35:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CD93E08BB for ; Sat, 2 Oct 2021 13:35:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF6DB342B80 for ; Sat, 2 Oct 2021 13:35:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A0AF89 for ; Sat, 2 Oct 2021 13:35:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1633181706.686a75446fd2e7c96d88d939ca710adb6714ce42.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/files/, kde-frameworks/knewstuff/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild X-VCS-Directories: kde-frameworks/knewstuff/files/ kde-frameworks/knewstuff/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 686a75446fd2e7c96d88d939ca710adb6714ce42 X-VCS-Branch: master Date: Sat, 2 Oct 2021 13:35:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bcebf13e-0aff-4d39-aa4b-193a8a6785bc X-Archives-Hash: 7900985138284c0887b639ba672dec60 commit: 686a75446fd2e7c96d88d939ca710adb6714ce42 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 2 13:30:51 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 2 13:35:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686a7544 kde-frameworks/knewstuff: Help upstream lower server utilization See also: https://mail.kde.org/pipermail/distributions/2021-October/001054.html https://invent.kde.org/frameworks/knewstuff/-/merge_requests/142 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...5.86.0-include-user-agent-on-KNS-requests.patch | 58 ++++++++++++++++++++++ .../knewstuff/knewstuff-5.86.0-r2.ebuild | 54 ++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch new file mode 100644 index 00000000000..6252d28f7b9 --- /dev/null +++ b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch @@ -0,0 +1,58 @@ +From f687c5abd0c5e9bd5a6688b6d9d50f2536b7d33d Mon Sep 17 00:00:00 2001 +From: Aleix Pol +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 4c218b08..b81edd2d 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 + #include + #include + #include +@@ -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); +-- +GitLab + diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild new file mode 100644 index 00000000000..06de5529585 --- /dev/null +++ b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Framework for downloading and sharing additional application data" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="opds" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/attica-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kpackage-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + opds? ( =kde-frameworks/syndication-${PVCUT}*:5 ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${PVCUT}:5 +" + +PATCHES=( + "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" # KDE-bug 443025 + "${FILESDIR}/${P}-include-user-agent-on-KNS-requests.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package opds KF5Syndication) + ) + + ecm_src_configure +}