From 1d9e409fcb59ebde7f2a5baaf0b2923b2f090295 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Fri, 30 Aug 2024 15:01:10 +0000
Subject: [PATCH] rutorrent: Update from version 4.1.5 to 4.3.6

---
 cross/rutorrent/Makefile |  2 +-
 cross/rutorrent/digests  |  6 ++---
 spk/rutorrent/Makefile   | 47 +++++++++++++++++++---------------------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/cross/rutorrent/Makefile b/cross/rutorrent/Makefile
index d5561d978b2..a0cb3246a82 100644
--- a/cross/rutorrent/Makefile
+++ b/cross/rutorrent/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = ruTorrent
-PKG_VERS = 4.1.5
+PKG_VERS = 4.3.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Novik/ruTorrent/archive/refs/tags
diff --git a/cross/rutorrent/digests b/cross/rutorrent/digests
index dd14fd2c71e..46de9191848 100644
--- a/cross/rutorrent/digests
+++ b/cross/rutorrent/digests
@@ -1,3 +1,3 @@
-ruTorrent-4.1.5.tar.gz SHA1 1e5ef5c381a218a40ce373c968432c7a3e581684
-ruTorrent-4.1.5.tar.gz SHA256 b84da2c9169444aa50b438ce2fdb0ce81f7bbcdd3e3138b3cc215dd27c58b2bf
-ruTorrent-4.1.5.tar.gz MD5 19e906f37be308ee7c9030ad6091c64f
+ruTorrent-4.3.6.tar.gz SHA1 1515df6bd5e478eccb64dc91a8e20cec76fd596b
+ruTorrent-4.3.6.tar.gz SHA256 f89258941c61c86c51909c23c62473bed8abde054214dcb2bd81da153cd3650e
+ruTorrent-4.3.6.tar.gz MD5 f3cd2bccabdedbdde3e5cdd779a23b4c
diff --git a/spk/rutorrent/Makefile b/spk/rutorrent/Makefile
index bd593188eaa..ddcba090639 100644
--- a/spk/rutorrent/Makefile
+++ b/spk/rutorrent/Makefile
@@ -1,34 +1,36 @@
 SPK_NAME = rutorrent
-SPK_VERS = 4.1.5
-SPK_REV = 16
+SPK_VERS = 4.3.6
+SPK_REV = 17
 SPK_ICON = src/rutorrent.png
 DSM_UI_DIR = app
 
-SPK_DEPENDS = "WebStation:python311:PHP7.4:Apache2.4"
-WHEELS = src/requirements-pure.txt
+MAINTAINER = smaarn
+DESCRIPTION = ruTorrent is a front-end for the popular Bittorrent client rTorrent. rTorrent is a BitTorrent client for ncurses, using the libtorrent library. The client and library is written in C++ with emphasis on speed and efficiency, while delivering equivalent features to those found in GUI based clients in an ncurses client.
+DISPLAY_NAME = ruTorrent
+CHANGELOG = "1. Upgrade rutorrent to 4.3.6"
 
-DEPENDS = cross/busybox cross/curl cross/mediainfo cross/rtorrent cross/rutorrent cross/screen cross/unzip
-DEPENDS += cross/sox
+# newer libtorrent-rakshasa requires C++14 support
+REQUIRED_MIN_DSM = 7.0
+UNSUPPORTED_ARCHS = comcerto2k
 
-BUSYBOX_CONFIG = procutils
+SPK_DEPENDS = "WebStation:python311:PHP7.4:Apache2.4"
+WHEELS = src/requirements-pure.txt
 
-include ../../mk/spksrc.common.mk
-include ../../mk/spksrc.directories.mk
+# Must be done prior to busybox (aarch64)
+DEPENDS += cross/openssl3
 
-ifeq ($(call version_lt, $(TCVERSION), 7.0),1)
-BUSYBOX_CONFIG += usrmng nice
-endif
+DEPENDS += cross/busybox
+export BUSYBOX_CONFIG=procutils
 
 # include bin/curl from cross/curl
+DEPENDS += cross/curl
 export CURL_INCLUDE_EXECUTABLE=1
 
-MAINTAINER = smaarn
-DESCRIPTION = ruTorrent is a front-end for the popular Bittorrent client rTorrent. rTorrent is a BitTorrent client for ncurses, using the libtorrent library. The client and library is written in C++ with emphasis on speed and efficiency, while delivering equivalent features to those found in GUI based clients in an ncurses client.
+# Remaining dependencies
+DEPENDS += cross/mediainfo cross/rtorrent cross/rutorrent cross/screen cross/sox cross/unzip
+
 ADMIN_URL = /rutorrent/
 STARTABLE = yes
-DISPLAY_NAME = ruTorrent
-CHANGELOG = "<ol><li>Upgrade rutorrent to 4.1.5</li><li>Update to Python 3.11</li><li>Update to PHP 7.4</li><li>Remove tools from procps-ng</li><li>Fix support of DSM 7.</li><li>Fix torrent creation wizard (\#5288)</li><li>Add service port declarations</li><li>Migrate to OpenSSL 3.1.2</li></ol>"
-
 HOMEPAGE = https://github.com/Novik/ruTorrent
 LICENSE = GPLv3
 
@@ -48,13 +50,6 @@ WIZARDS = install_uifile upgrade_uifile
 
 POST_STRIP_TARGET = rutorrent_extra_install
 
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
-# some dependents require C++11 support
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
-# unsupported with cross/rtorrent
-UNSUPPORTED_ARCHS += $(ARMv7L_ARCHS)
-
 SYSTEM_GROUP = http
 
 SERVICE_PORT = 8050
@@ -62,11 +57,13 @@ SERVICE_PORT_TITLE = rutorrent RPC
 
 SUPPORTED_LANGUAGES = fre
 
+include ../../mk/spksrc.common.mk
+include ../../mk/spksrc.directories.mk
+
 wizards: generated-wizards
 
 include ../../mk/spksrc.spk.mk
 
-
 .PHONY: generated-wizards
 generated-wizards:
 	@mkdir -p $(WIZARDS_DIR)