From 773189b334aa7b7bf5b813bd6d9f3ec8f2d216ad Mon Sep 17 00:00:00 2001 From: spz Date: Tue, 8 Jul 2014 05:55:33 +0000 Subject: [PATCH] infrastructure for bind-9.10.0-P2: adding the tools delv and dnssec-importkey adding libirs to support delv --- distrib/sets/lists/base/ad.arm | 7 +- distrib/sets/lists/base/ad.mips | 12 +- distrib/sets/lists/base/ad.powerpc | 7 +- distrib/sets/lists/base/md.amd64 | 7 +- distrib/sets/lists/base/md.sparc64 | 7 +- distrib/sets/lists/base/mi | 4 +- distrib/sets/lists/base/shl.mi | 8 +- distrib/sets/lists/comp/ad.arm | 12 +- distrib/sets/lists/comp/ad.mips | 10 +- distrib/sets/lists/comp/ad.powerpc | 6 +- distrib/sets/lists/comp/md.amd64 | 6 +- distrib/sets/lists/comp/md.sparc64 | 6 +- distrib/sets/lists/comp/mi | 4 +- distrib/sets/lists/comp/shl.mi | 3 +- distrib/sets/lists/man/mi | 7 +- external/bsd/bind/bin/Makefile | 5 +- external/bsd/bind/bin/delv/Makefile | 17 ++ external/bsd/bind/bin/dnssec/Makefile | 4 +- .../bind/bin/dnssec/dnssec-importkey/Makefile | 7 + external/bsd/bind/include/config.h | 6 + external/bsd/bind/include/irs/netdb.h | 167 ++++++++++++++++++ external/bsd/bind/include/irs/platform.h | 45 +++++ external/bsd/bind/include/isc/atomic.h | 2 +- external/bsd/bind/include/isc/platform.h | 5 + external/bsd/bind/lib/Makefile | 5 +- external/bsd/bind/lib/libirs/Makefile | 21 +++ external/bsd/bind/lib/libirs/shlib_version | 5 + external/bsd/bind/lib/libisccfg/Makefile | 4 +- external/bsd/bind/lib/libisccfg/shlib_version | 4 +- 29 files changed, 369 insertions(+), 34 deletions(-) create mode 100644 external/bsd/bind/bin/delv/Makefile create mode 100644 external/bsd/bind/bin/dnssec/dnssec-importkey/Makefile create mode 100644 external/bsd/bind/include/irs/netdb.h create mode 100644 external/bsd/bind/include/irs/platform.h create mode 100644 external/bsd/bind/lib/libirs/Makefile create mode 100644 external/bsd/bind/lib/libirs/shlib_version diff --git a/distrib/sets/lists/base/ad.arm b/distrib/sets/lists/base/ad.arm index b2fc4bb446b9..4f222d8951d4 100644 --- a/distrib/sets/lists/base/ad.arm +++ b/distrib/sets/lists/base/ad.arm @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.46 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: ad.arm,v 1.47 2014/07/08 05:55:33 spz Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -163,12 +163,15 @@ ./usr/lib/oabi/libintl.so.1.0 base-compat-shlib compat,pic ./usr/lib/oabi/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/oabi/libipsec.so.3.0 base-compat-shlib compat,pic +./usr/lib/oabi/libirs.so.8 base-compat-shlib compat,pic +./usr/lib/oabi/libirs.so.8.0 base-compat-shlib compat,pic ./usr/lib/oabi/libisc.so.8 base-compat-shlib compat,pic ./usr/lib/oabi/libisc.so.8.0 base-compat-shlib compat,pic ./usr/lib/oabi/libisccc.so.8 base-compat-shlib compat,pic ./usr/lib/oabi/libisccc.so.8.0 base-compat-shlib compat,pic ./usr/lib/oabi/libisccfg.so.8 base-compat-shlib compat,pic -./usr/lib/oabi/libisccfg.so.8.0 base-compat-shlib compat,pic +./usr/lib/oabi/libisccfg.so.8.1 base-compat-shlib compat,pic +./usr/lib/oabi/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/oabi/libiscsi.so.2 base-compat-shlib compat,pic,iscsi ./usr/lib/oabi/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi ./usr/lib/oabi/libisns.so.0 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/ad.mips b/distrib/sets/lists/base/ad.mips index 328f60045ef9..0ae6885e48d8 100644 --- a/distrib/sets/lists/base/ad.mips +++ b/distrib/sets/lists/base/ad.mips @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.42 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: ad.mips,v 1.43 2014/07/08 05:55:33 spz Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.so base-npf-shlib compat,pic,arch64 @@ -163,12 +163,15 @@ ./usr/lib/64/libintl.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libipsec.so.3 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libipsec.so.3.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libirs.so.8 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libirs.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libisc.so.8 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libisc.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libisccc.so.8 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libisccc.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libisccfg.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/64/libisccfg.so.8.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libisccfg.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/64/libiscsi.so.2 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/64/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/64/libisns.so.0 base-compat-shlib compat,pic,arch64 @@ -497,12 +500,15 @@ ./usr/lib/o32/libintl.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libipsec.so.3 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libipsec.so.3.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libirs.so.8 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libirs.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisc.so.8 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisc.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisccc.so.8 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisccc.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisccfg.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libisccfg.so.8.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libisccfg.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/o32/libiscsi.so.2 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/o32/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/o32/libisns.so.0 base-compat-shlib compat,pic,arch64 diff --git a/distrib/sets/lists/base/ad.powerpc b/distrib/sets/lists/base/ad.powerpc index f66d269de021..1257c19927a7 100644 --- a/distrib/sets/lists/base/ad.powerpc +++ b/distrib/sets/lists/base/ad.powerpc @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.11 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: ad.powerpc,v 1.12 2014/07/08 05:55:33 spz Exp $ ./lib/powerpc base-npf-shlib compat,arch64 ./lib/powerpc/npf base-npf-shlib compat,arch64 ./lib/powerpc/npf/ext_log.so base-npf-shlib compat,arch64,pic @@ -146,12 +146,15 @@ ./usr/lib/powerpc/libintl.so.1.0 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libipsec.so.3 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libipsec.so.3.0 base-compat-shlib compat,arch64,pic +./usr/lib/powerpc/libirs.so.8 base-compat-shlib compat,arch64,pic +./usr/lib/powerpc/libirs.so.8.0 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libisc.so.8 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libisc.so.8.0 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libisccc.so.8 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libisccc.so.8.0 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libisccfg.so.8 base-compat-shlib compat,arch64,pic -./usr/lib/powerpc/libisccfg.so.8.0 base-compat-shlib compat,arch64,pic +./usr/lib/powerpc/libisccfg.so.8.1 base-compat-shlib compat,arch64,pic +./usr/lib/powerpc/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/powerpc/libiscsi.so.2 base-compat-shlib compat,arch64,pic,iscsi ./usr/lib/powerpc/libiscsi.so.2.0 base-compat-shlib compat,arch64,pic,iscsi ./usr/lib/powerpc/libisns.so.0 base-compat-shlib compat,arch64,pic diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index d38bc68a47ce..1f45e2e88104 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.236 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: md.amd64,v 1.237 2014/07/08 05:55:33 spz Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./lib/i386 base-compat-shlib compat @@ -158,12 +158,15 @@ ./usr/lib/i386/libintl.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libipsec.so.3.0 base-compat-shlib compat,pic +./usr/lib/i386/libirs.so.8 base-compat-shlib compat,pic +./usr/lib/i386/libirs.so.8.0 base-compat-shlib compat,pic ./usr/lib/i386/libisc.so.8 base-compat-shlib compat,pic ./usr/lib/i386/libisc.so.8.0 base-compat-shlib compat,pic ./usr/lib/i386/libisccc.so.8 base-compat-shlib compat,pic ./usr/lib/i386/libisccc.so.8.0 base-compat-shlib compat,pic ./usr/lib/i386/libisccfg.so.8 base-compat-shlib compat,pic -./usr/lib/i386/libisccfg.so.8.0 base-compat-shlib compat,pic +./usr/lib/i386/libisccfg.so.8.1 base-compat-shlib compat,pic +./usr/lib/i386/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/i386/libiscsi.so.2 base-compat-shlib compat,pic,iscsi ./usr/lib/i386/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi ./usr/lib/i386/libisns.so.0 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 0ff44740d492..cd34ba3c9032 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.223 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: md.sparc64,v 1.224 2014/07/08 05:55:33 spz Exp $ ./lib/sparc base-npf-shlib compat ./lib/sparc/npf base-npf-shlib compat ./lib/sparc/npf/ext_log.so base-npf-shlib compat,pic @@ -153,12 +153,15 @@ ./usr/lib/sparc/libintl.so.1.0 base-compat-shlib compat,pic ./usr/lib/sparc/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libipsec.so.3.0 base-compat-shlib compat,pic +./usr/lib/sparc/libirs.so.8 base-compat-shlib compat,pic +./usr/lib/sparc/libirs.so.8.0 base-compat-shlib compat,pic ./usr/lib/sparc/libisc.so.8 base-compat-shlib compat,pic ./usr/lib/sparc/libisc.so.8.0 base-compat-shlib compat,pic ./usr/lib/sparc/libisccc.so.8 base-compat-shlib compat,pic ./usr/lib/sparc/libisccc.so.8.0 base-compat-shlib compat,pic ./usr/lib/sparc/libisccfg.so.8 base-compat-shlib compat,pic -./usr/lib/sparc/libisccfg.so.8.0 base-compat-shlib compat,pic +./usr/lib/sparc/libisccfg.so.8.1 base-compat-shlib compat,pic +./usr/lib/sparc/libisccfg.so.8.0 base-compat-shlib obsolete ./usr/lib/sparc/libiscsi.so.2 base-compat-shlib compat,pic,iscsi ./usr/lib/sparc/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi ./usr/lib/sparc/libisns.so.0 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index f57a3c146ad3..765df677a8d1 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1071 2014/07/06 21:06:48 tron Exp $ +# $NetBSD: mi,v 1.1072 2014/07/08 05:55:33 spz Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -462,6 +462,7 @@ ./usr/bin/cut base-util-bin ./usr/bin/db base-util-bin ./usr/bin/dc base-util-bin +./usr/bin/delv base-bind-bin ./usr/bin/deroff base-util-bin ./usr/bin/diff base-util-bin ./usr/bin/diff3 base-util-bin @@ -1283,6 +1284,7 @@ ./usr/sbin/diskpart base-sysutil-bin ./usr/sbin/dnsquery base-obsolete obsolete ./usr/sbin/dnssec-dsfromkey base-bind-bin +./usr/sbin/dnssec-importkey base-bind-bin ./usr/sbin/dnssec-keyfromlabel base-bind-bin ./usr/sbin/dnssec-keygen base-bind-bin ./usr/sbin/dnssec-makekeyset base-obsolete obsolete diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index 672ebde06aa4..9194a5e2e09a 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.705 2014/06/18 17:50:14 christos Exp $ +# $NetBSD: shl.mi,v 1.706 2014/07/08 05:55:33 spz Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -306,6 +306,9 @@ ./usr/lib/libipsec.so base-net-shlib ./usr/lib/libipsec.so.3 base-net-shlib ./usr/lib/libipsec.so.3.0 base-net-shlib +./usr/lib/libirs.so base-bind-shlib +./usr/lib/libirs.so.8 base-bind-shlib +./usr/lib/libirs.so.8.0 base-bind-shlib ./usr/lib/libisc.so base-bind-shlib ./usr/lib/libisc.so.8 base-bind-shlib ./usr/lib/libisc.so.8.0 base-bind-shlib @@ -314,7 +317,8 @@ ./usr/lib/libisccc.so.8.0 base-bind-shlib ./usr/lib/libisccfg.so base-bind-shlib ./usr/lib/libisccfg.so.8 base-bind-shlib -./usr/lib/libisccfg.so.8.0 base-bind-shlib +./usr/lib/libisccfg.so.8.1 base-bind-shlib +./usr/lib/libisccfg.so.8.0 base-bind-shlib obsolete ./usr/lib/libiscsi.so base-iscsi-shlib iscsi ./usr/lib/libiscsi.so.2 base-iscsi-shlib iscsi ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi diff --git a/distrib/sets/lists/comp/ad.arm b/distrib/sets/lists/comp/ad.arm index 4912222b87b5..52924071c2f8 100644 --- a/distrib/sets/lists/comp/ad.arm +++ b/distrib/sets/lists/comp/ad.arm @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.56 2014/06/17 06:36:40 alnsn Exp $ +# $NetBSD: ad.arm,v 1.57 2014/07/08 05:55:33 spz Exp $ ./usr/include/acorn26 comp-c-include ./usr/include/acorn26/ansi.h comp-obsolete obsolete ./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete @@ -1242,9 +1242,17 @@ ./usr/lib/oabi/libipsec_p.a comp-c-proflib compat,profile ./usr/lib/oabi/libipsec_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/oabi/libipsec_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/oabi/libirs.a comp-c-lib compat +./usr/lib/oabi/libirs.a comp-c-lib compat +./usr/lib/oabi/libirs.so base-sys-shlib compat,pic +./usr/lib/oabi/libirs.so base-sys-shlib compat,pic +./usr/lib/oabi/libirs_p.a comp-c-proflib compat,profile +./usr/lib/oabi/libirs_p.a comp-c-proflib compat,profile +./usr/lib/oabi/libirs_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/oabi/libirs_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/oabi/libisc.a comp-c-lib compat ./usr/lib/oabi/libisc.a comp-c-lib compat -./usr/lib/oabi/libisc.so base-sys-shlib compat,pic +./usr/lib/oabi/libisc.so base-sys-shlib compat,pic ./usr/lib/oabi/libisc.so base-sys-shlib compat,pic ./usr/lib/oabi/libisc_p.a comp-c-proflib compat,profile ./usr/lib/oabi/libisc_p.a comp-c-proflib compat,profile diff --git a/distrib/sets/lists/comp/ad.mips b/distrib/sets/lists/comp/ad.mips index 85c15de04ab6..8fb7c76a7269 100644 --- a/distrib/sets/lists/comp/ad.mips +++ b/distrib/sets/lists/comp/ad.mips @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.48 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: ad.mips,v 1.49 2014/07/08 05:55:33 spz Exp $ ./usr/bin/elf2aout comp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/g++/bits/mips32 comp-c-include arch64 @@ -368,6 +368,10 @@ ./usr/lib/64/libipsec.so base-sys-shlib compat,pic ./usr/lib/64/libipsec_p.a comp-c-proflib compat,profile ./usr/lib/64/libipsec_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/64/libirs.a comp-c-lib compat +./usr/lib/64/libirs.so base-sys-shlib compat,pic +./usr/lib/64/libirs_p.a comp-c-proflib compat,profile +./usr/lib/64/libirs_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/64/libisc.a comp-c-lib compat ./usr/lib/64/libisc.so base-sys-shlib compat,pic ./usr/lib/64/libisc_p.a comp-c-proflib compat,profile @@ -977,6 +981,10 @@ ./usr/lib/o32/libipsec.so base-sys-shlib compat,pic ./usr/lib/o32/libipsec_p.a comp-c-proflib compat,profile ./usr/lib/o32/libipsec_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/o32/libirs.a comp-c-lib compat +./usr/lib/o32/libirs.so base-sys-shlib compat,pic +./usr/lib/o32/libirs_p.a comp-c-proflib compat,profile +./usr/lib/o32/libirs_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/o32/libisc.a comp-c-lib compat ./usr/lib/o32/libisc.so base-sys-shlib compat,pic ./usr/lib/o32/libisc_p.a comp-c-proflib compat,profile diff --git a/distrib/sets/lists/comp/ad.powerpc b/distrib/sets/lists/comp/ad.powerpc index cb6fe1c34e53..99a27967ea5f 100644 --- a/distrib/sets/lists/comp/ad.powerpc +++ b/distrib/sets/lists/comp/ad.powerpc @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.69 2014/07/05 20:17:51 joerg Exp $ +# $NetBSD: ad.powerpc,v 1.70 2014/07/08 05:55:33 spz Exp $ ./usr/bin/elf2aout comp-sysutil-bin ./usr/bin/psim comp-debug-bin gdb ./usr/include/altivec.h comp-obsolete obsolete @@ -333,6 +333,10 @@ ./usr/lib/powerpc/libipsec.so base-sys-shlib compat,arch64,pic ./usr/lib/powerpc/libipsec_p.a comp-c-proflib compat,arch64,profile ./usr/lib/powerpc/libipsec_pic.a comp-c-piclib compat,arch64,pic,picinstall +./usr/lib/powerpc/libirs.a comp-c-lib compat,arch64 +./usr/lib/powerpc/libirs.so base-sys-shlib compat,arch64,pic +./usr/lib/powerpc/libirs_p.a comp-c-proflib compat,arch64,profile +./usr/lib/powerpc/libirs_pic.a comp-c-piclib compat,arch64,pic,picinstall ./usr/lib/powerpc/libisc.a comp-c-lib compat,arch64 ./usr/lib/powerpc/libisc.so base-sys-shlib compat,arch64,pic ./usr/lib/powerpc/libisc_p.a comp-c-proflib compat,arch64,profile diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64 index 33c98515b2f5..5fb233fcc2f6 100644 --- a/distrib/sets/lists/comp/md.amd64 +++ b/distrib/sets/lists/comp/md.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.221 2014/07/05 20:17:51 joerg Exp $ +# $NetBSD: md.amd64,v 1.222 2014/07/08 05:55:34 spz Exp $ ./usr/include/amd64 comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -686,6 +686,10 @@ ./usr/lib/i386/libipsec.so comp-sys-shlib compat,pic ./usr/lib/i386/libipsec_p.a comp-c-proflib compat,profile ./usr/lib/i386/libipsec_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/i386/libirs.a comp-c-lib compat +./usr/lib/i386/libirs.so comp-sys-shlib compat,pic +./usr/lib/i386/libirs_p.a comp-c-proflib compat,profile +./usr/lib/i386/libirs_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/i386/libisc.a comp-c-lib compat ./usr/lib/i386/libisc.so comp-sys-shlib compat,pic ./usr/lib/i386/libisc_p.a comp-c-proflib compat,profile diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64 index a5cd0fc7d0ce..2c4d41416dcc 100644 --- a/distrib/sets/lists/comp/md.sparc64 +++ b/distrib/sets/lists/comp/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.184 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: md.sparc64,v 1.185 2014/07/08 05:55:34 spz Exp $ ./usr/include/g++/bits/sparc comp-c-include compat ./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc=48,compat ./usr/include/g++/bits/sparc64 comp-c-include compat @@ -442,6 +442,10 @@ ./usr/lib/sparc/libipsec.so base-sys-shlib compat,pic ./usr/lib/sparc/libipsec_p.a comp-c-proflib compat,profile ./usr/lib/sparc/libipsec_pic.a comp-c-piclib compat,pic,picinstall +./usr/lib/sparc/libirs.a comp-c-lib compat +./usr/lib/sparc/libirs.so base-sys-shlib compat,pic +./usr/lib/sparc/libirs_p.a comp-c-proflib compat,profile +./usr/lib/sparc/libirs_pic.a comp-c-piclib compat,pic,picinstall ./usr/lib/sparc/libisc.a comp-c-lib compat ./usr/lib/sparc/libisc.so base-sys-shlib compat,pic ./usr/lib/sparc/libisc_p.a comp-c-proflib compat,profile diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 940d360462c1..8988fbb08cab 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1896 2014/06/18 17:52:49 christos Exp $ +# $NetBSD: mi,v 1.1897 2014/07/08 05:55:34 spz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3598,6 +3598,8 @@ ./usr/lib/libintl_p.a comp-c-proflib profile ./usr/lib/libipsec.a comp-c-lib ./usr/lib/libipsec_p.a comp-c-proflib profile +./usr/lib/libirs.a comp-bind-lib +./usr/lib/libirs_p.a comp-bind-lib profile ./usr/lib/libisc.a comp-bind-lib ./usr/lib/libisc_p.a comp-bind-lib profile ./usr/lib/libisccc.a comp-bind-lib diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi index 077529a7b420..925c9c940bd6 100644 --- a/distrib/sets/lists/comp/shl.mi +++ b/distrib/sets/lists/comp/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.264 2014/04/24 21:46:44 pooka Exp $ +# $NetBSD: shl.mi,v 1.265 2014/07/08 05:55:34 spz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -64,6 +64,7 @@ ./usr/lib/libhx509_pic.a comp-c-piclib kerberos,picinstall ./usr/lib/libintl_pic.a comp-c-piclib picinstall ./usr/lib/libipsec_pic.a comp-c-piclib picinstall +./usr/lib/libirs_pic.a comp-bind-piclib picinstall ./usr/lib/libisc_pic.a comp-bind-piclib picinstall ./usr/lib/libisccc_pic.a comp-bind-piclib picinstall ./usr/lib/libisccfg_pic.a comp-bind-piclib picinstall diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index a4df99ac25aa..45fa9ba1e8d3 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1477 2014/07/06 21:06:48 tron Exp $ +# $NetBSD: mi,v 1.1478 2014/07/08 05:55:34 spz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -135,6 +135,7 @@ ./usr/share/man/cat1/db.0 man-util-catman .cat ./usr/share/man/cat1/dc.0 man-util-catman .cat ./usr/share/man/cat1/dd.0 man-util-catman .cat +./usr/share/man/cat1/delv.0 man-netutil-catman .cat ./usr/share/man/cat1/deroff.0 man-util-catman .cat ./usr/share/man/cat1/df.0 man-util-catman .cat ./usr/share/man/cat1/diff.0 man-util-catman .cat @@ -3257,6 +3258,7 @@ ./usr/share/man/html1/db.html man-util-htmlman html ./usr/share/man/html1/dc.html man-util-htmlman html ./usr/share/man/html1/dd.html man-util-htmlman html +./usr/share/man/html1/delv.html man-netutil-htmlman html ./usr/share/man/html1/deroff.html man-util-htmlman html ./usr/share/man/html1/df.html man-util-htmlman html ./usr/share/man/html1/diff.html man-util-htmlman html @@ -5283,6 +5285,7 @@ ./usr/share/man/html8/dmsetup.html man-lvm-htmlman lvm,html ./usr/share/man/html8/dnsblog.html man-postfix-htmlman postfix,html ./usr/share/man/html8/dnssec-dsfromkey.html man-bind-htmlman html +./usr/share/man/html8/dnssec-importkey.html man-bind-htmlman html ./usr/share/man/html8/dnssec-keyfromlabel.html man-bind-htmlman html ./usr/share/man/html8/dnssec-keygen.html man-bind-htmlman html ./usr/share/man/html8/dnssec-revoke.html man-bind-htmlman html @@ -5987,6 +5990,7 @@ ./usr/share/man/man1/db.1 man-util-man .man ./usr/share/man/man1/dc.1 man-util-man .man ./usr/share/man/man1/dd.1 man-util-man .man +./usr/share/man/man1/delv.1 man-netutil-man .man ./usr/share/man/man1/deroff.1 man-util-man .man ./usr/share/man/man1/df.1 man-util-man .man ./usr/share/man/man1/diff.1 man-util-man .man @@ -8234,6 +8238,7 @@ ./usr/share/man/man8/dmsetup.8 man-lvm-man lvm,.man ./usr/share/man/man8/dnsblog.8 man-postfix-man postfix,.man ./usr/share/man/man8/dnssec-dsfromkey.8 man-bind-man .man +./usr/share/man/man8/dnssec-importkey.8 man-bind-man .man ./usr/share/man/man8/dnssec-keyfromlabel.8 man-bind-man .man ./usr/share/man/man8/dnssec-keygen.8 man-bind-man .man ./usr/share/man/man8/dnssec-makekeyset.8 man-obsolete obsolete diff --git a/external/bsd/bind/bin/Makefile b/external/bsd/bind/bin/Makefile index e04ef3f9fe3d..45b5bd5f63df 100644 --- a/external/bsd/bind/bin/Makefile +++ b/external/bsd/bind/bin/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2012/05/09 21:59:10 christos Exp $ +# $NetBSD: Makefile,v 1.5 2014/07/08 05:55:33 spz Exp $ -SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools confgen +SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools \ + confgen delv .include "Makefile.inc" diff --git a/external/bsd/bind/bin/delv/Makefile b/external/bsd/bind/bin/delv/Makefile new file mode 100644 index 000000000000..06b5ff82e793 --- /dev/null +++ b/external/bsd/bind/bin/delv/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2014/07/08 05:55:33 spz Exp $ + +.include + +PROG= delv +SRCS= delv.c +BINDIR= /usr/bin + +.include "${.CURDIR}/../Makefile.inc" + +DIST=${IDIST}/bin/delv +CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include +LDADD+= -lirs + +.PATH: ${DIST} + +.include diff --git a/external/bsd/bind/bin/dnssec/Makefile b/external/bsd/bind/bin/dnssec/Makefile index e705151f3843..dbfbcd7444a5 100644 --- a/external/bsd/bind/bin/dnssec/Makefile +++ b/external/bsd/bind/bin/dnssec/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2012/12/04 23:38:37 spz Exp $ +# $NetBSD: Makefile,v 1.4 2014/07/08 05:55:33 spz Exp $ SUBDIR= dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone \ - dnssec-settime dnssec-revoke dnssec-verify + dnssec-settime dnssec-revoke dnssec-verify dnssec-importkey .include "Makefile.inc" diff --git a/external/bsd/bind/bin/dnssec/dnssec-importkey/Makefile b/external/bsd/bind/bin/dnssec/dnssec-importkey/Makefile new file mode 100644 index 000000000000..12b39b7f5cd2 --- /dev/null +++ b/external/bsd/bind/bin/dnssec/dnssec-importkey/Makefile @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.1 2014/07/08 05:55:33 spz Exp $ + +BASE= ${.CURDIR:T} + +.include "${.CURDIR}/../Makefile.inc" + +.include diff --git a/external/bsd/bind/include/config.h b/external/bsd/bind/include/config.h index 333c1821062a..b9e89ab4fbba 100644 --- a/external/bsd/bind/include/config.h +++ b/external/bsd/bind/include/config.h @@ -334,9 +334,15 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the header file. */ #define HAVE_NET_ROUTE_H 1 +/* Define if your OpenSSL version supports AES */ +#define HAVE_OPENSSL_AES 1 + /* Define if your OpenSSL version supports ECDSA. */ #define HAVE_OPENSSL_ECDSA 1 +/* Define if your OpenSSL version supports EVP AES */ +#define HAVE_OPENSSL_EVP_AES 1 + /* Define if your OpenSSL version supports GOST. */ #define HAVE_OPENSSL_GOST 1 diff --git a/external/bsd/bind/include/irs/netdb.h b/external/bsd/bind/include/irs/netdb.h new file mode 100644 index 000000000000..9568d6217da2 --- /dev/null +++ b/external/bsd/bind/include/irs/netdb.h @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* Id: netdb.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp */ + +/*! \file */ + +#ifndef IRS_NETDB_H +#define IRS_NETDB_H 1 + +#include /* Required on FreeBSD (and others?) for size_t. */ +#include /* Contractual provision. */ + +/* + * Define if does not declare struct addrinfo. + */ +#undef ISC_IRS_NEEDADDRINFO + +#ifdef ISC_IRS_NEEDADDRINFO +struct addrinfo { + int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ + int ai_family; /* PF_xxx */ + int ai_socktype; /* SOCK_xxx */ + int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ + size_t ai_addrlen; /* Length of ai_addr */ + char *ai_canonname; /* Canonical name for hostname */ + struct sockaddr *ai_addr; /* Binary address */ + struct addrinfo *ai_next; /* Next structure in linked list */ +}; +#endif + +/* + * Undefine all #defines we are interested in as may or may not have + * defined them. + */ + +/* + * Error return codes from gethostbyname() and gethostbyaddr() + * (left in extern int h_errno). + */ + +#undef NETDB_INTERNAL +#undef NETDB_SUCCESS +#undef HOST_NOT_FOUND +#undef TRY_AGAIN +#undef NO_RECOVERY +#undef NO_DATA +#undef NO_ADDRESS + +#define NETDB_INTERNAL -1 /* see errno */ +#define NETDB_SUCCESS 0 /* no problem */ +#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ +#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ +#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ +#define NO_DATA 4 /* Valid name, no data record of requested type */ +#define NO_ADDRESS NO_DATA /* no address, look for MX record */ + +/* + * Error return codes from getaddrinfo(). EAI_INSECUREDATA is our own extension + * and it's very unlikely to be already defined, but undef it just in case; it + * at least doesn't do any harm. + */ + +#undef EAI_ADDRFAMILY +#undef EAI_AGAIN +#undef EAI_BADFLAGS +#undef EAI_FAIL +#undef EAI_FAMILY +#undef EAI_MEMORY +#undef EAI_NODATA +#undef EAI_NONAME +#undef EAI_SERVICE +#undef EAI_SOCKTYPE +#undef EAI_SYSTEM +#undef EAI_BADHINTS +#undef EAI_PROTOCOL +#undef EAI_OVERFLOW +#undef EAI_INSECUREDATA +#undef EAI_MAX + +#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ +#define EAI_AGAIN 2 /* temporary failure in name resolution */ +#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ +#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ +#define EAI_FAMILY 5 /* ai_family not supported */ +#define EAI_MEMORY 6 /* memory allocation failure */ +#define EAI_NODATA 7 /* no address associated with hostname */ +#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ +#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ +#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ +#define EAI_SYSTEM 11 /* system error returned in errno */ +#define EAI_BADHINTS 12 +#define EAI_PROTOCOL 13 +#define EAI_OVERFLOW 14 +#define EAI_INSECUREDATA 15 +#define EAI_MAX 16 + +/* + * Flag values for getaddrinfo() + */ +#undef AI_PASSIVE +#undef AI_CANONNAME +#undef AI_NUMERICHOST + +#define AI_PASSIVE 0x00000001 +#define AI_CANONNAME 0x00000002 +#define AI_NUMERICHOST 0x00000004 + +/* + * Flag values for getipnodebyname() + */ +#undef AI_V4MAPPED +#undef AI_ALL +#undef AI_ADDRCONFIG +#undef AI_DEFAULT + +#define AI_V4MAPPED 0x00000008 +#define AI_ALL 0x00000010 +#define AI_ADDRCONFIG 0x00000020 +#define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG) + +/* + * Constants for lwres_getnameinfo() + */ +#undef NI_MAXHOST +#undef NI_MAXSERV + +#define NI_MAXHOST 1025 +#define NI_MAXSERV 32 + +/* + * Flag values for lwres_getnameinfo() + */ +#undef NI_NOFQDN +#undef NI_NUMERICHOST +#undef NI_NAMEREQD +#undef NI_NUMERICSERV +#undef NI_DGRAM +#undef NI_NUMERICSCOPE + +#define NI_NOFQDN 0x00000001 +#define NI_NUMERICHOST 0x00000002 +#define NI_NAMEREQD 0x00000004 +#define NI_NUMERICSERV 0x00000008 +#define NI_DGRAM 0x00000010 + +/* + * Tell Emacs to use C mode on this file. + * Local variables: + * mode: c + * End: + */ + +#endif /* IRS_NETDB_H */ diff --git a/external/bsd/bind/include/irs/platform.h b/external/bsd/bind/include/irs/platform.h new file mode 100644 index 000000000000..0a1ce4aad34a --- /dev/null +++ b/external/bsd/bind/include/irs/platform.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* Id: platform.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp */ + +/*! \file */ + +#ifndef IRS_PLATFORM_H +#define IRS_PLATFORM_H 1 + +/***** + ***** Platform-dependent defines. + *****/ + +#ifndef IRS_PLATFORM_USEDECLSPEC +#define LIBIRS_EXTERNAL_DATA +#else +#ifdef LIBIRS_EXPORTS +#define LIBIRS_EXTERNAL_DATA __declspec(dllexport) +#else +#define LIBIRS_EXTERNAL_DATA __declspec(dllimport) +#endif +#endif + +/* + * Tell Emacs to use C mode on this file. + * Local Variables: + * mode: c + * End: + */ + +#endif /* IRS_PLATFORM_H */ diff --git a/external/bsd/bind/include/isc/atomic.h b/external/bsd/bind/include/isc/atomic.h index 9d65249318f1..8dcb3eaa3c37 100644 --- a/external/bsd/bind/include/isc/atomic.h +++ b/external/bsd/bind/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.3 2010/12/25 15:26:32 christos Exp $ */ +/* NetBSD: atomic.h,v 1.3 2010/12/25 15:26:32 christos Exp */ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 diff --git a/external/bsd/bind/include/isc/platform.h b/external/bsd/bind/include/isc/platform.h index 3c92ef2651c7..63d09755f1fa 100644 --- a/external/bsd/bind/include/isc/platform.h +++ b/external/bsd/bind/include/isc/platform.h @@ -322,6 +322,11 @@ */ #define ISC_PLATFORM_OPENSSLAES 1 +/* + * Define if AES support is wanted + */ +#define ISC_PLATFORM_WANTAES 1 + /* * Defines for the noreturn attribute. */ diff --git a/external/bsd/bind/lib/Makefile b/external/bsd/bind/lib/Makefile index 3eb91d70b6e7..5f58e048dd97 100644 --- a/external/bsd/bind/lib/Makefile +++ b/external/bsd/bind/lib/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/08 05:55:33 spz Exp $ -SUBDIR+= libisc liblwres .WAIT libdns libisccc .WAIT libisccfg .WAIT libbind9 +SUBDIR+= libisc liblwres .WAIT libdns libisccc .WAIT libisccfg .WAIT libbind9 \ + libirs .include diff --git a/external/bsd/bind/lib/libirs/Makefile b/external/bsd/bind/lib/libirs/Makefile new file mode 100644 index 000000000000..82cb3a154866 --- /dev/null +++ b/external/bsd/bind/lib/libirs/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1 2014/07/08 05:55:33 spz Exp $ + +LIB=irs +#USE_SHLIBDIR= yes + +.include + +.include "${.CURDIR}/../Makefile.inc" + +CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include + +DIST= ${IDIST}/lib/irs +.include "${DIST}/api" + +.PATH.c: ${DIST} + +SRCS= context.c dnsconf.c gai_strerror.c getaddrinfo.c \ + getnameinfo.c resconf.c version.c + + +.include diff --git a/external/bsd/bind/lib/libirs/shlib_version b/external/bsd/bind/lib/libirs/shlib_version new file mode 100644 index 000000000000..42bb561c681c --- /dev/null +++ b/external/bsd/bind/lib/libirs/shlib_version @@ -0,0 +1,5 @@ +# $NetBSD: shlib_version,v 1.1 2014/07/08 05:55:33 spz Exp $ +# Remember to update distrib/sets/lists/base/shl.* when changing +# +major=8 +minor=0 diff --git a/external/bsd/bind/lib/libisccfg/Makefile b/external/bsd/bind/lib/libisccfg/Makefile index a641313dd55d..f44477ac3f3d 100644 --- a/external/bsd/bind/lib/libisccfg/Makefile +++ b/external/bsd/bind/lib/libisccfg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/08 05:55:33 spz Exp $ LIB=isccfg @@ -14,6 +14,6 @@ DIST= ${IDIST}/lib/isccfg .PATH.c: ${DIST}/unix ${DIST} -SRCS= aclconf.c log.c namedconf.c parser.c version.c +SRCS= aclconf.c log.c namedconf.c parser.c version.c dnsconf.c .include diff --git a/external/bsd/bind/lib/libisccfg/shlib_version b/external/bsd/bind/lib/libisccfg/shlib_version index bd54ae722a46..094b15002655 100644 --- a/external/bsd/bind/lib/libisccfg/shlib_version +++ b/external/bsd/bind/lib/libisccfg/shlib_version @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.12 2014/03/01 03:24:41 christos Exp $ +# $NetBSD: shlib_version,v 1.13 2014/07/08 05:55:33 spz Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=8 -minor=0 +minor=1