[Midnightbsd-cvs] mports [21900] trunk/dns/bind910: 9.10.4 P3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 27 20:22:14 EDT 2016


Revision: 21900
          http://svnweb.midnightbsd.org/mports/?rev=21900
Author:   laffer1
Date:     2016-09-27 20:22:14 -0400 (Tue, 27 Sep 2016)
Log Message:
-----------
9.10.4 P3

Modified Paths:
--------------
    trunk/dns/bind910/Makefile
    trunk/dns/bind910/distinfo
    trunk/dns/bind910/files/extrapatch-bind-min-override-ttl
    trunk/dns/bind910/files/named.root
    trunk/dns/bind910/files/patch-configure
    trunk/dns/bind910/pkg-plist

Added Paths:
-----------
    trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in

Removed Paths:
-------------
    trunk/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in

Modified: trunk/dns/bind910/Makefile
===================================================================
--- trunk/dns/bind910/Makefile	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/Makefile	2016-09-28 00:22:14 UTC (rev 21900)
@@ -29,7 +29,7 @@
 LICENSE=	iscl
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.3-P4
+ISCVERSION=	9.10.4-P3
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: trunk/dns/bind910/distinfo
===================================================================
--- trunk/dns/bind910/distinfo	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/distinfo	2016-09-28 00:22:14 UTC (rev 21900)
@@ -1,2 +1,3 @@
-SHA256 (bind-9.10.3-P4.tar.gz) = 2ac044b5fbdf45fb45107af0df961b3b7cb5262a3bf1948ed3fe7a170dd13e3e
-SIZE (bind-9.10.3-P4.tar.gz) = 8529535
+TIMESTAMP = 1474631813
+SHA256 (bind-9.10.4-P3.tar.gz) = a075e5ce89fddccb0e64d1777d59161387dd5151cf4e7d1a93875a487812baef
+SIZE (bind-9.10.4-P3.tar.gz) = 9299078

Modified: trunk/dns/bind910/files/extrapatch-bind-min-override-ttl
===================================================================
--- trunk/dns/bind910/files/extrapatch-bind-min-override-ttl	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/files/extrapatch-bind-min-override-ttl	2016-09-28 00:22:14 UTC (rev 21900)
@@ -1,7 +1,6 @@
-diff -Nabdur bind-9.6.0-P1.orig/bin/named/config.c bind-9.6.0-P1/bin/named/config.c
---- bin/named/config.c	2009-05-22 12:24:49.000000000 +0400
-+++ bin/named/config.c	2009-05-22 12:31:35.000000000 +0400
-@@ -129,6 +129,8 @@
+--- bin/named/config.c.orig	2016-04-20 20:11:20 UTC
++++ bin/named/config.c
+@@ -151,6 +151,8 @@ options {\n\
  	min-roots 2;\n\
  	lame-ttl 600;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
@@ -10,11 +9,10 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 0;\n\
-diff -Nabdur bind-9.6.0-P1.orig/bin/named/server.c bind-9.6.0-P1/bin/named/server.c
---- bin/named/server.c	2009-05-22 12:24:49.000000000 +0400
-+++ bin/named/server.c	2009-05-22 12:32:18.000000000 +0400
-@@ -1727,6 +1727,16 @@
- 		CHECK(mustbesecure(obj, view->resolver));
+--- bin/named/server.c.orig	2016-04-20 20:11:20 UTC
++++ bin/named/server.c
+@@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie
+ 	}
  
  	obj = NULL;
 +	result = ns_config_get(maps, "override-cache-ttl", &obj);
@@ -30,22 +28,20 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
-diff -Nabdur bind-9.6.0-P1.orig/lib/dns/include/dns/view.h bind-9.6.0-P1/lib/dns/include/dns/view.h
---- lib/dns/include/dns/view.h	2009-05-22 12:24:49.000000000 +0400
-+++ lib/dns/include/dns/view.h	2009-05-22 12:29:03.000000000 +0400
-@@ -131,6 +131,8 @@
- 	isc_boolean_t			provideixfr;
+--- lib/dns/include/dns/view.h.orig	2016-04-20 20:11:20 UTC
++++ lib/dns/include/dns/view.h
+@@ -150,6 +150,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
+ 	isc_boolean_t			requestsit;
  	dns_ttl_t			maxcachettl;
 +	dns_ttl_t			mincachettl;
 +	dns_ttl_t			overridecachettl;
  	dns_ttl_t			maxncachettl;
