From ae40741809fa1fc115f296e6e0fe574b89f17344 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Nov 2022 06:24:58 +0000 Subject: [PATCH 1/3] Upgrade to v5.14.2 --- conf/pi-hole_AdminLTE.src | 4 ++-- conf/pi-hole_Core.src | 4 ++-- conf/pi-hole_FTL.src | 6 ++++-- manifest.json | 2 +- scripts/_common.sh | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/conf/pi-hole_AdminLTE.src b/conf/pi-hole_AdminLTE.src index 5c066f5..185ff0a 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.16.tar.gz -SOURCE_SUM=9874e4745068a737cf4f6277719fc725ac25308fef950cdc27ff56aaa551ac4b +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.17.tar.gz +SOURCE_SUM=0cafb2cff261360470ec3076e25ebe0abc935d2a628b1926565bd4e9ab90d597 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 4bb42b0..b507ba6 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.13.tar.gz -SOURCE_SUM=26222254df130b56d7e0419c9828c995415b2aafd1717f92850c6cb4e0e20d2d +SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.14.2.tar.gz +SOURCE_SUM=fb2bf933eb7dc54de7b5ab220458e0298fb48fa84d5cba1bcb3c72c47bee1051 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 bdc92a3..f7f6630 100644 --- a/conf/pi-hole_FTL.src +++ b/conf/pi-hole_FTL.src @@ -1,5 +1,7 @@ -SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.18.2.tar.gz -SOURCE_SUM=69f167dd69fdc3ca18ee9067f0f8728f9d9be5686ecb68dc7d05df21e94f3a70 +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.19.2.tar.gz +SOURCE_SUM=e7c220c9daff01d12a9587de549c834cf97505dd5a5e18a4b96af1b0466a9709 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index f6da29c..7b5e248 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.13~ynh1", + "version": "5.14.2~ynh1", "url": "https://pi-hole.net/", "upstream": { "license": "EUPL-1.2", diff --git a/scripts/_common.sh b/scripts/_common.sh index 82285ba..e89e0f0 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.16 -pihole_flt_version=5.18.2 +pihole_adminlte_version=5.17 +pihole_flt_version=5.19.2 PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_INSTALL_DIR="/opt/pihole" From b392ead262c7de3248cdfc1060561f9b86bcee62 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Nov 2022 06:25:06 +0000 Subject: [PATCH 2/3] 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 af7ce5d..002df90 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 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software. -**Shipped version:** 5.13~ynh1 +**Shipped version:** 5.14.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 22b73a9..0f2fdb0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Pi-hole® est un puits DNS qui protège vos appareils des contenus indésirables sans installer de logiciel côté client. -**Version incluse :** 5.13~ynh1 +**Version incluse :** 5.14.2~ynh1 ## Captures d'écran From 148553f25f6f8032f26b3712fdb0a5e9799f47de Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 22 Dec 2022 06:21:59 +0000 Subject: [PATCH 3/3] Upgrade to v5.14.2 --- conf/pi-hole_AdminLTE.src | 4 ++-- conf/pi-hole_FTL.src | 4 ++-- scripts/_common.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/pi-hole_AdminLTE.src b/conf/pi-hole_AdminLTE.src index 185ff0a..4ef4df5 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.17.tar.gz -SOURCE_SUM=0cafb2cff261360470ec3076e25ebe0abc935d2a628b1926565bd4e9ab90d597 +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.18.tar.gz +SOURCE_SUM=7d29b443b233a19fd2a8c2e345e4a0ed7c0dc05492a35c75a5627264423dd1f3 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 f7f6630..563bfa7 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.19.2.tar.gz -SOURCE_SUM=e7c220c9daff01d12a9587de549c834cf97505dd5a5e18a4b96af1b0466a9709 +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.20.tar.gz +SOURCE_SUM=c098d65ed7e59865b814d64a0a5fac65914ce93277e69ef97ab87e8479731fc9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/_common.sh b/scripts/_common.sh index e89e0f0..2e40376 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.17 -pihole_flt_version=5.19.2 +pihole_adminlte_version=5.18 +pihole_flt_version=5.20 PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_INSTALL_DIR="/opt/pihole"