1 |
commit: 9f00f8c78bb8ff523fb21e2aa4e580ae115fb7d9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 22 22:29:57 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 22 22:48:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f00f8c7 |
7 |
|
8 |
kde-frameworks/kio: Fix FTP as well as HTTP no-proxy settings |
9 |
|
10 |
Reported-by: Andreas Thalhammer <andreas.thalhammer <AT> linux.com> |
11 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/kio-5.64.0-fix-ftp-proxy-settings.patch | 39 ++++++++++ |
15 |
.../files/kio-5.64.0-fix-no-proxy-settings.patch | 38 +++++++++ |
16 |
kde-frameworks/kio/kio-5.64.0-r2.ebuild | 89 ++++++++++++++++++++++ |
17 |
3 files changed, 166 insertions(+) |
18 |
|
19 |
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..17968ff6cdb |
22 |
--- /dev/null |
23 |
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch |
24 |
@@ -0,0 +1,39 @@ |
25 |
+From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001 |
26 |
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@×××××.com> |
27 |
+Date: Fri, 22 Nov 2019 12:39:48 +0100 |
28 |
+Subject: Ftp ioslave: Fix ProxyUrls parameter passing |
29 |
+ |
30 |
+Summary: |
31 |
+QVariant stored in mapConfig always contain QByteArray values. |
32 |
+So QVariant needs to be converted string before splitting to StringList |
33 |
+ |
34 |
+Relates to D25432 |
35 |
+ |
36 |
+Reviewers: trufanov, #frameworks |
37 |
+ |
38 |
+Reviewed By: trufanov |
39 |
+ |
40 |
+Subscribers: kde-frameworks-devel |
41 |
+ |
42 |
+Tags: #frameworks |
43 |
+ |
44 |
+Differential Revision: https://phabricator.kde.org/D25438 |
45 |
+--- |
46 |
+ src/ioslaves/ftp/ftp.cpp | 2 +- |
47 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
48 |
+ |
49 |
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp |
50 |
+index 8cd58c9..4266a6c 100644 |
51 |
+--- a/src/ioslaves/ftp/ftp.cpp |
52 |
++++ b/src/ioslaves/ftp/ftp.cpp |
53 |
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u |
54 |
+ qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; |
55 |
+ |
56 |
+ m_proxyURL.clear(); |
57 |
+- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList(); |
58 |
++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); |
59 |
+ qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; |
60 |
+ |
61 |
+ if (m_host != _host || m_port != _port || |
62 |
+-- |
63 |
+cgit v1.1 |
64 |
|
65 |
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch |
66 |
new file mode 100644 |
67 |
index 00000000000..54f9755092f |
68 |
--- /dev/null |
69 |
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch |
70 |
@@ -0,0 +1,38 @@ |
71 |
+From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001 |
72 |
+From: David Faure <faure@×××.org> |
73 |
+Date: Sat, 23 Nov 2019 20:11:21 +0100 |
74 |
+Subject: Repair FTP/HTTP proxy querying for the case of no proxy |
75 |
+ |
76 |
+--- |
77 |
+ src/ioslaves/ftp/ftp.cpp | 2 +- |
78 |
+ src/ioslaves/http/http.cpp | 2 +- |
79 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
80 |
+ |
81 |
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp |
82 |
+index 4266a6c..f310871 100644 |
83 |
+--- a/src/ioslaves/ftp/ftp.cpp |
84 |
++++ b/src/ioslaves/ftp/ftp.cpp |
85 |
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u |
86 |
+ qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; |
87 |
+ |
88 |
+ m_proxyURL.clear(); |
89 |
+- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); |
90 |
++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); |
91 |
+ qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; |
92 |
+ |
93 |
+ if (m_host != _host || m_port != _port || |
94 |
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp |
95 |
+index aca847b..5f9cd7c 100644 |
96 |
+--- a/src/ioslaves/http/http.cpp |
97 |
++++ b/src/ioslaves/http/http.cpp |
98 |
+@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection() |
99 |
+ |
100 |
+ // Get proxy information... |
101 |
+ if (m_request.proxyUrls.isEmpty()) { |
102 |
+- m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); |
103 |
++ m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); |
104 |
+ qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls; |
105 |
+ } |
106 |
+ |
107 |
+-- |
108 |
+cgit v1.1 |
109 |
|
110 |
diff --git a/kde-frameworks/kio/kio-5.64.0-r2.ebuild b/kde-frameworks/kio/kio-5.64.0-r2.ebuild |
111 |
new file mode 100644 |
112 |
index 00000000000..9fb1a18b075 |
113 |
--- /dev/null |
114 |
+++ b/kde-frameworks/kio/kio-5.64.0-r2.ebuild |
115 |
@@ -0,0 +1,89 @@ |
116 |
+# Copyright 1999-2019 Gentoo Authors |
117 |
+# Distributed under the terms of the GNU General Public License v2 |
118 |
+ |
119 |
+EAPI=7 |
120 |
+ |
121 |
+ECM_DESIGNERPLUGIN="true" |
122 |
+ECM_TEST="forceoptional" |
123 |
+PVCUT=$(ver_cut 1-2) |
124 |
+QTMIN=5.12.3 |
125 |
+VIRTUALX_REQUIRED="test" |
126 |
+inherit ecm kde.org |
127 |
+ |
128 |
+DESCRIPTION="Framework providing transparent file and data management" |
129 |
+LICENSE="LGPL-2+" |
130 |
+KEYWORDS="amd64 ~arm ~arm64 ~x86" |
131 |
+IUSE="acl +handbook kerberos +kwallet X" |
132 |
+ |
133 |
+RDEPEND=" |
134 |
+ >=kde-frameworks/kauth-${PVCUT}:5 |
135 |
+ >=kde-frameworks/karchive-${PVCUT}:5 |
136 |
+ >=kde-frameworks/kbookmarks-${PVCUT}:5 |
137 |
+ >=kde-frameworks/kcodecs-${PVCUT}:5 |
138 |
+ >=kde-frameworks/kcompletion-${PVCUT}:5 |
139 |
+ >=kde-frameworks/kconfig-${PVCUT}:5 |
140 |
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5 |
141 |
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5 |
142 |
+ >=kde-frameworks/kcrash-${PVCUT}:5 |
143 |
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5 |
144 |
+ >=kde-frameworks/ki18n-${PVCUT}:5 |
145 |
+ >=kde-frameworks/kiconthemes-${PVCUT}:5 |
146 |
+ >=kde-frameworks/kitemviews-${PVCUT}:5 |
147 |
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5 |
148 |
+ >=kde-frameworks/knotifications-${PVCUT}:5 |
149 |
+ >=kde-frameworks/kservice-${PVCUT}:5 |
150 |
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5 |
151 |
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5 |
152 |
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5 |
153 |
+ >=kde-frameworks/kxmlgui-${PVCUT}:5 |
154 |
+ >=kde-frameworks/solid-${PVCUT}:5 |
155 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
156 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
157 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
158 |
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl] |
159 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
160 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
161 |
+ dev-libs/libxml2 |
162 |
+ dev-libs/libxslt |
163 |
+ acl? ( |
164 |
+ sys-apps/attr |
165 |
+ virtual/acl |
166 |
+ ) |
167 |
+ handbook? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) |
168 |
+ kerberos? ( virtual/krb5 ) |
169 |
+ kwallet? ( >=kde-frameworks/kwallet-${PVCUT}:5 ) |
170 |
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) |
171 |
+" |
172 |
+DEPEND="${RDEPEND} |
173 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
174 |
+ test? ( sys-libs/zlib ) |
175 |
+ X? ( |
176 |
+ x11-base/xorg-proto |
177 |
+ x11-libs/libX11 |
178 |
+ x11-libs/libXrender |
179 |
+ ) |
180 |
+" |
181 |
+PDEPEND=" |
182 |
+ >=kde-frameworks/kded-${PVCUT}:5 |
183 |
+" |
184 |
+ |
185 |
+# tests hang |
186 |
+RESTRICT+=" test" |
187 |
+ |
188 |
+PATCHES=( |
189 |
+ "${FILESDIR}/${P}-fix-http-proxy-settings.patch" |
190 |
+ "${FILESDIR}/${P}-fix-ftp-proxy-settings.patch" |
191 |
+ "${FILESDIR}/${P}-fix-no-proxy-settings.patch" |
192 |
+) |
193 |
+ |
194 |
+src_configure() { |
195 |
+ local mycmakeargs=( |
196 |
+ $(cmake_use_find_package acl ACL) |
197 |
+ $(cmake_use_find_package handbook KF5DocTools) |
198 |
+ $(cmake_use_find_package kerberos GSSAPI) |
199 |
+ $(cmake_use_find_package kwallet KF5Wallet) |
200 |
+ $(cmake_use_find_package X X11) |
201 |
+ ) |
202 |
+ |
203 |
+ ecm_src_configure |
204 |
+} |