aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwin Lansing <erwin@FreeBSD.org>2013-03-27 07:15:01 +0000
committerErwin Lansing <erwin@FreeBSD.org>2013-03-27 07:15:01 +0000
commit650b026006ec14e630f658a0f877099ec38b660b (patch)
tree71861231d22ebf4fb9567084b8bea45efddc641d
parent2efa5510c3a664350be589050d2b3e8f34b7edb9 (diff)
downloadsrc-650b026006ec14e630f658a0f877099ec38b660b.tar.gz
src-650b026006ec14e630f658a0f877099ec38b660b.zip
Vendor import of Bind 9.8.4-P2vendor/bind9/9.8.4-P2
Approved by: delphij (mentor) Sponsored by: DK Hostmaster A/S
Notes
Notes: svn path=/vendor/bind9/dist/; revision=248784 svn path=/vendor/bind9/9.8.4-P2/; revision=248785; tag=vendor/bind9/9.8.4-P2
-rw-r--r--CHANGES7
-rw-r--r--config.h.in3
-rw-r--r--configure.in2
-rw-r--r--version2
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 6d1ee3109994..bd064e5ff980 100644
--- 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 e2f5999dabce..42d7a21fa5f4 100644
--- 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 a0ec70020cc3..0567addc186e 100644
--- 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 1090bee28cee..da686fa0a2d0 100644
--- a/version
+++ b/version
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=8
PATCHVER=4
RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2