Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (2c429a525920bfa0a84d08d835c6769d04e9b22a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (2c429a525920bfa0a84d08d835c6769d04e9b22a)
  • Date: Mon, 3 Feb 2025 17:38:44 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ftp/transmission/DETAILS | 4
ftp/transmission/HISTORY | 4
ftp/transmission/PRE_BUILD | 3
ftp/transmission/patches/0001-Make-TP-optional-again.patch | 202
+++++++++++++
4 files changed, 211 insertions(+), 2 deletions(-)

New commits:
commit 2c429a525920bfa0a84d08d835c6769d04e9b22a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

transmission 4.0.6

diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index 7e68be9..e7dd557 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,10 +1,10 @@
# Watch: https://transmissionbt.com/download
SPELL=transmission
- VERSION=4.0.5
+ VERSION=4.0.6
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/releases/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:9d3df965929ba18aa8186f89060aeacc8ead3df4a5acdc74a005dc62deadc5fa239af99c49ca2477cc5c1adfcd834481105f1dbc94e0efe210e9e6680bfec124
+
SOURCE_HASH=sha512:d11654bd5174a990d8021fde890389bc7c073f63f80e1335bb2c250aff60f06d0b6481fb041ae4fdccd1c43278c71ddc36f692d7dda3ed2a1aaa9bd1bbc2cb0c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.transmissionbt.com/
LICENSE[0]=MIT
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 4a71f39..72a0c28 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,7 @@
+2025-02-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PRE_BUILD, patches/0001-Make-TP-optional-again.patch:
+ updated spell to 4.0.6
+
2024-05-17 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: updated spell to 4.0.5
* transmission/PRE_BUILD, transmission/no-utp.patch:
diff --git a/ftp/transmission/PRE_BUILD b/ftp/transmission/PRE_BUILD
new file mode 100755
index 0000000..0e88f08
--- /dev/null
+++ b/ftp/transmission/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches
diff --git a/ftp/transmission/patches/0001-Make-TP-optional-again.patch
b/ftp/transmission/patches/0001-Make-TP-optional-again.patch
new file mode 100644
index 0000000..c5b70b4
--- /dev/null
+++ b/ftp/transmission/patches/0001-Make-TP-optional-again.patch
@@ -0,0 +1,202 @@
+From 4985c8a7947a5b1498774d6ee6d9a40e2d779e34 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sat, 1 Feb 2025 13:09:46 +0100
+Subject: [PATCH] =?UTF-8?q?Make=20=C2=B5TP=20optional=20again?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ libtransmission/CMakeLists.txt | 6 +++++-
+ libtransmission/net.cc | 4 ++++
+ libtransmission/peer-io.cc | 4 ++++
+ libtransmission/peer-mgr.cc | 2 ++
+ libtransmission/peer-socket.cc | 2 ++
+ libtransmission/session.cc | 6 ++++++
+ libtransmission/tr-udp.cc | 4 ++++
+ libtransmission/tr-utp.cc | 2 ++
+ 8 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt
+index 7c2127d5658e..aa08195d0428 100644
+--- a/libtransmission/CMakeLists.txt
++++ b/libtransmission/CMakeLists.txt
+@@ -178,6 +178,10 @@ target_sources(${TR_NAME}
+ webseed.cc
+ webseed.h)
+
++if(NOT ENABLE_UTP)
++ set_source_files_properties(tr-utp.cc PROPERTIES HEADER_FILE_ONLY ON)
++endif()
++
+ configure_file(version.h.in version.h)
+
+ target_sources(${TR_NAME}
+@@ -281,7 +285,7 @@ target_link_libraries(${TR_NAME}
+ natpmp::natpmp
+ miniupnpc::libminiupnpc
+ dht::dht
+- libutp::libutp
++ ${UTP_LIBRARY}
+ libb64::libb64
+ ${LIBINTL_LIBRARY}
+ ${LIBM_LIBRARY}
+diff --git a/libtransmission/net.cc b/libtransmission/net.cc
+index d7384b6bdcf1..9927bf2005b3 100644
+--- a/libtransmission/net.cc
++++ b/libtransmission/net.cc
+@@ -25,7 +25,9 @@
+
+ #include <fmt/core.h>
+
++#ifdef WITH_UTP
+ #include <libutp/utp.h>
++#endif
+
+ #include "transmission.h"
+
+@@ -35,7 +37,9 @@
+ #include "session.h"
+ #include "tr-assert.h"
+ #include "tr-macros.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h"
+ #include "variant.h"
+
+diff --git a/libtransmission/peer-io.cc b/libtransmission/peer-io.cc
+index a3e143b9b606..e80462814b58 100644
+--- a/libtransmission/peer-io.cc
++++ b/libtransmission/peer-io.cc
+@@ -13,7 +13,9 @@
+ #include <event2/event.h>
+ #include <event2/bufferevent.h>
+
++#ifdef WITH_UTP
+ #include <libutp/utp.h>
++#endif
+
+ #include <fmt/format.h>
+
+@@ -24,7 +26,9 @@
+ #include "net.h"
+ #include "peer-io.h"
+ #include "tr-assert.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h" // for _()
+
+ #define tr_logAddErrorIo(io, msg) tr_logAddError(msg, (io)->display_name())
+diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc
+index f17577647b1f..e9810daeb208 100644
+--- a/libtransmission/peer-mgr.cc
++++ b/libtransmission/peer-mgr.cc
+@@ -45,7 +45,9 @@
+ #include "torrent.h"
+ #include "torrent-magnet.h"
+ #include "tr-assert.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h"
+ #include "webseed.h"
+
+diff --git a/libtransmission/peer-socket.cc b/libtransmission/peer-socket.cc
+index 380ed11c6e17..6143f885f3da 100644
+--- a/libtransmission/peer-socket.cc
++++ b/libtransmission/peer-socket.cc
+@@ -5,7 +5,9 @@
+
+ #include <fmt/format.h>
+
++#ifdef WITH_UTP
+ #include <libutp/utp.h>
++#endif
+
+ #include "transmission.h"
+
+diff --git a/libtransmission/session.cc b/libtransmission/session.cc
+index 1fa954d344d6..6395b675acfc 100644
+--- a/libtransmission/session.cc
++++ b/libtransmission/session.cc
+@@ -55,7 +55,9 @@
+ #include "tr-assert.h"
+ #include "tr-lpd.h"
+ #include "tr-strbuf.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h"
+ #include "variant.h"
+ #include "verify.h"
+@@ -652,7 +654,9 @@ void tr_session::initImpl(init_data& data)
+ this->lpd_ = tr_lpd::create(lpd_mediator_, eventBase());
+ }
+
++#if WITH_UTP
+ tr_utpInit(this);
++#endif
+
+ /* cleanup */
+ tr_variantClear(&settings);
+@@ -1313,7 +1317,9 @@ void tr_session::closeImplPart2(std::promise<void>*
closed_promise, std::chrono:
+ stats().saveIfDirty();
+ peer_mgr_.reset();
+ openFiles().closeAll();
++#if WITH_UTP
+ tr_utpClose(this);
++#endif
+ this->udp_core_.reset();
+
+ // tada we are done!
+diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
+index ef66a4ffa1b9..bf52846ef8ee 100644
+--- a/libtransmission/tr-udp.cc
++++ b/libtransmission/tr-udp.cc
+@@ -16,7 +16,9 @@
+ #include "net.h"
+ #include "session.h"
+ #include "tr-assert.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h"
+
+ namespace
+@@ -123,6 +125,7 @@ void event_callback(evutil_socket_t s, [[maybe_unused]]
short type, void* vsessi
+ tr_logAddTrace("Couldn't parse UDP tracker packet.");
+ }
+ }
++#ifdef WITH_UTP
+ else if (session->allowsUTP() && (session->utp_context != nullptr))
+ {
+ if (!tr_utpPacket(std::data(buf), rc, from_sa, fromlen, session))
+@@ -130,6 +133,7 @@ void event_callback(evutil_socket_t s, [[maybe_unused]]
short type, void* vsessi
+ tr_logAddTrace("Unexpected UDP packet");
+ }
+ }
++#endif
+ }
+ } // namespace
+
+diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
+index 905c68e85bcd..42ab6df08f25 100644
+--- a/libtransmission/tr-utp.cc
++++ b/libtransmission/tr-utp.cc
+@@ -20,7 +20,9 @@
+ #include "peer-socket.h"
+ #include "session.h"
+ #include "timer.h"
++#ifdef WITH_UTP
+ #include "tr-utp.h"
++#endif
+ #include "utils.h"
+
+ using namespace std::literals;
+--
+2.48.1
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (2c429a525920bfa0a84d08d835c6769d04e9b22a), Ismael Luceno, 02/03/2025

Archive powered by MHonArc 2.6.24.

Top of Page