From 9d81b6e4cac85a387a629fbb0a278b1ca320ea1c Mon Sep 17 00:00:00 2001 From: Jan Hak Date: Tue, 26 May 2020 10:31:18 +0200 Subject: [PATCH] knot: update to version 2.9.5 Removed patch `03-configure-allow-to-manually-disable-POSIX-capabiliti.patch` that has been backported into release. Signed-off-by: Jan Hak --- net/knot/Makefile | 6 +-- ...to-manually-disable-POSIX-capabiliti.patch | 39 ------------------- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 net/knot/patches/03-configure-allow-to-manually-disable-POSIX-capabiliti.patch diff --git a/net/knot/Makefile b/net/knot/Makefile index 79af85b75..f835a7f10 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot -PKG_VERSION:=2.9.3 -PKG_RELEASE:=2 +PKG_VERSION:=2.9.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ -PKG_HASH:=f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e +PKG_HASH:=1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76 PKG_MAINTAINER:=Daniel Salzman PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8 diff --git a/net/knot/patches/03-configure-allow-to-manually-disable-POSIX-capabiliti.patch b/net/knot/patches/03-configure-allow-to-manually-disable-POSIX-capabiliti.patch deleted file mode 100644 index 047dc1230..000000000 --- a/net/knot/patches/03-configure-allow-to-manually-disable-POSIX-capabiliti.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 442633ae37f8a4e1164a2db3ad6b55bc738ba0b2 Mon Sep 17 00:00:00 2001 -From: Daniel Salzman -Date: Fri, 22 May 2020 12:50:29 +0200 -Subject: [PATCH] configure: allow to manually disable POSIX capabilities - ---- - configure.ac | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 47772799e..a08ca8532 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -554,7 +554,13 @@ AS_IF([test "$enable_utilities" = "yes"], [ - ]) - ]) # Knot DNS utilities dependencies - -+AC_ARG_ENABLE([cap-ng], -+ AS_HELP_STRING([--enable-cap-ng=auto|no], [enable POSIX capabilities [default=auto]]), -+ [enable_cap_ng="$enableval"], [enable_cap_ng=auto]) -+ - AS_IF([test "$enable_daemon" = "yes"], [ -+ -+AS_IF([test "$enable_cap_ng" != "no"],[ - PKG_CHECK_MODULES([cap_ng], [cap-ng], [enable_cap_ng=yes], [ - enable_cap_ng=no - AC_CHECK_HEADER([cap-ng.h], [ -@@ -570,7 +576,7 @@ AS_IF([test "$enable_daemon" = "yes"], [ - ], [ - enable_cap_ng=no - cap_ng_LIBS= --]) -+])]) - - AS_IF([test "$enable_cap_ng" = yes], - [AC_DEFINE([ENABLE_CAP_NG], [1], [POSIX capabilities available])] --- -2.17.1 -