From 988f8a2fe98d722a0d460fe06a564e7e5f44fd67 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Fri, 10 Jun 2022 21:58:03 +0200 Subject: [PATCH 1/7] 11.0.0 --- check_process | 8 +++----- manifest.json | 4 ++-- scripts/_common.sh | 10 +++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index eca2a1c..b6606cb 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=791ed7fd54608553b90ad564f40eaa8508a6bdd0 + upgrade=1 from_commit=6b11a17102bc9f6495aae618381fc959833d3857 backup_restore=1 multi_instance=0 port_already_use=1 @@ -22,7 +22,5 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - + ; commit=6b11a17102bc9f6495aae618381fc959833d3857 + name=10.21.1 diff --git a/manifest.json b/manifest.json index af3a653..d6d6ee4 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.21.1~ynh1", + "version": "11.0.0~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.21.1", + "version": "11.0.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 d7381cd..3a4ec97 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,11 +9,11 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=23b1bb23118cf0128c752c4e19afb2ad7f3a3830d24b4755f5fb8ebcf42e5c0d -sha256_armel=0785e8a3e3078a3956cf05b1f41b3f63e57df2e840f4e9a0af929e688cef0244 -sha256_armhf=031ca6ac177212abd91b2cf8de39a6c09804935e0c775392ea78271023d770ab -sha256_x86_64=b6238039647660c23f3376c6524167fc845c4ca5ad5a5c13b21259ac7c96af20 -sha256_x86=27e9d29297b3fb54e0c5db26f42e8dba218f38c8ee8eaa661db5d490a0fc2081 +sha256_arm64=1402af4a8b9235c5b7e074694fbc2b0d16be77c7124b00e143e174fb585d3711 +sha256_armel=1432dcec235b2ecfd674a1d9c8400dc2022ebe135b4f6b26ccd18d263e1ec8d9 +sha256_armhf=cf9ba4dad0776c6f8bc3dfe2faf3baeec16f599a613d3afddaab55ad0ad5c41d +sha256_x86_64=eca4900b51518153206dd0cddf7fbc4ed2e74e8bd9291b9d63ff2346da95581e +sha256_x86=1bdbd61ebd34e0967c902f0832abe77575964acdffb282126122c76827695f71 case "$mach" in "armv6l" ) mach="armel" From 6ba0c15ebeba8e4d948d6b6d787d8eb851632c53 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 Jun 2022 19:58:37 +0000 Subject: [PATCH 2/7] 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 62b3995..f340b0d 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.21.1 +**Shipped version:** 11.0.0 ## Screenshots ![Screenshot of Universal Media Server](./doc/screenshots/screenshot.gif) diff --git a/README_fr.md b/README_fr.md index 2313d5c..bdd89ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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.21.1 +**Version incluse :** 11.0.0 ## Captures d'écran ![Capture d'écran de Universal Media Server](./doc/screenshots/screenshot.gif) From ccd899862b8f0dc6fe120f13d599305a68d329e4 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 11 Jun 2022 12:42:30 +0200 Subject: [PATCH 3/7] minimum version 11 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d6d6ee4..2a9bd02 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "misterl56@hotmail.com" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 11.0.7" }, "multi_instance": false, "services": [ From 8889c598ed6cd46b72d4189c3f399d6b8846b573 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 13 Aug 2022 10:22:21 +0200 Subject: [PATCH 4/7] move to openjdk-17 --- scripts/_common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3a4ec97..d49e32e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,7 +19,7 @@ case "$mach" in "armv6l" ) mach="armel" sha256=$sha256_armel #for some reason, jre is not in the tarball - pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then mach="armhf" sha256=$sha256_armhf @@ -27,13 +27,13 @@ case "$mach" in mach="armel" sha256=$sha256_armel fi - pkg_dependencies="$pkg_dependencies openjdk-11-jre";; + pkg_dependencies="$pkg_dependencies openjdk-17-jre";; "armv8l" ) mach="arm64" sha256=$sha256_arm64 - pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; "aarch64" ) mach="arm64" sha256=$sha256_arm64 - pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; "x86_64" ) mach="x86_64" sha256=$sha256_x86_64 ;; * ) mach="x86" From 02a243c3fe957ec9a6f5746dcc6826a634b3bbfe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 13 Aug 2022 08:22:26 +0000 Subject: [PATCH 5/7] Auto-update README --- README.md | 2 ++ README_fr.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f340b0d..0aaf096 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A DLNA, UPnP and HTTP(S) Media Server **Shipped version:** 11.0.0 + + ## Screenshots ![Screenshot of Universal Media Server](./doc/screenshots/screenshot.gif) diff --git a/README_fr.md b/README_fr.md index bdd89ec..e5f56dc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 11.0.0 +**Version incluse :** 11.0.0 + + ## Captures d'écran ![Capture d'écran de Universal Media Server](./doc/screenshots/screenshot.gif) From 1c3993acff90faf078942ccdeb385831eff4772d Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 13 Aug 2022 12:07:22 +0200 Subject: [PATCH 6/7] 11.3.0 --- manifest.json | 6 +++--- scripts/_common.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 2a9bd02..229acc7 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": "11.0.0~ynh1", + "version": "11.3.0~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "11.0.0", + "version": "11.3.0", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", @@ -21,7 +21,7 @@ "email": "misterl56@hotmail.com" }, "requirements": { - "yunohost": ">= 11.0.7" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index d49e32e..3da9270 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,11 +9,11 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=1402af4a8b9235c5b7e074694fbc2b0d16be77c7124b00e143e174fb585d3711 -sha256_armel=1432dcec235b2ecfd674a1d9c8400dc2022ebe135b4f6b26ccd18d263e1ec8d9 -sha256_armhf=cf9ba4dad0776c6f8bc3dfe2faf3baeec16f599a613d3afddaab55ad0ad5c41d -sha256_x86_64=eca4900b51518153206dd0cddf7fbc4ed2e74e8bd9291b9d63ff2346da95581e -sha256_x86=1bdbd61ebd34e0967c902f0832abe77575964acdffb282126122c76827695f71 +sha256_arm64=32290c3d4217c6cc0168566691787f503204af44e44ea33d3b7a3c7bd1d4763f +sha256_armel=27d3c770885226b0e3762de81a24ea39cfe2ec0d90a595059bfb10f9252e0f7a +sha256_armhf=a7acecc62dae6dbb5c4161ee47662c427b025270b64ecb1edc932e9fed1dae28 +sha256_x86_64=12533de6705ff7a7526753cf1c25c45a469f8ae743824dfa2abb40b2071459eb +sha256_x86=34ca82263301e41d1666621d8f156f5fdfef34b451eefd0829530101089328db case "$mach" in "armv6l" ) mach="armel" From 53eae76d15a50a8387ff412da33486dc557b96d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 13 Aug 2022 10:07:58 +0000 Subject: [PATCH 7/7] 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 0aaf096..47123b7 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:** 11.0.0 +**Shipped version:** 11.3.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e5f56dc..1a92d50 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 11.0.0 +**Version incluse :** 11.3.0 ## Captures d'écran