Jackett: add libstdc++ to .NET builds and curl to mono builds (SynoCommunity#4485)

* Jackett: add libstdc++ to .NET builds and curl to mono builds

* Update digests

* jackett fix mono start script

* Add mono as a runtime dependency

Author: publicarray

cross/jackett-mono/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = Jackett
-PKG_VERS = 0.17.568
+PKG_VERS = 0.17.668
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME).Binaries.Mono.$(PKG_EXT)
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

cross/jackett-mono/digests

@@ -1,3 +1,3 @@
-Jackett-0.17.568.tar.gz SHA1 2bb67ea64fdf6bb5aaadaa011ec11b3dada0a260
-Jackett-0.17.568.tar.gz SHA256 5ff0912dde4391dfb1078053b745eee9cbac4ae6ca1b93add9fcf9dd1a22015b
-Jackett-0.17.568.tar.gz MD5 a67707ac02819721a993cdbcbdd47517
+Jackett-0.17.668.tar.gz SHA1 40783c21d69e346a8f6f367bf3aec4e0363a334e
+Jackett-0.17.668.tar.gz SHA256 f9cbd4a565695c4916f9df766883a58bea4d8be6431c46f10c343aeceea43950
+Jackett-0.17.668.tar.gz MD5 0736e0caf2492ce4859e1fe494be53c9

cross/jackett/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = Jackett
-PKG_VERS = 0.17.568
+PKG_VERS = 0.17.668
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_FILE = $(PKG_NAME)-dotnet-$(PKG_VERS).$(PKG_EXT)

cross/jackett/digests

@@ -1,3 +1,3 @@
-Jackett-dotnet-0.17.568.tar.gz SHA1 ea08ea4beebc2597e71b95d0f1c82e13a3613895
-Jackett-dotnet-0.17.568.tar.gz SHA256 3bc562a0f5061d8f0f0808746afd8e62d659410bb807dbc1f3da8ddadd3b10ca
-Jackett-dotnet-0.17.568.tar.gz MD5 401d4f10ba575f4f62ddade21ce2dd36
+Jackett-dotnet-0.17.668.tar.gz SHA1 aae078265d788cebbfedd034df7233db71394ba7
+Jackett-dotnet-0.17.668.tar.gz SHA256 3c9bb550a80c7934933d905c559507465337af9e65f6335a94fd7e91668d8d64
+Jackett-dotnet-0.17.668.tar.gz MD5 24e7e750ae7000a444323dec28a9d17f

native/dotnet-sdk-3.1/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME = dotnet-sdk-3.1
 # PKG_VERS = SDK 3.1.404 (v3.1.10 release)
 # https://github.com/dotnet/core/blob/master/release-notes/3.1/3.1.9/3.1.9.md
-PKG_VERS = 3.1.404
+PKG_VERS = 3.1.407
 PKG_EXT = tar.gz
 # https://download.visualstudio.microsoft.com/download/pr/ec187f12-929e-4aa7-8abc-2f52e147af1d/56b0dbb5da1c191bff2c271fcd6e6394/dotnet-sdk-3.1.404-linux-x64.tar.gz
 PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}

native/dotnet-sdk-3.1/digests

@@ -1,3 +1,3 @@
-dotnet-sdk-3.1.404-linux-x64.tar.gz SHA1 3aeee34359456c2ec303ecfde16e97a47da1196c
-dotnet-sdk-3.1.404-linux-x64.tar.gz SHA256 6b8dd87de54bd855968325feec9cf57e2fb4b0dba745591d48d71eb2b8d7280d
-dotnet-sdk-3.1.404-linux-x64.tar.gz MD5 2078ffff254a01597009c6f9b5e9df64
+dotnet-sdk-3.1.407-linux-x64.tar.gz SHA1 0e6df1d3f7dbdfaf1973a58794c91b8d96a8bfeb
+dotnet-sdk-3.1.407-linux-x64.tar.gz SHA256 a744359910206fe657c3a02dfa54092f288a44c63c7c86891e866f0678a7e911
+dotnet-sdk-3.1.407-linux-x64.tar.gz MD5 fd1e8043fdbc96eb7a41cf896d5474b8

