[src/trunk]: src/external/bsd/bind changes for 9.9.5b1

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40c1383f5e32
branches:  trunk
changeset: 792350:40c1383f5e32
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 31 20:23:12 2013 +0000

description:
changes for 9.9.5b1

diffstat:

 external/bsd/bind/bin/named/Makefile       |    3 +-
 external/bsd/bind/binclude4netbsd          |   49 +++++++++++
 external/bsd/bind/bind2netbsd              |  129 +++++++++++++++++++++++++++++
 external/bsd/bind/include/config.h         |   51 +++++++++--
 external/bsd/bind/include/isc/platform.h   |    8 +-
 external/bsd/bind/lib/libisc/Makefile      |    9 +-
 external/bsd/bind/lib/libisc/shlib_version |    4 +-
 7 files changed, 236 insertions(+), 17 deletions(-)

diffs (truncated from 403 to 300 lines):

diff -r 217cd46b8ab6 -r 40c1383f5e32 external/bsd/bind/bin/named/Makefile
--- a/external/bsd/bind/bin/named/Makefile      Tue Dec 31 20:09:42 2013 +0000
+++ b/external/bsd/bind/bin/named/Makefile      Tue Dec 31 20:23:12 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2013/07/27 19:23:09 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2013/12/31 20:23:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -13,6 +13,7 @@
 CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\"defaults\"
 CPPFLAGS+=-DNO_VERSION_DATE -DPRODUCT=\"BIND\" -DSRCID=\"${SRCID}\"
 CPPFLAGS+=-DDESCRIPTION=\"\(Extended\ Support\ Version\)\"
+CPPFLAGS+=-DBUILDER=\"make\"   # I am tempted to say Bob
 
 .include "${IDIST}/srcid"
 
diff -r 217cd46b8ab6 -r 40c1383f5e32 external/bsd/bind/binclude4netbsd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/binclude4netbsd Tue Dec 31 20:23:12 2013 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Use this script to update the bind include files used in the nameserver,
+# after you've imported and built the latest bind code. After you run this,
+# cvs import the resulting directory
+#
+# $ cd bind-X.Y.Z
+# $ configure
+# $ make
+# $ ./binclude4netbsd . /tmp/include
+# Fix manually the config.h file to disable things controlled by the Makefiles
+# $ cd /tmp/include
+# $ cvs -d cvs.netbsd.org:/cvsroot import src/external/bsd/bind/include -m "Include files for bind-X-Y-Z" ISC bind-X-Y-Z
+#
+
+PROG=$(basename $0)
+if [ \( -z "$1" \) -o \( -z "$2" \) ]
+then
+       echo "Usage: $PROG <bind-src> <include-dest>" 1>&2
+       exit 1
+fi
+
+BIND=$1
+INCLUDE=$2
+
+mkdir -p $INCLUDE
+cp $BIND/config.h $INCLUDE
+
+mkdir -p $INCLUDE/dns
+
+cp $BIND/lib/dns/code.h $INCLUDE/dns
+
+for i in enumclass.h enumtype.h rdatastruct.h
+do
+       cp $BIND/lib/dns/include/dns/$i $INCLUDE/dns
+done
+
+mkdir -p $INCLUDE/isc
+
+cp $BIND/lib/isc/include/isc/platform.h $INCLUDE/isc
+
+mkdir -p $INCLUDE/lwres
+
+for i in netdb.h platform.h
+do
+       cp $BIND/lib/lwres/include/lwres/$i $INCLUDE/lwres
+done
+
+cleantags $INCLUDE
diff -r 217cd46b8ab6 -r 40c1383f5e32 external/bsd/bind/bind2netbsd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bind2netbsd     Tue Dec 31 20:23:12 2013 +0000
@@ -0,0 +1,129 @@
+#! /bin/sh
+#
+#      $NetBSD: bind2netbsd,v 1.1 2013/12/31 20:23:12 christos Exp $
+#
+# Copyright (c) 2000 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.
+#
+# bind2netbsd:  convert a bind tree into a
+# netbsd bind source tree, under src/external/bsd/bind/dist,
+# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
+#
+# Rough instructions for importing new bind release:
+#
+#      $ cd /some/where/temporary
+#      $ tar xpfz /new/bind/release/tar/file
+#      $ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd`
+#      $ cd src/external/bsd/bind/dist
+#      $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/bsd/bind/dist ISC bind-9-x-y
+#      $ cd ../../../../../bind-9.x.y
+#      $ run ./configure
+#      $ run make
+#      - use the binclude4netbsd to create and import the new headers in
+#        /usr/src/external/bsd/bind/include
+#      - check makefiles to see if any extra sources have been added.
+#      - update distrib/sets if necessary.
+#
+# Note that properly the import message should include a short summary
+# of changes since the previous import rather than just "Import bind 9.x.y".
+#
+
+if [ $# -ne 2 ]; then echo "bind2netbsd src dest"; exit 1; fi
+
+r=$1
+d=$2/src/external/bsd/bind/dist
+
+case "$d" in
+       /*)
+               ;;
+       *)
+               d=`/bin/pwd`/$d
+               ;;
+esac
+
+case "$r" in
+       /*)
+               ;;
+       *)
+               r=`/bin/pwd`/$r
+               ;;
+esac
+
+echo preparing directory $d
+rm -rf $d
+mkdir -p $d
+
+### Copy the files and directories
+echo copying $r to $d
+cd $r
+pax -rw * $d
+
+### Remove the $'s around RCS tags
+cleantags $d
+
+### Add our NetBSD RCS Id
+find $d -type f -name '*.[chly]' -print | while read c; do
+       sed 1q < $c | grep -q '\$NetBSD' || (
+echo "/*       \$NetBSD\$      */" >/tmp/bind3n$$
+echo "" >>/tmp/bind3n$$
+cat $c  >> /tmp/bind3n$$
+mv /tmp/bind3n$$ $c && echo added NetBSD RCS tag to $c
+       )
+done
+
+find $d -type f -name '*.[0-9]' -print | while read m; do
+       sed 1q < $m | grep -q '\$NetBSD' || (
+echo ".\\\"    \$NetBSD\$" >/tmp/bind2m$$
+echo ".\\\"" >>/tmp/bind2m$$
+cat $m >> /tmp/bind2m$$
+mv /tmp/bind2m$$ $m && echo added NetBSD RCS tag to $m
+       )
+done
+
+find $d -type f -name '*.texi' -print | while read t; do
+        sed "2 s/^/@c \$NetBSD\$\\
+/" < $t > /tmp/bind4t$$
+       mv /tmp/bind4t$$ $t && echo added NetBSD RCS tag to $t
+done
+
+echo done
+
+### Clean up any CVS directories that might be around.
+echo "cleaning up CVS residue."
+(
+       cd $d
+       find . -type d -name "CVS" -print | xargs rm -r
+)
+echo done
+
+### Fixing file and directory permissions.
+echo "Fixing file/directory permissions."
+(
+       cd $d
+       find . -type f -print | xargs chmod u+rw,go+r
+       find . -type d -print | xargs chmod u+rwx,go+rx
+)
+echo done
+
+exit 0
diff -r 217cd46b8ab6 -r 40c1383f5e32 external/bsd/bind/include/config.h
--- a/external/bsd/bind/include/config.h        Tue Dec 31 20:09:42 2013 +0000
+++ b/external/bsd/bind/include/config.h        Tue Dec 31 20:23:12 2013 +0000
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp */
+/* Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp  */
 
 /*! \file */
 
