svn commit: r478206 - in head/dns/bind9-devel: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Aug 27 13:51:27 UTC 2018
Author: mat
Date: Mon Aug 27 13:51:26 2018
New Revision: 478206
URL: https://svnweb.freebsd.org/changeset/ports/478206
Log:
Update to latest (building) commit.
Cleanup obsolete options.
Modified:
head/dns/bind9-devel/Makefile (contents, props changed)
head/dns/bind9-devel/distinfo (contents, props changed)
head/dns/bind9-devel/files/patch-configure (contents, props changed)
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Mon Aug 27 13:51:04 2018 (r478205)
+++ head/dns/bind9-devel/Makefile Mon Aug 27 13:51:26 2018 (r478206)
@@ -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
@@ -40,13 +40,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
# XXX: remove tar:bz2
USES= cpe libedit ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.13.1a0.2018.08.17
+ISCVERSION= 9.13.1a0.2018.08.24
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= bf98eb41bfc6a8580a5f430f11a2ded73ea9c234
+GL_COMMIT= e79b42fec05b61082d7c3ee7a43dcbb7a1dca440
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
@@ -57,7 +57,6 @@ CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
- --with-randomdev=/dev/random \
--with-libxml2=${LOCALBASE} \
--with-readline="-L${LOCALBASE}/lib -ledit" \
--with-dlopen=yes \
@@ -82,13 +81,12 @@ MAKE_JOBS_UNSAFE= yes
PORTDOCS= *
-OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON
+OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON
OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \
- FIXED_RRSET SIGCHASE IPV6 THREADS
+ FIXED_RRSET SIGCHASE IPV6
-OPTIONS_RADIO= CRYPTO GOSTDEF
+OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11
-OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
@@ -115,9 +113,6 @@ DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
GEOIP_DESC= Allow geographically based ACL.
-GOSTDEF_DESC= Enable GOST ciphers
-GOST_ASN1_DESC= GOST using ASN.1
-GOST_DESC= GOST raw keys (new default)
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@@ -145,7 +140,6 @@ DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes
DLZ_LDAP_USE= openldap=yes
DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes
-DLZ_MYSQL_PREVENTS= THREADS
DLZ_MYSQL_USES= mysql
DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes
@@ -154,7 +148,6 @@ DLZ_POSTGRESQL_USES= pgsql
DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes
DNSTAP_CONFIGURE_ENABLE= dnstap
-DNSTAP_IMPLIES= THREADS
DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
@@ -163,10 +156,6 @@ FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
GEOIP_CONFIGURE_WITH= geoip
GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GOST_ASN1_CONFIGURE_ON= --with-gost=asn1
-
-GOST_CONFIGURE_ON= --with-gost
-
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_BASE_USES= gssapi
@@ -199,7 +188,6 @@ LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11
-NATIVE_PKCS11_IMPLIES= THREADS
PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
@@ -221,23 +209,10 @@ START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldco
TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen
-THREADS_CONFIGURE_ENABLE= threads
-
-TUNING_LARGE_IMPLIES= THREADS
TUNING_LARGE_CONFIGURE_ON= --with-tuning=large
TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default
.include <bsd.port.pre.mk>
-
-.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1}
-CONFIGURE_ARGS+= --without-gost
-.endif
-
-.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
-BROKEN= OpenSSL from the base system does not support GOST, add \
- DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \
- that needs SSL.
-.endif
# XXX: Remove
post-extract:
Modified: head/dns/bind9-devel/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo Mon Aug 27 13:51:04 2018 (r478205)
+++ head/dns/bind9-devel/distinfo Mon Aug 27 13:51:26 2018 (r478206)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534758794
-SHA256 (isc-projects-bind9-bf98eb41bfc6a8580a5f430f11a2ded73ea9c234_GL0.tar.gz) = a2d09c6adbedbc0cf9e212435fd1de4b894e506c629bbaec312c4b6b244e500a
-SIZE (isc-projects-bind9-bf98eb41bfc6a8580a5f430f11a2ded73ea9c234_GL0.tar.gz) = 8523629
+TIMESTAMP = 1535376514
+SHA256 (isc-projects-bind9-e79b42fec05b61082d7c3ee7a43dcbb7a1dca440_GL0.tar.gz) = f247179d173152899c68fe7a2560deb363476e01f1881e25969d1d269b51ec06
+SIZE (isc-projects-bind9-e79b42fec05b61082d7c3ee7a43dcbb7a1dca440_GL0.tar.gz) = 8527679
Modified: head/dns/bind9-devel/files/patch-configure
==============================================================================
--- head/dns/bind9-devel/files/patch-configure Mon Aug 27 13:51:04 2018 (r478205)
+++ head/dns/bind9-devel/files/patch-configure Mon Aug 27 13:51:26 2018 (r478206)
@@ -1,6 +1,6 @@
---- configure.orig 2018-08-17 13:37:31 UTC
+--- configure.orig 2018-08-24 15:01:10 UTC
+++ configure
-@@ -16730,27 +16730,9 @@ done
+@@ -16785,27 +16785,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -30,7 +30,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
-@@ -16793,47 +16775,7 @@ $as_echo "no" >&6; } ;;
+@@ -16848,47 +16830,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23046,7 +22988,7 @@ $as_echo "" >&6; }
+@@ -23101,7 +23043,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
More information about the svn-ports-all
mailing list