- 	in_port_t			dstport;
- 	dns_aclenv_t			aclenv;
-diff -Nabdur bind-9.6.0-P1.orig/lib/dns/resolver.c bind-9.6.0-P1/lib/dns/resolver.c
---- lib/dns/resolver.c	2009-05-22 12:24:49.000000000 +0400
-+++ lib/dns/resolver.c	2009-05-22 12:30:41.000000000 +0400
-@@ -4054,6 +4054,18 @@
+ 	dns_ttl_t			prefetch_trigger;
+ 	dns_ttl_t			prefetch_eligible;
+--- lib/dns/resolver.c.orig	2016-04-20 20:11:20 UTC
++++ lib/dns/resolver.c
+@@ -5371,6 +5371,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -64,11 +60,10 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
-diff -Nabdur bind-9.6.0-P1.orig/lib/isccfg/namedconf.c bind-9.6.0-P1/lib/isccfg/namedconf.c
---- lib/isccfg/namedconf.c	2009-05-22 12:24:49.000000000 +0400
-+++ lib/isccfg/namedconf.c	2009-05-22 12:31:21.000000000 +0400
-@@ -821,6 +821,8 @@
- 	{ "lame-ttl", &cfg_type_uint32, 0 },
+--- lib/isccfg/namedconf.c.orig	2016-04-20 20:11:20 UTC
++++ lib/isccfg/namedconf.c
+@@ -1572,6 +1572,8 @@ view_clauses[] = {
+ #endif
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizenodefault, 0 },
 +	{ "override-cache-ttl", &cfg_type_uint32, 0 },

Modified: trunk/dns/bind910/files/named.root
===================================================================
--- trunk/dns/bind910/files/named.root	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/files/named.root	2016-09-28 00:22:14 UTC (rev 21900)
@@ -1,5 +1,5 @@
 ;
-; $FreeBSD: head/dns/bind910/files/named.root 406719 2016-01-19 21:13:06Z mat $
+; $FreeBSD: head/dns/bind910/files/named.root 414266 2016-04-29 10:05:11Z mat $
 ;
 
 ;       This file holds the information on root name servers needed to
@@ -13,8 +13,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    December 01, 2015
-;       related version of root zone:   2015120100
+;       last update:    March 23, 2016
+;       related version of root zone:   2016032301
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -84,7 +84,7 @@
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
 ;
 ; OPERATED BY WIDE
 ;

Deleted: trunk/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in
===================================================================
--- trunk/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in	2016-09-28 00:22:14 UTC (rev 21900)
@@ -1,11 +0,0 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig	2015-09-09 02:23:40 UTC
-+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -43,7 +43,7 @@ OBJS =          ${DLOPENOBJS}
- @BIND9_MAKE_RULES@
- 
- CFLAGS =	@CFLAGS@ @SO_CFLAGS@
--SO_LDFLAGS =	@LDFLAGS@ @SO_LDFLAGS@
-+SO_LDFLAGS =	@SO_LDFLAGS@
- 
- dlopen at EXEEXT@: ${DLOPENOBJS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \

Copied: trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in (from rev 21899, trunk/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in)
===================================================================
--- trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in	                        (rev 0)
+++ trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in	2016-09-28 00:22:14 UTC (rev 21900)
@@ -0,0 +1,11 @@
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2016-04-20 20:11:20 UTC
++++ bin/tests/system/dlzexternal/Makefile.in
+@@ -43,7 +43,7 @@ OBJS =          ${DLOPENOBJS}
+ @BIND9_MAKE_RULES@
+ 
+ CFLAGS =	@CFLAGS@ @SO_CFLAGS@
+-SO_LDFLAGS =	@LDFLAGS@ @SO_LDFLAGS@
++SO_LDFLAGS =	@SO_LDFLAGS@
+ 
+ dlopen at EXEEXT@: ${DLOPENOBJS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \

Modified: trunk/dns/bind910/files/patch-configure
===================================================================
--- trunk/dns/bind910/files/patch-configure	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/files/patch-configure	2016-09-28 00:22:14 UTC (rev 21900)
@@ -1,6 +1,6 @@
---- configure.orig	2015-12-06 12:37:44 UTC
+--- configure.orig	2016-04-20 20:11:20 UTC
 +++ configure
-@@ -14100,27 +14100,9 @@ done
+@@ -14142,27 +14142,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
-@@ -14163,47 +14145,7 @@ $as_echo "no" >&6; } ;;
+@@ -14205,47 +14187,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
-@@ -21456,7 +21398,7 @@ $as_echo "" >&6; }
+@@ -21602,7 +21544,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Modified: trunk/dns/bind910/pkg-plist
===================================================================
--- trunk/dns/bind910/pkg-plist	2016-09-14 12:21:06 UTC (rev 21899)
+++ trunk/dns/bind910/pkg-plist	2016-09-28 00:22:14 UTC (rev 21900)
@@ -410,6 +410,8 @@
 sbin/tsig-keygen
 %%ETCDIR%%/rndc.conf.sample
 %%ETCDIR%%/bind.keys
+%%NOBASE%%etc/mtree/BIND.chroot.dist
+%%NOBASE%%etc/mtree/BIND.chroot.local.dist
 %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
 %%NOBASE%%%%ETCDIR%%/named.root
 %%NOBASE%%%%ETCDIR%%/master/empty.db
@@ -416,6 +418,6 @@
 %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master
+%%NOBASE%%@dir %%ETCDIR%%/master
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working



More information about the Midnightbsd-cvs mailing list