Rel 1; obsolete patches dropped

diff --git a/bind-ac-libs.patch b/bind-ac-libs.patch
index fa732897e46c073e78c12e34d2d88ea9ed035393..677cd99cf1c5268a8cf4ef1e6cdf4aab0ce04908 100644 (file)
--- a/bind-ac-libs.patch
+++ b/bind-ac-libs.patch
@@ -1,11 +1,20 @@
---- bind-9.8.0-P4/configure.ac~        2011-08-03 11:46:24.326770259 +0200
-+++ bind-9.8.0-P4/configure.ac 2011-08-03 11:49:53.240770212 +0200
-@@ -1076,7 +1076,7 @@ case "$use_gssapi" in
-                   then
-                           LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
-                   else
--                          LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
-+                          LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
-                   fi
-                   AC_MSG_CHECKING(linking as $TRY_LIBS)
-                   AC_TRY_LINK([
+--- bind-9.18.0/configure.ac~  2022-01-24 21:06:11.000000000 +0100
++++ bind-9.18.0/configure.ac   2022-01-27 13:36:04.136536700 +0100
+@@ -474,7 +474,7 @@ AS_IF([test "$enable_geoip" = "yes"],
+              [ # default
+                  AX_SAVE_FLAGS([maxminddb])
+                  MAXMINDDB_CFLAGS="-I$with_maxminddb/include"
+-                 MAXMINDDB_LIBS="-L$with_maxminddb/lib"
++                 MAXMINDDB_LIBS=""
+                  CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
+                  LIBS="$LIBS $MAXMINDDB_LIBS"
+                  AC_SEARCH_LIBS([MMDB_open], [maxminddb],
+@@ -1295,7 +1295,7 @@ AS_CASE([$with_libidn2],
+       [no],   [],
+       [*],    [AX_SAVE_FLAGS([libidn2])
+                LIBIDN2_CFLAGS="-I$with_libidn2/include"
+-               LIBIDN2_LIBS="-L$with_libidn2/lib"
++               LIBIDN2_LIBS=""
+                CFLAGS="$CFLAGS $LIBIDN2_CFLAGS"
+                LIBS="$LIBS $LIBIDN2_LIBS"
+                AC_CHECK_HEADERS([idn2.h],

diff --git a/bind-link.patch b/bind-link.patch
deleted file mode 100644 (file)
index a2cacb0..0000000
--- a/bind-link.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur bind-9.3.2.orig/configure.ac bind-9.3.2.link/configure.ac
---- bind-9.3.2.orig/configure.ac       2006-08-05 01:45:48.000000000 +0200
-+++ bind-9.3.2.link/configure.ac       2006-08-05 01:45:55.000000000 +0200
-@@ -1171,8 +1171,8 @@
-       *-linux*)
-               ;;
-       *)
--              AC_CHECK_LIB(socket, socket)
--              AC_CHECK_LIB(nsl, inet_addr)
-+              AC_SEARCH_LIBS(socket, socket)
-+              AC_SEARCH_LIBS(inet_ntoa, nsl)
-               ;;
- esac
- 
-diff -Nur bind-9.3.2.orig/lib/isccc/Makefile.in bind-9.3.2.link/lib/isccc/Makefile.in
---- bind-9.3.2.orig/lib/isccc/Makefile.in      2004-07-20 09:01:58.000000000 +0200
-+++ bind-9.3.2.link/lib/isccc/Makefile.in      2006-08-05 01:45:55.000000000 +0200
-@@ -36,7 +36,7 @@
- ISCDEPLIBS =  ../../lib/isc/libisc.@A@
- ISCCCDEPLIBS =        libisccc.@A@
- 
--LIBS =                @LIBS@
-+LIBS =                @LIBS@ ../isc/libisc.la
- 
- SUBDIRS =     include
- 
-diff -Nur bind-9.3.2.orig/lib/isccfg/Makefile.in bind-9.3.2.link/lib/isccfg/Makefile.in
---- bind-9.3.2.orig/lib/isccfg/Makefile.in     2004-07-20 09:01:58.000000000 +0200
-+++ bind-9.3.2.link/lib/isccfg/Makefile.in     2006-08-05 01:45:55.000000000 +0200
-@@ -38,7 +38,7 @@
- ISCDEPLIBS =  ../../lib/isc/libisc.@A@
- ISCCFGDEPLIBS =       libisccfg.@A@
- 
--LIBS =                @LIBS@
-+LIBS =                @LIBS@ ../isc/libisc.la ../dns/libdns.la
- 
- SUBDIRS =     include
- TESTDIRS =    @UNITTESTS@
---- bind-9.10.0/lib/irs/Makefile.in~   2014-04-28 21:18:53.000000000 +0200
-+++ bind-9.10.0/lib/irs/Makefile.in    2014-05-01 10:13:55.831613124 +0200
-@@ -42,7 +42,7 @@
- 
- ISCCFGDEPLIBS =       ../../lib/isccfg/libisccfg.@A@
- 
--LIBS =                @LIBS@
-+LIBS =                @LIBS@ ../isccfg/libisccfg.la ../isc/libisc.la ../dns/libdns.la
- 
- # Alphabetically
- OBJS =                context.@O@ \
---- bind-9.12.0/lib/ns/Makefile.in~    2018-01-17 07:56:09.000000000 +0100
-+++ bind-9.12.0/lib/ns/Makefile.in     2018-01-24 08:29:54.886677552 +0100
-@@ -37,7 +37,7 @@ DNSLIBS =    ../../lib/dns/libdns.@A@ @DNS_
- 
- DNSDEPLIBS =  ../../lib/dns/libdns.@A@
- 
--LIBS =                @LIBS@
-+LIBS =                @LIBS@ ../dns/libdns.la
- 
- # Alphabetically
- OBJS =                client.@O@ hooks.@O@ interfacemgr.@O@ lib.@O@ \

diff --git a/bind-named.conf b/bind-named.conf
index 83e3783bd5a9bf90264c49058e54caa458118a47..7968c2b4da7bd494f0a1ed5119ac2427e8ce78fd 100644 (file)
--- a/bind-named.conf
+++ b/bind-named.conf
@@ -5,15 +5,25 @@ options {
        pid-file "named.pid";
        auth-nxdomain yes;
        datasize default;
-// Uncoment these to enable IPv6 connections support
-// IPv4 will still work
-//     listen-on { none; };
+// For IPv4 and IPv6 uncoment listen-on and listen-on-v6 entries.
+// Regular DNS
+//     listen-on { any; };
+// DNS-over-TLS (DoT)
+//     listen-on tls ephemeral { any; };
+// DNS-over-HTTPS (DoH)
+//     listen-on tls ephemeral http local { any; };
 //     listen-on-v6 { any; };
+//     listen-on-v6 tls ephemeral { any; };
+//     listen-on-v6 tls ephemeral http local { any; };
 
-       #dnssec-enable yes;      # enable DNSSEC, default yes
+//     dnssec-enable yes;      # enable DNSSEC, default yes
        dnssec-validation auto;  # enable DNSSEC validation with the key from bind.keys
 };
 
+http local {
+    endpoints { "/dns-query"; };
+};
+
 zone "localhost" IN {
        type master;
        file "M/localhost.zone";

diff --git a/bind-pmake.patch b/bind-pmake.patch
deleted file mode 100644 (file)
index 681fa80..0000000
--- a/bind-pmake.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ur bind-9.3.0rc3.orig/make/rules.in bind-9.3.0rc3/make/rules.in
---- bind-9.3.0rc3.orig/make/rules.in   2004-03-15 02:02:44.000000000 +0100
-+++ bind-9.3.0rc3/make/rules.in        2004-09-01 10:51:31.568733488 +0200
-@@ -47,7 +47,10 @@ top_builddir =      @BIND9_TOP_BUILDDIR@
- ###   PREREQS
- ###   TARGETS
- 
--all: ${PREREQS} subdirs ${TARGETS} testdirs
-+all: ${PREREQS} touchfile ${TARGETS} testdirs
-+
-+touchfile: subdirs
-+      touch touchfile
- 
- ###
- ### Subdirectories
-diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.in
---- bind-9.3.0rc3.orig/lib/dns/Makefile.in     2004-07-20 09:01:57.000000000 +0200
-+++ bind-9.3.0rc3/lib/dns/Makefile.in  2004-09-01 10:54:21.089962344 +0200
-@@ -135,11 +135,11 @@ version.@O@: version.c
-               -DMAPAPI=\"${MAPAPI}\" \
-               -c ${srcdir}/version.c
- 
--libdns.@SA@: ${OBJS}
-+libdns.@SA@: touchfile ${OBJS}
-       ${AR} ${ARFLAGS} $@ ${OBJS}
-       ${RANLIB} $@
- 
--libdns.la: ${OBJS}
-+libdns.la: touchfile ${OBJS}
-       ${LIBTOOL_MODE_LINK} \
-               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
-               -release "${VERSION}" \
---- bind-9.16.12/lib/isc/Makefile.in~  2021-02-04 12:35:16.000000000 +0100
-+++ bind-9.16.12/lib/isc/Makefile.in   2021-02-17 22:03:34.729090432 +0100
-@@ -97,21 +97,21 @@ version.@O@: version.c
-               -DVERSION=\"${VERSION}\" \
-               -c ${srcdir}/version.c
- 
--libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
-+libisc.@SA@: touchfile ${OBJS} ${SYMTBLOBJS}
-       ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
-       ${RANLIB} $@
- 
--libisc-nosymtbl.@SA@: ${OBJS}
-+libisc-nosymtbl.@SA@: touchfile ${OBJS}
-       ${AR} ${ARFLAGS} $@ ${OBJS}
-       ${RANLIB} $@
- 
--libisc.la: ${OBJS} ${SYMTBLOBJS}
-+libisc.la: touchfile ${OBJS} ${SYMTBLOBJS}
-       ${LIBTOOL_MODE_LINK} \
-               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
-               -release "${VERSION}" \
-               ${OBJS} ${SYMTBLOBJS} ${LIBS}
- 
--libisc-nosymtbl.la: ${OBJS}
-+libisc-nosymtbl.la: touchfile ${OBJS}
-       ${LIBTOOL_MODE_LINK} \
-               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-               -release "${VERSION}" \
-

diff --git a/bind.spec b/bind.spec
index 2d5af6c347a0d554e2ad1a0fb3a9803dcfef12a0..d52ddca7411fbd8c87991aa816846c93feebd5d0 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -43,7 +43,7 @@ Summary(uk.UTF-8):    BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):  Internet 域名服务器
 Name:          bind
 Version:       %{ver}%{pverdot}
-Release:       0.1
+Release:       1
 Epoch:         7
 License:       MPL 2.0
 Group:         Networking/Daemons
@@ -67,8 +67,6 @@ Source10:     %{name}-named.conf
 Source11:      %{name}.tmpfiles
 Source12:      named.service
 
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-pmake.patch
 Patch4:                %{name}-ac-libs.patch
 Patch5:                %{name}-edns-client-subnet.patch
 URL:           https://www.isc.org/software/bind
@@ -365,9 +363,7 @@ BIND.
 %prep
 %setup -q %{?with_hip:-a6} -n %{name}-%{ver}%{pverdir}
 
-#%patch1 -p1
-#%patch2 -p1
-#%patch4 -p1
+%patch4 -p1
 %{?with_hip:%{__mv} bind-hip/hip_55.[ch] lib/dns/rdata/generic}
 %{?with_edns_cli:%patch5 -p0}
 

diff --git a/named.init b/named.init
index 661f1bc305d96750141fc8daedd5a26361790a70..f22b6489b32dfce1aecc4b7c653c084e0a41325d 100644 (file)
--- a/named.init
+++ b/named.init
@@ -38,7 +38,7 @@ fi
 
 # configtest itself
 configtest() {
-       /usr/sbin/named-checkconf -j -t $CHROOT_TO_DIR 2>&1
+       /usr/bin/named-checkconf -j -t $CHROOT_TO_DIR 2>&1
        return $?
 }
 

diff --git a/named.service b/named.service
index 4df05921c5fa9468b1eae26dfa522788a01a41e1..d58df8033fe82475ae241cee9bbf5a88228a9658 100644 (file)
--- a/named.service
+++ b/named.service
@@ -11,7 +11,7 @@ Environment=CHROOT_TO_DIR=/var/lib/named
 EnvironmentFile=-/etc/sysconfig/named
 ExecStartPre=/bin/touch ${CHROOT_TO_DIR}/named.log
 ExecStartPre=/bin/chown named:named ${CHROOT_TO_DIR}/named.log
-ExecStartPre=/usr/sbin/named-checkconf -t ${CHROOT_TO_DIR} -z /etc/named.conf
+ExecStartPre=/usr/bin/named-checkconf -t ${CHROOT_TO_DIR} -z /etc/named.conf
 ExecStart=/usr/sbin/named -u named -t ${CHROOT_TO_DIR} -c /etc/named.conf $NAMED_OPT
 ExecStop=/bin/sh -c '[ -f /etc/rndc.conf ] && /usr/sbin/rndc stop || /bin/kill -TERM $MAINPID'
 ExecReload=/bin/sh -c '[ -f /etc/rndc.conf ] && /usr/sbin/rndc reload || /bin/kill -HUP $MAINPID'