Browse Source

knot-resolver: update to 5.5.3

* fixes CVE-2022-40188

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
(cherry picked from commit 5d2fd88693)
lilik-openwrt-22.03
Michal Vasilek 2 years ago
committed by Josef Schlehofer
parent
commit
5a02ae2fe8
No known key found for this signature in database GPG Key ID: B950216FE4329F4C
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      net/knot-resolver/Makefile
  2. +1
    -1
      net/knot-resolver/patches/010-fix-lmdb.patch
  3. +1
    -1
      net/knot-resolver/patches/030-fix-policy-hack.patch

+ 2
- 2
net/knot-resolver/Makefile View File

@ -10,12 +10,12 @@ PKG_RELRO_FULL:=0
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=knot-resolver PKG_NAME:=knot-resolver
PKG_VERSION:=5.5.1
PKG_VERSION:=5.5.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
PKG_HASH:=9bad1edfd6631446da2d2331bd869887d7fe502f6eeaf62b2e43e2c113f02b6d
PKG_HASH:=a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com> PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=GPL-3.0-later PKG_LICENSE:=GPL-3.0-later


+ 1
- 1
net/knot-resolver/patches/010-fix-lmdb.patch View File

@ -1,5 +1,5 @@
This is just workaround. It should be removed after proper fixing in upstream. 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
Patch fixes problem with lmdb pkg confing. It also adds workaround for get_option
which is now not propagated in OpenWrt meson host package. which is now not propagated in OpenWrt meson host package.
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build


+ 1
- 1
net/knot-resolver/patches/030-fix-policy-hack.patch View File

@ -2,7 +2,7 @@ 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) ) It reintroduces a fix which enables policy related hack (knot/knot-resolver#205 (comment 94566) )
--- a/modules/policy/policy.lua --- a/modules/policy/policy.lua
+++ b/modules/policy/policy.lua +++ b/modules/policy/policy.lua
@@ -1098,7 +1098,7 @@ policy.layer = {
@@ -1093,7 +1093,7 @@ policy.layer = {
if bit.band(state, bit.bor(kres.FAIL, kres.DONE)) ~= 0 then return state end 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 local qry = req:initial() -- same as :current() but more descriptive
return policy.evaluate(policy.rules, req, qry, state) return policy.evaluate(policy.rules, req, qry, state)


Loading…
Cancel
Save