bind: update to 9.16.22

5 files changed, 68 insertions, 13 deletions

diff --git a/package/bind/Makefile b/package/bind/Makefile
index 0a2852fcc..dc7801f2f 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,21 +4,19 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
-PKG_VERSION:=		9.10.4
+PKG_VERSION:=		9.16.22
 PKG_RELEASE:=		1
-PKG_HASH:=		f8d412b38d5ac390275b943bde69f4608f67862a45487ec854b30e4448fcb056
+PKG_HASH:=		65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061
 PKG_DESCR:=		dns server
 PKG_SECTION:=		net/dns
-PKG_DEPENDS:=		libxml2 libressl
-PKG_BUILDDEP:=		libxml2 libressl
+PKG_DEPENDS:=		libxml2 libressl libuv libressl-util
+PKG_BUILDDEP:=		libxml2 libressl libuv
 PKG_NEEDS:=		c++
 PKG_URL:=		https://www.isc.org/software/bind/
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 PKG_LIBNAME:=		libbind
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
 PKG_SUBPKGS:=		LIBBIND BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG
 PKGSD_LIBBIND:=		library for the bind software suite
 PKGSC_LIBBIND:=		libs/net
@@ -67,7 +65,8 @@ CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \
 			--with-gost=no \
 			--with-gssapi=no \
 			--with-openssl=${STAGING_TARGET_DIR}/usr \
-			--with-libxml2=${STAGING_TARGET_DIR}/usr \
+			--without-python \
+			--disable-linux-caps \
 			--enable-epoll \
 			--with-libtool
 
@@ -116,11 +115,12 @@ bind-dig-install:
 
 libbind-install:
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libbind9*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libdns*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libisccc*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libisccfg*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libisc*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libirs*.so ${IDIR_LIBBIND}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libns*.so ${IDIR_LIBBIND}/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/files/bind/named.conf.example b/package/bind/files/bind/named.conf
index 162454955..162454955 100644
--- a/package/bind/files/bind/named.conf.example
+++ b/package/bind/files/bind/named.conf
diff --git a/package/bind/patches/patch-lib_isc_backtrace_c b/package/bind/patches/patch-lib_isc_backtrace_c
new file mode 100644
index 000000000..d9470ccb4
--- /dev/null
+++ b/package/bind/patches/patch-lib_isc_backtrace_c
@@ -0,0 +1,14 @@
+--- bind-9.16.22.orig/lib/isc/backtrace.c	2021-10-13 12:56:16.000000000 +0200
++++ bind-9.16.22/lib/isc/backtrace.c	2021-10-29 13:57:20.009433814 +0200
+@@ -80,10 +80,7 @@ isc_backtrace_gettrace(void **addrs, int
+ 	return (ISC_R_SUCCESS);
+ }
+ #elif defined(BACKTRACE_GCC)
+-extern int
+-_Unwind_Backtrace(void *fn, void *a);
+-extern void *
+-_Unwind_GetIP(void *ctx);
++#include <unwind.h>
+ 
+ typedef struct {
+ 	void **result;
diff --git a/package/libuv/Makefile b/package/libuv/Makefile
new file mode 100644
index 000000000..3a8b43a61
--- /dev/null
+++ b/package/libuv/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libuv
+PKG_VERSION:=		1.42.0
+PKG_RELEASE:=		1
+PKG_HASH:=		371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764
+PKG_DESCR:=		multi-platform support library
+PKG_SECTION:=		libs/misc
+PKG_URL:=		https://github.com/libuv/libuv/
+PKG_SITES:=		https://github.com/libuv/libuv/archive/refs/tags/
+PKG_OPTS:=		dev
+
+DISTFILES:=             v$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBUV,libuv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:=		cmake
+
+libuv-install:
+	$(INSTALL_DIR) $(IDIR_LIBUV)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libuv*.so* \
+		$(IDIR_LIBUV)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libuv/patches/patch-libuv_pc_in b/package/libuv/patches/patch-libuv_pc_in
new file mode 100644
index 000000000..4c7ae339d
--- /dev/null
+++ b/package/libuv/patches/patch-libuv_pc_in
@@ -0,0 +1,12 @@
+--- libuv-1.42.0.orig/libuv.pc.in	2021-07-20 04:44:04.000000000 +0200
++++ libuv-1.42.0/libuv.pc.in	2021-10-29 13:40:49.561398557 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${prefix}/@libdir@
++includedir=${prefix}/@includedir@
+ 
+ Name: libuv
+ Version: @PACKAGE_VERSION@