From 42b1be492384110bb7d3780bde4b416cef74b221 Mon Sep 17 00:00:00 2001
From: thoradia <22841905+thoradia@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:34:39 +0200
Subject: [PATCH] dotnet-runtime: update to ASP.NET Core Runtime 3.1.9

---
 .../addons/tools/dotnet-runtime/changelog.txt |  6 ++
 .../addons/tools/dotnet-runtime/package.mk    | 58 ++++++++-----------
 .../tools/dotnet-runtime/source/bin/le_dotnet | 10 ----
 3 files changed, 31 insertions(+), 43 deletions(-)
 delete mode 100644 packages/addons/tools/dotnet-runtime/source/bin/le_dotnet

diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt
index e13b8d5c61..40aa078fe7 100644
--- a/packages/addons/tools/dotnet-runtime/changelog.txt
+++ b/packages/addons/tools/dotnet-runtime/changelog.txt
@@ -1,3 +1,9 @@
+111
+- Update to ASP.NET Core Runtime 3.1.9
+- Download source to architecture specific file
+- Add icu4c libraries
+- Remove superfluous libraries
+
 110
 - Update to 3.1.5
 
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index cefb27e232..3d6d9d7564 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/packages/addons/tools/dotnet-runtime/package.mk
@@ -1,31 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
-case "$ARCH" in
-  "aarch64")
-    PKG_NC_ARCH="arm64"
-    PKG_SHA256="05875790fbfc487cefb04fc6ff6d9a3ade147f1ae554e859dca60ea6a3c232aa"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/65291ed8-e931-4605-9d5a-265928a835d0/1a15d18655c8b260170117e9bd1a1cb7/dotnet-runtime-3.1.5-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_NC_ARCH="arm"
-    PKG_SHA256="5728786f517410f25c59799f443d0336129d6b1680fd40cb5b40202407949008"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/15132a5c-f0f4-4373-8b8b-b7e70834d899/cad479dda52359ad43956471274ec932/dotnet-runtime-3.1.5-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_NC_ARCH="x64"
-    PKG_SHA256="ae0a4e9a1e875b46d3201cdad2779572de1c12c0aae36688ae3c3978db319ff5"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d00eaeea-6d7b-4e73-9d96-c0234ed3b665/0d25d9d1aeaebdeef01d15370d5cd22b/dotnet-runtime-3.1.5-linux-x64.tar.gz"
-    ;;
-esac
-
 PKG_NAME="dotnet-runtime"
-PKG_VERSION="3.1.5"
-PKG_REV="110"
+PKG_VERSION="3.1.9"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.github.io/"
-PKG_DEPENDS_TARGET="toolchain curl curl3 krb5 lttng-ust"
+PKG_DEPENDS_TARGET="toolchain icu"
 PKG_SECTION="tools"
 PKG_SHORTDESC=".NET Core Runtime"
 PKG_LONGDESC=".NET Core Runtime ($PKG_VERSION) runs applications built with .NET Core, a cross-platform .NET implementation."
@@ -33,22 +15,32 @@ PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME=".Net Core Runtime"
+PKG_ADDON_PROJECTS="any !RPi1"
 PKG_ADDON_TYPE="xbmc.python.script"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
+case "${ARCH}" in
+  "aarch64")
+    PKG_SHA256="1ffe06b0012feb52d75e748438695e11905343890de73a594e6540d535fd084c"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/dffd493f-9eb8-483f-81c7-a9e2201574ef/54e7464241e01e7031fd89e6fe88e6da/aspnetcore-runtime-3.1.9-linux-arm64.tar.gz"
+    ;;
+  "arm")
+    PKG_SHA256="496247dc5098a506accb0c3286f82e497a6da30f4d0b8262c29484c096d5f717"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c8cd43dd-e9de-4ff9-9cea-2f02fba6869c/d5c653c12ec93cb71e30b21856acea66/aspnetcore-runtime-3.1.9-linux-arm.tar.gz"
+    ;;
+  "x86_64")
+    PKG_SHA256="b47a882277d4ef42d3cfebbd1f334559b8345fe8a8b05e2a7d83a37ffe5f775e"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/933b0cb8-3494-4ca4-8c9e-1bcfd3568ab0/8704eef073efdfecdaaad4a18beb05ac/aspnetcore-runtime-3.1.9-linux-x64.tar.gz"
+    ;;
+esac
+PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"
+
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -r $PKG_BUILD/* \
-        $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -r $PKG_BUILD/* \
+          $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/libs
-  cp -L $(get_install_dir curl3)/usr/lib/libcurl.so.? \
-        $(get_install_dir krb5)/usr/lib/libcom_err.so.? \
-        $(get_install_dir krb5)/usr/lib/libgssapi_krb5.so.? \
-        $(get_install_dir krb5)/usr/lib/libk5crypto.so.? \
-        $(get_install_dir krb5)/usr/lib/libkrb5.so.? \
-        $(get_install_dir krb5)/usr/lib/libkrb5support.so.? \
-        $(get_install_dir lttng-ust)/usr/lib/liblttng-ust.so.? \
-        $(get_install_dir lttng-ust)/usr/lib/liblttng-ust-tracepoint.so.? \
-        $ADDON_BUILD/$PKG_ADDON_ID/libs
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+    cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \
+          $ADDON_BUILD/$PKG_ADDON_ID/lib/
 }
diff --git a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet b/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet
deleted file mode 100644
index c5ed97d3c7..0000000000
--- a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon tools.dotnet-runtime
-
-DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="1" \
-LD_LIBRARY_PATH="$ADDON_DIR/libs:$LD_LIBRARY_PATH" \
-dotnet "$@"