ruTorrent: Update to 5.2.10

cross/libmediainfo-25.04/Makefile

@@ -0,0 +1,23 @@
+PKG_NAME = libmediainfo
+PKG_VERS = 25.04
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/MediaArea/MediaInfoLib/archive
+PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = MediaInfoLib-$(PKG_VERS)/Project/GNU/Library
+
+DEPENDS = cross/libzen cross/zlib
+
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+
+HOMEPAGE = https://mediaarea.net/en/MediaInfo
+COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
+LICENSE  = 2-Clause BSD
+
+PRE_CONFIGURE_TARGET = libmediainfo_pre_configure
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
+
+libmediainfo_pre_configure:
+	$(RUN) ; ./autogen.sh

cross/libmediainfo-latest/Makefile

@@ -0,0 +1,23 @@
+PKG_NAME = libmediainfo
+PKG_VERS = 25.10
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/MediaArea/MediaInfoLib/archive
+PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = MediaInfoLib-$(PKG_VERS)/Project/GNU/Library
+
+DEPENDS = cross/libzen cross/zlib
+
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+
+HOMEPAGE = https://mediaarea.net/en/MediaInfo
+COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
+LICENSE  = 2-Clause BSD
+
+PRE_CONFIGURE_TARGET = libmediainfo_pre_configure
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
+
+libmediainfo_pre_configure:
+	$(RUN) ; ./autogen.sh

cross/libmediainfo-latest/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/libmediainfo.so
+lnk:lib/libmediainfo.so.0
+lib:lib/libmediainfo.so.0.0.0

cross/libmediainfo-latest/digests

@@ -0,0 +1,3 @@
+libmediainfo_25.10.tar.gz SHA1 85491da94e4bdfe45b6ed478fb7628a6771ae2e3
+libmediainfo_25.10.tar.gz SHA256 e4b2b82f3df8d2c190643d1705ee35c3102674954858d02a2e2b42840f0f07aa
+libmediainfo_25.10.tar.gz MD5 cdf8cdd3362d1193365ef9926952054d

cross/libmediainfo/Makefile

@@ -1,24 +1,12 @@
-PKG_NAME = libmediainfo
-PKG_VERS = 25.04
-PKG_EXT = tar.gz
-PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/MediaArea/MediaInfoLib/archive
-PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
-PKG_DIR = MediaInfoLib-$(PKG_VERS)/Project/GNU/Library
+PKG_NAME = libmediainfo-main
 
-DEPENDS = cross/libzen cross/zlib
+OPTIONAL_DEPENDS  = cross/libmediainfo-latest
+OPTIONAL_DEPENDS += cross/libmediainfo-25.04
 
-# cross/libzen:
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+include ../../mk/spksrc.main-depends.mk
 
-HOMEPAGE = https://mediaarea.net/en/MediaInfo
-COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
-LICENSE  = 2-Clause BSD
-
-PRE_CONFIGURE_TARGET = libmediainfo_pre_configure
-GNU_CONFIGURE = 1
-
-include ../../mk/spksrc.cross-cc.mk
-
-libmediainfo_pre_configure:
-	$(RUN) ; ./autogen.sh
+ifeq ($(call version_ge, ${TC_GCC}, 5),1)
+DEPENDS = cross/libmediainfo-latest
+else
+DEPENDS = cross/libmediainfo-25.04
+endif

cross/mediainfo-25.04/Makefile

@@ -0,0 +1,24 @@
+PKG_NAME = mediainfo
+PKG_VERS = 25.04
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/MediaArea/MediaInfo/archive
+PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = MediaInfo-$(PKG_VERS)/Project/GNU/CLI
+
+DEPENDS = cross/libmediainfo-25.04
+
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+
+HOMEPAGE = https://mediaarea.net/en/MediaInfo
+COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
+LICENSE  = 2-Clause BSD
+
+PRE_CONFIGURE_TARGET = mediainfo_pre_configure
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: mediainfo_pre_configure
+mediainfo_pre_configure:
+	$(RUN) ; ./autogen.sh

cross/mediainfo-latest/Makefile

@@ -0,0 +1,24 @@
+PKG_NAME = mediainfo
+PKG_VERS = 25.10
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/MediaArea/MediaInfo/archive
+PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = MediaInfo-$(PKG_VERS)/Project/GNU/CLI
+
+DEPENDS = cross/libmediainfo-latest
+
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+
+HOMEPAGE = https://mediaarea.net/en/MediaInfo
+COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
+LICENSE  = 2-Clause BSD
+
+PRE_CONFIGURE_TARGET = mediainfo_pre_configure
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: mediainfo_pre_configure
+mediainfo_pre_configure:
+	$(RUN) ; ./autogen.sh

cross/mediainfo-latest/PLIST

@@ -0,0 +1 @@
+bin:bin/mediainfo

cross/mediainfo-latest/digests

