From 08545d256b1d9ac2ad296d713e7ff67e25fca239 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 30 Jun 2021 18:04:29 +0200 Subject: [PATCH] Upgrade to 5.3.1 --- README.md | 2 +- README_fr.md | 2 +- conf/FTL_3.src | 4 ++-- conf/FTL_last.src | 6 +++--- conf/admin_dashboard_3.src | 4 ++-- conf/admin_dashboard_last.src | 6 +++--- conf/app_3.src | 4 ++-- conf/app_last.src | 6 +++--- conf/nginx.conf | 2 +- manifest.json | 6 +++--- scripts/_variables | 8 ++++---- scripts/install | 1 + scripts/upgrade | 1 + 13 files changed, 27 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index d461fbb..bb33777 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Network-wide ad blocking via your own Linux hardware -**Shipped version:** 3.3.1 or 5.0 +**Shipped version:** 3.3.1 or 5.3.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 636f57f..23c754c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst ## Résumé Blocage des publicités sur l'ensemble du réseau via votre propre matériel Linux -**Version embarquée:** 3.3.1 ou 5.0 +**Version embarquée:** 3.3.1 ou 5.3.1 ## Captures d'écran diff --git a/conf/FTL_3.src b/conf/FTL_3.src index c08c993..a9e335c 100644 --- a/conf/FTL_3.src +++ b/conf/FTL_3.src @@ -1,6 +1,6 @@ SOURCE_URL=https://github.com/pi-hole/FTL/archive/v3.0.tar.gz -SOURCE_SUM=45fd33e4498b2ab9403d96e1251abb8c -SOURCE_SUM_PRG=md5sum +SOURCE_SUM=8c3d55eb3054698172e59ae81b8562ce235d73da461389840da62d90b32f0057 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/FTL_last.src b/conf/FTL_last.src index f6e3f41..463dd0c 100644 --- a/conf/FTL_last.src +++ b/conf/FTL_last.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.0.tar.gz -SOURCE_SUM=a405fee9a924324eefe6bfb832180c3d -SOURCE_SUM_PRG=md5sum +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.8.1.tar.gz +SOURCE_SUM=6177f775a8d0be703b235741befe90b6192bdc0baab5a6e028019a9af00a44ae +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/admin_dashboard_3.src b/conf/admin_dashboard_3.src index 410936c..8f65ffe 100644 --- a/conf/admin_dashboard_3.src +++ b/conf/admin_dashboard_3.src @@ -1,6 +1,6 @@ SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v3.3.tar.gz -SOURCE_SUM=23368537fa576480e45f625b5e1a7cd7 -SOURCE_SUM_PRG=md5sum +SOURCE_SUM=caba2129fe8753b0c7aaf611b7c7b2146ff1ac56d5ac58987053b1553d09c49f +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/admin_dashboard_last.src b/conf/admin_dashboard_last.src index 25b95ff..0e3c61c 100644 --- a/conf/admin_dashboard_last.src +++ b/conf/admin_dashboard_last.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.0.tar.gz -SOURCE_SUM=9402041b365e78a02a95942bdd3c3c05 -SOURCE_SUM_PRG=md5sum +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.5.tar.gz +SOURCE_SUM=39340eeb115732db7cf96166dfa9c7240afb0843b4f49defc42e704b751cf278 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/app_3.src b/conf/app_3.src index 74230e9..ac08837 100644 --- a/conf/app_3.src +++ b/conf/app_3.src @@ -1,6 +1,6 @@ SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v3.3.1.tar.gz -SOURCE_SUM=ea4f64bdf88620f59a1b01c19253e4e3 -SOURCE_SUM_PRG=md5sum +SOURCE_SUM=6a80e4b6b38fc65df83459fe52f3a61623763709a077645f25ac9e29247e6d6d +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/app_last.src b/conf/app_last.src index 4836f9a..efeaefa 100644 --- a/conf/app_last.src +++ b/conf/app_last.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.0.tar.gz -SOURCE_SUM=0f19aeefad3063c44f421de1ad21b233 -SOURCE_SUM_PRG=md5sum +SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.3.1.tar.gz +SOURCE_SUM=19c856584f180b2ed5b3d0500cd3567f00e37fa9c493282bc119be8276cdddd9 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index 166d57b..647da87 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location __PATH__/ { try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php7.3-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/manifest.json b/manifest.json index b561183..f811709 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ad blocking via your own DNS server.", "fr": "Filtrage publicitaire sur l'ensemble du réseau via votre propre serveur DNS." }, - "version": "5.0~ynh1", + "version": "5.3.1~ynh1", "url": "https://pi-hole.net/", "license": "EUPL-1.2", "maintainer": { @@ -14,12 +14,12 @@ "email": "maniackc_dev@crudelis.fr" }, "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 4.2" }, "multi_instance": false, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ diff --git a/scripts/_variables b/scripts/_variables index 331ded1..a08ca42 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -1,7 +1,7 @@ #!/bin/bash # Dependencies -app_depencencies="sqlite idn2 php7.0-sqlite3 nettle-dev libcap2-bin" +app_depencencies="sqlite3 idn2 php7.3-sqlite3 nettle-dev libcap2-bin build-essential libgmp-dev m4 cmake libidn11-dev libreadline-dev xxd" if [ "$YNH_APP_ARG_PIHOLE_VERSION" == "Last 3.X" ] then @@ -9,7 +9,7 @@ then dashboard_version=3.3 FTL_version=3.0 else - pihole_core_version=5.0 - dashboard_version=5.0 - FTL_version=5.0 + pihole_core_version=5.3.1 + dashboard_version=5.5 + FTL_version=5.8.1 fi diff --git a/scripts/install b/scripts/install index 4f17c8d..39cc6e7 100644 --- a/scripts/install +++ b/scripts/install @@ -217,6 +217,7 @@ fi # Instead of downloading a binary file, we're going to compile it ( cd "$FTL_temp_path" +ynh_exec_warn_less cmake . ynh_exec_warn_less make ynh_exec_warn_less make install ) ynh_secure_remove --file="$FTL_temp_path" diff --git a/scripts/upgrade b/scripts/upgrade index d1e393e..7918816 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -257,6 +257,7 @@ then # Instead of downloading a binary file, we're going to compile it ( cd "$FTL_temp_path" + ynh_exec_warn_less cmake . ynh_exec_warn_less make ynh_exec_warn_less make install ) ynh_secure_remove --file="$FTL_temp_path"