knot: update to verion 3.4.2

Signed-off-by: Jan Hák <jan.hak@nic.cz>

diff --git a/net/knot/Makefile b/net/knot/Makefile
index 86115c5706806e0dd509160bc40d9da8c5819f95..0df88e369d1fcb68b0eecda33f62f11bac416a2a 100644 (file)
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knot
-PKG_VERSION:=3.4.1
+PKG_VERSION:=3.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=252a2b83a9319a605103f7491d73a881e97c63339d09170ac9d525155fa41b1a
+PKG_HASH:=d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e
 
 PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
 PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8
@@ -30,6 +30,7 @@ define Package/knot-lib/Default
        TITLE:=Knot DNS
        DEPENDS=+libpthread
        URL:=https://www.knot-dns.cz
+       VERSION:=${PKG_VERSION}-r${PKG_RELEASE}
 endef
 
 define Package/knot/Default
@@ -39,6 +40,7 @@ define Package/knot/Default
        TITLE:=Knot DNS
        DEPENDS=+libatomic
        URL:=https://www.knot-dns.cz
+       VERSION:=${PKG_VERSION}-r${PKG_RELEASE}
 endef
 
 define Package/knot-libs

diff --git a/net/knot/patches/03-atomic.patch b/net/knot/patches/03-atomic.patch
deleted file mode 100644 (file)
index 12e2a22..0000000
--- a/net/knot/patches/03-atomic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/contrib/atomic.h
-+++ b/src/contrib/atomic.h
-@@ -41,6 +41,7 @@
- 
-  #include <stdint.h>
-  #include <stdbool.h>
-+ #include <stddef.h>
- 
-  #define ATOMIC_SET(dst, val)  __atomic_store_n(&(dst), (val), __ATOMIC_RELAXED)
-  #define ATOMIC_GET(src)       __atomic_load_n(&(src), __ATOMIC_RELAXED)
-@@ -58,6 +59,7 @@
- 
-  #include <stdint.h>
-  #include <stdbool.h>
-+ #include <stddef.h>
- 
-  #define ATOMIC_SET(dst, val)  ((dst) = (val))
-  #define ATOMIC_GET(src)       (src)