mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

Update to latest commit.

Browse Source 
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2018-08-13 13:26:24 +00:00
parent 5fcce45eec
commit e0d56ca9a1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=477067
7 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dns/bind9-devel/Makefile
View File

@ -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.02
ISCVERSION= 9.13.1a0.2018.08.13
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= 9c4fb3b3e65aeabb20efe82d53e5fb3d7ff39024
GL_COMMIT= a2188e61e78403b374ec8842493a0b13799114ba
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind9-devel/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1533552092
SHA256 (isc-projects-bind9-9c4fb3b3e65aeabb20efe82d53e5fb3d7ff39024_GL0.tar.gz) = 33875f3eed12065994d2bf1df499a6da9cb34a75b43d67180a9995bd1d8fb169
SIZE (isc-projects-bind9-9c4fb3b3e65aeabb20efe82d53e5fb3d7ff39024_GL0.tar.gz) = 8526082
TIMESTAMP = 1534162144
SHA256 (isc-projects-bind9-a2188e61e78403b374ec8842493a0b13799114ba_GL0.tar.gz) = 17133f2fffd45486bb7c1a5de6f3db932753bd0896009a42a17d485112afc45e
SIZE (isc-projects-bind9-a2188e61e78403b374ec8842493a0b13799114ba_GL0.tar.gz) = 8521884

28
dns/bind9-devel/files/extrapatch-bind-min-override-ttl
View File

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2018-07-20 16:02:35 UTC
--- bin/named/config.c.orig 2018-08-13 11:22:25 UTC
+++ bin/named/config.c
@@ -173,12 +173,14 @@ options {\n\
@@ -174,12 +174,14 @@ options {\n\
max-recursion-queries 75;\n\
max-stale-ttl 604800; /* 1 week */\n\
message-compression yes;\n\
@ -15,9 +15,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2018-07-20 16:02:35 UTC
--- bin/named/server.c.orig 2018-08-13 11:22:25 UTC
+++ bin/named/server.c
@@ -4071,6 +4071,16 @@ configure_view(dns_view_t *view, dns_vie
@@ -4073,6 +4073,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@ -34,20 +34,20 @@
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2018-07-20 16:02:35 UTC
--- lib/dns/include/dns/view.h.orig 2018-08-13 11:22:25 UTC
+++ lib/dns/include/dns/view.h
@@ -151,6 +151,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
@@ -153,6 +153,8 @@ struct dns_view {
bool requestnsid;
bool sendcookie;
dns_ttl_t maxcachettl;
+ dns_ttl_t mincachettl;
+ dns_ttl_t overridecachettl;
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-07-20 16:02:35 UTC
uint32_t nta_lifetime;
uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-08-13 11:22:25 UTC
+++ lib/dns/resolver.c
@@ -5799,6 +5799,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
@@ -5801,6 +5801,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@ -66,9 +66,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2018-07-20 16:02:35 UTC
--- lib/isccfg/namedconf.c.orig 2018-08-13 11:22:25 UTC
+++ lib/isccfg/namedconf.c
@@ -1917,6 +1917,8 @@ view_clauses[] = {
@@ -1919,6 +1919,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },

4
dns/bind9-devel/files/patch-bin_named_include_named_globals.h
View File

@ -1,8 +1,8 @@
We reference the pid file as being run/named/pid everywere else.
--- bin/named/include/named/globals.h.orig 2018-05-18 05:44:02 UTC
--- bin/named/include/named/globals.h.orig 2018-08-13 11:22:25 UTC
+++ bin/named/include/named/globals.h
@@ -126,7 +126,7 @@ EXTERN isc_boolean_t named_g_forcelock
@@ -128,7 +128,7 @@ EXTERN bool named_g_forcelock INIT(fals
#if NAMED_RUN_PID_DIR
EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR
"/run/named/"

8
dns/bind9-devel/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2018-07-27 05:55:45 UTC
--- configure.orig 2018-08-13 11:22:25 UTC
+++ configure
@@ -16701,27 +16701,9 @@ done
@@ -16847,27 +16847,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
@@ -16764,47 +16746,7 @@ $as_echo "no" >&6; } ;;
@@ -16910,47 +16892,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
@@ -23093,7 +23035,7 @@ $as_echo "" >&6; }
@@ -23189,7 +23131,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

17
dns/bind9-devel/files/patch-lib_isc_include_isc_Makefile.in Normal file
View File

@ -0,0 +1,17 @@
--- lib/isc/include/isc/Makefile.in.orig 2018-08-13 11:22:25 UTC
+++ lib/isc/include/isc/Makefile.in
@@ -19,12 +19,12 @@ VERSION=@BIND9_VERSION@
# install target below.
#
HEADERS = aes.h app.h assertions.h backtrace.h base32.h base64.h \
- bind9.h boolean.h buffer.h bufferlist.h \
+ bind9.h buffer.h bufferlist.h \
commandline.h counter.h crc64.h deprecated.h \
errno.h error.h event.h eventclass.h \
file.h formatcheck.h fsaccess.h fuzz.h \
hash.h heap.h hex.h hmacmd5.h hmacsha.h ht.h httpd.h \
- int.h interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \
+ interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \
json.h lang.h lex.h lfsr.h lib.h likely.h list.h log.h \
magic.h md5.h mem.h meminfo.h msgcat.h msgs.h mutexblock.h \
netaddr.h netscope.h nonce.h os.h parseint.h \

2
dns/bind9-devel/pkg-plist
View File

@ -141,7 +141,6 @@ include/isc/backtrace.h
include/isc/base32.h
include/isc/base64.h
include/isc/bind9.h
include/isc/boolean.h
include/isc/buffer.h
include/isc/bufferlist.h
include/isc/commandline.h
@ -165,7 +164,6 @@ include/isc/hmacmd5.h
include/isc/hmacsha.h
include/isc/ht.h
include/isc/httpd.h
include/isc/int.h
include/isc/interfaceiter.h
include/isc/iterated_hash.h
include/isc/json.h