diff --git a/check_process b/check_process index f7f8cef..24110a1 100644 --- a/check_process +++ b/check_process @@ -23,10 +23,8 @@ setup_private=1 setup_public=0 upgrade=1 - # 5.4~ynh1 - upgrade=1 from_commit=cfa9c5a3dbcfb765dcca3b2e7d179756afe26def # 5.11.4~ynh1 - upgrade=1 from_commit=3d2f68c4e19f335e63f8ffa259708b38a58c8f67 + upgrade=1 from_commit=4999654987af8b1427a6c72f8af482b235bb46db backup_restore=1 multi_instance=0 port_already_use=1 @@ -37,5 +35,5 @@ Email= Notification=none ;;; Upgrade options - ; commit=cfa9c5a3dbcfb765dcca3b2e7d179756afe26def - name=Merge pull request #66 + ; commit=4999654987af8b1427a6c72f8af482b235bb46db + name=Merge pull request #88 diff --git a/conf/pi-hole_AdminLTE.src b/conf/pi-hole_AdminLTE.src index 3727406..5c066f5 100644 --- a/conf/pi-hole_AdminLTE.src +++ b/conf/pi-hole_AdminLTE.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.13.tar.gz -SOURCE_SUM=67d01bd4245024c9c6f9bf474bb17e8bde269ccc42ba4bb5a99da25632162c21 +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.16.tar.gz +SOURCE_SUM=9874e4745068a737cf4f6277719fc725ac25308fef950cdc27ff56aaa551ac4b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/pi-hole_Core.src b/conf/pi-hole_Core.src index 0792efb..4bb42b0 100644 --- a/conf/pi-hole_Core.src +++ b/conf/pi-hole_Core.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.11.4.tar.gz -SOURCE_SUM=e24db53c63a6ea240f0852bd082b224dda91ad4fd049ab700c218b9672fc59cf +SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.13.tar.gz +SOURCE_SUM=26222254df130b56d7e0419c9828c995415b2aafd1717f92850c6cb4e0e20d2d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/pi-hole_FTL.src b/conf/pi-hole_FTL.src index 65b730b..bdc92a3 100644 --- a/conf/pi-hole_FTL.src +++ b/conf/pi-hole_FTL.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.16.1.tar.gz -SOURCE_SUM=2fc5f2ce76328d10d4789cdd4bb73365f368e2d4c8daeeb0869b1a51771cbde1 +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.18.2.tar.gz +SOURCE_SUM=69f167dd69fdc3ca18ee9067f0f8728f9d9be5686ecb68dc7d05df21e94f3a70 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index fcfff20..f6da29c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ad blocking via your own DNS server", "fr": "Filtrage publicitaire via votre propre serveur DNS" }, - "version": "5.11.4~ynh1", + "version": "5.13~ynh1", "url": "https://pi-hole.net/", "upstream": { "license": "EUPL-1.2", @@ -26,12 +26,12 @@ } ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ "nginx", - "php7.3-fpm" + "php7.4-fpm" ], "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index ba82989..82285ba 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,8 +9,8 @@ php_dependencies="php$YNH_DEFAULT_PHP_VERSION-common php$YNH_DEFAULT_PHP_VERSION # dependencies used by the app (must be on a single line) pkg_dependencies="cmake build-essential libgmp-dev libidn11-dev nettle-dev libreadline-dev sqlite3 cron curl iputils-ping psmisc unzip idn2 libcap2-bin dns-root-data libcap2 netcat-openbsd procps jq $php_dependencies" -pihole_adminlte_version=5.13 -pihole_flt_version=5.16.1 +pihole_adminlte_version=5.16 +pihole_flt_version=5.18.2 PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_INSTALL_DIR="/opt/pihole"