summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-09-23 10:58:38 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-09-23 10:58:38 +0000
commit211e42d231a01850aa90f32c2218b538ffbef0a5 (patch)
tree869e82fc2c8c866e333e0df80ced8678259825ff
parentUpdate to v5.31.4-7-g75e935adf0. (diff)
Update ti latest commit.
Notes
Notes: svn path=/head/; revision=512623
-rw-r--r--dns/bind9-devel/Makefile6
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/patch-configure8
-rw-r--r--dns/bind9-devel/pkg-plist2
4 files changed, 10 insertions, 12 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index bea6306e5ce7..1a49b6c89c43 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -9,7 +9,7 @@ PORTREVISION= 0
.else
# XXX: correct version
# dns/bind9xx here
-PORTREVISION= 1
+PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
# XXX: put the ISC master_site
@@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove tar:bz2
USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.15.3a0.2019.09.13
+ISCVERSION= 9.15.3a0.2019.09.17
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= 3699545dace25859d5fe265cb9aeced22d883eb1
+GL_COMMIT= 6aec894c4c4ac708f94ef495a010862733f8e5af
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index bacca2d52bb0..f8a89eee100e 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568666955
-SHA256 (isc-projects-bind9-3699545dace25859d5fe265cb9aeced22d883eb1_GL0.tar.gz) = dc8957993d1278fba7306968b0c63e3a00343bd56678f1b549655205dcd17a92
-SIZE (isc-projects-bind9-3699545dace25859d5fe265cb9aeced22d883eb1_GL0.tar.gz) = 6343436
+TIMESTAMP = 1569232851
+SHA256 (isc-projects-bind9-6aec894c4c4ac708f94ef495a010862733f8e5af_GL0.tar.gz) = 802aeba09b883e2cc1dfe9e8c51b195e43fd198be199224d236fb857ac739bd3
+SIZE (isc-projects-bind9-6aec894c4c4ac708f94ef495a010862733f8e5af_GL0.tar.gz) = 6335747
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 89a72f864059..4d2d4fde9b87 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,8 +1,8 @@
Fixup gssapi and db detection.
---- configure.orig 2019-09-13 08:55:55 UTC
+--- configure.orig 2019-09-17 18:26:12 UTC
+++ configure
-@@ -17249,27 +17249,9 @@ done
+@@ -17247,27 +17247,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
{ $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
-@@ -17312,47 +17294,7 @@ $as_echo "no" >&6; } ;;
+@@ -17310,47 +17292,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22742,7 +22684,7 @@ $as_echo "" >&6; }
+@@ -22689,7 +22631,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index ffea3c092bf2..142681c10af4 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -257,8 +257,6 @@ include/pk11/site.h
include/pkcs11/cryptoki.h
include/pkcs11/eddsa.h
include/pkcs11/pkcs11.h
-include/pkcs11/pkcs11f.h
-include/pkcs11/pkcs11t.h
lib/libbind9.a
lib/libdns.a
lib/libirs.a