From 8cc30d0c7913210264146837961a4250faa6f5d3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:41:24 +0100 Subject: [PATCH 01/11] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From c3c96024b2aab999d333dcf7bd234529c24d0694 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 2 Mar 2023 21:10:28 +0000 Subject: [PATCH 02/11] Update install --- scripts/install | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 4011168..855a9b9 100644 --- a/scripts/install +++ b/scripts/install @@ -130,18 +130,14 @@ if [ -z "$ipv4_interface" ] && [ -z "$ipv6_interface" ]; then ynh_die --message="Impossible to find the main network interface, please report this issue." elif [ "$ipv4_interface" != "$ipv6_interface" ]; then if [ -z "$ipv4_interface" ]; then - echo "bind-interfaces -except-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interface\nexcept-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app" elif [ -z "$ipv6_interface" ]; then - echo "bind-interfaces -except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" else - echo "bind-interfaces -except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" fi else - echo "bind-interfaces -except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" fi systemctl restart dnsmasq From 996e5edb0825a4bd5da45e2b307127ffd182e73f Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:31:29 +0000 Subject: [PATCH 03/11] Update upgrade --- scripts/upgrade | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 861fb38..a514d11 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,18 +147,14 @@ if [ -z "$ipv4_interface" ] && [ -z "$ipv6_interface" ]; then ynh_die --message="Impossible to find the main network interface, please report this issue." elif [ "$ipv4_interface" != "$ipv6_interface" ]; then if [ -z "$ipv4_interface" ]; then - echo "bind-interfaces -except-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app" elif [ -z "$ipv6_interface" ]; then - echo "bind-interfaces -except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" else - echo "bind-interfaces -except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" fi else - echo "bind-interfaces -except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" + echo -e "bind-interfaces\nexcept-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" fi systemctl restart dnsmasq From 253214f67f6b466073c98f29636527d178a5e1fe Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 12:42:33 +0000 Subject: [PATCH 04/11] Update install --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 855a9b9..c47c844 100644 --- a/scripts/install +++ b/scripts/install @@ -54,6 +54,10 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin if [ "$dns_over_https" == "1" ]; then dns_over_https="true" + adguard_DoT_port=853 + ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + adguard_DoQ_port=784 + ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port else dns_over_https="false" fi From c8f7bcbec9c6c3ee5160d8e3ef5d8067881af5d0 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 12:44:35 +0000 Subject: [PATCH 05/11] Update upgrade --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index a514d11..a27ccfc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,6 +86,11 @@ if [ -n "$dns_over_https" ] && [ "$dns_over_https" == "1" ]; then dns_over_https="true" ynh_app_setting_set --app=$app --key=dns_over_https --value=$dns_over_https + dns_over_https="true" + adguard_DoT_port=853 + ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + adguard_DoQ_port=784 + ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port elif [ -z "$dns_over_https" ] || [ "$dns_over_https" == "0" ]; then dns_over_https="false" From 6ec4f2ce5c8cbf2b9e96175868ddb805f6236034 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:34:55 +0000 Subject: [PATCH 06/11] Update upgrade --- scripts/upgrade | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a27ccfc..bcd0441 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,11 +86,15 @@ if [ -n "$dns_over_https" ] && [ "$dns_over_https" == "1" ]; then dns_over_https="true" ynh_app_setting_set --app=$app --key=dns_over_https --value=$dns_over_https - dns_over_https="true" + # DNS over TLS adguard_DoT_port=853 ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoT_port + ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_DoT_port + # DNS over QUIC adguard_DoQ_port=784 ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port + ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoQ_port elif [ -z "$dns_over_https" ] || [ "$dns_over_https" == "0" ]; then dns_over_https="false" From a48a6d3ba0e17b70501bfc7b684d638f7dcd1e86 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:02:16 +0000 Subject: [PATCH 07/11] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index bcd0441..0f075bb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,6 +58,7 @@ ynh_systemd_action --service_name=$app --action="stop" # Disable the port 53 for upnp ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_port +ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_port #================================================= # ENSURE DOWNWARD COMPATIBILITY From 6add0ef717ef718a070feacddba46a36bfd07332 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:04:00 +0000 Subject: [PATCH 08/11] Update install --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index c47c844..126161b 100644 --- a/scripts/install +++ b/scripts/install @@ -54,10 +54,15 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin if [ "$dns_over_https" == "1" ]; then dns_over_https="true" + # DNS over TLS adguard_DoT_port=853 ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoT_port + ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_DoT_port + # DNS over QUIC adguard_DoQ_port=784 ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port + ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoQ_port else dns_over_https="false" fi @@ -80,6 +85,7 @@ ynh_app_setting_set --app=$app --key=adguard_port --value=$adguard_port # Disable the port 53 for upnp ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_port +ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_port #================================================= # INSTALL DEPENDENCIES From cf52a80ccea52b05ecae836bed9d5ddac4bd355e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 Mar 2023 06:07:58 +0000 Subject: [PATCH 09/11] Upgrade to v0.107.26 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index a9865ac..766a599 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=a43d6fb38347581c99984a33760a730570de4b36c4068bb26b0778d4499ff101 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=022e90ce636b00b1cac49217e60c7919088b95ca4a46e4fe00bc4dd0f0c943d1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 948fa66..c4b33c1 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=0699273bda8be09a37d5dfef4578ee53fc0959f095bcb7e087ab592c6ffa8a92 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=709eefbefe18ca8d2bd3578eb9923a8ea7382c59920e6565f386898f0c64b91e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 6e9d12a..9d1f1ca 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=30ebc32afab6e3e3459a0b1e659037cf3d33e95affecebcef2c1e9b035af32ea +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=387a14f1d3f96f68ea1537e7e050b12fcf07ad09ed7316797a7305aff60dd732 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index 5587cc2..9a2ede3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.25~ynh1", + "version": "0.107.26~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 714ce73f085441e319f883b2d669e4e30ebabbe4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 Mar 2023 06:08:06 +0000 Subject: [PATCH 10/11] 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 fc1aafd..44f57d0 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ AdGuard Home is a network-wide software for blocking ads & tracking. After you s It operates as a DNS server that re-routes tracking domains to a "black hole", thus preventing your devices from connecting to those servers. It's based on software we use for our public AdGuard DNS servers -- both share a lot of common code. -**Shipped version:** 0.107.25~ynh1 +**Shipped version:** 0.107.26~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3d11c3b..9d790b1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ AdGuard Home est un logiciel à l'échelle du réseau pour bloquer les publicit Il fonctionne comme un serveur DNS qui redirige les domaines de pistage vers un "trou noir", empêchant ainsi vos appareils de se connecter à ces serveurs. Il est basé sur un logiciel que nous utilisons pour nos serveurs DNS publics AdGuard - les deux partagent beaucoup de code commun. -**Version incluse :** 0.107.25~ynh1 +**Version incluse :** 0.107.26~ynh1 ## Captures d’écran From 6058f63702a59eb20613ff9cd6c05af35e67670c Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Mon, 13 Mar 2023 13:03:26 +0000 Subject: [PATCH 11/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9a2ede3..9da1113 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ }, "license": "GPL-3.0", "maintainer": { - "name": "", + "name": "ddataa", "email": "" }, "requirements": {