From d31f3a07b6903e85fd95076ffb5d44d5c05e2d6b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 30 Dec 2022 19:29:49 +0000 Subject: [PATCH] bind: Update to 9.18.10 This patch drops named which we don't use and only provides a package with dig, host, and nslookup. Signed-off-by: Michael Tremer --- bind/bind.nm | 147 ++++----------- bind/patches/bind97-exportlib.patch | 226 ----------------------- bind/patches/bind99-dont-build-bin.patch | 13 -- 3 files changed, 31 insertions(+), 355 deletions(-) delete mode 100644 bind/patches/bind97-exportlib.patch delete mode 100644 bind/patches/bind99-dont-build-bin.patch diff --git a/bind/bind.nm b/bind/bind.nm index 6cb259791..87f459b23 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -4,156 +4,71 @@ ############################################################################### name = bind -version = 9.9.9-P6 +version = 9.18.10 release = 1 groups = Networking/Tools -url = http://www.isc.org/products/BIND/ +url = https://www.isc.org/bind/ license = Proprietary -summary = BIND provides tools for the DNS. +summary = BIND provides tools for the DNS description BIND (Berkeley Internet Name Domain or named) is the most commonly used DNS server on the Internet, especially on Unix-like systems. end -source_dl = ftp://ftp.isc.org/isc/bind/%{version}/ +source_dl = https://downloads.isc.org/isc/bind9/%{version}/ +sources = %{thisapp}.tar.xz build requires - autoconf - automake + json-c-devel libcap-devel - libidn-devel - libtool + libidn2-devel + libuv-devel + nghttp2-devel pkg-config openssl-devel >= 1.0.1h-2 - shadow-utils end + #export LD_LIBRARY_PATH = %{DIR_APP}/lib/bind9/.libs:%{DIR_APP}/lib/dns/.libs:%{DIR_APP}/lib/isc/.libs:%{DIR_APP}/lib/isccfg/.libs:%{DIR_APP}/lib/ns/.libs + configure_options += \ - --with-libtool \ - --enable-threads \ - --enable-ipv6 \ - --with-pic \ --disable-static \ - --disable-openssl-version-check \ - --enable-exportlib \ - --with-export-libdir=%{libdir}/ \ - --with-export-includedir=%{includedir} \ - --includedir=%{includedir}/bind9/ \ - --with-gssapi \ - --enable-rrl \ - --disable-isc-spnego - - prepare_cmds - # Create m4 directory. - cd %{DIR_APP} && mkdir -pv m4 + --enable-auto-validation - # Branding. - sed -i -e 's/RELEASEVER=\(.*\)/RELEASEVER=\1-%{DISTRO_NAME}-%{version}-%{release}/' version + tools = dig nsupdate - # Regenerate build environment - autoreconf -vfi - - end + build + %{configure} - build_cmds - # Build some typical system tools (dig, host, nslookup) - make -C bin/dig -j %{PARALLELISMFLAGS} + # Build libraries + make -C lib %{PARALLELISMFLAGS} - # Build nsupdate - make -C bin/nsupdate -j %{PARALLELISMFLAGS} + # Build tools + for tool in %{tools}; do + make -C bin/${tool} %{PARALLELISMFLAGS} || exit $? + done end - install_cmds - # Install typical system tools - make -C bin/dig install DESTDIR=%{BUILDROOT} + install + # Install libraries + make -C lib install DESTDIR="%{BUILDROOT}" - # Install nsupdate - make -C bin/nsupdate install DESTDIR=%{BUILDROOT} + # Install tools + for tool in %{tools}; do + make -C bin/${tool} install DESTDIR="%{BUILDROOT}" || exit $? + done - # Install isc/errno2result.h header - install -m 644 lib/isc/unix/errno2result.h %{BUILDROOT}%{includedir}/isc - - # Install trusted root key. + # Install trusted root key + mkdir -pv %{BUILDROOT}%{sysconfdir} install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}%{sysconfdir}/trusted-key.key - - # Remove development libraries and headers except *-export ones - rm -rvf %{BUILDROOT}%{libdir}/libbind9.so - rm -rvf %{BUILDROOT}%{libdir}/libdns.so - rm -rvf %{BUILDROOT}%{libdir}/libisccc.so - rm -rvf %{BUILDROOT}%{libdir}/libisccfg.so - rm -rvf %{BUILDROOT}%{libdir}/libisc.so - rm -rvf %{BUILDROOT}%{libdir}/liblwres.so - rm -rvf %{BUILDROOT}%{includedir}/bind9 - - # Remove unwanted files - rm -rvf %{BUILDROOT}/etc - rm -rvf %{BUILDROOT}/var - - # Remove unneeded tools - rm -rvf %{BUILDROOT}%{bindir}/isc-config.sh - rm -rvf %{BUILDROOT}%{bindir}/bind9-config - - # Remove manpages for the unneeded tools - rm -rvf %{BUILDROOT}%{mandir}/man1/isc-config.sh.1 - rm -rvf %{BUILDROOT}%{mandir}/man1/bind9-config.1 - - # Remove documentation for liblwres and tools - rm -rvf %{BUILDROOT}%{mandir}/man3 end end packages - package %{name} - # The bind package is just an umbrella package for the utils - # and libs package. - requires - %{name}-libs = %{thisver} - %{name}-utils = %{thisver} - %{name}-utils-libs = %{thisver} - end - end - package %{name}-utils - summary = Utilities for querying bind DNS name server. - description = %{summary} - - requires - %{name}-utils-libs = %{thisver} - end - - files - /etc/trusted-key.key - /usr/bin/dig - /usr/bin/host - /usr/bin/nslookup - /usr/bin/nsupdate - /usr/share/man/man1/dig.1* - /usr/share/man/man1/host.1* - /usr/share/man/man1/nslookup.1* - /usr/share/man/man1/nsupdate.1* - end - end - - package %{name}-utils-libs - template LIBS - - summary = Required libraries for the tools in the bind-utils package. - description = %{summary} - end - - package %{name}-libs - template LIBS - - files - %{libdir}/*export.so.* - end - end - - package %{name}-devel - template DEVEL + summary = Utilities for querying the DNS system end package %{name}-debuginfo diff --git a/bind/patches/bind97-exportlib.patch b/bind/patches/bind97-exportlib.patch deleted file mode 100644 index 4468ef526..000000000 --- a/bind/patches/bind97-exportlib.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -up bind-9.9.3rc2/isc-config.sh.in.exportlib bind-9.9.3rc2/isc-config.sh.in -diff -up bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc2/lib/export/dns/Makefile.in ---- bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/lib/export/dns/Makefile.in 2013-05-13 10:45:22.574089729 +0200 -@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_ - - CWARNINGS = - --ISCLIBS = ../isc/libisc.@A@ -+ISCLIBS = ../isc/libisc-export.@A@ - --ISCDEPLIBS = ../isc/libisc.@A@ -+ISCDEPLIBS = ../isc/libisc-export.@A@ - - LIBS = @LIBS@ - -@@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - --libdns.@SA@: ${OBJS} -+libdns-export.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ - --libdns.la: ${OBJS} -+libdns-export.la: ${OBJS} - ${LIBTOOL_MODE_LINK} \ -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la \ -+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \ - -rpath ${export_libdir} \ - -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS} - --timestamp: libdns.@A@ -+timestamp: libdns-export.@A@ - touch timestamp - - installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} - - install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ \ -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \ - ${DESTDIR}${export_libdir}/ - - clean distclean:: -- rm -f libdns.@A@ timestamp -+ rm -f libdns-export.@A@ timestamp - rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h - rm -f include/dns/rdatastruct.h - -diff -up bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc2/lib/export/irs/Makefile.in ---- bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/lib/export/irs/Makefile.in 2013-05-13 10:45:22.575089729 +0200 -@@ -43,9 +43,9 @@ SRCS = context.c \ - gai_sterror.c getaddrinfo.c getnameinfo.c \ - resconf.c - --ISCLIBS = ../isc/libisc.@A@ --DNSLIBS = ../dns/libdns.@A@ --ISCCFGLIBS = ../isccfg/libisccfg.@A@ -+ISCLIBS = ../isc/libisc-export.@A@ -+DNSLIBS = ../dns/libdns-export.@A@ -+ISCCFGLIBS = ../isccfg/libisccfg-export.@A@ - - LIBS = @LIBS@ - -@@ -62,26 +62,26 @@ version.@O@: ${srcdir}/version.c - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - --libirs.@SA@: ${OBJS} version.@O@ -+libirs-export.@SA@: ${OBJS} version.@O@ - ${AR} ${ARFLAGS} $@ ${OBJS} version.@O@ - ${RANLIB} $@ - --libirs.la: ${OBJS} version.@O@ -+libirs-export.la: ${OBJS} version.@O@ - ${LIBTOOL_MODE_LINK} \ -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la \ -+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs-export.la \ - -rpath ${export_libdir} \ - -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} version.@O@ ${LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} - --timestamp: libirs.@A@ -+timestamp: libirs-export.@A@ - touch timestamp - - installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} - - install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ \ -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export.@A@ \ - ${DESTDIR}${export_libdir}/ - - clean distclean:: -- rm -f libirs.@A@ libirs.la timestamp -+ rm -f libirs-export.@A@ libirs-export.la timestamp -diff -up bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isccfg/Makefile.in ---- bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/lib/export/isccfg/Makefile.in 2013-05-13 10:45:22.576089729 +0200 -@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo - CDEFINES = - CWARNINGS = - --ISCLIBS = ../isc/libisc.@A@ --DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -+ISCLIBS = ../isc/libisc-export.@A@ -+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@ - - ISCDEPLIBS = ../../lib/isc/libisc.@A@ --ISCCFGDEPLIBS = libisccfg.@A@ -+ISCCFGDEPLIBS = libisccfg-export.@A@ - - LIBS = @LIBS@ - -@@ -58,26 +58,26 @@ version.@O@: ${srcdir}/version.c - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - --libisccfg.@SA@: ${OBJS} -+libisccfg-export.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ - --libisccfg.la: ${OBJS} -+libisccfg-export.la: ${OBJS} - ${LIBTOOL_MODE_LINK} \ -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la \ -+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg-export.la \ - -rpath ${export_libdir} \ - -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} ${DNSLIBS} ${ISCLIBS} - --timestamp: libisccfg.@A@ -+timestamp: libisccfg-export.@A@ - touch timestamp - - installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} - - install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ \ -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export.@A@ \ - ${DESTDIR}${export_libdir}/ - - clean distclean:: -- rm -f libisccfg.@A@ timestamp -+ rm -f libisccfg-export.@A@ timestamp -diff -up bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isc/Makefile.in ---- bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/lib/export/isc/Makefile.in 2013-05-13 10:45:22.576089729 +0200 -@@ -100,6 +100,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ - - LIBS = @LIBS@ - -+# Note: the order of SUBDIRS is important. -+# Attempt to disable parallel processing. -+.NOTPARALLEL: -+.NO_PARALLEL: - SUBDIRS = include unix nls @ISC_THREAD_DIR@ - TARGETS = timestamp - -@@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - --libisc.@SA@: ${OBJS} -+libisc-export.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ - --libisc.la: ${OBJS} -+libisc-export.la: ${OBJS} - ${LIBTOOL_MODE_LINK} \ -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \ -+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \ - -rpath ${export_libdir} \ - -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} - --timestamp: libisc.@A@ -+timestamp: libisc-export.@A@ - touch timestamp - - installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} - - install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \ -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \ - ${DESTDIR}${export_libdir} - - clean distclean:: -- rm -f libisc.@A@ libisc.la timestamp -+ rm -f libisc-export.@A@ libisc-export.la timestamp -diff -up bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc2/lib/export/samples/Makefile.in ---- bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/lib/export/samples/Makefile.in 2013-05-13 10:45:22.577089729 +0200 -@@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns - CDEFINES = - CWARNINGS = - --DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ --ISCLIBS = ../isc/libisc.@A@ --ISCCFGLIBS = ../isccfg/libisccfg.@A@ --IRSLIBS = ../irs/libirs.@A@ -+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@ -+ISCLIBS = ../isc/libisc-export.@A@ -+ISCCFGLIBS = ../isccfg/libisccfg-export.@A@ -+IRSLIBS = ../irs/libirs-export.@A@ - --DNSDEPLIBS = ../dns/libdns.@A@ --ISCDEPLIBS = ../isc/libisc.@A@ --ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@ --IRSDEPLIBS = ../irs/libirs.@A@ -+DNSDEPLIBS = ../dns/libdns-export.@A@ -+ISCDEPLIBS = ../isc/libisc-export.@A@ -+ISCCFGDEPLIBS = ../isccfg/libisccfg-export.@A@ -+IRSDEPLIBS = ../irs/libirs-export.@A@ - - DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} - diff --git a/bind/patches/bind99-dont-build-bin.patch b/bind/patches/bind99-dont-build-bin.patch deleted file mode 100644 index ae50372b3..000000000 --- a/bind/patches/bind99-dont-build-bin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 4f7f5a6..d59b9b1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ - - VERSION=@BIND9_VERSION@ - --SUBDIRS = make unit lib bin doc @LIBEXPORT@ -+SUBDIRS = make lib doc @LIBEXPORT@ - TARGETS = - - MANPAGES = isc-config.sh.1 -- 2.39.5