Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/bind fixes for 9.7.0-b1
details: https://anonhg.NetBSD.org/src/rev/eae488884f93
branches: trunk
changeset: 748476:eae488884f93
user: christos <christos%NetBSD.org@localhost>
date: Sun Oct 25 00:18:38 2009 +0000
description:
fixes for 9.7.0-b1
diffstat:
external/bsd/bind/Makefile.inc | 7 +-
external/bsd/bind/bin/Makefile | 4 +-
external/bsd/bind/bin/dnssec/Makefile | 5 +-
external/bsd/bind/bin/dnssec/dnssec-revoke/Makefile | 7 +
external/bsd/bind/bin/dnssec/dnssec-settime/Makefile | 7 +
external/bsd/bind/bin/rndc-confgen/Makefile | 20 -
external/bsd/bind/include/config.h | 44 +++-
external/bsd/bind/include/dns/code.h | 34 +++
external/bsd/bind/include/dns/enumtype.h | 4 +
external/bsd/bind/include/dns/rdatastruct.h | 194 +++++++++++++-----
external/bsd/bind/include/isc/platform.h | 18 +-
external/bsd/bind/lib/libbind9/shlib_version | 4 +-
external/bsd/bind/lib/libdns/Makefile | 12 +-
external/bsd/bind/lib/libdns/shlib_version | 4 +-
external/bsd/bind/lib/libisc/Makefile | 9 +-
external/bsd/bind/lib/libisc/shlib_version | 4 +-
external/bsd/bind/lib/libisccc/shlib_version | 4 +-
external/bsd/bind/lib/libisccfg/shlib_version | 4 +-
external/bsd/bind/lib/liblwres/shlib_version | 4 +-
19 files changed, 280 insertions(+), 109 deletions(-)
diffs (truncated from 1241 to 300 lines):
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc Sun Oct 25 00:17:06 2009 +0000
+++ b/external/bsd/bind/Makefile.inc Sun Oct 25 00:18:38 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/20 15:40:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/10/25 00:18:38 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -38,7 +38,8 @@
-I${IDIST}/lib/dns/sec/dst/include \
-DNS_LOCALSTATEDIR=\"${LOCALSTATEDIR}\" \
-DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
- -DVERSION=\"${VERSION}\"
+ -DSESSION_KEYFILE=\"${LOCALSTATEDIR}/run/named/session.key\" \
+ -DVERSION=\"${VERSION}\" -DBIND9
.if (${USE_INET6} != "no")
CPPFLAGS+= -DWANT_IPV6
@@ -57,6 +58,8 @@
CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
-DLIBREVISION=${LIBREVISION} -DLIBAGE=${LIBAGE}
.endif
+#CPPFLAGS+= -DUSE_MEMIMPREGISTER -DUSE_APPIMPREGISTER -DUSE_SOCKETIMPREGISTER \
+# -DUSE_TIMERIMPREGISTER
.if ${NAMED_USE_PTHREADS} == "yes"
# XXX: Not ready yet
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/bin/Makefile
--- a/external/bsd/bind/bin/Makefile Sun Oct 25 00:17:06 2009 +0000
+++ b/external/bsd/bind/bin/Makefile Sun Oct 25 00:18:38 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:04 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/25 00:18:38 christos Exp $
-SUBDIR= html dig host named nslookup nsupdate rndc rndc-confgen dnssec check
+SUBDIR= html dig host named nslookup nsupdate rndc dnssec check
.include "Makefile.inc"
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/bin/dnssec/Makefile
--- a/external/bsd/bind/bin/dnssec/Makefile Sun Oct 25 00:17:06 2009 +0000
+++ b/external/bsd/bind/bin/dnssec/Makefile Sun Oct 25 00:18:38 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:05 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/25 00:18:39 christos Exp $
-SUBDIR= dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone
+SUBDIR= dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone \
+ dnssec-settime dnssec-revoke
.include "Makefile.inc"
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/bin/dnssec/dnssec-revoke/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/dnssec/dnssec-revoke/Makefile Sun Oct 25 00:18:38 2009 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2009/10/25 00:18:39 christos Exp $
+
+BASE= ${.CURDIR:T}
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/bin/dnssec/dnssec-settime/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/dnssec/dnssec-settime/Makefile Sun Oct 25 00:18:38 2009 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2009/10/25 00:18:39 christos Exp $
+
+BASE= ${.CURDIR:T}
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/bin/rndc-confgen/Makefile
--- a/external/bsd/bind/bin/rndc-confgen/Makefile Sun Oct 25 00:17:06 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:06 christos Exp $
-
-.include <bsd.own.mk>
-
-PROG= rndc-confgen
-SRCS= rndc-confgen.c util.c os.c
-MAN= rndc-confgen.8
-BINDIR= /usr/sbin
-
-.include "${.CURDIR}/../Makefile.inc"
-
-DIST=${IDIST}/bin/rndc
-CPPFLAGS+= -I${DIST}/include \
- -DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
- -DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
-
-
-.PATH: ${DIST}/unix ${DIST}
-
-.include <bsd.prog.mk>
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/include/config.h
--- a/external/bsd/bind/include/config.h Sun Oct 25 00:17:06 2009 +0000
+++ b/external/bsd/bind/include/config.h Sun Oct 25 00:18:38 2009 +0000
@@ -1,7 +1,7 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
/*
- * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -66,9 +66,6 @@
/** define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */
#define HAVE_IFLIST_SYSCTL 1
-/** define if chroot() is available */
-#define HAVE_CHROOT 1
-
/** define if tzset() is available */
#define HAVE_TZSET 1
@@ -167,6 +164,18 @@
/* Define to enable "rrset-order fixed" syntax. */
#define DNS_RDATASET_FIXED 1
+/* Solaris hack to get select_large_fdset. */
+/* #undef FD_SETSIZE */
+
+/* Define to 1 if you have the `chroot' function. */
+#define HAVE_CHROOT 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
#define HAVE_GSSAPI_GSSAPI_H 1
@@ -224,9 +233,24 @@
/* Define to 1 if you have the <net/if6.h> header file. */
/* #undef HAVE_NET_IF6_H */
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the `setegid' function. */
+#define HAVE_SETEGID 1
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
+/* Define to 1 if you have the `setresgid' function. */
+/* #undef HAVE_SETRESGID */
+
+/* Define to 1 if you have the `setresuid' function. */
+/* #undef HAVE_SETRESUID */
+
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -284,6 +308,15 @@
/* Defined if extern char *optarg is not declared. */
/* #undef NEED_OPTARG */
+/* Define to the buffer length type used by getnameinfo(3). */
+#define IRS_GETNAMEINFO_BUFLEN_T socklen_t
+
+/* Define to the flags type used by getnameinfo(3). */
+#define IRS_GETNAMEINFO_FLAGS_T int
+
+/* Define to the return type of gai_strerror(3). */
+#define IRS_GAISTRERROR_RETURN_T const char *
+
/* Define if connect does not honour the permission on the UNIX domain socket.
*/
/* #undef NEED_SECURE_DIRECTORY */
@@ -317,6 +350,9 @@
non-blocking. */
/* #undef USE_FIONBIO_IOCTL */
+/** define if the system have backtrace function. */
+/* #undef HAVE_LIBCTRACE */
+
/* define if idnkit support is to be included. */
/* #undef WITH_IDN */
diff -r de32e4128705 -r eae488884f93 external/bsd/bind/include/dns/code.h
--- a/external/bsd/bind/include/dns/code.h Sun Oct 25 00:17:06 2009 +0000
+++ b/external/bsd/bind/include/dns/code.h Sun Oct 25 00:18:38 2009 +0000
@@ -81,11 +81,13 @@
#include "rdata/in_1/dhcid_49.c"
#include "rdata/generic/nsec3_50.c"
#include "rdata/generic/nsec3param_51.c"
+#include "rdata/generic/hip_55.c"
#include "rdata/generic/spf_99.c"
#include "rdata/generic/unspec_103.c"
#include "rdata/generic/tkey_249.c"
#include "rdata/any_255/tsig_250.c"
#include "rdata/generic/dlv_32769.c"
+#include "rdata/generic/keydata_65533.c"
@@ -188,6 +190,7 @@
break; \
case 50: result = fromtext_nsec3(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 51: result = fromtext_nsec3param(rdclass, type, lexer, origin, options, target, callbacks); break; \
+ case 55: result = fromtext_hip(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 99: result = fromtext_spf(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 103: result = fromtext_unspec(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 249: result = fromtext_tkey(rdclass, type, lexer, origin, options, target, callbacks); break; \
@@ -197,6 +200,7 @@
} \
break; \
case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
+ case 65533: result = fromtext_keydata(rdclass, type, lexer, origin, options, target, callbacks); break; \
default: result = DNS_R_UNKNOWN; break; \
}
@@ -299,6 +303,7 @@
break; \
case 50: result = totext_nsec3(rdata, tctx, target); break; \
case 51: result = totext_nsec3param(rdata, tctx, target); break; \
+ case 55: result = totext_hip(rdata, tctx, target); break; \
case 99: result = totext_spf(rdata, tctx, target); break; \
case 103: result = totext_unspec(rdata, tctx, target); break; \
case 249: result = totext_tkey(rdata, tctx, target); break; \
@@ -308,6 +313,7 @@
} \
break; \
case 32769: result = totext_dlv(rdata, tctx, target); break; \
+ case 65533: result = totext_keydata(rdata, tctx, target); break; \
default: use_default = ISC_TRUE; break; \
}
@@ -410,6 +416,7 @@
break; \
case 50: result = fromwire_nsec3(rdclass, type, source, dctx, options, target); break; \
case 51: result = fromwire_nsec3param(rdclass, type, source, dctx, options, target); break; \
+ case 55: result = fromwire_hip(rdclass, type, source, dctx, options, target); break; \
case 99: result = fromwire_spf(rdclass, type, source, dctx, options, target); break; \
case 103: result = fromwire_unspec(rdclass, type, source, dctx, options, target); break; \
case 249: result = fromwire_tkey(rdclass, type, source, dctx, options, target); break; \
@@ -419,6 +426,7 @@
} \
break; \
case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
+ case 65533: result = fromwire_keydata(rdclass, type, source, dctx, options, target); break; \
default: use_default = ISC_TRUE; break; \
}
@@ -521,6 +529,7 @@
break; \
case 50: result = towire_nsec3(rdata, cctx, target); break; \
case 51: result = towire_nsec3param(rdata, cctx, target); break; \
+ case 55: result = towire_hip(rdata, cctx, target); break; \
case 99: result = towire_spf(rdata, cctx, target); break; \
case 103: result = towire_unspec(rdata, cctx, target); break; \
case 249: result = towire_tkey(rdata, cctx, target); break; \
@@ -530,6 +539,7 @@
} \
break; \
case 32769: result = towire_dlv(rdata, cctx, target); break; \
+ case 65533: result = towire_keydata(rdata, cctx, target); break; \
default: use_default = ISC_TRUE; break; \
}
@@ -632,6 +642,7 @@
break; \
case 50: result = compare_nsec3(rdata1, rdata2); break; \
case 51: result = compare_nsec3param(rdata1, rdata2); break; \
+ case 55: result = compare_hip(rdata1, rdata2); break; \
case 99: result = compare_spf(rdata1, rdata2); break; \
case 103: result = compare_unspec(rdata1, rdata2); break; \
case 249: result = compare_tkey(rdata1, rdata2); break; \
@@ -641,6 +652,7 @@
} \
break; \
case 32769: result = compare_dlv(rdata1, rdata2); break; \
+ case 65533: result = compare_keydata(rdata1, rdata2); break; \
default: use_default = ISC_TRUE; break; \
}
@@ -743,6 +755,7 @@
break; \
case 50: result = fromstruct_nsec3(rdclass, type, source, target); break; \
case 51: result = fromstruct_nsec3param(rdclass, type, source, target); break; \
+ case 55: result = fromstruct_hip(rdclass, type, source, target); break; \
case 99: result = fromstruct_spf(rdclass, type, source, target); break; \
case 103: result = fromstruct_unspec(rdclass, type, source, target); break; \
case 249: result = fromstruct_tkey(rdclass, type, source, target); break; \
@@ -752,6 +765,7 @@
} \
break; \
case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \
Home |
Main Index |
Thread Index |
Old Index