diff options
| -rw-r--r-- | package/bind/Makefile | 44 | ||||
| -rw-r--r-- | package/bind/patches/patch-bin_rndc_Makefile_am | 18 | ||||
| -rw-r--r-- | package/bind/patches/patch-lib_isc_backtrace_c | 14 |
3 files changed, 32 insertions, 44 deletions
diff --git a/package/bind/Makefile b/package/bind/Makefile index dc7801f2f..ac59cc624 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.16.22 +PKG_VERSION:= 9.18.24 PKG_RELEASE:= 1 -PKG_HASH:= 65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061 +PKG_HASH:= 709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66 PKG_DESCR:= dns server PKG_SECTION:= net/dns PKG_DEPENDS:= libxml2 libressl libuv libressl-util @@ -42,9 +42,6 @@ PKGSD_BIND_DIG:= dig utility PKGSC_BIND_DIG:= net/dns PKGSS_BIND_DIG:= libbind libxml2 -PKG_FLAVOURS_LIBBIND:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -58,23 +55,10 @@ $(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGS AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= BUILD_CC="${HOST_CC}" BUILD_CFLAGS='${HOST_CFLAGS}' BUILD_LDFLAGS='${HOST_LDFLAGS}' -CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ - --with-export-libdir=/usr/lib \ - --enable-exportlib \ - --with-ecdsa=no \ - --with-gost=no \ - --with-gssapi=no \ +CONFIGURE_ARGS+= --with-gssapi=no \ --with-openssl=${STAGING_TARGET_DIR}/usr \ - --without-python \ --disable-linux-caps \ - --enable-epoll \ - --with-libtool - -ifneq (${ADK_PACKAGE_LIBBIND_WITH_IPV6},) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif + --disable-doh bind-server-install: ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc @@ -92,18 +76,18 @@ bind-rndc-install: ${IDIR_BIND_RNDC}/usr/sbin bind-check-install: - ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \ - ${IDIR_BIND_CHECK}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \ - ${IDIR_BIND_CHECK}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/named-checkconf \ + ${IDIR_BIND_CHECK}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/named-checkzone \ + ${IDIR_BIND_CHECK}/usr/bin/ bind-dnssec-install: - ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \ - ${IDIR_BIND_DNSSEC}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \ - ${IDIR_BIND_DNSSEC}/usr/sbin + ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/dnssec-keygen \ + ${IDIR_BIND_DNSSEC}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/dnssec-signzone \ + ${IDIR_BIND_DNSSEC}/usr/bin bind-host-install: ${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin diff --git a/package/bind/patches/patch-bin_rndc_Makefile_am b/package/bind/patches/patch-bin_rndc_Makefile_am new file mode 100644 index 000000000..4bf3b893c --- /dev/null +++ b/package/bind/patches/patch-bin_rndc_Makefile_am @@ -0,0 +1,18 @@ +--- bind-9.18.24.orig/bin/rndc/Makefile.am 2024-02-11 11:42:55.296980787 +0100 ++++ bind-9.18.24/bin/rndc/Makefile.am 2024-02-20 08:02:25.039885442 +0100 +@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.top + + AM_CPPFLAGS += \ + $(LIBISC_CFLAGS) \ ++ $(LIBNS_CFLAGS) \ + $(LIBDNS_CFLAGS) \ + $(LIBISCCFG_CFLAGS) \ + $(LIBISCCC_CFLAGS) \ +@@ -20,6 +21,7 @@ rndc_SOURCES = \ + + rndc_LDADD = \ + $(LIBISC_LIBS) \ ++ $(LIBNS_LIBS) \ + $(LIBDNS_LIBS) \ + $(LIBISCCC_LIBS) \ + $(LIBISCCFG_LIBS) \ diff --git a/package/bind/patches/patch-lib_isc_backtrace_c b/package/bind/patches/patch-lib_isc_backtrace_c deleted file mode 100644 index d9470ccb4..000000000 --- a/package/bind/patches/patch-lib_isc_backtrace_c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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; |