From 174938cbe0571f01688241d65a1eb99145305244 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 7 Sep 2021 14:43:15 +0200 Subject: [PATCH 1/2] Version 10.11.0 --- check_process | 2 +- manifest.json | 4 ++-- scripts/_common.sh | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index 424f7b1..4c8ec49 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=bc1a48f956ec737b7a9cf141a9d9437a5b636f10 + upgrade=1 from_commit=0bdac48b6ee51cbfd687a1e3a693f105f79185b6 backup_restore=1 multi_instance=0 port_already_use=1 diff --git a/manifest.json b/manifest.json index 9efe529..d1855cf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.10.1~ynh1", + "version": "10.11.0~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.10.1", + "version": "10.11.0", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", diff --git a/scripts/_common.sh b/scripts/_common.sh index f8a8e02..176d91e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,24 +8,31 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` + +sha256_arm64=365f475fbf6bfa1707059c58f04d8bd278ac198687ed079cdf9558ce907f99e8 +sha256_armel=b2a2183fa1c8fb7fd21b26350de99e4111443be1418eaf1245b46d893fa1dda4 +sha256_armhf=f3058462c4134bee62616c46b0642396ca61a393f2f1238052d1dc2af156234c +sha256_x86_64=a6d5fd04bbece4f8f5ecfb62e6d7cdb5b03f58d13fb1428d7568b8f97389d129 +sha256_x86=8b9dd457ff8c86c15f6ca06335c7c62c750547911ed740195c9447e9d3e84888 + case "$mach" in "armv6l" ) mach="armel" - sha256=5f8c48404c5f9ec0e33ba1db25a26ec0bbcbac80ae971b586289873940d9bce0 + sha256=$sha256_armel #for some reason, jre is not in the tarball pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then mach="armhf" - sha256=aac79bcdc8d84250ec7f91a0b8752c9b1e7f6b9a4a1935bdbd0f5c01cacf7d09 + sha256=$sha256_armhf pkg_dependencies="$pkg_dependencies openjdk-8-jre" else mach="armel" - sha256=5f8c48404c5f9ec0e33ba1db25a26ec0bbcbac80ae971b586289873940d9bce0 + sha256=$sha256_armel pkg_dependencies="$pkg_dependencies openjdk-8-jre" fi ;; "armv8l" ) mach="arm64" - sha256=177460262ec4d1dfb8b28f44b4f91d79d519ca7a4afe2a6e6ed6c0d1a821a240 ;; + sha256=$sha256_arm64 ;; "x86_64" ) mach="x86_64" - sha256=471b7bf68aaae7c68836b6e503ee0748cfba7b4cd01f23e408be559172dda45a ;; + sha256=$sha256_x86_64 ;; * ) mach="x86" - sha256=309d61fe65cbca5b7f6fca7eff4b7a14a13f177a0912798c38f5c80dd833c7d9 ;; + sha256=$sha256_x86 ;; esac From ee7c9f68ec8fe77b779d0566ada6930d0f876882 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 7 Sep 2021 12:43:24 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 047b0a8..95b0b52 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A DLNA, UPnP and HTTP(S) Media Server -**Shipped version:** 10.10.1 +**Shipped version:** 10.11.0 diff --git a/README_fr.md b/README_fr.md index ec2a1e0..d59d34f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 10.10.1 +**Version incluse :** 10.11.0