1 |
commit: 00aecb219784e55163507332bfe620c25136005a |
2 |
Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 25 01:40:28 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 28 08:04:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00aecb21 |
7 |
|
8 |
net-p2p/eiskaltdcpp: Drop older versions and backported patches |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org> |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
net-p2p/eiskaltdcpp/Manifest | 1 - |
15 |
net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild | 155 --------------------- |
16 |
net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild | 7 +- |
17 |
net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 7 +- |
18 |
.../files/eiskaltdcpp-2.2.10-ipv6_upnp.patch | 123 ---------------- |
19 |
.../files/eiskaltdcpp-2.2.10-miniupnpc1.patch | 31 ----- |
20 |
.../files/eiskaltdcpp-2.2.10-miniupnpc2.patch | 29 ---- |
21 |
.../files/eiskaltdcpp-2.2.10-openssl-1.1.patch | 138 ------------------ |
22 |
.../files/eiskaltdcpp-2.2.10-tray-close.patch | 23 --- |
23 |
net-p2p/eiskaltdcpp/metadata.xml | 6 +- |
24 |
10 files changed, 15 insertions(+), 505 deletions(-) |
25 |
|
26 |
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest |
27 |
index d58c59f8511..a15238ff7ea 100644 |
28 |
--- a/net-p2p/eiskaltdcpp/Manifest |
29 |
+++ b/net-p2p/eiskaltdcpp/Manifest |
30 |
@@ -1,2 +1 @@ |
31 |
-DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818 |
32 |
DIST eiskaltdcpp-2.4.1.tar.xz 4301580 BLAKE2B 5fbf17d59686373b06ab7f86c5eaa00d9dd8d16b9ff89367d50024e4af1ea4c7abd281fa294718228544f8e0b8276af89a5d6a79d02fd09ca226387c278829c6 SHA512 05bb31a94081207812787d6d5ee4d8f479b3582f41f09441fbb60a4214a220d9d7fa3ea3e52c6e91a5d084aa92bab6994dbd9769e4d792d95c51dde5bc12ee55 |
33 |
|
34 |
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild |
35 |
deleted file mode 100644 |
36 |
index 930dfe474fe..00000000000 |
37 |
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,155 +0,0 @@ |
40 |
-# Copyright 1999-2021 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-LUA_COMPAT=( lua5-1 ) |
46 |
- |
47 |
-PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr@latin sr sv_SE uk vi zh_CN" |
48 |
- |
49 |
-inherit cmake l10n lua-single xdg-utils |
50 |
-[[ ${PV} = *9999* ]] && inherit git-r3 |
51 |
- |
52 |
-DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols" |
53 |
-HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp" |
54 |
- |
55 |
-LICENSE="GPL-2 GPL-3" |
56 |
-SLOT="0" |
57 |
-IUSE="cli daemon dbus +dht examples idn -javascript json lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc" |
58 |
- |
59 |
-REQUIRED_USE=" |
60 |
- ?? ( json xmlrpc ) |
61 |
- cli? ( ^^ ( json xmlrpc ) ) |
62 |
- dbus? ( qt5 ) |
63 |
- javascript? ( qt5 ) |
64 |
- lua? ( ${LUA_REQUIRED_USE} ) |
65 |
- spell? ( qt5 ) |
66 |
- sqlite? ( qt5 ) |
67 |
-" |
68 |
- |
69 |
-if [[ ${PV} != *9999* ]]; then |
70 |
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
71 |
- KEYWORDS="~amd64 ~x86" |
72 |
-else |
73 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
74 |
-fi |
75 |
- |
76 |
-RDEPEND=" |
77 |
- app-arch/bzip2 |
78 |
- dev-libs/boost:= |
79 |
- dev-libs/openssl:0= |
80 |
- sys-apps/attr |
81 |
- sys-libs/zlib |
82 |
- virtual/libiconv |
83 |
- virtual/libintl |
84 |
- cli? ( |
85 |
- dev-lang/perl |
86 |
- dev-perl/Data-Dump |
87 |
- dev-perl/Term-ShellUI |
88 |
- virtual/perl-Getopt-Long |
89 |
- json? ( dev-perl/JSON-RPC ) |
90 |
- xmlrpc? ( dev-perl/RPC-XML ) |
91 |
- ) |
92 |
- daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) ) |
93 |
- idn? ( net-dns/libidn ) |
94 |
- lua? ( ${LUA_DEPS} ) |
95 |
- pcre? ( dev-libs/libpcre ) |
96 |
- qt5? ( |
97 |
- dev-qt/qtconcurrent:5 |
98 |
- dev-qt/qtcore:5 |
99 |
- dev-qt/qtgui:5 |
100 |
- dev-qt/qtmultimedia:5 |
101 |
- dev-qt/qtnetwork:5 |
102 |
- dev-qt/qtwidgets:5 |
103 |
- dev-qt/qtxml:5 |
104 |
- dbus? ( dev-qt/qtdbus:5 ) |
105 |
- javascript? ( |
106 |
- dev-qt/qtdeclarative:5 |
107 |
- dev-qt/qtscript:5 |
108 |
- ) |
109 |
- spell? ( app-text/aspell ) |
110 |
- sqlite? ( dev-qt/qtsql:5[sqlite] ) |
111 |
- ) |
112 |
- upnp? ( net-libs/miniupnpc ) |
113 |
-" |
114 |
-DEPEND="${RDEPEND} |
115 |
- sys-devel/gettext |
116 |
- virtual/pkgconfig |
117 |
- qt5? ( dev-qt/linguist-tools:5 ) |
118 |
-" |
119 |
- |
120 |
-DOCS=( AUTHORS ChangeLog.txt ) |
121 |
- |
122 |
-PATCHES=( |
123 |
- "${FILESDIR}"/${PN}-2.2.10-cmake_lua_version.patch |
124 |
- "${FILESDIR}"/${PN}-2.2.10-ipv6_upnp.patch |
125 |
- "${FILESDIR}"/${PN}-2.2.10-miniupnpc{1,2}.patch |
126 |
- "${FILESDIR}"/${PN}-2.2.10-openssl-1.1.patch |
127 |
- "${FILESDIR}"/${PN}-2.2.10-tray-close.patch |
128 |
-) |
129 |
- |
130 |
-CMAKE_REMOVE_MODULES_LIST="FindLua" |
131 |
- |
132 |
-src_prepare() { |
133 |
- cmake_src_prepare |
134 |
- l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts' |
135 |
-} |
136 |
- |
137 |
-src_configure() { |
138 |
- local mycmakeargs=( |
139 |
- -DLIB_INSTALL_DIR="$(get_libdir)" |
140 |
- -Dlinguas="$(l10n_get_locales)" |
141 |
- -DLOCAL_MINIUPNP=OFF |
142 |
- -DUSE_GTK=OFF |
143 |
- -DUSE_GTK3=OFF |
144 |
- -DUSE_LIBGNOME2=OFF |
145 |
- -DUSE_LIBCANBERRA=OFF |
146 |
- -DUSE_LIBNOTIFY=OFF |
147 |
- -DUSE_QT=OFF |
148 |
- -DUSE_QT_QML=OFF |
149 |
- -DNO_UI_DAEMON=$(usex daemon) |
150 |
- -DDBUS_NOTIFY=$(usex dbus) |
151 |
- -DWITH_DHT=$(usex dht) |
152 |
- -DWITH_EXAMPLES=$(usex examples) |
153 |
- -DUSE_IDNA=$(usex idn) |
154 |
- -DUSE_JS=$(usex javascript) |
155 |
- -DWITH_DEV_FILES=$(usex !minimal) |
156 |
- -DPERL_REGEX=$(usex pcre) |
157 |
- -DUSE_QT5=$(usex qt5) |
158 |
- -DWITH_EMOTICONS=$(usex qt5) |
159 |
- -DWITH_SOUNDS=$(usex qt5) |
160 |
- -DUSE_ASPELL=$(usex spell) |
161 |
- -DUSE_QT_SQLITE=$(usex sqlite) |
162 |
- -DUSE_MINIUPNP=$(usex upnp) |
163 |
- ) |
164 |
- if use cli; then |
165 |
- mycmakeargs+=( |
166 |
- -DUSE_CLI_JSONRPC=$(usex json) |
167 |
- -DUSE_CLI_XMLRPC=$(usex xmlrpc) |
168 |
- ) |
169 |
- fi |
170 |
- if use daemon; then |
171 |
- mycmakeargs+=( |
172 |
- -DJSONRPC_DAEMON=$(usex json) |
173 |
- -DXMLRPC_DAEMON=$(usex xmlrpc) |
174 |
- ) |
175 |
- fi |
176 |
- if use lua; then |
177 |
- mycmakeargs+=( |
178 |
- -DLUA_SCRIPT=ON |
179 |
- -DWITH_LUASCRIPTS=ON |
180 |
- -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) |
181 |
- ) |
182 |
- fi |
183 |
- cmake_src_configure |
184 |
-} |
185 |
- |
186 |
-pkg_postinst() { |
187 |
- xdg_desktop_database_update |
188 |
- xdg_icon_cache_update |
189 |
-} |
190 |
- |
191 |
-pkg_postrm() { |
192 |
- xdg_desktop_database_update |
193 |
- xdg_icon_cache_update |
194 |
-} |
195 |
|
196 |
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild |
197 |
index db60ca40584..e9ac1f096f6 100644 |
198 |
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild |
199 |
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild |
200 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp" |
201 |
|
202 |
LICENSE="GPL-2 GPL-3" |
203 |
SLOT="0" |
204 |
-IUSE="cli daemon dbus +dht examples -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc" |
205 |
+IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc" |
206 |
|
207 |
REQUIRED_USE=" |
208 |
?? ( json xmlrpc ) |
209 |
@@ -158,6 +158,11 @@ src_configure() { |
210 |
-DWITH_LUASCRIPTS=$(usex examples) |
211 |
-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) |
212 |
) |
213 |
+ else |
214 |
+ mycmakeargs+=( |
215 |
+ -DLUA_SCRIPT=OFF |
216 |
+ -DWITH_LUASCRIPTS=OFF |
217 |
+ ) |
218 |
fi |
219 |
if use qt5 || use gtk; then |
220 |
mycmakeargs+=( |
221 |
|
222 |
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild |
223 |
index fe6e41e66ad..8467b419629 100644 |
224 |
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild |
225 |
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild |
226 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp" |
227 |
|
228 |
LICENSE="GPL-2 GPL-3" |
229 |
SLOT="0" |
230 |
-IUSE="cli daemon dbus +dht examples -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc" |
231 |
+IUSE="cli daemon dbus +dht examples gold gtk idn javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp xmlrpc" |
232 |
|
233 |
REQUIRED_USE=" |
234 |
?? ( json xmlrpc ) |
235 |
@@ -157,6 +157,11 @@ src_configure() { |
236 |
-DWITH_LUASCRIPTS=$(usex examples) |
237 |
-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) |
238 |
) |
239 |
+ else |
240 |
+ mycmakeargs+=( |
241 |
+ -DLUA_SCRIPT=OFF |
242 |
+ -DWITH_LUASCRIPTS=OFF |
243 |
+ ) |
244 |
fi |
245 |
if use qt5 || use gtk; then |
246 |
mycmakeargs+=( |
247 |
|
248 |
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-ipv6_upnp.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-ipv6_upnp.patch |
249 |
deleted file mode 100644 |
250 |
index 9b1f7638b6a..00000000000 |
251 |
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-ipv6_upnp.patch |
252 |
+++ /dev/null |
253 |
@@ -1,123 +0,0 @@ |
254 |
-From 639b9f9aa286f10ce11f9fb28f0c83985f069a0d Mon Sep 17 00:00:00 2001 |
255 |
-From: Sergey Farbotka <z8sergey8z@×××××.com> |
256 |
-Date: Mon, 31 Aug 2015 23:55:44 +0300 |
257 |
-Subject: [PATCH] Core: send IPv4-only address in UPNP request |
258 |
- |
259 |
-The app sends first available local IP address in UPNP request. |
260 |
-If first available address is IPv6, miniupnpd sends the following error: |
261 |
-"Failed to convert hostname '<my-ipv6-address>' to ip address" |
262 |
- |
263 |
-As eiskaltdc++ does not support IPv6 yet, we can use IPv4 address only |
264 |
-in UPNP requests. |
265 |
---- |
266 |
- dcpp/ConnectivityManager.cpp | 2 +- |
267 |
- dcpp/Util.cpp | 17 ++++++++++++----- |
268 |
- dcpp/Util.h | 5 +++-- |
269 |
- extra/upnpc.cpp | 2 +- |
270 |
- 4 files changed, 17 insertions(+), 9 deletions(-) |
271 |
- |
272 |
-diff --git a/dcpp/ConnectivityManager.cpp b/dcpp/ConnectivityManager.cpp |
273 |
-index 3495a9a..acc0d68 100644 |
274 |
---- a/dcpp/ConnectivityManager.cpp |
275 |
-+++ b/dcpp/ConnectivityManager.cpp |
276 |
-@@ -90,7 +90,7 @@ void ConnectivityManager::detectConnection() { |
277 |
- |
278 |
- autoDetected = true; |
279 |
- |
280 |
-- if (!Util::isPrivateIp(Util::getLocalIp())) { |
281 |
-+ if (!Util::isPrivateIp(Util::getLocalIp(AF_INET))) { |
282 |
- SettingsManager::getInstance()->set(SettingsManager::INCOMING_CONNECTIONS, SettingsManager::INCOMING_DIRECT); |
283 |
- log(_("Public IP address detected, selecting active mode with direct connection")); |
284 |
- fire(ConnectivityManagerListener::Finished()); |
285 |
-diff --git a/dcpp/Util.cpp b/dcpp/Util.cpp |
286 |
-index dc7e08e..9b5a2ca 100644 |
287 |
---- a/dcpp/Util.cpp |
288 |
-+++ b/dcpp/Util.cpp |
289 |
-@@ -704,7 +704,7 @@ string Util::formatExactSize(int64_t aBytes) { |
290 |
- #endif |
291 |
- } |
292 |
- |
293 |
--vector<string> Util::getLocalIPs() { |
294 |
-+vector<string> Util::getLocalIPs(unsigned short sa_family) { |
295 |
- vector<string> addresses; |
296 |
- |
297 |
- #ifdef HAVE_IFADDRS_H |
298 |
-@@ -712,6 +712,9 @@ vector<string> Util::getLocalIPs() { |
299 |
- |
300 |
- if (getifaddrs(&ifap) == 0) |
301 |
- { |
302 |
-+ bool ipv4 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET); |
303 |
-+ bool ipv6 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET6); |
304 |
-+ |
305 |
- for (struct ifaddrs *i = ifap; i != NULL; i = i->ifa_next) |
306 |
- { |
307 |
- struct sockaddr *sa = i->ifa_addr; |
308 |
-@@ -723,14 +726,14 @@ vector<string> Util::getLocalIPs() { |
309 |
- socklen_t len; |
310 |
- |
311 |
- // IPv4 address |
312 |
-- if (sa->sa_family == AF_INET) |
313 |
-+ if (ipv4 && (sa->sa_family == AF_INET)) |
314 |
- { |
315 |
- struct sockaddr_in* sai = (struct sockaddr_in*)sa; |
316 |
- src = (void*) &(sai->sin_addr); |
317 |
- len = INET_ADDRSTRLEN; |
318 |
- } |
319 |
- // IPv6 address |
320 |
-- else if (sa->sa_family == AF_INET6) |
321 |
-+ else if (ipv6 && (sa->sa_family == AF_INET6)) |
322 |
- { |
323 |
- struct sockaddr_in6* sai6 = (struct sockaddr_in6*)sa; |
324 |
- src = (void*) &(sai6->sin6_addr); |
325 |
-@@ -752,9 +755,13 @@ vector<string> Util::getLocalIPs() { |
326 |
- |
327 |
- return addresses; |
328 |
- } |
329 |
--string Util::getLocalIp() { |
330 |
-+string Util::getLocalIp(unsigned short as_family) { |
331 |
- #ifdef HAVE_IFADDRS_H |
332 |
-- return getLocalIPs().empty() ? "0.0.0.0" : getLocalIPs()[0]; |
333 |
-+ vector<string> addresses = getLocalIPs(as_family); |
334 |
-+ if (addresses.empty()) |
335 |
-+ return (((as_family == AF_UNSPEC) || (as_family == AF_INET)) ? "0.0.0.0" : "::"); |
336 |
-+ |
337 |
-+ return addresses[0]; |
338 |
- #else |
339 |
- string tmp; |
340 |
- |
341 |
-diff --git a/dcpp/Util.h b/dcpp/Util.h |
342 |
-index a489f70..f2842d3 100644 |
343 |
---- a/dcpp/Util.h |
344 |
-+++ b/dcpp/Util.h |
345 |
-@@ -28,6 +28,7 @@ |
346 |
- |
347 |
- #include <sys/stat.h> |
348 |
- #include <sys/types.h> |
349 |
-+#include <sys/socket.h> |
350 |
- #include <unistd.h> |
351 |
- #include <cstdlib> |
352 |
- #include <vector> |
353 |
-@@ -403,8 +404,8 @@ class Util |
354 |
- } |
355 |
- |
356 |
- static string encodeURI(const string& /*aString*/, bool reverse = false); |
357 |
-- static string getLocalIp(); |
358 |
-- static std::vector<string> getLocalIPs(); |
359 |
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC); |
360 |
-+ static std::vector<string> getLocalIPs(unsigned short sa_family = AF_UNSPEC); |
361 |
- static bool isPrivateIp(string const& ip); |
362 |
- static string formatAdditionalInfo(const std::string& aIp, bool sIp, bool sCC); |
363 |
- /** |
364 |
-diff --git a/extra/upnpc.cpp b/extra/upnpc.cpp |
365 |
-index fb61f14..63f6d34 100644 |
366 |
---- a/extra/upnpc.cpp |
367 |
-+++ b/extra/upnpc.cpp |
368 |
-@@ -63,7 +63,7 @@ bool UPnPc::add(const unsigned short port, const UPnP::Protocol protocol, const |
369 |
- const string port_ = Util::toString(port); |
370 |
- |
371 |
- return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(), |
372 |
-- Util::getLocalIp().c_str(), description.c_str(), protocols[protocol], NULL |
373 |
-+ Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL |
374 |
- #if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16)) |
375 |
- , 0) == UPNPCOMMAND_SUCCESS; |
376 |
- #else |
377 |
|
378 |
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch |
379 |
deleted file mode 100644 |
380 |
index 7cca21840c7..00000000000 |
381 |
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch |
382 |
+++ /dev/null |
383 |
@@ -1,31 +0,0 @@ |
384 |
-From 33bf1489e75d1b1cc834d6eb9629598cd77d6c58 Mon Sep 17 00:00:00 2001 |
385 |
-From: Pavel Vatagin <pavelvat@×××××.com> |
386 |
-Date: Sun, 17 Jan 2016 03:00:36 +0300 |
387 |
-Subject: [PATCH] extra: fix static build for windows with -DLOCAL_MINIUPNP=OFF |
388 |
- |
389 |
---- |
390 |
- extra/upnpc.cpp | 4 ++-- |
391 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
392 |
- |
393 |
-diff --git a/extra/upnpc.cpp b/extra/upnpc.cpp |
394 |
-index 63f6d34..40a011a 100644 |
395 |
---- a/extra/upnpc.cpp |
396 |
-+++ b/extra/upnpc.cpp |
397 |
-@@ -42,7 +42,7 @@ using namespace dcpp; |
398 |
- bool UPnPc::init() |
399 |
- { |
400 |
- UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0 |
401 |
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16)) |
402 |
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16)) |
403 |
- , 0, 0); |
404 |
- #else |
405 |
- ); |
406 |
-@@ -64,7 +64,7 @@ bool UPnPc::add(const unsigned short port, const UPnP::Protocol protocol, const |
407 |
- |
408 |
- return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(), |
409 |
- Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL |
410 |
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16)) |
411 |
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16)) |
412 |
- , 0) == UPNPCOMMAND_SUCCESS; |
413 |
- #else |
414 |
- ) == UPNPCOMMAND_SUCCESS; |
415 |
|
416 |
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc2.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc2.patch |
417 |
deleted file mode 100644 |
418 |
index bbe113b9cf4..00000000000 |
419 |
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc2.patch |
420 |
+++ /dev/null |
421 |
@@ -1,29 +0,0 @@ |
422 |
-From b88120830e974d843cbfec552b639fa72c64dcbd Mon Sep 17 00:00:00 2001 |
423 |
-From: Pavel Vatagin <pavelvat@×××××.com> |
424 |
-Date: Fri, 5 Feb 2016 04:15:33 +0300 |
425 |
-Subject: [PATCH] extra: fix #332 |
426 |
- |
427 |
---- |
428 |
- extra/upnpc.cpp | 8 ++++++-- |
429 |
- 1 file changed, 6 insertions(+), 2 deletions(-) |
430 |
- |
431 |
-diff --git a/extra/upnpc.cpp b/extra/upnpc.cpp |
432 |
-index 40a011a..bbd7bbf 100644 |
433 |
---- a/extra/upnpc.cpp |
434 |
-+++ b/extra/upnpc.cpp |
435 |
-@@ -41,9 +41,13 @@ using namespace dcpp; |
436 |
- |
437 |
- bool UPnPc::init() |
438 |
- { |
439 |
-- UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0 |
440 |
-+ UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), NULL, 0 |
441 |
- #if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16)) |
442 |
-- , 0, 0); |
443 |
-+ , 0 |
444 |
-+#if (MINIUPNPC_API_VERSION >= 14) |
445 |
-+ , 2 |
446 |
-+#endif |
447 |
-+ , NULL); |
448 |
- #else |
449 |
- ); |
450 |
- #endif |
451 |
|
452 |
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-openssl-1.1.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-openssl-1.1.patch |
453 |
deleted file mode 100644 |
454 |
index bf6f387ec26..00000000000 |
455 |
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-openssl-1.1.patch |
456 |
+++ /dev/null |
457 |
@@ -1,138 +0,0 @@ |
458 |
-From 3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7 Mon Sep 17 00:00:00 2001 |
459 |
-From: Igor Gnatenko <ignatenkobrain@×××××××××××××.org> |
460 |
-Date: Tue, 7 Feb 2017 09:19:18 +0100 |
461 |
-Subject: [PATCH] crypto: add support for OpenSSL 1.1 |
462 |
- |
463 |
-In OpenSSL 1.1 BN and SSL are opaque structures. |
464 |
- |
465 |
-* BN_set0_pqg() has been implemented in 1.1 |
466 |
-* SSL_is_server() has been implemented in 1.0.2 and 1.1 |
467 |
- |
468 |
-Reported-by: Vasiliy Glazov <vascom2@×××××.com> |
469 |
-Closes: https://github.com/eiskaltdcpp/eiskaltdcpp/issues/356 |
470 |
-Signed-off-by: Igor Gnatenko <ignatenkobrain@×××××××××××××.org> |
471 |
---- |
472 |
- dcpp/CryptoManager.cpp | 15 +++++++++++---- |
473 |
- dcpp/SSLSocket.cpp | 11 +++++++++-- |
474 |
- 2 files changed, 20 insertions(+), 6 deletions(-) |
475 |
- |
476 |
-diff --git a/dcpp/CryptoManager.cpp b/dcpp/CryptoManager.cpp |
477 |
-index 08893a75c..b672d92f4 100644 |
478 |
---- a/dcpp/CryptoManager.cpp |
479 |
-+++ b/dcpp/CryptoManager.cpp |
480 |
-@@ -27,12 +27,20 @@ |
481 |
- #include "version.h" |
482 |
- |
483 |
- #include <openssl/bn.h> |
484 |
-- |
485 |
-+#include <openssl/rand.h> |
486 |
- #include <bzlib.h> |
487 |
- |
488 |
- namespace dcpp { |
489 |
- |
490 |
-- |
491 |
-+static const char ciphersuites[] = |
492 |
-+ "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:" |
493 |
-+ "ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:" |
494 |
-+ "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:" |
495 |
-+ "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:" |
496 |
-+ "ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:" |
497 |
-+ "DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:" |
498 |
-+ "AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:AES128-SHA" |
499 |
-+ "!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"; |
500 |
- |
501 |
- CryptoManager::CryptoManager() |
502 |
- : |
503 |
-@@ -42,10 +50,10 @@ |
504 |
- { |
505 |
- SSL_library_init(); |
506 |
- |
507 |
-- clientContext.reset(SSL_CTX_new(TLSv1_client_method())); |
508 |
-- clientVerContext.reset(SSL_CTX_new(TLSv1_client_method())); |
509 |
-- serverContext.reset(SSL_CTX_new(TLSv1_server_method())); |
510 |
-- serverVerContext.reset(SSL_CTX_new(TLSv1_server_method())); |
511 |
-+ clientContext.reset(SSL_CTX_new(SSLv23_client_method())); |
512 |
-+ clientVerContext.reset(SSL_CTX_new(SSLv23_client_method())); |
513 |
-+ serverContext.reset(SSL_CTX_new(SSLv23_server_method())); |
514 |
-+ serverVerContext.reset(SSL_CTX_new(SSLv23_server_method())); |
515 |
- |
516 |
- if(clientContext && clientVerContext && serverContext && serverVerContext) { |
517 |
- dh.reset(DH_new()); |
518 |
-@@ -101,10 +109,15 @@ |
519 |
- }; |
520 |
- |
521 |
- if(dh) { |
522 |
-- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); |
523 |
-- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); |
524 |
-- |
525 |
-+ BIGNUM *p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); |
526 |
-+ BIGNUM *g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); |
527 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
528 |
-+ dh->p = p; |
529 |
-+ dh->g = g; |
530 |
- if (!dh->p || !dh->g) { |
531 |
-+#else |
532 |
-+ if (!DH_set0_pqg(dh, p, NULL, g)) { |
533 |
-+#endif |
534 |
- dh.reset(); |
535 |
- } else { |
536 |
- SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE); |
537 |
-@@ -112,6 +125,28 @@ |
538 |
- SSL_CTX_set_tmp_dh(serverContext, (DH*)dh); |
539 |
- SSL_CTX_set_tmp_dh(serverVerContext, (DH*)dh); |
540 |
- } |
541 |
-+ BN_free(p); |
542 |
-+ BN_free(g); |
543 |
-+ } |
544 |
-+ |
545 |
-+ SSL_CTX_set_options(clientContext, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION); |
546 |
-+ SSL_CTX_set_cipher_list(clientContext, ciphersuites); |
547 |
-+ SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION); |
548 |
-+ SSL_CTX_set_cipher_list(serverContext, ciphersuites); |
549 |
-+ SSL_CTX_set_options(clientVerContext, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION); |
550 |
-+ SSL_CTX_set_cipher_list(clientVerContext, ciphersuites); |
551 |
-+ SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION); |
552 |
-+ SSL_CTX_set_cipher_list(serverVerContext, ciphersuites); |
553 |
-+ |
554 |
-+ EC_KEY* tmp_ecdh; |
555 |
-+ /* NID_X9_62_prime256v1 is not secure, more secure is NID_secp384r1 or NID_secp521r1*/ |
556 |
-+ if((tmp_ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)) != NULL) { |
557 |
-+ SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_ECDH_USE); |
558 |
-+ SSL_CTX_set_tmp_ecdh(serverContext, tmp_ecdh); |
559 |
-+ SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_ECDH_USE); |
560 |
-+ SSL_CTX_set_tmp_ecdh(serverVerContext, tmp_ecdh); |
561 |
-+ |
562 |
-+ EC_KEY_free(tmp_ecdh); |
563 |
- } |
564 |
- |
565 |
- SSL_CTX_set_verify(serverContext, SSL_VERIFY_NONE, 0); |
566 |
-diff --git a/dcpp/SSLSocket.cpp b/dcpp/SSLSocket.cpp |
567 |
-index 1e283eec8..d4dc12388 100644 |
568 |
---- a/dcpp/SSLSocket.cpp |
569 |
-+++ b/dcpp/SSLSocket.cpp |
570 |
-@@ -37,6 +37,13 @@ void SSLSocket::connect(const string& aIp, uint16_t aPort) { |
571 |
- waitConnected(0); |
572 |
- } |
573 |
- |
574 |
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L |
575 |
-+static inline int SSL_is_server(SSL *s) |
576 |
-+{ |
577 |
-+ return s->server; |
578 |
-+} |
579 |
-+#endif |
580 |
-+ |
581 |
- bool SSLSocket::waitConnected(uint32_t millis) { |
582 |
- if(!ssl) { |
583 |
- if(!Socket::waitConnected(millis)) { |
584 |
-@@ -54,9 +61,9 @@ bool SSLSocket::waitConnected(uint32_t millis) { |
585 |
- } |
586 |
- |
587 |
- while(true) { |
588 |
-- int ret = ssl->server?SSL_accept(ssl):SSL_connect(ssl); |
589 |
-+ int ret = SSL_is_server(ssl)?SSL_accept(ssl):SSL_connect(ssl); |
590 |
- if(ret == 1) { |
591 |
-- dcdebug("Connected to SSL server using %s as %s\n", SSL_get_cipher(ssl), ssl->server?"server":"client"); |
592 |
-+ dcdebug("Connected to SSL server using %s as %s\n", SSL_get_cipher(ssl), SSL_is_server(ssl)?"server":"client"); |
593 |
- return true; |
594 |
- } |
595 |
- if(!waitWant(ret, millis)) { |
596 |
|
597 |
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-tray-close.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-tray-close.patch |
598 |
deleted file mode 100644 |
599 |
index 0749fe80802..00000000000 |
600 |
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-tray-close.patch |
601 |
+++ /dev/null |
602 |
@@ -1,23 +0,0 @@ |
603 |
-From 35edb67258747a4704bad0288d9d02d3486493d8 Mon Sep 17 00:00:00 2001 |
604 |
-From: aneo78 <aneo78@××××××.ru> |
605 |
-Date: Fri, 11 Aug 2017 23:29:33 +0700 |
606 |
-Subject: [PATCH] fix issue 363: eiskaltdcpp-qt don't close in Qt5 |
607 |
- |
608 |
---- |
609 |
- eiskaltdcpp-qt/src/MainWindow.cpp | 3 +++ |
610 |
- 1 file changed, 3 insertions(+) |
611 |
- |
612 |
-diff --git a/eiskaltdcpp-qt/src/MainWindow.cpp b/eiskaltdcpp-qt/src/MainWindow.cpp |
613 |
-index a80c5e9c0..e8b49e4b6 100644 |
614 |
---- a/eiskaltdcpp-qt/src/MainWindow.cpp |
615 |
-+++ b/eiskaltdcpp-qt/src/MainWindow.cpp |
616 |
-@@ -390,6 +390,9 @@ void MainWindow::closeEvent(QCloseEvent *c_e){ |
617 |
- if (ConnectionManager::getInstance()) |
618 |
- ConnectionManager::getInstance()->disconnect(); |
619 |
- |
620 |
-+ if (Notification::getInstance()) |
621 |
-+ Notify->enableTray(false); |
622 |
-+ |
623 |
- d->arena->hide(); |
624 |
- d->arena->setWidget(NULL); |
625 |
- |
626 |
|
627 |
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml |
628 |
index 9f4843b1a10..33f2f84657f 100644 |
629 |
--- a/net-p2p/eiskaltdcpp/metadata.xml |
630 |
+++ b/net-p2p/eiskaltdcpp/metadata.xml |
631 |
@@ -10,9 +10,9 @@ |
632 |
<name>Proxy Maintainers</name> |
633 |
</maintainer> |
634 |
<longdescription lang="en"> |
635 |
- EiskaltDC++ is a multi-platform program that uses the Direct Connect and |
636 |
- ADC protocol. It is compatible with other DC clients, such as the original DC |
637 |
- from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all |
638 |
+ EiskaltDC++ is a cross-platform program that uses the Direct Connect and |
639 |
+ Advanced Direct Connect protocols. It is compatible with DC++, AirDC++, |
640 |
+ FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with all |
641 |
common DC hub software. |
642 |
</longdescription> |
643 |
<use> |