From 315502b57dd0af9b298fc34c0884ffe3a51c4467 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 29 Jul 2025 15:23:57 +0200
Subject: [PATCH] dns/dnscrypt-proxy: new version and lint pass

---
 dns/dnscrypt-proxy/Makefile                      |  3 +--
 dns/dnscrypt-proxy/pkg-descr                     |  5 ++++-
 .../app/models/OPNsense/Dnscryptproxy/Dnsbl.xml  |  1 -
 .../models/OPNsense/Dnscryptproxy/General.xml    | 16 ++++------------
 .../models/OPNsense/Dnscryptproxy/Whitelist.xml  |  4 +---
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index 2f982bea5..d0b5eeb8b 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		dnscrypt-proxy
-PLUGIN_VERSION=		1.15
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.16
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index 90d55760d..f06697ce8 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -1,10 +1,13 @@
 A flexible DNS proxy, with support for modern encrypted DNS protocols
 such as DNSCrypt v2 and DNS-over-HTTPS.
 
-
 Plugin Changelog
 ================
 
+1.16
+
+* Fix ODoH servers not working (contributed by Pascal Herget)
+
 1.15
 
 * Update plugin for dnscrypt-proxy 2.1 (contributed by Adrian Fedoreanu and Michael Muenz)
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
index 4b056064d..188564ee6 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
@@ -8,7 +8,6 @@
             <Required>Y</Required>
         </enabled>
         <type type="OptionField">
-            <Required>N</Required>
             <Multiple>Y</Multiple>
             <OptionValues>
                 <aa>AdAway List</aa>
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
index 435c9713b..b942d30b0 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
@@ -39,7 +39,7 @@
             <Required>Y</Required>
         </doh_servers>
         <odoh_servers type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
         </odoh_servers>
         <require_dnssec type="BooleanField">
@@ -58,9 +58,7 @@
             <Default>0</Default>
             <Required>Y</Required>
         </force_tcp>
-        <proxy type="TextField">
-            <Required>N</Required>
-        </proxy>
+        <proxy type="TextField"/>
         <timeout type="IntegerField">
             <Default>2500</Default>
             <Required>Y</Required>
@@ -137,21 +135,15 @@
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Choose a number between 1 and 86400.</ValidationMessage>
         </cache_neg_max_ttl>
-        <serverlist type="CSVListField">
-            <Required>N</Required>
-        </serverlist>
+        <serverlist type="CSVListField"/>
         <query_logs type="BooleanField">
             <Default>1</Default>
             <Required>Y</Required>
         </query_logs>
         <disabled_serverlist type="CSVListField">
             <Mask>/^[A-Za-z0-9\._\-]{1,70}(,[A-Za-z0-9\._\-]{1,70})*$/</Mask>
-            <Default></Default>
-            <Required>N</Required>
             <ValidationMessage>Please use valid server names.</ValidationMessage>
         </disabled_serverlist>
-        <relaylist type="CSVListField">
-            <Required>N</Required>
-        </relaylist>
+        <relaylist type="CSVListField"/>
     </items>
 </model>
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Whitelist.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Whitelist.xml
index ae33ad3f6..c3d65113e 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Whitelist.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Whitelist.xml
@@ -12,9 +12,7 @@
                 <name type="TextField">
                     <Required>Y</Required>
                 </name>
-                <description type="TextField">
-                    <Required>N</Required>
-                </description>
+                <description type="TextField"/>
             </whitelist>
         </whitelists>
     </items>