git: b273390548ec - 2021Q2 - dns/bind911: Update to 9.11.31.

[Mathieu Arnold]

The branch 2021Q2 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b273390548ec4080e4f905ea107ed8423d68ce01

commit b273390548ec4080e4f905ea107ed8423d68ce01
Author:     Mathieu Arnold <mat at FreeBSD.org>
AuthorDate: 2021-04-27 09:50:24 +0000
Commit:     Mathieu Arnold <mat at FreeBSD.org>
CommitDate: 2021-04-29 09:38:26 +0000

    dns/bind911: Update to 9.11.31.
    
    MFH:            2021Q2
    Security:       CVE-2021-25214
    Security:       CVE-2021-25215
    Security:       CVE-2021-25216
    Sponsored by:   Absolight
    
    (cherry picked from commit 291f35995908f8221f758db17058f2cb4f88c9aa)
---
 dns/bind911/Makefile              |  2 +-
 dns/bind911/distinfo              |  6 +++---
 dns/bind911/files/patch-configure | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 0d9af87bc116..f80e86d7ed50 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 USES=	cpe libedit pkgconfig
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.29
+ISCVERSION=	9.11.31
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 3e623c34c866..bdfd63ad0477 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616162892
-SHA256 (bind-9.11.29.tar.gz) = c7bbc751cc6e9ba84038c55a29475ae004a71df8067127be73e4770de99e7b07
-SIZE (bind-9.11.29.tar.gz) = 8297010
+TIMESTAMP = 1619513308
+SHA256 (bind-9.11.31.tar.gz) = f5f24457f42b2e86870d887596e47500e4d40521a098dcb96f3a06f18adfa36a
+SIZE (bind-9.11.31.tar.gz) = 8296079
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index b6a5e514857b..06b9fe949302 100644
--- a/dns/bind911/files/patch-configure
+++ b/dns/bind911/files/patch-configure
@@ -3,9 +3,9 @@
 - Make sure only json-c is detected.
 - Cleanup the BDB discovery code to find more recent versions.
 
---- configure.orig	2021-03-09 12:49:28 UTC
+--- configure.orig	2021-04-19 14:10:40 UTC
 +++ configure
-@@ -15692,27 +15692,9 @@ done
+@@ -15689,27 +15689,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -35,7 +35,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15755,47 +15737,7 @@ $as_echo "no" >&6; } ;;
+@@ -15752,47 +15734,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -84,7 +84,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -18670,7 +18612,7 @@ case "$use_libjson" in
+@@ -18667,7 +18609,7 @@ case "$use_libjson" in
  	auto|yes)
  		for d in /usr /usr/local /opt/local
  		do
@@ -93,7 +93,7 @@
  			then
  				if test ${d} != /usr
  				then
-@@ -18678,29 +18620,16 @@ case "$use_libjson" in
+@@ -18675,29 +18617,16 @@ case "$use_libjson" in
  					LIBS="$LIBS -L${d}/lib"
  				fi
  				have_libjson="yes"
@@ -124,7 +124,7 @@
  			have_libjson_c="yes"
  		else
  			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
-@@ -24995,7 +24924,7 @@ $as_echo "" >&6; }
+@@ -24964,7 +24893,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).