native/dotnet-sdk-5.0/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = dotnet-sdk-5.0
-PKG_VERS = 5.0.100
+PKG_VERS = 5.0.201
 PKG_EXT = tar.gz
 PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}
 PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)

native/dotnet-sdk-5.0/digests

@@ -1,3 +1,3 @@
-dotnet-sdk-5.0.100-linux-x64.tar.gz SHA1 ab456308344dc6a18c9c8b0a394c29dfcc19553a
-dotnet-sdk-5.0.100-linux-x64.tar.gz SHA256 b8278fd20a7242e711ee46910c23804babf9b38a4c1b97e2a4d9c5155d21cbd2
-dotnet-sdk-5.0.100-linux-x64.tar.gz MD5 8e69311010323e389456f1451458be45
+dotnet-sdk-5.0.201-linux-x64.tar.gz SHA1 1f5bf58e45e5f33931a30cdac6f90d252808e2d2
+dotnet-sdk-5.0.201-linux-x64.tar.gz SHA256 9ff77087831e8ca32719566ec9ef537e136cfc02c5ff565e53f5509cc6e7b341
+dotnet-sdk-5.0.201-linux-x64.tar.gz MD5 f580eb7b06abdb55a529dca0e2f3b6a2

spk/jackett/Makefile

@@ -1,17 +1,16 @@
 SPK_NAME = jackett
-SPK_VERS = 0.17.568
-SPK_REV = 13
+SPK_VERS = 0.17.668
+SPK_REV = 14
 SPK_ICON = src/jackett.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/libstdc++ cross/$(SPK_NAME)
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = "Jackett works as a proxy server. It translates queries from apps into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. Jackett is a single repository of maintained indexer scraping and translation logic - removing the burden from other apps."
-RELOAD_UI = yes
 DISPLAY_NAME = Jackett
 STARTABLE = yes
-CHANGELOG = "Update Jackett 0.17.568 and compile using .NET"
+CHANGELOG = "Update Jackett 0.17.668 and compile using .NET"
 HOMEPAGE = https://github.com/Jackett/Jackett
 LICENSE = GPLv2
 LICENSE_FILE = $(WORK_DIR)/Jackett-$(SPK_VERS)/LICENSE
@@ -32,10 +31,11 @@ UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 # Mono build for unsupported .NET archs
 include ../../mk/spksrc.archs.mk
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(i686_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
-DEPENDS = cross/$(SPK_NAME)-mono
+DEPENDS = cross/curl cross/$(SPK_NAME)-mono
 SERVICE_SETUP = src/service-setup-mono.sh
-CHANGELOG = "Update Jackett 17.474 and fix mono build (88f6281 and 88f6282)"
+CHANGELOG = "Update Jackett 0.17.668"
 LICENSE_FILE = $(WORK_DIR)/Jackett/LICENSE
+SPK_DEPENDS = "mono>3.6"
 endif
 
 POST_STRIP_TARGET = jackett_extra_install

spk/jackett/src/service-setup-mono.sh

@@ -2,10 +2,12 @@ MONO_PATH="/var/packages/mono/target/bin"
 PATH="${SYNOPKG_PKGDEST}/bin:${MONO_PATH}:${PATH}"
 MONO="${MONO_PATH}/mono"
 JACKETT="${SYNOPKG_PKGDEST}/share/JackettConsole.exe"
+HOME_DIR="${SYNOPKG_PKGDEST}/var"
 
 # workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
 if [ "$SYNOPKG_DSM_ARCH" == "88f6281" -o "$SYNOPKG_DSM_ARCH" == "88f6282" ]; then
     MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
 fi
 
-COMMAND="env HOME=${HOME_DIR} PATH=${PATH} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${JACKETT} --PIDFile ${PID_FILE}"
+SERVICE_COMMAND="env HOME=${HOME_DIR} PATH=${PATH} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${JACKETT} --PIDFile ${PID_FILE}"
+SVC_BACKGROUND=y