https-dns-proxy: update to 2021-09-27

[stangri]

Maintainer: me
Compile tested: x86_64, Sophos SG-105, OpenWrt 21.02.0
Run tested: x86_64, Sophos SG-105, OpenWrt 21.02.0, install, run dns lookup, check logs

Description:

• update to 2021-09-27
• fixes https_dns_proxy is very chatty in logs on OpenWrt when WAN cable is disconnected aarond10/https_dns_proxy#125
• restart instead of reload on interface hotplug
• fixes https-dns-proxy error using DoH/adblock (https_client.c:297) #16794
• produce output and log entries on service start/stop
• prevent unnecessary dnsmasq restarts if service has previously updated dnsmasq settings
• allow both named and typed dnsmasq instance settings to be updated

Signed-off-by: Stan Grishin stangri@melmac.net

[stangri]

@champtar could you please have a look at the build failure? It built fine on my system, so I don't understand why the CI fails with "dirty patch"? There were changes to the upstream makefiles (commit is linked in the description), does the patch file need to be updated?

[champtar]

make package/https-dns-proxy/{clean,refresh}

[stangri]

make package/https-dns-proxy/{clean,refresh}

Thanks, I did that and force-pushed an update to my repo, but nothing has changed. Am I missing or not doing something?

[champtar]

On my phone until Monday so can't help more

[stangri]

@champtar any further insight?

[stangri]

@jow- @neheb any ideas?

[neheb]

--- a/net/https-dns-proxy/patches/010-fix-cmakelists.patch
+++ b/net/https-dns-proxy/patches/010-fix-cmakelists.patch
@@ -3,17 +3,17 @@
 @@ -12,12 +12,12 @@ function(define_file_basename_for_source
    endforeach()
  endfunction()
-
+
 -set(CMAKE_BUILD_TYPE "Debug")
 +#set(CMAKE_BUILD_TYPE "Debug")
  #set(CMAKE_BUILD_TYPE "Release")
-
+
 -set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
 -set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
 -set(CMAKE_C_FLAGS_RELEASE "-O2")
 +#set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
 +#set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
 +#set(CMAKE_C_FLAGS_RELEASE "-O2")
-
+
  if ((CMAKE_C_COMPILER_ID MATCHES GNU   AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR
      (CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10))

edit:

edit2: that patch is questionable. Why not just delete those lines instead of commenting them out?

[neheb]

your refresh removes the spaces too. wonder why.

What's your host OS?

[stangri]

your refresh removes the spaces too. wonder why.

What's your host OS?

It's Ubuntu. Have I messed the patch file with my editor (vscode)? Based on your suggestion, this patch file works when I build locally, but CI still throws an error.

PS. It builds fine locally using original @champtar 's patch file too.

[neheb]

It's possible. I use vim if I need to manually edit mostly because other editors tend to wreck more than needed. Especially line endings.

[stangri]

@champtar could you please help figuring out what's going on with the patch file?

[champtar]

@champtar could you please help figuring out what's going on with the patch file?

I've been busy lately but this should be better this week

[champtar]

@stangri can you make sure you have a ~/.quiltrc as documented in https://openwrt.org/docs/guide-developer/build-system/use-patches-with-buildsystem
When I run make package/https-dns-proxy/{clean,refresh} I get

$ git diff
diff --git a/net/https-dns-proxy/patches/010-fix-cmakelists.patch b/net/https-dns-proxy/patches/010-fix-cmakelists.patch
index 99c3f4d8c..788285e99 100644
--- a/net/https-dns-proxy/patches/010-fix-cmakelists.patch
+++ b/net/https-dns-proxy/patches/010-fix-cmakelists.patch
@@ -1,6 +1,6 @@
---- a/CMakeLists.txt   2021-10-08 22:16:25.818000370 +0000
-+++ b/CMakeLists.txt   2021-10-08 22:16:56.462466489 +0000
-@@ -12,12 +12,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,12 +12,7 @@ function(define_file_basename_for_source
    endforeach()
  endfunction()
  

[stangri]

@stangri can you make sure you have a ~/.quiltrc as documented in https://openwrt.org/docs/guide-developer/build-system/use-patches-with-buildsystem

Thank you so much, I've recreated the patch and pushed the update and it worked wonders!