summaryrefslogtreecommitdiff
path: root/net-p2p/transmission/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p/transmission/files')
-rw-r--r--net-p2p/transmission/files/cmake-unused-command-line.patch21
-rw-r--r--net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch36
-rw-r--r--net-p2p/transmission/files/transmission-3.00-openssl-3.patch37
-rw-r--r--net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch24
4 files changed, 24 insertions, 94 deletions
diff --git a/net-p2p/transmission/files/cmake-unused-command-line.patch b/net-p2p/transmission/files/cmake-unused-command-line.patch
deleted file mode 100644
index 6e0af5dc7cc9..000000000000
--- a/net-p2p/transmission/files/cmake-unused-command-line.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63b8fd6391cd30bb45e1c9432f69c43ade9bb7ea Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 23 May 2020 22:25:42 -0400
-Subject: [PATCH] Do not warn about unused command line options
-
----
- cmake/TrMacros.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/TrMacros.cmake b/cmake/TrMacros.cmake
-index 5e439126f..674b2ede0 100644
---- a/cmake/TrMacros.cmake
-+++ b/cmake/TrMacros.cmake
-@@ -95,6 +95,7 @@ macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
- PREFIX "${${ID}_PREFIX}"
- CMAKE_ARGS
- -Wno-dev # We don't want to be warned over unused variables
-+ --no-warn-unused-cli
- "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}"
- "-DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE}"
- "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
deleted file mode 100644
index 63d8ca2fe274..000000000000
--- a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/878099
-https://github.com/transmission/transmission/issues/3150
-
---- a/qt/FileTreeDelegate.cc
-+++ a/qt/FileTreeDelegate.cc
-@@ -49,7 +49,7 @@
- if (column == FileTreeModel::COL_PROGRESS)
- {
- QStyleOptionProgressBar p;
-- p.state = option.state | QStyle::State_Small;
-+ p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small;
- p.direction = qApp->layoutDirection();
- p.rect = option.rect;
- p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8));
---- a/qt/TorrentDelegate.cc
-+++ a/qt/TorrentDelegate.cc
-@@ -545,7 +545,7 @@
- progressBarState = QStyle::State_None;
- }
-
-- progressBarState |= QStyle::State_Small;
-+ progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
-
- QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
- QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
---- a/qt/TorrentDelegateMin.cc
-+++ a/qt/TorrentDelegateMin.cc
-@@ -218,7 +218,7 @@
- progressBarState = QStyle::State_None;
- }
-
-- progressBarState |= QStyle::State_Small;
-+ progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
-
- QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
- QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
diff --git a/net-p2p/transmission/files/transmission-3.00-openssl-3.patch b/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
deleted file mode 100644
index f288298cbf3d..000000000000
--- a/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 15 May 2022 10:54:38 -0400
-Subject: [PATCH] openssl: load "legacy" provider for RC4
-
----
- libtransmission/crypto-utils-openssl.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index 45fd71913..14d680654 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -20,6 +20,9 @@
- #include <openssl/rand.h>
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
-+#if OPENSSL_VERSION_MAJOR >= 3
-+#include <openssl/provider.h>
-+#endif
-
- #include "transmission.h"
- #include "crypto-utils.h"
-@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle)
-
- tr_rc4_ctx_t tr_rc4_new(void)
- {
-+#if OPENSSL_VERSION_MAJOR >= 3
-+ OSSL_PROVIDER_load(NULL, "default");
-+ OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
- EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new();
-
- if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1)))
---
-2.35.1
-
diff --git a/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch
new file mode 100644
index 000000000000..e1f9c2e36b8d
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/934016
+https://github.com/transmission/transmission/pull/6907
+
+From 3523b928c8c968d0b7bca2c6c3a84a939e908f8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr>
+Date: Mon, 10 Jun 2024 22:16:06 +0800
+Subject: [PATCH] bump miniupnpc to 2.2.8
+
+diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc
+index 6d7bbc7f7c2..d805bc18218 100644
+--- a/libtransmission/port-forwarding-upnp.cc
++++ b/libtransmission/port-forwarding-upnp.cc
+@@ -261,7 +261,11 @@ tr_port_forwarding_state tr_upnpPulse(
+
+ FreeUPNPUrls(&handle->urls);
+ auto lanaddr = std::array<char, TR_ADDRSTRLEN>{};
++#if (MINIUPNPC_API_VERSION >= 18)
++ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, NULL, 0) ==
++#else
+ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ==
++#endif
+ UPNP_IGD_VALID_CONNECTED)
+ {
+ tr_logAddInfo(fmt::format(_("Found Internet Gateway Device '{url}'"), fmt::arg("url", handle->urls.controlURL)));