From 5a85fa23a37017391e24f22c78a157051b2e7495 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Fri, 29 Dec 2023 18:30:59 +0100
Subject: [PATCH] bind - update to version 9.18.21

---
 components/network/bind/Makefile |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/components/network/bind/Makefile b/components/network/bind/Makefile
index 3bcf691..9bf8c93 100644
--- a/components/network/bind/Makefile
+++ b/components/network/bind/Makefile
@@ -24,13 +24,12 @@
 # Copyright (c) 2023, Friedrich Kink
 #
 
-OPENSSL_VERSION= 3.1
 USE_DEFAULT_TEST_TRANSFORMS= yes
 include ../../../make-rules/shared-macros.mk
+COMPONENT_TEST_DIR = $(@D)/tests
 
 COMPONENT_NAME=		bind
-COMPONENT_VERSION=	9.18.19
-COMPONENT_REVISION=	1
+COMPONENT_VERSION=	9.18.21
 COMPONENT_SUMMARY=	BIND DNS name server and configuration tools.
 COMPONENT_DESCRIPTION=	BIND is open source software that implements the Domain Name System \
                         (DNS) protocols for the Internet.  This package contains the DNS \
@@ -38,7 +37,7 @@
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_PROJECT_URL=	https://www.isc.org/software/bind/
-COMPONENT_ARCHIVE_HASH=	sha256:115e09c05439bebade1d272eda08fa88eb3b60129edef690588c87a4d27612cc
+COMPONENT_ARCHIVE_HASH=	sha256:a556be22505d9ea4f9c6717aee9c549739c68498aff3ca69035787ecc648fec5
 COMPONENT_ARCHIVE_URL=	https://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_FMRI=		network/dns/$(COMPONENT_NAME)
 COMPONENT_CLASSIFICATION=	Applications/Internet
@@ -51,7 +50,7 @@
 
 COMPONENT_PREP_ACTION= ( cd $(@D) && autoreconf -fi )
 
-# Missing files in build dir without this.
+# Missing files in build dir without this (mainly man pages).
 COMPONENT_PRE_CONFIGURE_ACTION= ( $(CLONEY) $(SOURCE_DIR) $(@D) )
 
 CFLAGS += $(CPP_XPG6MODE)
@@ -69,14 +68,21 @@
 CONFIGURE_OPTIONS += --sysconfdir=/etc
 CONFIGURE_OPTIONS += --localstatedir=/var
 CONFIGURE_OPTIONS += --with-openssl=/usr
-CONFIGURE_OPTIONS += --enable-devpoll=yes
+CONFIGURE_OPTIONS += --enable-warn-error
 CONFIGURE_OPTIONS += --enable-fixed-rrset
 CONFIGURE_OPTIONS += --enable-full-report
+CONFIGURE_OPTIONS += --with-cmocka
 CONFIGURE_OPTIONS += --with-gssapi
 CONFIGURE_OPTIONS += --with-libidn2
 CONFIGURE_OPTIONS += --with-libxml2
 CONFIGURE_OPTIONS += --with-json-c
+CONFIGURE_OPTIONS += --with-libnghttp2=yes
+CONFIGURE_OPTIONS += --enable-pthread-rwlock
+CONFIGURE_OPTIONS += --with-readline=readline
+CONFIGURE_OPTIONS += --with-tuning=default
 CONFIGURE_OPTIONS += --disable-linux-caps
+CONFIGURE_OPTIONS += READLINE_CFLAGS=-I/usr/include/readline
+CONFIGURE_OPTIONS += READLINE_LIBS="-lreadline -ltermcap"
 
 # Install.
 #
@@ -89,22 +95,25 @@
 # prototype directory, they are simply referenced in relevant manifest
 # (p5m) file.
 
+COMPONENT_TEST_ENV_CMD =
 COMPONENT_TEST_ENV += PATH=$(PATH.gnu)
 COMPONENT_TEST_ENV += LC_ALL=C.UTF-8
 # The user running the test needs an profiles=Network Management entry in /etc/user_attr in order to successfully run the following ifconfig.sh up script:
 COMPONENT_PRE_TEST_ACTION= ( cd $(BUILD_DIR_64)/bin/tests/system && pfexec sh ./ifconfig.sh up )
 COMPONENT_POST_TEST_ACTION= ( cd $(BUILD_DIR_64)/bin/tests/system && pfexec sh ./ifconfig.sh down )
-COMPONENT_TEST_TARGETS= test
+
+# required for tests
+TEST_REQUIRED_PACKAGES += library/cmocka
 
 # Auto-generated dependencies
 REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += database/lmdb
 REQUIRED_PACKAGES += library/json-c
-REQUIRED_PACKAGES += library/libedit
 REQUIRED_PACKAGES += library/libidn2
 REQUIRED_PACKAGES += library/libuv
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/nghttp2
+REQUIRED_PACKAGES += library/readline
 REQUIRED_PACKAGES += library/security/openssl-31
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += service/security/kerberos-5

--
Gitblit v1.9.3