@@ -0,0 +1,3 @@
+mediainfo_25.10.tar.gz SHA1 40ffad790e946f79f0da25f7ac111c7210293e97
+mediainfo_25.10.tar.gz SHA256 2edaff16dfad9ee372d17d6d01eb2e3d2f8ee8dd4af606b1ee6f045c9b009662
+mediainfo_25.10.tar.gz MD5 8ae0e5740a0854f99d8eca9ce187aa4c

cross/mediainfo/Makefile

@@ -1,25 +1,12 @@
-PKG_NAME = mediainfo
-PKG_VERS = 25.04
-PKG_EXT = tar.gz
-PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/MediaArea/MediaInfo/archive
-PKG_DIST_FILE = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
-PKG_DIR = MediaInfo-$(PKG_VERS)/Project/GNU/CLI
+PKG_NAME = mediainfo-main
 
-DEPENDS = cross/libmediainfo
+OPTIONAL_DEPENDS  = cross/mediainfo-latest
+OPTIONAL_DEPENDS += cross/mediainfo-25.04
 
-# cross/libmediainfo:
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+include ../../mk/spksrc.main-depends.mk
 
-HOMEPAGE = https://mediaarea.net/en/MediaInfo
-COMMENT  = MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
-LICENSE  = 2-Clause BSD
-
-PRE_CONFIGURE_TARGET = mediainfo_pre_configure
-GNU_CONFIGURE = 1
-
-include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: mediainfo_pre_configure
-mediainfo_pre_configure:
-	$(RUN) ; ./autogen.sh
+ifeq ($(call version_ge, ${TC_GCC}, 5),1)
+DEPENDS = cross/mediainfo-latest
+else
+DEPENDS = cross/mediainfo-25.04
+endif

cross/rutorrent/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ruTorrent
-PKG_VERS = 5.1.12
+PKG_VERS = 5.2.10
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Novik/ruTorrent/archive

cross/rutorrent/digests

@@ -1,3 +1,3 @@
-ruTorrent-5.1.12.tar.gz SHA1 e323f3d464bc049dd70c1d9bc0540639fe9332c7
-ruTorrent-5.1.12.tar.gz SHA256 8e75dad81541a406fa181f0aaf274b276e7e2f33550033832c5f9e2aaae41d29
-ruTorrent-5.1.12.tar.gz MD5 2785e74ef1347a6b597293c356faa4de
+ruTorrent-5.2.10.tar.gz SHA1 4608ff49e979f698e465a8d7788f1938d65abe0a
+ruTorrent-5.2.10.tar.gz SHA256 a3e57be03f965abcf2ed17125b61ee2bd55a1223fe9226fa1978f3002a93427d
+ruTorrent-5.2.10.tar.gz MD5 9588f744416bf2854aade63b020b857f

cross/rutorrent/patches/001-expanding-external-programs.patch

@@ -1,17 +1,17 @@
 Added entries corresponding to external programs which are also potentially used by plugins and
 may therefore be configured
-index b68c526c..604f6263 100644
+index b68c526c..3f79fd6f 100644
 --- conf/config.php.orig
 +++ conf/config.php
-@@ -57,6 +57,10 @@
+@@ -57,6 +57,11 @@
  		"gzip"	=> '',			// Something like /usr/bin/gzip. If empty, will be found in PATH.
  		"id"	=> '',			// Something like /usr/bin/id. If empty, will be found in PATH.
  		"stat"	=> '',			// Something like /usr/bin/stat. If empty, will be found in PATH.
 +		"python"=> '',			// Something like /usr/bin/python3. If empty, will be found in PATH.
 +		"pgrep"	=> '',			// Something like /usr/bin/pgrep. If empty, will be found in PATH.
 +		"sox"	=> '',			// Something like /usr/bin/sox. If empty, will be found in PATH.
 +		"mediainfo"	=> '',			// Something like /usr/bin/mediainfo. If empty, will be found in PATH.
