mono: update 5.20.1 and adapt applications (#3865)

* Update mono - update mono to version 5.20 - update mono icon - add symlinks (fix #3755) - remove obsolete patch * add workaround for mono bug with armv5 - ref: mono/mono#12537
SynoCommunity · Apr 9, 2020 · 862ce5b · 862ce5b
1 parent d91dda6
commit 862ce5b
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 87 deletions.
diff --git a/cross/mono/Makefile b/cross/mono/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = mono
-PKG_VERS_MAJOR = 5.18.0
-PKG_VERS_MINOR = 240
+PKG_VERS_MAJOR = 5.20.1
+PKG_VERS_MINOR = 34
 PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

diff --git a/cross/mono/PLIST b/cross/mono/PLIST
@@ -1,51 +1,51 @@
-bin:bin/al
-bin:bin/al2
-bin:bin/csc
-bin:bin/csc-dim
-bin:bin/csi
-bin:bin/gacutil
-bin:bin/gacutil2
-bin:bin/ilasm
-bin:bin/makecert
-bin:bin/mcs
-bin:bin/mdassembler
-bin:bin/mdoc-assemble
-bin:bin/mdoc-export-html
-bin:bin/mdoc-export-msxdoc
-bin:bin/mdoc-update
-bin:bin/mdoc-validate
-bin:bin/mdvalidater
-bin:bin/mkbundle
+rsc:bin/al
+rsc:bin/al2
+rsc:bin/csc
+rsc:bin/csc-dim
+rsc:bin/csi
+rsc:bin/gacutil
+rsc:bin/gacutil2
+rsc:bin/ilasm
+rsc:bin/makecert
+rsc:bin/mcs
+rsc:bin/mdassembler
+rsc:bin/mdoc-assemble
+rsc:bin/mdoc-export-html
+rsc:bin/mdoc-export-msxdoc
+rsc:bin/mdoc-update
+rsc:bin/mdoc-validate
+rsc:bin/mdvalidater
+rsc:bin/mkbundle
 bin:bin/mono
 bin:bin/mono-boehm
-bin:bin/mono-configuration-crypto
-bin:bin/monodis
-bin:bin/monodocer
-bin:bin/monodocs2html
-bin:bin/monodocs2slashdoc
-bin:bin/mono-find-provides
-bin:bin/mono-find-requires
-bin:bin/mono-gdb.py
-bin:bin/mono-heapviz
-bin:bin/monop
-bin:bin/monop2
-bin:bin/mono-package-runtime
-bin:bin/mono-service
-bin:bin/mono-service2
+rsc:bin/mono-configuration-crypto
+rsc:bin/monodis
+rsc:bin/monodocer
+rsc:bin/monodocs2html
+rsc:bin/monodocs2slashdoc
+rsc:bin/mono-find-provides
+rsc:bin/mono-find-requires
+rsc:bin/mono-gdb.py
+rsc:bin/mono-heapviz
+rsc:bin/monop
+rsc:bin/monop2
+rsc:bin/mono-package-runtime
+rsc:bin/mono-service
+rsc:bin/mono-service2
 bin:bin/mono-sgen
-bin:bin/mono-sgen-gdb.py
-bin:bin/mono-test-install
+rsc:bin/mono-sgen-gdb.py
+rsc:bin/mono-test-install
 bin:bin/mprof-report
-bin:bin/nunit-console
-bin:bin/nunit-console2
-bin:bin/nunit-console4
-bin:bin/peverify
-bin:bin/resgen
-bin:bin/resgen2
-bin:bin/sn
-bin:bin/vbc
-bin:bin/wsdl
-bin:bin/wsdl2
+rsc:bin/nunit-console
+rsc:bin/nunit-console2
+rsc:bin/nunit-console4
+rsc:bin/peverify
+rsc:bin/resgen
+rsc:bin/resgen2
+rsc:bin/sn
+rsc:bin/vbc
+rsc:bin/wsdl
+rsc:bin/wsdl2
 rsc:etc/mono/2.0/Browsers/Compat.browser
 rsc:etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
 rsc:etc/mono/2.0/machine.config
@@ -85,10 +85,10 @@ lnk:lib/libmonosgen-2.0.so
 lnk:lib/libmonosgen-2.0.so.1
 lib:lib/libmonosgen-2.0.so.1.0.0
 lib:lib/libMonoSupportW.so
-lnk:lib/libmono-system-native.so
-lnk:lib/libmono-system-native.so.0
-lib:lib/libmono-system-native.so.0.0.0
+lnk:lib/libmono-native.so
+lnk:lib/libmono-native.so.0
+lib:lib/libmono-native.so.0.0.0
+rsc:lib/mono/lldb/mono.py
 rsc:share/mono-2.0/mono/cil/cil-opcodes.xml
 rsc:share/mono-2.0/mono/eglib/eglib-config.h
 rsc:share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression
-
diff --git a/cross/mono/digests b/cross/mono/digests
@@ -1,3 +1,3 @@
-mono-5.18.0.240.tar.bz2 SHA1 a58aedde88c775659c9eda85ac162c9d73585e35
-mono-5.18.0.240.tar.bz2 SHA256 143e80eb00519ff496742e78ee07403a3c3629437f3a498eee539de8108da895
-mono-5.18.0.240.tar.bz2 MD5 304c05c402c110543fb2ebe2999bc28e
+mono-5.20.1.34.tar.bz2 SHA1 06f6bce0644c87ed132f3f2155a940c3b6fcf8e6
+mono-5.20.1.34.tar.bz2 SHA256 cd91d44cf62515796ba90dfdc274bb33471c25a2f1a262689a3bdc0a672b7c8b
+mono-5.20.1.34.tar.bz2 MD5 b4af6c8d1f23f19809a5c18d43bac613
diff --git a/cross/mono/patches/002-fix-shm-open-configuration-regression.patch b/cross/mono/patches/002-fix-shm-open-configuration-regression.patch
diff --git a/native/mono/Makefile b/native/mono/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = mono
-PKG_VERS_MAJOR = 5.18.0
-PKG_VERS_MINOR = 240
+PKG_VERS_MAJOR = 5.20.1
+PKG_VERS_MINOR = 34
 PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

diff --git a/native/mono/digests b/native/mono/digests
@@ -1,3 +1,3 @@
-mono-5.18.0.240.tar.bz2 SHA1 a58aedde88c775659c9eda85ac162c9d73585e35
-mono-5.18.0.240.tar.bz2 SHA256 143e80eb00519ff496742e78ee07403a3c3629437f3a498eee539de8108da895
-mono-5.18.0.240.tar.bz2 MD5 304c05c402c110543fb2ebe2999bc28e
+mono-5.20.1.34.tar.bz2 SHA1 06f6bce0644c87ed132f3f2155a940c3b6fcf8e6
+mono-5.20.1.34.tar.bz2 SHA256 cd91d44cf62515796ba90dfdc274bb33471c25a2f1a262689a3bdc0a672b7c8b
+mono-5.20.1.34.tar.bz2 MD5 b4af6c8d1f23f19809a5c18d43bac613
diff --git a/spk/jackett/Makefile b/spk/jackett/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = jackett
 SPK_VERS = 0.11.43
-SPK_REV = 8
+SPK_REV = 9
 SPK_ICON = src/jackett.png
 DSM_UI_DIR = app
 
@@ -14,7 +14,7 @@ RELOAD_UI = yes
 DISPLAY_NAME = Jackett
 BETA = 1
 STARTABLE = yes
-CHANGELOG = "Update Jackett to version 0.11.43"
+CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
 HOMEPAGE = https://github.com/Jackett/Jackett
 LICENSE = GPLv2
 

diff --git a/spk/jackett/src/service-setup.sh b/spk/jackett/src/service-setup.sh
@@ -5,13 +5,17 @@
 service_prestart ()
 {
     # Replace generic service startup
-
     MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
     PATH="${SYNOPKG_PKGDEST}/bin:${MONO_PATH}:${PATH}"
     MONO="${MONO_PATH}/mono"
     JACKETT="${SYNOPKG_PKGDEST}/share/${SYNOPKG_PKGNAME}/JackettConsole.exe"
     HOME_DIR="${SYNOPKG_PKGDEST}/var"
 
+    # workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
+    if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
+        MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
+    fi
+
     echo "Starting Jackett as user ${EFF_USER}" >> ${LOG_FILE}
     COMMAND="env HOME=${HOME_DIR} PATH=${PATH} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${JACKETT} --PIDFile ${PID_FILE}"
 
@@ -30,5 +34,5 @@ service_postinst ()
     $BIN/delgroup "${USER}" "users" >> ${INST_LOG}
     $BIN/deluser "${USER}" >> ${INST_LOG}
 
-    echo "service_postinst ${SYNOPKG_PKG_STATUS}" >> $INST_LOG
+    echo "service_postinst ${SYNOPKG_PKG_STATUS}" >> ${INST_LOG}
 }
diff --git a/spk/lidarr/Makefile b/spk/lidarr/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = lidarr
 SPK_VERS = $(shell date +%Y%m%d)
-SPK_REV = 2
+SPK_REV = 3
 SPK_ICON = src/lidarr.png
 
 REQUIRED_DSM = 5.0
@@ -16,7 +16,7 @@ DESCRIPTION  = Lidarr is a music collection manager for Usenet and BitTorrent us
 RELOAD_UI = yes
 STARTABLE = yes
 DISPLAY_NAME = Lidarr
-CHANGELOG = "Update Lidarr to v0.5.0.583"
+CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
 
 HOMEPAGE = http://lidarr.audio/
 LICENSE  = GPLv3

diff --git a/spk/lidarr/src/service-setup.sh b/spk/lidarr/src/service-setup.sh
@@ -1,5 +1,5 @@
 PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
-MONO_PATH="/usr/local/mono/bin"
+MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
 MONO="${MONO_PATH}/mono"
 
 # Check versions during upgrade
@@ -14,6 +14,11 @@ PID_FILE="${CONFIG_DIR}/Lidarr/lidarr.pid"
 # Some have it stored in the root of package
 LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
 
+# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
+if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
+    MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
+fi
+
 GROUP="sc-download"
 
 SERVICE_COMMAND="env PATH=${MONO_PATH}:${PATH} HOME=${HOME_DIR} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${LIDARR}"
@@ -46,7 +51,7 @@ service_preupgrade ()
 
 service_postupgrade ()
 {
-    # Restore Current Lidarr Binary If Current Ver. >= SPK Ver.
+    # Restore Current Lidarr Binary if Current Ver. >= SPK Ver.
     . ${CONFIG_DIR}/KEEP_VAR
     if [ "$KEEP_CUR" == "yes" ]; then
         echo "Restoring Lidarr version from before upgrade" >> ${INST_LOG}

diff --git a/spk/mono/Makefile b/spk/mono/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = mono
-SPK_VERS = 5.18.0.240
-SPK_REV = 12
+SPK_VERS = 5.20.1.34
+SPK_REV = 13
 SPK_ICON = src/mono.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -9,7 +9,7 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Cross platform, open source .NET development framework
 DISPLAY_NAME = Mono
 STARTABLE = no
-CHANGELOG = "Update to 5.18.0.240"
+CHANGELOG = "Update to version 5.20.1.34"
 
 HOMEPAGE = http://mono-project.com
 LICENSE  = http://www.mono-project.com/docs/faq/licensing
@@ -20,6 +20,9 @@ POST_STRIP_TARGET = mono_extra_install
 
 MONO_NATIVE_INSTALL = $(WORK_DIR)/../../../native/$(SPK_NAME)/work-native/install
 
+SPK_COMMANDS = bin/mono bin/mcs bin/gacutil bin/gacutil2 bin/makecert
+
+
 include ../../mk/spksrc.spk.mk
 
 .PHONY: mono_extra_install

diff --git a/spk/mono/src/mono.png b/spk/mono/src/mono.png
diff --git a/spk/radarr/Makefile b/spk/radarr/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = radarr
 SPK_VERS = $(shell date +%Y%m%d)
-SPK_REV = 8
+SPK_REV = 9
 SPK_ICON = src/radarr.png
 
 REQUIRED_DSM = 5.0
@@ -16,7 +16,7 @@ DESCRIPTION  = Radarr is a movie manager like Couchpotato, but based on the Sona
 RELOAD_UI = yes
 STARTABLE = yes
 DISPLAY_NAME = Radarr
-CHANGELOG = "Update Radarr to v0.2.0.1293."
+CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
 
 HOMEPAGE = https://radarr.video/
 LICENSE  = GPLv3

diff --git a/spk/radarr/src/service-setup.sh b/spk/radarr/src/service-setup.sh
@@ -1,5 +1,5 @@
 PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
-MONO_PATH="/usr/local/mono/bin"
+MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
 MONO="${MONO_PATH}/mono"
 
 # Check versions during upgrade
@@ -14,6 +14,11 @@ PID_FILE="${CONFIG_DIR}/Radarr/nzbdrone.pid"
 # Some have it stored in the root of package
 LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
 
+# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
+if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
+    MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
+fi
+
 GROUP="sc-download"
 LEGACY_GROUP="sc-media"
 
@@ -68,7 +73,7 @@ service_preupgrade ()
 
 service_postupgrade ()
 {
-    # Restore Current Radarr Binary If Current Ver. >= SPK Ver.
+    # Restore Current Radarr Binary if Current Ver. >= SPK Ver.
     . ${CONFIG_DIR}/KEEP_VAR
     if [ "$KEEP_CUR" == "yes" ]; then
         echo "Restoring Radarr version from before upgrade" >> ${INST_LOG}

diff --git a/spk/sonarr/Makefile b/spk/sonarr/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = nzbdrone
 SPK_VERS = $(shell date +%Y%m%d)
-SPK_REV = 15
+SPK_REV = 16
 SPK_ICON = src/sonarr.png
 
 REQUIRED_DSM = 5.0
@@ -18,7 +18,7 @@ DESCRIPTION_SPN = Sonarr es un PVR para los usuarios de grupos de noticias y tor
 RELOAD_UI = yes
 DISPLAY_NAME = Sonarr
 STARTABLE = yes
-CHANGELOG = "Update Sonarr to v2.0.0.5301."
+CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
 
 HOMEPAGE = https://sonarr.tv
 LICENSE  = GPLv3

diff --git a/spk/sonarr/src/service-setup.sh b/spk/sonarr/src/service-setup.sh
@@ -1,5 +1,5 @@
 PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
-MONO_PATH="/usr/local/mono/bin"
+MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
 MONO="${MONO_PATH}/mono"
 
 # Sonarr uses the home directory to store it's ".config"
@@ -29,6 +29,11 @@ fi
 # Some have it stored in the root of package
 LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
 
+# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
+if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
+    MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
+fi
+
 GROUP="sc-download"
 LEGACY_GROUP="sc-media"