[v9_8_4_patch] spin 9.8.4-P2, disabling regex.h

3516.	[security]	Removed the check for regex.h in configure in order
			to disable regex syntax checking, as it exposes
			BIND to a critical flaw in libregex on some
			platforms. [RT #32688]

diff --git a/CHANGES b/CHANGES
index 6d1ee3109994f0cbd4992585c675863ed7d4e1c5..bd064e5ff9806586d28b73f4a20ef86e42e0f0d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+       --- 9.8.4-P2 released ---
+
+3516.  [security]      Removed the check for regex.h in configure in order
+                       to disable regex syntax checking, as it exposes
+                       BIND to a critical flaw in libregex on some
+                       platforms. [RT #32688]
+
        --- 9.8.4-P1 released ---
 
 3407.  [security]      Named could die on specific queries with dns64 enabled.

diff --git a/config.h.in b/config.h.in
index e2f5999dabcebf9fad266ef5d239559c62bc1f6d..42d7a21fa5f4b4b9b2bf3592e13ab1d80717cd93 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -286,9 +286,6 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define if your OpenSSL version supports GOST. */
 #undef HAVE_OPENSSL_GOST
 
-/* Define to 1 if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
-
 /* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 

diff --git a/configure.in b/configure.in
index a0ec70020cc3eb68d8c4a150a544e91fa4ce0b17..0567addc186e776a1999a2786bd5dfeb30cd521f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -298,7 +298,7 @@ esac
 
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(fcntl.h regex.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,,
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,,
 [$ac_includes_default
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>

diff --git a/version b/version
index 1090bee28cee5f35f3d83434217ec0174f2f1884..da686fa0a2d0b552cfa2d5551dce8a677734ab12 100644 (file)
--- a/version
+++ b/version
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=8
 PATCHVER=4
 RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2