++		"dumptorrent"	=> '',			// Something like /usr/bin/dumptorrent. If empty, will be found in PATH.
  	);
 
  	$localhosts = array( 			// list of local interfaces
-root@b1d8647331b2:/spksrc/spk/rutorrent/work-evansport-6.1/ruTorrent-3.10# 

cross/xmlrpc-c/Makefile

@@ -14,7 +14,19 @@ LICENSE  = BSD
 GNU_CONFIGURE = 1
 
 CONFIGURE_ARGS = --enable-libxml2-backend
+
+# Limit parallelism for xmlrpc-c; avoid races in libxmlrpc_util.so build
+DISABLE_PARALLEL_MAKE = 1
+
 # requires xml2-config in path to build libxml2-backend
 ENV += PATH=$(INSTALL_DIR)/$(INSTALL_PREFIX)/bin:$$PATH
 
+POST_INSTALL_TARGET = xmlrpc_c_post_install
+
 include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: xmlrpc_c_post_install
+xmlrpc_c_post_install:
+	# make xmlrpc-c-config use xml2-config from the same dir
+	sed -i -e 's|LIBXML=`xml2-config --libs`|LIBXML=`"$$\(dirname "$$0")/xml2-config" --libs`|' \
+		$(STAGING_INSTALL_PREFIX)/bin/xmlrpc-c-config

spk/rutorrent/Makefile

@@ -1,13 +1,13 @@
 SPK_NAME = rutorrent
-SPK_VERS = 5.1.12
-SPK_REV = 18
+SPK_VERS = 5.2.10
+SPK_REV = 19
 SPK_ICON = src/rutorrent.png
 DSM_UI_DIR = app
 
 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 5.1.12. <br/>2. Update rtorrent to v0.10.0. <br/>3. Update libtorrent to v0.14.0. <br/>4. Update screen to v5.0.1. <br/>5. Migrate to Python 3.12."
+CHANGELOG = "1. Upgrade rutorrent to v5.2.10.<br/>2. Update MediaInfo to v25.10.<br/>3. Adjust PHP dependency per DSM version."
 
 # libtorrent-rakshasa requires C++14 support
 REQUIRED_MIN_DSM = 7.0
@@ -16,7 +16,7 @@ UNSUPPORTED_ARCHS = comcerto2k
 REQUIRED_MIN_SRM = 3.0
 
 PYTHON_PACKAGE = python312
-SPK_DEPENDS = "WebStation:${PYTHON_PACKAGE}:PHP7.4:Apache2.4"
+
 WHEELS = src/requirements-pure.txt
 
 # Must be done prior to busybox (aarch64)
@@ -48,7 +48,6 @@ DSM_UI_CONFIG = src/app/config
 # Required environment variables will be injected in service-setup.sh
 SERVICE_COMMAND = /var/packages/rutorrent/target/bin/rtorrent-daemon
 
-CONF_DIR = src/conf/
 WIZARDS_DIR = $(WORK_DIR)/generated-wizards
 WIZARDS = install_uifile upgrade_uifile
 
@@ -62,6 +61,18 @@ SERVICE_PORT_TITLE = ruTorrent RPC
 SUPPORTED_LANGUAGES = fre
 
 include ../../mk/spksrc.common.mk
+
+ifeq ($(call version_ge, ${TCVERSION}, 7.2),1)
+# Default to PHP 8.2 on DSM 7.2+ (PHP 8.0 not supported)
+SPK_DEPENDS = "WebStation:PHP8.2:Apache2.4:${PYTHON_PACKAGE}"
+CONF_DIR = src/conf_72
+else
+# Default to PHP 8.0 on DSM 7.0/7.1
+SPK_DEPENDS = "WebStation:PHP8.0:Apache2.4:${PYTHON_PACKAGE}"
+OS_MAX_VER = 7.1-59999
+CONF_DIR = src/conf_7
+endif
+
 include ../../mk/spksrc.directories.mk
 
 wizards: generated-wizards

spk/rutorrent/src/conf/resource → spk/rutorrent/src/conf_7/resource

@@ -9,8 +9,8 @@
 			"backend": 2,
 			"php": {
 				"profile_name": "ruTorrent",
-				"profile_desc": "PHP profile used by ruTorrent",
-				"backend": 8,
+				"profile_desc": "PHP profile for ruTorrent",
+				"backend": 9,
 				"extensions": [],
 				"user": "sc-rutorrent",
 				"open_basedir": null,
@@ -49,4 +49,4 @@
 			}
 		]
 	}
-}
+}

spk/rutorrent/src/conf_72/resource

@@ -0,0 +1,52 @@
+{
+	"webservice": {
+		"services": [{
+			"service": "rutorrent",
+			"display_name": "ruTorrent",
+			"icon": "app/images/rutorrent-{0}.png",
+			"type": "apache_php",
+			"root": "rutorrent",
+			"backend": 2,
+			"php": {
+				"profile_name": "ruTorrent",
+				"profile_desc": "PHP profile for ruTorrent",
+				"backend": 11,
+				"extensions": [],
+				"user": "sc-rutorrent",
+				"open_basedir": null,
+				"group": "http"
+			}
+		}],
+		"portals": [
+			{
+				"service": "rutorrent",
+				"type": "alias",
+				"name": "ruTorrent",
+				"alias": "rutorrent",
+				"app": "com.synocommunity.packages.rutorrent"
+			}
+		],
+		"migrate": {
+			"root": [{
+				"old": "rutorrent",
+				"new": "rutorrent"
+			}]
+		},
+		"pkg_dir_prepare": [{
+			"source": "/var/packages/rutorrent/target/share/rutorrent",
+			"target": "rutorrent",
+			"mode": "0755",
+			"user": "sc-rutorrent",
+			"group": "http"
+		}]
+	},
+	"data-share": {
+		"shares": [
+			{
+				"name": "{{wizard_download_share}}", 
+				"permission":{"rw":["sc-rutorrent"]},
+				"once": true
+			}
+		]
+	}
+}

spk/rutorrent/src/rtorrent.rc

@@ -13,5 +13,3 @@ dht.mode.set = auto
 dht.port.set = 6881
 protocol.pex.set= yes
 port_range = 6881-6999
-
-execute2 = {sh,-c,/var/packages/PHP7.4/target/usr/local/bin/php74 /var/services/web_packages/rutorrent/php/initplugins.php ratio}