From 02f071eeae83740ef7747c5fe9eaf0dcab6ac286 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jan 2020 17:54:04 -0800 Subject: [PATCH] nsd: update to 4.2.4 Removed upstreamed patches. Signed-off-by: Rosen Penev --- net/nsd/Makefile | 4 ++-- net/nsd/patches/010-musl.patch | 10 ---------- net/nsd/patches/020-openssl.patch | 13 ------------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 net/nsd/patches/010-musl.patch delete mode 100644 net/nsd/patches/020-openssl.patch diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 27bff1d1d..d1469b9b5 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nsd -PKG_VERSION:=4.2.1 +PKG_VERSION:=4.2.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.nlnetlabs.nl/downloads/nsd -PKG_HASH:=d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f +PKG_HASH:=9ebd6d766765631a56c0eb332eac26b310fa39f662e5582c8210488cf91ef27c PKG_MAINTAINER:=Vasilis Tsiligiannis PKG_LICENSE:=BSD-3-Clause diff --git a/net/nsd/patches/010-musl.patch b/net/nsd/patches/010-musl.patch deleted file mode 100644 index 3ba61e408..000000000 --- a/net/nsd/patches/010-musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/nsd-control.c -+++ b/nsd-control.c -@@ -42,6 +42,7 @@ - */ - - #include "config.h" -+#include - #ifdef HAVE_SSL - - #include diff --git a/net/nsd/patches/020-openssl.patch b/net/nsd/patches/020-openssl.patch deleted file mode 100644 index 31381ff7f..000000000 --- a/net/nsd/patches/020-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tsig.c -+++ b/tsig.c -@@ -19,6 +19,10 @@ - #include "query.h" - #include "rbtree.h" - -+#ifndef HAVE_SSL -+#define CRYPTO_memcmp memcmp -+#endif -+ - static region_type *tsig_region; - - struct tsig_key_table