@@ -87,7 +87,8 @@
  */
 /* #undef CALL_PTHREAD_SETCONCURRENCY */
 
-#if 0  /* We'll define this in each Makefile as necessary */
+#ifndef __NetBSD__
+/* defined by the build process */
 /** define if IPv6 is not disabled */
 #define WANT_IPV6 1
 #endif
@@ -148,6 +149,9 @@
 /* Define if OpenSSL includes DSA support */
 #define HAVE_OPENSSL_DSA 1
 
+/* Define if OpenSSL includes ECDSA support */
+#define HAVE_OPENSSL_ECDSA 1
+
 /* Define to the length type used by the socket API (socklen_t, size_t, int). */
 #define ISC_SOCKADDR_LEN_T socklen_t
 
@@ -263,6 +267,9 @@
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #define HAVE_LIBPTHREAD 1
 
+/* Define to 1 if you have the `rt' library (-lrt). */
+#define HAVE_LIBRT 1
+
 /* Define to 1 if you have the `scf' library (-lscf). */
 /* #undef HAVE_LIBSCF */
 
@@ -273,11 +280,14 @@
 /* #undef HAVE_LIBTHR */
 
 /* Define if libxml2 was found */
-/* #undef HAVE_LIBXML2 */
+/* #undef HAVE_LIBXML2 1 */
 
 /* Define to 1 if you have the <linux/capability.h> header file. */
 /* #undef HAVE_LINUX_CAPABILITY_H */
 
+/* Define to 1 if you have the <linux/types.h> header file. */
+/* #undef HAVE_LINUX_TYPES_H */
+
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -290,18 +300,30 @@
 /* Define to 1 if you have the <net/if6.h> header file. */
 /* #undef HAVE_NET_IF6_H */
 
-/* Define if OpenSSL includes ECDSA support */
+/* Define if your OpenSSL version supports ECDSA. */
 #define HAVE_OPENSSL_ECDSA 1
 
 /* Define if your OpenSSL version supports GOST. */
 #define HAVE_OPENSSL_GOST 1
 
+/* Define to 1 if you have the `pthread_yield' function. */
+/* #undef HAVE_PTHREAD_YIELD */
+
+/* Define to 1 if you have the `pthread_yield_np' function. */
+/* #undef HAVE_PTHREAD_YIELD_NP */
+
 /* Define to 1 if you have the `readline' function. */
-#define HAVE_READLINE 1
+/* #undef HAVE_READLINE */
 
 /* Define to 1 if you have the <regex.h> header file. */
 #define HAVE_REGEX_H 1
 
+/* Define to 1 if you have the <sched.h> header file. */
+#define HAVE_SCHED_H 1
+
+/* Define to 1 if you have the `sched_yield' function. */
+#define HAVE_SCHED_YIELD 1
+
 /* Define to 1 if you have the `setegid' function. */
 #define HAVE_SETEGID 1
 
@@ -386,6 +408,10 @@
 /* Define to allow building of objects for dlopen(). */
 #define ISC_DLZ_DLOPEN 1
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */