# HG changeset patch # User Stacey Marshall # Date 1398161229 -3600 # Node ID 3855f970a9cc9ac690c518061a1ee5abd46e8c98 # Parent 7d29921cebab8154d1321757298a5871edc54f0b 18452930 Upgrade Solaris to BIND 9.6-ESV-R11 15609922 SUNBT6909705 BIND 9.6.x test T:dst:2:a fails as of onnv_119 18390583 problem in SERVICE/DNS-SERVER diff -r 7d29921cebab -r 3855f970a9cc components/bind/Makefile --- a/components/bind/Makefile Tue Apr 22 22:07:10 2014 -0700 +++ b/components/bind/Makefile Tue Apr 22 11:07:09 2014 +0100 @@ -23,17 +23,18 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= bind -COMPONENT_VERSION= 9.6-ESV-R10-P2 -IPS_COMPONENT_VERSION= 9.6.3.10.2 +COMPONENT_VERSION= 9.6-ESV-R11 +IPS_COMPONENT_VERSION= 9.6.3.11.0 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_PROJECT_URL= http://www.isc.org/software/bind/ # hash from: sha256sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha256:\1/' COMPONENT_ARCHIVE_HASH= \ - sha256:1b131ef3a3b27a7916815ec5f4a87f0d9f5ac0669df21c7ec75ba18a13238eda + sha256:4f052195a62218c05a05033774452e6a9e329b865c01e594cc20a6adf11e0d0f COMPONENT_ARCHIVE_URL= \ http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= service/dns-server include ../../make-rules/prep.mk include ../../make-rules/configure.mk @@ -92,7 +93,9 @@ # /^I:/ = Info from a test; colleced for possible use later. # /^A:/ = About: summary of the test - not used here. # /^R:/ = Result: If 'PASS' then continue, else print line and collected info. -# Known issues may then be accounted for. +# Known issues may then be accounted for by adding tests, for example: +# /^R:UNTESTED/ && name ~ /^T:dst:2:A/ {known++;}\ +# /^R:UNRESOLVED/ && name ~ /^T:dst:1:A/ {known++;}\ # @ EOF = Display count of RESULTS: i.e. R:PASS=124 R:UNTESTED=26 Total=150 # if not 100% pass rate and issue is not known the word 'issues!' is appended # to resulting string. @@ -102,8 +105,6 @@ /^R:/ {test++; result[$$1]++;}\ /^R:PASS/ {next;}\ /^R:/ {printf("%s: %s\n%s\n", $$1, name, info);}\ - /^R:UNTESTED/ && name ~ /^T:dst:2:A/ {known++;}\ - /^R:UNRESOLVED/ && name ~ /^T:dst:1:A/ {known++;}\ END{for (item in result)\ printf("%s=%d ", item, result[item]);\ printf("(known=%d) Total=%d%s\n", known, test, \ @@ -118,19 +119,20 @@ # fulltest requires sufficient privileges to configures IP addresses # 10.53.0.1 through 10.53.0.5 as aliases on the loopback interface. +# Note PATH is being set so that isc_ifconfig can find ifconfig. FULL_TEST_32= $(TEST_32:%=%_FULL) .PHONY: fulltest fulltest: build $(FULL_TEST_32) $(FULL_TEST_32): - cd $(COMPONENT_SRC) && $(SHELL) $(isc_ifconfig) up + cd $(COMPONENT_SRC) && PATH=/sbin:$(PATH) $(SHELL) $(isc_ifconfig) up -cd $(@D) && $(MAKE) test 2>&1 | $(TEE) $@ - cd $(COMPONENT_SRC) && $(SHELL) $(isc_ifconfig) down + -cd $(COMPONENT_SRC) && PATH=/sbin:$(PATH) $(SHELL) $(isc_ifconfig) down $(NAWK) $(summarize) $@ $(TEST_32): - -cd $(@D) && $(MAKE) test 2>&1 | $(TEE) $@ + -cd $(@D) && $(MAKE) force-test 2>&1 | $(TEE) $@ $(NAWK) $(summarize) $@ # test-summary shows summary for targets test and fulltest. Use target diff -r 7d29921cebab -r 3855f970a9cc components/bind/bind.license --- a/components/bind/bind.license Tue Apr 22 22:07:10 2014 -0700 +++ b/components/bind/bind.license Tue Apr 22 11:07:09 2014 +0100 @@ -2,13 +2,13 @@ This package may include technology which may be subject to one or more of the following additional notices: ------------------------ -- BIND 9.6-ESV-R10-P2 - ------------------------ +-------------------- +- BIND 9.6-ESV-R11 - +-------------------- -Oracle Internal Tracking Number: 16217 +Oracle Internal Tracking Number: 16931 -Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -23,8 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id$ - Portions of this code release fall under one or more of the following Copyright notices. Please see individual source files for details. @@ -109,11 +107,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -526,3 +520,29 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- + +Copyright (c) 1995, 1997, 1998 The NetBSD Foundation, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + diff -r 7d29921cebab -r 3855f970a9cc components/bind/bindc.p5m --- a/components/bind/bindc.p5m Tue Apr 22 22:07:10 2014 -0700 +++ b/components/bind/bindc.p5m Tue Apr 22 11:07:09 2014 +0100 @@ -41,12 +41,12 @@ dir path=usr/lib/dns dir path=usr/sbin -file path=usr/lib/dns/libbind9.so.50.0.10 -file path=usr/lib/dns/libdns.so.113.0.4 -file path=usr/lib/dns/libisc.so.57.2.1 -file path=usr/lib/dns/libisccc.so.50.0.5 -file path=usr/lib/dns/libisccfg.so.50.0.9 -file path=usr/lib/dns/liblwres.so.50.0.10 +file path=usr/lib/dns/libbind9.so.50.0.11 +file path=usr/lib/dns/libdns.so.113.1.1 +file path=usr/lib/dns/libisc.so.110.0.2 +file path=usr/lib/dns/libisccc.so.50.0.6 +file path=usr/lib/dns/libisccfg.so.50.0.10 +file path=usr/lib/dns/liblwres.so.50.0.11 file path=usr/sbin/dig file path=usr/sbin/host file path=usr/sbin/nslookup @@ -54,15 +54,15 @@ file path=usr/sbin/rndc file path=usr/sbin/rndc-confgen -link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.10 -link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.10 -link path=usr/lib/dns/libdns.so target=libdns.so.113.0.4 -link path=usr/lib/dns/libdns.so.113 target=libdns.so.113.0.4 -link path=usr/lib/dns/libisc.so target=libisc.so.57.2.1 -link path=usr/lib/dns/libisc.so.57 target=libisc.so.57.2.1 -link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.5 -link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.5 -link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.9 -link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.9 -link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.10 -link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.10 +link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.11 +link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.11 +link path=usr/lib/dns/libdns.so target=libdns.so.113.1.1 +link path=usr/lib/dns/libdns.so.113 target=libdns.so.113.1.1 +link path=usr/lib/dns/libisc.so target=libisc.so.110.0.2 +link path=usr/lib/dns/libisc.so.110 target=libisc.so.110.0.2 +link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.6 +link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.6 +link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.10 +link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.10 +link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.11 +link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.11