knot-resolver: add new package

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry picked from commit bb1f6174fa)
This commit is contained in:
Jan Pavlinec
2020-10-15 15:14:41 +02:00
committed by Josef Schlehofer
parent 1da33ba207
commit 0d56e8c19e
7 changed files with 215 additions and 0 deletions
@@ -0,0 +1,20 @@
This is just workaround. It should be removed after proper fixing in upstream.
Patch fixes problem with lmdb pkg config. It also adds workaround for get_option
which is now not propagated in OpenWrt meson host package.
--- a/meson.build
+++ b/meson.build
@@ -23,10 +23,10 @@ libknot = dependency('libknot', version:
libdnssec = dependency('libdnssec', version: knot_version)
libzscanner = dependency('libzscanner', version: knot_version)
libuv = dependency('libuv', version: '>=1.7')
-lmdb = dependency('lmdb', required: false)
-if not lmdb.found() # darwin workaround: missing pkgconfig
- lmdb = meson.get_compiler('c').find_library('lmdb')
-endif
+##lmdb = dependency('lmdb', required: false)
+##if not lmdb.found() # darwin workaround: missing pkgconfig
+lmdb = meson.get_compiler('c').find_library('lmdb')
+##endif
gnutls = dependency('gnutls')
luajit = dependency('luajit')
# NOTE avoid using link_args for luajit due to a macOS issue
@@ -0,0 +1,13 @@
This patch fixes the problem with forwarding in knot-resolver v4.3.0.
It reintroduces a fix which enables policy related hack (knot/knot-resolver#205 (comment 94566) )
--- a/modules/policy/policy.lua
+++ b/modules/policy/policy.lua
@@ -985,7 +985,7 @@ policy.layer = {
if bit.band(state, bit.bor(kres.FAIL, kres.DONE)) ~= 0 then return state end
local qry = req:initial() -- same as :current() but more descriptive
return policy.evaluate(policy.rules, req, qry, state)
- or (special_names_optim(req, qry.sname)
+ or (true--special_names_optim(req, qry.sname)
and policy.evaluate(policy.special_names, req, qry, state))
or state
end,