[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

zrouter-src-freebsd at zrouter.org zrouter-src-freebsd at zrouter.org
Tue Apr 17 08:58:59 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/f2935497fa04
changeset: 453:f2935497fa04
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Tue Apr 17 11:51:51 2012 +0300
description:
FreeBSD HEAD @svn 234370r.

diffstat:

 head/Makefile                                                             =
                        |     21 +-
 head/Makefile.inc1                                                        =
                        |     63 +-
 head/ObsoleteFiles.inc                                                    =
                        |     61 +-
 head/UPDATING                                                             =
                        |      9 +-
 head/bin/kenv/kenv.1                                                      =
                        |      3 +-
 head/bin/ps/ps.1                                                          =
                        |     64 +-
 head/bin/pwait/pwait.1                                                    =
                        |      5 +-
 head/bin/setfacl/setfacl.1                                                =
                        |      4 +-
 head/bin/sh/jobs.c                                                        =
                        |      6 +-
 head/bin/sh/sh.1                                                          =
                        |      7 +-
 head/bin/stty/stty.1                                                      =
                        |      7 +-
 head/cddl/contrib/opensolaris/cmd/zpool/zpool.8                           =
                        |      4 +-
 head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c              =
                        |      2 +-
 head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c                         =
                        |     99 +
 head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c                    =
                        |      4 +-
 head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h                    =
                        |      1 +
 head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c                      =
                        |     20 +-
 head/cddl/lib/Makefile                                                    =
                        |      4 +-
 head/cddl/lib/libdtrace/Makefile                                          =
                        |     10 +-
 head/cddl/usr.sbin/Makefile                                               =
                        |      6 +-
 head/contrib/bind9/CHANGES                                                =
                        |    360 +-
 head/contrib/bind9/COPYRIGHT                                              =
                        |      4 +-
 head/contrib/bind9/FAQ.xml                                                =
                        |      2 +-
 head/contrib/bind9/Makefile.in                                            =
                        |      8 +-
 head/contrib/bind9/README                                                 =
                        |     51 +
 head/contrib/bind9/acconfig.h                                             =
                        |      2 +-
 head/contrib/bind9/bin/Makefile.in                                        =
                        |      2 +-
 head/contrib/bind9/bin/check/Makefile.in                                  =
                        |      2 +-
 head/contrib/bind9/bin/check/check-tool.c                                 =
                        |      2 +-
 head/contrib/bind9/bin/check/check-tool.h                                 =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkconf.8                            =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkconf.c                            =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkconf.docbook                      =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkconf.html                         =
                        |     12 +-
 head/contrib/bind9/bin/check/named-checkzone.8                            =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkzone.c                            =
                        |     14 +-
 head/contrib/bind9/bin/check/named-checkzone.docbook                      =
                        |      2 +-
 head/contrib/bind9/bin/check/named-checkzone.html                         =
                        |     12 +-
 head/contrib/bind9/bin/confgen/Makefile.in                                =
                        |      2 +-
 head/contrib/bind9/bin/confgen/ddns-confgen.8                             =
                        |      2 +-
 head/contrib/bind9/bin/confgen/ddns-confgen.c                             =
                        |      2 +-
 head/contrib/bind9/bin/confgen/ddns-confgen.docbook                       =
                        |      2 +-
 head/contrib/bind9/bin/confgen/ddns-confgen.html                          =
                        |     10 +-
 head/contrib/bind9/bin/confgen/include/confgen/os.h                       =
                        |      2 +-
 head/contrib/bind9/bin/confgen/keygen.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/confgen/keygen.h                                   =
                        |      2 +-
 head/contrib/bind9/bin/confgen/rndc-confgen.8                             =
                        |      2 +-
 head/contrib/bind9/bin/confgen/rndc-confgen.c                             =
                        |      2 +-
 head/contrib/bind9/bin/confgen/rndc-confgen.docbook                       =
                        |      2 +-
 head/contrib/bind9/bin/confgen/rndc-confgen.html                          =
                        |     12 +-
 head/contrib/bind9/bin/confgen/unix/Makefile.in                           =
                        |      2 +-
 head/contrib/bind9/bin/confgen/unix/os.c                                  =
                        |      2 +-
 head/contrib/bind9/bin/confgen/util.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/confgen/util.h                                     =
                        |      2 +-
 head/contrib/bind9/bin/dig/Makefile.in                                    =
                        |      2 +-
 head/contrib/bind9/bin/dig/dig.1                                          =
                        |      2 +-
 head/contrib/bind9/bin/dig/dig.c                                          =
                        |      4 +-
 head/contrib/bind9/bin/dig/dig.docbook                                    =
                        |      2 +-
 head/contrib/bind9/bin/dig/dig.html                                       =
                        |     20 +-
 head/contrib/bind9/bin/dig/dighost.c                                      =
                        |     96 +-
 head/contrib/bind9/bin/dig/host.1                                         =
                        |      2 +-
 head/contrib/bind9/bin/dig/host.c                                         =
                        |      2 +-
 head/contrib/bind9/bin/dig/host.docbook                                   =
                        |      2 +-
 head/contrib/bind9/bin/dig/host.html                                      =
                        |     10 +-
 head/contrib/bind9/bin/dig/include/dig/dig.h                              =
                        |      4 +-
 head/contrib/bind9/bin/dig/nslookup.1                                     =
                        |      2 +-
 head/contrib/bind9/bin/dig/nslookup.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/dig/nslookup.docbook                               =
                        |      2 +-
 head/contrib/bind9/bin/dig/nslookup.html                                  =
                        |     16 +-
 head/contrib/bind9/bin/dnssec/Makefile.in                                 =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8                          =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c                          =
                        |     13 +-
 head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook                    =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html                       =
                        |     16 +-
 head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8                       =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c                       =
                        |     14 +-
 head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook                 =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html                    =
                        |     14 +-
 head/contrib/bind9/bin/dnssec/dnssec-keygen.8                             =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-keygen.c                             =
                        |     14 +-
 head/contrib/bind9/bin/dnssec/dnssec-keygen.docbook                       =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-keygen.html                          =
                        |     16 +-
 head/contrib/bind9/bin/dnssec/dnssec-revoke.8                             =
                        |     13 +-
 head/contrib/bind9/bin/dnssec/dnssec-revoke.c                             =
                        |     14 +-
 head/contrib/bind9/bin/dnssec/dnssec-revoke.docbook                       =
                        |     16 +-
 head/contrib/bind9/bin/dnssec/dnssec-revoke.html                          =
                        |     19 +-
 head/contrib/bind9/bin/dnssec/dnssec-settime.8                            =
                        |      4 +-
 head/contrib/bind9/bin/dnssec/dnssec-settime.c                            =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-settime.docbook                      =
                        |      5 +-
 head/contrib/bind9/bin/dnssec/dnssec-settime.html                         =
                        |     17 +-
 head/contrib/bind9/bin/dnssec/dnssec-signzone.8                           =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-signzone.c                           =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-signzone.docbook                     =
                        |      2 +-
 head/contrib/bind9/bin/dnssec/dnssec-signzone.html                        =
                        |     12 +-
 head/contrib/bind9/bin/dnssec/dnssectool.c                                =
                        |     25 +-
 head/contrib/bind9/bin/dnssec/dnssectool.h                                =
                        |      9 +-
 head/contrib/bind9/bin/named/Makefile.in                                  =
                        |      2 +-
 head/contrib/bind9/bin/named/bind.keys.h                                  =
                        |      4 +-
 head/contrib/bind9/bin/named/bind9.xsl                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/bind9.xsl.h                                  =
                        |      6 +-
 head/contrib/bind9/bin/named/builtin.c                                    =
                        |      6 +-
 head/contrib/bind9/bin/named/client.c                                     =
                        |     30 +-
 head/contrib/bind9/bin/named/config.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/named/control.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/controlconf.c                                =
                        |     22 +-
 head/contrib/bind9/bin/named/convertxsl.pl                                =
                        |      4 +-
 head/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h              =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/builtin.h                      =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/client.h                       =
                        |      7 +-
 head/contrib/bind9/bin/named/include/named/config.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/control.h                      =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/globals.h                      =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/interfacemgr.h                 =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/listenlist.h                   =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/log.h                          =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/logconf.h                      =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/lwaddr.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/lwdclient.h                    =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/lwresd.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/lwsearch.h                     =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/main.h                         =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/notify.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/ns_smf_globals.h               =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/query.h                        =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/server.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/sortlist.h                     =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/statschannel.h                 =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/tkeyconf.h                     =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/tsigconf.h                     =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/types.h                        =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/update.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/xfrout.h                       =
                        |      2 +-
 head/contrib/bind9/bin/named/include/named/zoneconf.h                     =
                        |      2 +-
 head/contrib/bind9/bin/named/interfacemgr.c                               =
                        |      2 +-
 head/contrib/bind9/bin/named/listenlist.c                                 =
                        |      2 +-
 head/contrib/bind9/bin/named/log.c                                        =
                        |      2 +-
 head/contrib/bind9/bin/named/logconf.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/lwaddr.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/named/lwdclient.c                                  =
                        |      2 +-
 head/contrib/bind9/bin/named/lwderror.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/named/lwdgabn.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/lwdgnba.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/lwdgrbn.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/lwdnoop.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/lwresd.8                                     =
                        |      2 +-
 head/contrib/bind9/bin/named/lwresd.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/named/lwresd.docbook                               =
                        |      2 +-
 head/contrib/bind9/bin/named/lwresd.html                                  =
                        |     14 +-
 head/contrib/bind9/bin/named/lwsearch.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/named/main.c                                       =
                        |     21 +-
 head/contrib/bind9/bin/named/named.8                                      =
                        |      2 +-
 head/contrib/bind9/bin/named/named.conf.5                                 =
                        |      7 +-
 head/contrib/bind9/bin/named/named.conf.docbook                           =
                        |      7 +-
 head/contrib/bind9/bin/named/named.conf.html                              =
                        |     37 +-
 head/contrib/bind9/bin/named/named.docbook                                =
                        |      2 +-
 head/contrib/bind9/bin/named/named.html                                   =
                        |     16 +-
 head/contrib/bind9/bin/named/notify.c                                     =
                        |      2 +-
 head/contrib/bind9/bin/named/query.c                                      =
                        |   1019 +-
 head/contrib/bind9/bin/named/server.c                                     =
                        |     55 +-
 head/contrib/bind9/bin/named/sortlist.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/named/statschannel.c                               =
                        |      2 +-
 head/contrib/bind9/bin/named/tkeyconf.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/named/tsigconf.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/named/unix/Makefile.in                             =
                        |      2 +-
 head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c                     =
                        |      6 +-
 head/contrib/bind9/bin/named/unix/include/named/os.h                      =
                        |      2 +-
 head/contrib/bind9/bin/named/unix/os.c                                    =
                        |      2 +-
 head/contrib/bind9/bin/named/update.c                                     =
                        |     14 +-
 head/contrib/bind9/bin/named/xfrout.c                                     =
                        |     17 +-
 head/contrib/bind9/bin/named/zoneconf.c                                   =
                        |     28 +-
 head/contrib/bind9/bin/nsupdate/Makefile.in                               =
                        |      2 +-
 head/contrib/bind9/bin/nsupdate/nsupdate.1                                =
                        |      2 +-
 head/contrib/bind9/bin/nsupdate/nsupdate.c                                =
                        |      3 +-
 head/contrib/bind9/bin/nsupdate/nsupdate.docbook                          =
                        |      2 +-
 head/contrib/bind9/bin/nsupdate/nsupdate.html                             =
                        |     14 +-
 head/contrib/bind9/bin/rndc/Makefile.in                                   =
                        |      2 +-
 head/contrib/bind9/bin/rndc/include/rndc/os.h                             =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.8                                        =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.c                                        =
                        |      8 +-
 head/contrib/bind9/bin/rndc/rndc.conf                                     =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.conf.5                                   =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.conf.docbook                             =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.conf.html                                =
                        |     12 +-
 head/contrib/bind9/bin/rndc/rndc.docbook                                  =
                        |      2 +-
 head/contrib/bind9/bin/rndc/rndc.html                                     =
                        |     12 +-
 head/contrib/bind9/bin/rndc/util.c                                        =
                        |      2 +-
 head/contrib/bind9/bin/rndc/util.h                                        =
                        |      2 +-
 head/contrib/bind9/bin/tools/Makefile.in                                  =
                        |      2 +-
 head/contrib/bind9/bin/tools/arpaname.1                                   =
                        |      2 +-
 head/contrib/bind9/bin/tools/arpaname.c                                   =
                        |      2 +-
 head/contrib/bind9/bin/tools/arpaname.docbook                             =
                        |      2 +-
 head/contrib/bind9/bin/tools/arpaname.html                                =
                        |      8 +-
 head/contrib/bind9/bin/tools/genrandom.8                                  =
                        |      6 +-
 head/contrib/bind9/bin/tools/genrandom.c                                  =
                        |      2 +-
 head/contrib/bind9/bin/tools/genrandom.docbook                            =
                        |      5 +-
 head/contrib/bind9/bin/tools/genrandom.html                               =
                        |     12 +-
 head/contrib/bind9/bin/tools/isc-hmac-fixup.8                             =
                        |      2 +-
 head/contrib/bind9/bin/tools/isc-hmac-fixup.c                             =
                        |      2 +-
 head/contrib/bind9/bin/tools/isc-hmac-fixup.docbook                       =
                        |      2 +-
 head/contrib/bind9/bin/tools/isc-hmac-fixup.html                          =
                        |     10 +-
 head/contrib/bind9/bin/tools/named-journalprint.8                         =
                        |      2 +-
 head/contrib/bind9/bin/tools/named-journalprint.c                         =
                        |      2 +-
 head/contrib/bind9/bin/tools/named-journalprint.docbook                   =
                        |      2 +-
 head/contrib/bind9/bin/tools/named-journalprint.html                      =
                        |      8 +-
 head/contrib/bind9/bin/tools/nsec3hash.8                                  =
                        |      2 +-
 head/contrib/bind9/bin/tools/nsec3hash.c                                  =
                        |      7 +-
 head/contrib/bind9/bin/tools/nsec3hash.docbook                            =
                        |      2 +-
 head/contrib/bind9/bin/tools/nsec3hash.html                               =
                        |     10 +-
 head/contrib/bind9/config.h.in                                            =
                        |     25 +-
 head/contrib/bind9/config.threads.in                                      =
                        |      7 +-
 head/contrib/bind9/configure.in                                           =
                        |     30 +-
 head/contrib/bind9/doc/Makefile.in                                        =
                        |      2 +-
 head/contrib/bind9/doc/arm/Bv9ARM-book.xml                                =
                        |    432 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch01.html                               =
                        |     52 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch02.html                               =
                        |     24 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch03.html                               =
                        |     43 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch04.html                               =
                        |    279 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch05.html                               =
                        |      8 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch06.html                               =
                        |    488 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch07.html                               =
                        |     21 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch08.html                               =
                        |     20 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch09.html                               =
                        |    222 +-
 head/contrib/bind9/doc/arm/Bv9ARM.ch10.html                               =
                        |      4 +-
 head/contrib/bind9/doc/arm/Bv9ARM.html                                    =
                        |    208 +-
 head/contrib/bind9/doc/arm/Bv9ARM.pdf                                     =
                        |    Bin=20
 head/contrib/bind9/doc/arm/Makefile.in                                    =
                        |      2 +-
 head/contrib/bind9/doc/arm/README-SGML                                    =
                        |      2 +-
 head/contrib/bind9/doc/arm/dnssec.xml                                     =
                        |      4 +-
 head/contrib/bind9/doc/arm/libdns.xml                                     =
                        |      2 +-
 head/contrib/bind9/doc/arm/man.arpaname.html                              =
                        |     10 +-
 head/contrib/bind9/doc/arm/man.ddns-confgen.html                          =
                        |     12 +-
 head/contrib/bind9/doc/arm/man.dig.html                                   =
                        |     22 +-
 head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html                      =
                        |     18 +-
 head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html                   =
                        |     16 +-
 head/contrib/bind9/doc/arm/man.dnssec-keygen.html                         =
                        |     18 +-
 head/contrib/bind9/doc/arm/man.dnssec-revoke.html                         =
                        |     19 +-
 head/contrib/bind9/doc/arm/man.dnssec-settime.html                        =
                        |     19 +-
 head/contrib/bind9/doc/arm/man.dnssec-signzone.html                       =
                        |     14 +-
 head/contrib/bind9/doc/arm/man.genrandom.html                             =
                        |     12 +-
 head/contrib/bind9/doc/arm/man.host.html                                  =
                        |     12 +-
 head/contrib/bind9/doc/arm/man.isc-hmac-fixup.html                        =
                        |     12 +-
 head/contrib/bind9/doc/arm/man.named-checkconf.html                       =
                        |     14 +-
 head/contrib/bind9/doc/arm/man.named-checkzone.html                       =
                        |     14 +-
 head/contrib/bind9/doc/arm/man.named-journalprint.html                    =
                        |     10 +-
 head/contrib/bind9/doc/arm/man.named.html                                 =
                        |     18 +-
 head/contrib/bind9/doc/arm/man.nsec3hash.html                             =
                        |     12 +-
 head/contrib/bind9/doc/arm/man.nsupdate.html                              =
                        |     16 +-
 head/contrib/bind9/doc/arm/man.rndc-confgen.html                          =
                        |     14 +-
 head/contrib/bind9/doc/arm/man.rndc.conf.html                             =
                        |     14 +-
 head/contrib/bind9/doc/arm/man.rndc.html                                  =
                        |     14 +-
 head/contrib/bind9/doc/arm/managed-keys.xml                               =
                        |      2 +-
 head/contrib/bind9/doc/arm/pkcs11.xml                                     =
                        |    125 +-
 head/contrib/bind9/doc/misc/Makefile.in                                   =
                        |      2 +-
 head/contrib/bind9/doc/misc/dnssec                                        =
                        |      2 +-
 head/contrib/bind9/doc/misc/format-options.pl                             =
                        |      2 +-
 head/contrib/bind9/doc/misc/ipv6                                          =
                        |      2 +-
 head/contrib/bind9/doc/misc/migration                                     =
                        |      2 +-
 head/contrib/bind9/doc/misc/migration-4to9                                =
                        |      2 +-
 head/contrib/bind9/doc/misc/options                                       =
                        |     14 +-
 head/contrib/bind9/doc/misc/rfc-compliance                                =
                        |      2 +-
 head/contrib/bind9/doc/misc/roadmap                                       =
                        |      2 +-
 head/contrib/bind9/doc/misc/sdb                                           =
                        |      2 +-
 head/contrib/bind9/doc/misc/sort-options.pl                               =
                        |      2 +-
 head/contrib/bind9/isc-config.sh.in                                       =
                        |      2 +-
 head/contrib/bind9/lib/Makefile.in                                        =
                        |      2 +-
 head/contrib/bind9/lib/bind9/Makefile.in                                  =
                        |      2 +-
 head/contrib/bind9/lib/bind9/api                                          =
                        |      7 +-
 head/contrib/bind9/lib/bind9/check.c                                      =
                        |     66 +-
 head/contrib/bind9/lib/bind9/getaddresses.c                               =
                        |      2 +-
 head/contrib/bind9/lib/bind9/include/Makefile.in                          =
                        |      2 +-
 head/contrib/bind9/lib/bind9/include/bind9/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/bind9/include/bind9/check.h                        =
                        |      2 +-
 head/contrib/bind9/lib/bind9/include/bind9/getaddresses.h                 =
                        |      2 +-
 head/contrib/bind9/lib/bind9/include/bind9/version.h                      =
                        |      2 +-
 head/contrib/bind9/lib/bind9/version.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/dns/Makefile.in                                    =
                        |      4 +-
 head/contrib/bind9/lib/dns/acache.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/acl.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/adb.c                                          =
                        |      5 +-
 head/contrib/bind9/lib/dns/api                                            =
                        |     11 +-
 head/contrib/bind9/lib/dns/byaddr.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/cache.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/callbacks.c                                    =
                        |      4 +-
 head/contrib/bind9/lib/dns/client.c                                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/compress.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/db.c                                           =
                        |      9 +-
 head/contrib/bind9/lib/dns/dbiterator.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/dns/dbtable.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/diff.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/dispatch.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/dns/dlz.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/dns64.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/dnssec.c                                       =
                        |     15 +-
 head/contrib/bind9/lib/dns/ds.c                                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/dst_api.c                                      =
                        |     30 +-
 head/contrib/bind9/lib/dns/dst_internal.h                                 =
                        |      6 +-
 head/contrib/bind9/lib/dns/dst_lib.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/dst_openssl.h                                  =
                        |      4 +-
 head/contrib/bind9/lib/dns/dst_parse.c                                    =
                        |     19 +-
 head/contrib/bind9/lib/dns/dst_parse.h                                    =
                        |      2 +-
 head/contrib/bind9/lib/dns/dst_result.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/dns/ecdb.c                                         =
                        |     20 +-
 head/contrib/bind9/lib/dns/forward.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/gen-unix.h                                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/gen.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/gssapi_link.c                                  =
                        |      4 +-
 head/contrib/bind9/lib/dns/gssapictx.c                                    =
                        |     22 +-
 head/contrib/bind9/lib/dns/hmac_link.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/Makefile.in                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/Makefile.in                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/acache.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/acl.h                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/adb.h                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/bit.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/byaddr.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/cache.h                            =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/callbacks.h                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/cert.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/client.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/compress.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/db.h                               =
                        |     14 +-
 head/contrib/bind9/lib/dns/include/dns/dbiterator.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/dbtable.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/diff.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/dispatch.h                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/dlz.h                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/dlz_dlopen.h                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/dns64.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/dnssec.h                           =
                        |      7 +-
 head/contrib/bind9/lib/dns/include/dns/ds.h                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/ecdb.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/events.h                           =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/fixedname.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/forward.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/iptable.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/journal.h                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/keydata.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/keyflags.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/keytable.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/keyvalues.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/lib.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/log.h                              =
                        |      5 +-
 head/contrib/bind9/lib/dns/include/dns/lookup.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/master.h                           =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/masterdump.h                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/message.h                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/name.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/ncache.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/nsec.h                             =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/nsec3.h                            =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/opcode.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/order.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/peer.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/portlist.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/private.h                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/rbt.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rcode.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rdata.h                            =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/rdataclass.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rdatalist.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rdataset.h                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/rdatasetiter.h                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rdataslab.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rdatatype.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/request.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/resolver.h                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/result.h                           =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/rootns.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/rpz.h                              =
                        |     59 +-
 head/contrib/bind9/lib/dns/include/dns/rriterator.h                       =
                        |     88 +-
 head/contrib/bind9/lib/dns/include/dns/sdb.h                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/sdlz.h                             =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/secalg.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/secproto.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/soa.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/ssu.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/stats.h                            =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/tcpmsg.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/time.h                             =
                        |     10 +-
 head/contrib/bind9/lib/dns/include/dns/timer.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/tkey.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/tsec.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/tsig.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/ttl.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/types.h                            =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/validator.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/version.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/view.h                             =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dns/xfrin.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/zone.h                             =
                        |     37 +-
 head/contrib/bind9/lib/dns/include/dns/zonekey.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dns/zt.h                               =
                        |      4 +-
 head/contrib/bind9/lib/dns/include/dst/Makefile.in                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dst/dst.h                              =
                        |     13 +-
 head/contrib/bind9/lib/dns/include/dst/gssapi.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dst/lib.h                              =
                        |      2 +-
 head/contrib/bind9/lib/dns/include/dst/result.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/iptable.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/journal.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/dns/key.c                                          =
                        |     37 +-
 head/contrib/bind9/lib/dns/keydata.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/keytable.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/lib.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/log.c                                          =
                        |      5 +-
 head/contrib/bind9/lib/dns/lookup.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/master.c                                       =
                        |     14 +-
 head/contrib/bind9/lib/dns/masterdump.c                                   =
                        |     10 +-
 head/contrib/bind9/lib/dns/message.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/dns/name.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/ncache.c                                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/nsec.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/nsec3.c                                        =
                        |      8 +-
 head/contrib/bind9/lib/dns/openssl_link.c                                 =
                        |      4 +-
 head/contrib/bind9/lib/dns/openssldh_link.c                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/openssldsa_link.c                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/opensslgost_link.c                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/opensslrsa_link.c                              =
                        |      4 +-
 head/contrib/bind9/lib/dns/order.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/peer.c                                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/portlist.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/private.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/dns/rbt.c                                          =
                        |      8 +-
 head/contrib/bind9/lib/dns/rbtdb.c                                        =
                        |    395 +-
 head/contrib/bind9/lib/dns/rbtdb.h                                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/rbtdb64.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/rbtdb64.h                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/rcode.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata.c                                        =
                        |     82 +-
 head/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/ch_3/a_1.c                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/ch_3/a_1.h                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/cert_37.c                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/cert_37.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/cname_5.c                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/cname_5.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c                      =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/dname_39.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/dname_39.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c                      =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ds_43.c                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/ds_43.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/gpos_27.c                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/gpos_27.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/hip_55.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/hip_55.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c                    =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h                    =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/isdn_20.c                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/isdn_20.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/key_25.c                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/key_25.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c                  =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h                  =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/loc_29.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/loc_29.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mb_7.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mb_7.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/md_3.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/md_3.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mf_4.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mf_4.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mg_8.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mg_8.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/minfo_14.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/minfo_14.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mr_9.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mr_9.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mx_15.c                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/mx_15.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ns_2.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ns_2.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c                  =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h                  =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec_47.c                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nsec_47.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/null_10.c                        =
                        |     10 +-
 head/contrib/bind9/lib/dns/rdata/generic/null_10.h                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nxt_30.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/nxt_30.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/opt_41.c                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/opt_41.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/proforma.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/proforma.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ptr_12.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/ptr_12.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/rp_17.c                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/rp_17.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/rt_21.c                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/rt_21.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/sig_24.c                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/sig_24.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/soa_6.c                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/soa_6.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/spf_99.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/spf_99.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/tkey_249.c                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/generic/tkey_249.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/txt_16.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/txt_16.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/unspec_103.c                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/unspec_103.h                     =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/x25_19.c                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/generic/x25_19.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/hs_4/a_1.c                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/hs_4/a_1.h                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/a6_38.c                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/a6_38.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/a_1.c                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/a_1.h                               =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/apl_42.c                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/apl_42.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/kx_36.c                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/kx_36.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h                          =
                        |      6 +-
 head/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h                           =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/px_26.c                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/px_26.h                             =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/srv_33.c                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/srv_33.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/in_1/wks_11.c                            =
                        |     53 +-
 head/contrib/bind9/lib/dns/rdata/in_1/wks_11.h                            =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/rdatastructpre.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdata/rdatastructsuf.h                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdatalist.c                                    =
                        |      4 +-
 head/contrib/bind9/lib/dns/rdatalist_p.h                                  =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdataset.c                                     =
                        |     10 +-
 head/contrib/bind9/lib/dns/rdatasetiter.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/dns/rdataslab.c                                    =
                        |      5 +-
 head/contrib/bind9/lib/dns/request.c                                      =
                        |     12 +-
 head/contrib/bind9/lib/dns/resolver.c                                     =
                        |    230 +-
 head/contrib/bind9/lib/dns/result.c                                       =
                        |      4 +-
 head/contrib/bind9/lib/dns/rootns.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/rpz.c                                          =
                        |    183 +-
 head/contrib/bind9/lib/dns/rriterator.c                                   =
                        |     10 +-
 head/contrib/bind9/lib/dns/sdb.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/sdlz.c                                         =
                        |      8 +-
 head/contrib/bind9/lib/dns/soa.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/spnego.asn1                                    =
                        |      1 +
 head/contrib/bind9/lib/dns/spnego.c                                       =
                        |     15 +-
 head/contrib/bind9/lib/dns/spnego.h                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/spnego_asn1.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/dns/spnego_asn1.pl                                 =
                        |      4 +-
 head/contrib/bind9/lib/dns/ssu.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/dns/ssu_external.c                                 =
                        |      4 +-
 head/contrib/bind9/lib/dns/stats.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/tcpmsg.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/dns/time.c                                         =
                        |     16 +-
 head/contrib/bind9/lib/dns/timer.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/dns/tkey.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/dns/tsec.c                                         =
                        |      2 +-
 head/contrib/bind9/lib/dns/tsig.c                                         =
                        |     30 +-
 head/contrib/bind9/lib/dns/ttl.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/dns/validator.c                                    =
                        |     75 +-
 head/contrib/bind9/lib/dns/version.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/view.c                                         =
                        |      7 +-
 head/contrib/bind9/lib/dns/xfrin.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/dns/zone.c                                         =
                        |    345 +-
 head/contrib/bind9/lib/dns/zonekey.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/dns/zt.c                                           =
                        |      4 +-
 head/contrib/bind9/lib/export/Makefile.in                                 =
                        |      2 +-
 head/contrib/bind9/lib/export/dns/Makefile.in                             =
                        |      4 +-
 head/contrib/bind9/lib/export/dns/include/Makefile.in                     =
                        |      2 +-
 head/contrib/bind9/lib/export/dns/include/dns/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/export/dns/include/dst/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/export/irs/Makefile.in                             =
                        |      4 +-
 head/contrib/bind9/lib/export/irs/include/Makefile.in                     =
                        |      6 +-
 head/contrib/bind9/lib/export/irs/include/irs/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/Makefile.in                             =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/include/Makefile.in                     =
                        |      6 +-
 head/contrib/bind9/lib/export/isc/include/isc/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/include/isc/bind9.h                     =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/nls/Makefile.in                         =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/nothreads/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in           =
                        |      6 +-
 head/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in       =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/pthreads/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in            =
                        |      6 +-
 head/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in        =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/unix/Makefile.in                        =
                        |      2 +-
 head/contrib/bind9/lib/export/isc/unix/include/Makefile.in                =
                        |      6 +-
 head/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in            =
                        |      2 +-
 head/contrib/bind9/lib/export/isccfg/Makefile.in                          =
                        |      4 +-
 head/contrib/bind9/lib/export/isccfg/include/Makefile.in                  =
                        |      6 +-
 head/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in           =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/Makefile-postinstall.in             =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/Makefile.in                         =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/nsprobe.c                           =
                        |      4 +-
 head/contrib/bind9/lib/export/samples/sample-async.c                      =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/sample-gai.c                        =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/sample-request.c                    =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/sample-update.c                     =
                        |      2 +-
 head/contrib/bind9/lib/export/samples/sample.c                            =
                        |      2 +-
 head/contrib/bind9/lib/irs/Makefile.in                                    =
                        |      2 +-
 head/contrib/bind9/lib/irs/api                                            =
                        |      7 +-
 head/contrib/bind9/lib/irs/context.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/irs/dnsconf.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/irs/gai_strerror.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/irs/getaddrinfo.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/irs/getnameinfo.c                                  =
                        |      4 +-
 head/contrib/bind9/lib/irs/include/Makefile.in                            =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/Makefile.in                        =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/context.h                          =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/dnsconf.h                          =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/netdb.h.in                         =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/platform.h.in                      =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/resconf.h                          =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/types.h                            =
                        |      2 +-
 head/contrib/bind9/lib/irs/include/irs/version.h                          =
                        |      2 +-
 head/contrib/bind9/lib/irs/resconf.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/irs/version.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/Makefile.in                                    =
                        |      4 +-
 head/contrib/bind9/lib/isc/alpha/Makefile.in                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/alpha/include/Makefile.in                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/alpha/include/isc/atomic.h                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/api                                            =
                        |      7 +-
 head/contrib/bind9/lib/isc/app_api.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/assertions.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/backtrace-emptytbl.c                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/backtrace.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/base32.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/base64.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/bitstring.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/buffer.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/bufferlist.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/commandline.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/entropy.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/error.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/event.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/fsaccess.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/hash.c                                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/heap.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/isc/hex.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/hmacmd5.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/hmacsha.c                                      =
                        |     19 +-
 head/contrib/bind9/lib/isc/httpd.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/isc/ia64/Makefile.in                               =
                        |      2 +-
 head/contrib/bind9/lib/isc/ia64/include/Makefile.in                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/ia64/include/isc/atomic.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/Makefile.in                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/Makefile.in                        =
                        |      6 +-
 head/contrib/bind9/lib/isc/include/isc/app.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/assertions.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/backtrace.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/base32.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/base64.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/bind9.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/bitstring.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/boolean.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/buffer.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/bufferlist.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/commandline.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/entropy.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/error.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/event.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/eventclass.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/file.h                             =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/formatcheck.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/fsaccess.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/hash.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/heap.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/hex.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/hmacmd5.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/hmacsha.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/httpd.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/interfaceiter.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/ipv6.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/iterated_hash.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/lang.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/lex.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/lfsr.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/lib.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/list.h                             =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/log.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/magic.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/md5.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/mem.h                              =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/msgcat.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/msgs.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/mutexblock.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/namespace.h                        =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/netaddr.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/netscope.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/ondestroy.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/os.h                               =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/parseint.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/platform.h.in                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/portset.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/print.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/quota.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/radix.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/random.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/ratelimiter.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/refcount.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/region.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/resource.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/result.h                           =
                        |      7 +-
 head/contrib/bind9/lib/isc/include/isc/resultclass.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/rwlock.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/serial.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/sha1.h                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/sha2.h                             =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/sockaddr.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/socket.h                           =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/stats.h                            =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/stdio.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/stdlib.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/string.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/symtab.h                           =
                        |     12 +-
 head/contrib/bind9/lib/isc/include/isc/task.h                             =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/taskpool.h                         =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/timer.h                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/types.h                            =
                        |      4 +-
 head/contrib/bind9/lib/isc/include/isc/util.h                             =
                        |     14 +-
 head/contrib/bind9/lib/isc/include/isc/version.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/include/isc/xml.h                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/inet_aton.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/inet_ntop.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/inet_pton.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/iterated_hash.c                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/lex.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/lfsr.c                                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/lib.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/log.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/isc/md5.c                                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/mem.c                                          =
                        |      4 +-
 head/contrib/bind9/lib/isc/mem_api.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/mips/Makefile.in                               =
                        |      2 +-
 head/contrib/bind9/lib/isc/mips/include/Makefile.in                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/mips/include/isc/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/mips/include/isc/atomic.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/mutexblock.c                                   =
                        |      9 +-
 head/contrib/bind9/lib/isc/netaddr.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/isc/netscope.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/nls/Makefile.in                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/nls/msgcat.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/noatomic/Makefile.in                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/noatomic/include/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in               =
                        |      2 +-
 head/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/Makefile.in                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/condition.c                          =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/Makefile.in                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in              =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/isc/condition.h              =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/isc/once.h                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/include/isc/thread.h                 =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/mutex.c                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/nothreads/thread.c                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/ondestroy.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/parseint.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/portset.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/powerpc/Makefile.in                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/powerpc/include/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in                =
                        |      2 +-
 head/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h                   =
                        |      4 +-
 head/contrib/bind9/lib/isc/print.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/Makefile.in                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/condition.c                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in               =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/isc/condition.h               =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/isc/once.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/include/isc/thread.h                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/mutex.c                               =
                        |      2 +-
 head/contrib/bind9/lib/isc/pthreads/thread.c                              =
                        |      2 +-
 head/contrib/bind9/lib/isc/quota.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/radix.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/isc/random.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/ratelimiter.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/refcount.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/region.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/result.c                                       =
                        |      5 +-
 head/contrib/bind9/lib/isc/rwlock.c                                       =
                        |      4 +-
 head/contrib/bind9/lib/isc/serial.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/sha1.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/isc/sha2.c                                         =
                        |     20 +-
 head/contrib/bind9/lib/isc/sockaddr.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/socket_api.c                                   =
                        |      4 +-
 head/contrib/bind9/lib/isc/sparc64/Makefile.in                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/sparc64/include/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in                =
                        |      2 +-
 head/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h                   =
                        |      4 +-
 head/contrib/bind9/lib/isc/stats.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/isc/string.c                                       =
                        |      4 +-
 head/contrib/bind9/lib/isc/strtoul.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/symtab.c                                       =
                        |     53 +-
 head/contrib/bind9/lib/isc/task.c                                         =
                        |      4 +-
 head/contrib/bind9/lib/isc/task_api.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/task_p.h                                       =
                        |      4 +-
 head/contrib/bind9/lib/isc/taskpool.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/timer.c                                        =
                        |      4 +-
 head/contrib/bind9/lib/isc/timer_api.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/timer_p.h                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/Makefile.in                               =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/app.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/dir.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/unix/entropy.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/errno2result.c                            =
                        |     11 +-
 head/contrib/bind9/lib/isc/unix/errno2result.h                            =
                        |      8 +-
 head/contrib/bind9/lib/isc/unix/file.c                                    =
                        |      4 +-
 head/contrib/bind9/lib/isc/unix/fsaccess.c                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/ifiter_ioctl.c                            =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/ifiter_sysctl.c                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/Makefile.in                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/Makefile.in                   =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/dir.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/int.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/keyboard.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/net.h                         =
                        |      4 +-
 head/contrib/bind9/lib/isc/unix/include/isc/netdb.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/offset.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/stat.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/stdtime.h                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/unix/include/isc/strerror.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/syslog.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/include/isc/time.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/interfaceiter.c                           =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/ipv6.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/keyboard.c                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/net.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/isc/unix/os.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/resource.c                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/socket.c                                  =
                        |     40 +-
 head/contrib/bind9/lib/isc/unix/socket_p.h                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/stdio.c                                   =
                        |     17 +-
 head/contrib/bind9/lib/isc/unix/stdtime.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/strerror.c                                =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/syslog.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/isc/unix/time.c                                    =
                        |     28 +-
 head/contrib/bind9/lib/isc/version.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_32/Makefile.in                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_32/include/Makefile.in                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_64/Makefile.in                             =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_64/include/Makefile.in                     =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in                 =
                        |      2 +-
 head/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isccc/Makefile.in                                  =
                        |      4 +-
 head/contrib/bind9/lib/isccc/alist.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isccc/api                                          =
                        |      7 +-
 head/contrib/bind9/lib/isccc/base64.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isccc/cc.c                                         =
                        |     29 +-
 head/contrib/bind9/lib/isccc/ccmsg.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/Makefile.in                          =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/alist.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/base64.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/cc.h                           =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/ccmsg.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/events.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/lib.h                          =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/result.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/sexpr.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/symtab.h                       =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/symtype.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/types.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/util.h                         =
                        |      2 +-
 head/contrib/bind9/lib/isccc/include/isccc/version.h                      =
                        |      2 +-
 head/contrib/bind9/lib/isccc/lib.c                                        =
                        |      2 +-
 head/contrib/bind9/lib/isccc/result.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isccc/sexpr.c                                      =
                        |      2 +-
 head/contrib/bind9/lib/isccc/symtab.c                                     =
                        |      2 +-
 head/contrib/bind9/lib/isccc/version.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/Makefile.in                                 =
                        |      4 +-
 head/contrib/bind9/lib/isccfg/aclconf.c                                   =
                        |      6 +-
 head/contrib/bind9/lib/isccfg/api                                         =
                        |      7 +-
 head/contrib/bind9/lib/isccfg/dnsconf.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/Makefile.in                         =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in                  =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h                    =
                        |      4 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/cfg.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/grammar.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/log.h                        =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h                  =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/include/isccfg/version.h                    =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/log.c                                       =
                        |      2 +-
 head/contrib/bind9/lib/isccfg/namedconf.c                                 =
                        |     14 +-
 head/contrib/bind9/lib/isccfg/parser.c                                    =
                        |      4 +-
 head/contrib/bind9/lib/isccfg/version.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/lwres/Makefile.in                                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/api                                          =
                        |      7 +-
 head/contrib/bind9/lib/lwres/assert_p.h                                   =
                        |      4 +-
 head/contrib/bind9/lib/lwres/context.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/lwres/context_p.h                                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/gai_strerror.c                               =
                        |      2 +-
 head/contrib/bind9/lib/lwres/getaddrinfo.c                                =
                        |      2 +-
 head/contrib/bind9/lib/lwres/gethost.c                                    =
                        |      2 +-
 head/contrib/bind9/lib/lwres/getipnode.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/getnameinfo.c                                =
                        |     33 +-
 head/contrib/bind9/lib/lwres/getrrset.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/lwres/herror.c                                     =
                        |      4 +-
 head/contrib/bind9/lib/lwres/include/Makefile.in                          =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/Makefile.in                    =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/context.h                      =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/int.h                          =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/ipv6.h                         =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/lang.h                         =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/list.h                         =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h                     =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/lwpacket.h                     =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/lwres.h                        =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/netdb.h.in                     =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/platform.h.in                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/result.h                       =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/stdlib.h                       =
                        |      2 +-
 head/contrib/bind9/lib/lwres/include/lwres/version.h                      =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwbuffer.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwconfig.c                                   =
                        |      4 +-
 head/contrib/bind9/lib/lwres/lwinetaton.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwinetntop.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwinetpton.c                                 =
                        |     13 +-
 head/contrib/bind9/lib/lwres/lwpacket.c                                   =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwres_gabn.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwres_gnba.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwres_grbn.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwres_noop.c                                 =
                        |      2 +-
 head/contrib/bind9/lib/lwres/lwresutil.c                                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/Makefile.in                              =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/lwres.3                                  =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/lwres.docbook                            =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/lwres.html                               =
                        |     14 +-
 head/contrib/bind9/lib/lwres/man/lwres_buffer.3                           =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/lwres_buffer.docbook                     =
                        |      2 +-
 head/contrib/bind9/lib/lwres/man/lwres_buffer.html                        =
                        |      4 +-
 head/contrib/bind9/lib/lwres/man/lwres_config.3                           =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_config.docbook                     =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_config.html                        =
                        |     12 +-
 head/contrib/bind9/lib/lwres/man/lwres_context.3                          =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_context.docbook                    =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_context.html                       =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_gabn.3                             =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_gabn.docbook                       =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_gabn.html                          =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3                     =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook               =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html                  =
                        |      8 +-
 head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3                      =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook                =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html                   =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_gethostent.3                       =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook                 =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_gethostent.html                    =
                        |     12 +-
 head/contrib/bind9/lib/lwres/man/lwres_getipnode.3                        =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook                  =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_getipnode.html                     =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3                      =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook                =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html                   =
                        |     12 +-
 head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3                   =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook             =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html                =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_gnba.3                             =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_gnba.docbook                       =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_gnba.html                          =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_hstrerror.3                        =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook                  =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_hstrerror.html                     =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_inetntop.3                         =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook                   =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_inetntop.html                      =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_noop.3                             =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_noop.docbook                       =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_noop.html                          =
                        |     10 +-
 head/contrib/bind9/lib/lwres/man/lwres_packet.3                           =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_packet.docbook                     =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_packet.html                        =
                        |      8 +-
 head/contrib/bind9/lib/lwres/man/lwres_resutil.3                          =
                        |      6 +-
 head/contrib/bind9/lib/lwres/man/lwres_resutil.docbook                    =
                        |      5 +-
 head/contrib/bind9/lib/lwres/man/lwres_resutil.html                       =
                        |     10 +-
 head/contrib/bind9/lib/lwres/print.c                                      =
                        |      4 +-
 head/contrib/bind9/lib/lwres/print_p.h                                    =
                        |      4 +-
 head/contrib/bind9/lib/lwres/strtoul.c                                    =
                        |      4 +-
 head/contrib/bind9/lib/lwres/unix/Makefile.in                             =
                        |      4 +-
 head/contrib/bind9/lib/lwres/unix/include/Makefile.in                     =
                        |      4 +-
 head/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in               =
                        |      4 +-
 head/contrib/bind9/lib/lwres/unix/include/lwres/net.h                     =
                        |      8 +-
 head/contrib/bind9/lib/lwres/version.c                                    =
                        |      4 +-
 head/contrib/bind9/make/Makefile.in                                       =
                        |      4 +-
 head/contrib/bind9/make/includes.in                                       =
                        |      4 +-
 head/contrib/bind9/make/mkdep.in                                          =
                        |     38 +-
 head/contrib/bind9/make/rules.in                                          =
                        |     38 +-
 head/contrib/bind9/mkinstalldirs                                          =
                        |      2 +-
 head/contrib/bind9/version                                                =
                        |      8 +-
 head/contrib/com_err/com_err.3                                            =
                        |    325 +-
 head/contrib/com_err/com_err.c                                            =
                        |     92 +-
 head/contrib/com_err/com_err.h                                            =
                        |     92 +-
 head/contrib/com_err/com_right.h                                          =
                        |    100 +-
 head/contrib/com_err/compile_et.c                                         =
                        |    106 +-
 head/contrib/com_err/compile_et.h                                         =
                        |     57 +-
 head/contrib/com_err/error.c                                              =
                        |     92 +-
 head/contrib/com_err/lex.h                                                =
                        |     54 +-
 head/contrib/com_err/lex.l                                                =
                        |     62 +-
 head/contrib/com_err/parse.y                                              =
                        |     65 +-
 head/contrib/com_err/roken_rename.h                                       =
                        |     66 +-
 head/contrib/com_err/version-script.map                                   =
                        |      2 +
 head/contrib/gcc/ChangeLog.gcc43                                          =
                        |      5 +
 head/contrib/gcc/builtins.c                                               =
                        |      2 +-
 head/contrib/gcc/config/mips/freebsd.h                                    =
                        |      5 +-
 head/contrib/libcxxrt/dynamic_cast.cc                                     =
                        |    107 +-
 head/contrib/libcxxrt/exception.cc                                        =
                        |     47 +-
 head/contrib/libcxxrt/typeinfo.h                                          =
                        |    107 +-
 head/contrib/llvm/LICENSE.TXT                                             =
                        |      3 +-
 head/contrib/llvm/include/llvm-c/Analysis.h                               =
                        |     10 +
 head/contrib/llvm/include/llvm-c/BitReader.h                              =
                        |     10 +
 head/contrib/llvm/include/llvm-c/BitWriter.h                              =
                        |     10 +
 head/contrib/llvm/include/llvm-c/Core.h                                   =
                        |   1746 +-
 head/contrib/llvm/include/llvm-c/Disassembler.h                           =
                        |     11 +
 head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h                    =
                        |     17 +
 head/contrib/llvm/include/llvm-c/ExecutionEngine.h                        =
                        |     11 +
 head/contrib/llvm/include/llvm-c/Initialization.h                         =
                        |     14 +
 head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h                      =
                        |     11 +
 head/contrib/llvm/include/llvm-c/Object.h                                 =
                        |     76 +-
 head/contrib/llvm/include/llvm-c/Target.h                                 =
                        |     65 +
 head/contrib/llvm/include/llvm-c/Transforms/IPO.h                         =
                        |     11 +
 head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h          =
                        |     11 +
 head/contrib/llvm/include/llvm-c/Transforms/Scalar.h                      =
                        |     10 +
 head/contrib/llvm/include/llvm-c/lto.h                                    =
                        |     51 +-
 head/contrib/llvm/include/llvm/ADT/APFloat.h                              =
                        |     13 +-
 head/contrib/llvm/include/llvm/ADT/APInt.h                                =
                        |     41 +-
 head/contrib/llvm/include/llvm/ADT/ArrayRef.h                             =
                        |    129 +-
 head/contrib/llvm/include/llvm/ADT/BitVector.h                            =
                        |     92 +-
 head/contrib/llvm/include/llvm/ADT/DAGDeltaAlgorithm.h                    =
                        |      1 +
 head/contrib/llvm/include/llvm/ADT/DenseMap.h                             =
                        |     70 +-
 head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h                         =
                        |      2 +-
 head/contrib/llvm/include/llvm/ADT/FoldingSet.h                           =
                        |     28 +-
 head/contrib/llvm/include/llvm/ADT/GraphTraits.h                          =
                        |      5 +-
 head/contrib/llvm/include/llvm/ADT/ImmutableSet.h                         =
                        |     16 +-
 head/contrib/llvm/include/llvm/ADT/IntervalMap.h                          =
                        |      4 +-
 head/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h                   =
                        |     25 +-
 head/contrib/llvm/include/llvm/ADT/PointerIntPair.h                       =
                        |      6 +-
 head/contrib/llvm/include/llvm/ADT/PointerUnion.h                         =
                        |     21 +-
 head/contrib/llvm/include/llvm/ADT/SetVector.h                            =
                        |      6 +
 head/contrib/llvm/include/llvm/ADT/SmallBitVector.h                       =
                        |      6 +-
 head/contrib/llvm/include/llvm/ADT/SmallPtrSet.h                          =
                        |     16 +
 head/contrib/llvm/include/llvm/ADT/SmallSet.h                             =
                        |      4 +-
 head/contrib/llvm/include/llvm/ADT/SmallString.h                          =
                        |    233 +-
 head/contrib/llvm/include/llvm/ADT/SmallVector.h                          =
                        |    108 +-
 head/contrib/llvm/include/llvm/ADT/SparseBitVector.h                      =
                        |     43 +-
 head/contrib/llvm/include/llvm/ADT/Statistic.h                            =
                        |      2 +
 head/contrib/llvm/include/llvm/ADT/StringExtras.h                         =
                        |     37 -
 head/contrib/llvm/include/llvm/ADT/StringMap.h                            =
                        |     67 +-
 head/contrib/llvm/include/llvm/ADT/StringRef.h                            =
                        |     67 +-
 head/contrib/llvm/include/llvm/ADT/TinyPtrVector.h                        =
                        |     42 +-
 head/contrib/llvm/include/llvm/ADT/Trie.h                                 =
                        |      6 +-
 head/contrib/llvm/include/llvm/ADT/Triple.h                               =
                        |    202 +-
 head/contrib/llvm/include/llvm/ADT/Twine.h                                =
                        |      3 +-
 head/contrib/llvm/include/llvm/ADT/ValueMap.h                             =
                        |     24 +-
 head/contrib/llvm/include/llvm/ADT/ilist.h                                =
                        |      4 -
 head/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h                   =
                        |      7 +-
 head/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h                 =
                        |      1 +
 head/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h              =
                        |     15 +-
 head/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h              =
                        |      2 +-
 head/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h           =
                        |    126 +-
 head/contrib/llvm/include/llvm/Analysis/CFGPrinter.h                      =
                        |     12 +-
 head/contrib/llvm/include/llvm/Analysis/CaptureTracking.h                 =
                        |     34 +-
 head/contrib/llvm/include/llvm/Analysis/CodeMetrics.h                     =
                        |     87 +-
 head/contrib/llvm/include/llvm/Analysis/ConstantFolding.h                 =
                        |     26 +-
 head/contrib/llvm/include/llvm/Analysis/DIBuilder.h                       =
                        |     42 +-
 head/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h              =
                        |      6 +-
 head/contrib/llvm/include/llvm/Analysis/DebugInfo.h                       =
                        |     92 +-
 head/contrib/llvm/include/llvm/Analysis/DominanceFrontier.h               =
                        |      1 +
 head/contrib/llvm/include/llvm/Analysis/DominatorInternals.h              =
                        |      2 +-
 head/contrib/llvm/include/llvm/Analysis/Dominators.h                      =
                        |    136 +-
 head/contrib/llvm/include/llvm/Analysis/IVUsers.h                         =
                        |      6 +
 head/contrib/llvm/include/llvm/Analysis/InlineCost.h                      =
                        |    191 +-
 head/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h             =
                        |     97 +-
 head/contrib/llvm/include/llvm/Analysis/IntervalIterator.h                =
                        |      4 +-
 head/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h                   =
                        |      6 +-
 head/contrib/llvm/include/llvm/Analysis/Loads.h                           =
                        |      8 +-
 head/contrib/llvm/include/llvm/Analysis/LoopInfo.h                        =
                        |     74 +-
 head/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h        =
                        |      4 +
 head/contrib/llvm/include/llvm/Analysis/PHITransAddr.h                    =
                        |      8 +-
 head/contrib/llvm/include/llvm/Analysis/ProfileInfo.h                     =
                        |      9 +-
 head/contrib/llvm/include/llvm/Analysis/RegionInfo.h                      =
                        |      2 +-
 head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h                 =
                        |     26 +-
 head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h         =
                        |     37 +-
 head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h      =
                        |      1 -
 head/contrib/llvm/include/llvm/Analysis/ValueTracking.h                   =
                        |     58 +-
 head/contrib/llvm/include/llvm/Argument.h                                 =
                        |      1 +
 head/contrib/llvm/include/llvm/Assembly/AssemblyAnnotationWriter.h        =
                        |     20 +-
 head/contrib/llvm/include/llvm/Assembly/Parser.h                          =
                        |      1 -
 head/contrib/llvm/include/llvm/Assembly/Writer.h                          =
                        |      1 -
 head/contrib/llvm/include/llvm/Attributes.h                               =
                        |    185 +-
 head/contrib/llvm/include/llvm/AutoUpgrade.h                              =
                        |      8 -
 head/contrib/llvm/include/llvm/BasicBlock.h                               =
                        |      7 +-
 head/contrib/llvm/include/llvm/Bitcode/Archive.h                          =
                        |      2 +-
 head/contrib/llvm/include/llvm/Bitcode/BitCodes.h                         =
                        |     13 +-
 head/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h                  =
                        |     99 +-
 head/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h                  =
                        |     83 +-
 head/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h                     =
                        |     40 +-
 head/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h                     =
                        |     49 +-
 head/contrib/llvm/include/llvm/CodeGen/Analysis.h                         =
                        |      7 +-
 head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h                       =
                        |     32 +-
 head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h                 =
                        |     12 +-
 head/contrib/llvm/include/llvm/CodeGen/EdgeBundles.h                      =
                        |      3 +-
 head/contrib/llvm/include/llvm/CodeGen/FastISel.h                         =
                        |     11 +-
 head/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h             =
                        |     24 +-
 head/contrib/llvm/include/llvm/CodeGen/GCStrategy.h                       =
                        |     13 +-
 head/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h                       =
                        |     15 +-
 head/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h                   =
                        |      1 +
 head/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h             =
                        |      4 +-
 head/contrib/llvm/include/llvm/CodeGen/LexicalScopes.h                    =
                        |      3 +-
 head/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h         =
                        |      8 +-
 head/contrib/llvm/include/llvm/CodeGen/LiveInterval.h                     =
                        |     54 +-
 head/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h             =
                        |    258 +-
 head/contrib/llvm/include/llvm/CodeGen/LiveVariables.h                    =
                        |      9 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h                =
                        |    247 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h        =
                        |      6 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h     =
                        |     16 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h               =
                        |      3 +
 head/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h              =
                        |      1 +
 head/contrib/llvm/include/llvm/CodeGen/MachineDominators.h                =
                        |      3 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h                 =
                        |      2 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineFunction.h                  =
                        |     35 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h          =
                        |      5 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineInstr.h                     =
                        |    376 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h              =
                        |     52 +
 head/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h             =
                        |      7 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h                =
                        |     13 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h                =
                        |     16 +-
 head/contrib/llvm/include/llvm/CodeGen/MachineOperand.h                   =
                        |     72 +-
 head/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h              =
                        |      1 +
 head/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h              =
                        |    180 +-
 head/contrib/llvm/include/llvm/CodeGen/PBQP/Graph.h                       =
                        |     37 +
 head/contrib/llvm/include/llvm/CodeGen/PBQP/HeuristicBase.h               =
                        |     14 +-
 head/contrib/llvm/include/llvm/CodeGen/PBQP/Heuristics/Briggs.h           =
                        |      6 +
 head/contrib/llvm/include/llvm/CodeGen/Passes.h                           =
                        |    369 +-
 head/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h               =
                        |     14 +-
 head/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h                      =
                        |     73 +-
 head/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h                =
                        |     16 +-
 head/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h                     =
                        |     27 +-
 head/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h                 =
                        |     17 +-
 head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h                =
                        |     37 +-
 head/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h                      =
                        |    126 +-
 head/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h     =
                        |     13 +-
 head/contrib/llvm/include/llvm/CodeGen/ValueTypes.h                       =
                        |    113 +-
 head/contrib/llvm/include/llvm/CodeGen/ValueTypes.td                      =
                        |     62 +-
 head/contrib/llvm/include/llvm/Constant.h                                 =
                        |     23 +-
 head/contrib/llvm/include/llvm/Constants.h                                =
                        |    326 +-
 head/contrib/llvm/include/llvm/DefaultPasses.h                            =
                        |      2 +
 head/contrib/llvm/include/llvm/DerivedTypes.h                             =
                        |     10 +-
 head/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h          =
                        |     59 +-
 head/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h         =
                        |     50 +-
 head/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h         =
                        |     27 +
 head/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h              =
                        |     33 +-
 head/contrib/llvm/include/llvm/Function.h                                 =
                        |      8 +-
 head/contrib/llvm/include/llvm/GlobalValue.h                              =
                        |      7 +-
 head/contrib/llvm/include/llvm/InitializePasses.h                         =
                        |     27 +-
 head/contrib/llvm/include/llvm/InlineAsm.h                                =
                        |      1 +
 head/contrib/llvm/include/llvm/InstrTypes.h                               =
                        |      1 +
 head/contrib/llvm/include/llvm/Instruction.def                            =
                        |    125 +-
 head/contrib/llvm/include/llvm/Instruction.h                              =
                        |     26 +-
 head/contrib/llvm/include/llvm/Instructions.h                             =
                        |    340 +-
 head/contrib/llvm/include/llvm/IntrinsicInst.h                            =
                        |     28 -
 head/contrib/llvm/include/llvm/Intrinsics.td                              =
                        |     11 +-
 head/contrib/llvm/include/llvm/IntrinsicsX86.td                           =
                        |   1176 +-
 head/contrib/llvm/include/llvm/LLVMContext.h                              =
                        |     11 +-
 head/contrib/llvm/include/llvm/LinkAllPasses.h                            =
                        |      5 +-
 head/contrib/llvm/include/llvm/Linker.h                                   =
                        |      3 +-
 head/contrib/llvm/include/llvm/MC/MCAsmBackend.h                          =
                        |     49 +-
 head/contrib/llvm/include/llvm/MC/MCAsmInfo.h                             =
                        |     44 +-
 head/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h                         =
                        |     14 +-
 head/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h                       =
                        |      4 +-
 head/contrib/llvm/include/llvm/MC/MCAsmLayout.h                           =
                        |      1 +
 head/contrib/llvm/include/llvm/MC/MCAssembler.h                           =
                        |     47 +-
 head/contrib/llvm/include/llvm/MC/MCCodeEmitter.h                         =
                        |      6 +-
 head/contrib/llvm/include/llvm/MC/MCCodeGenInfo.h                         =
                        |     11 +-
 head/contrib/llvm/include/llvm/MC/MCContext.h                             =
                        |     62 +-
 head/contrib/llvm/include/llvm/MC/MCDisassembler.h                        =
                        |      2 +-
 head/contrib/llvm/include/llvm/MC/MCDwarf.h                               =
                        |     67 +-
 head/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h                     =
                        |     75 +-
 head/contrib/llvm/include/llvm/MC/MCExpr.h                                =
                        |     28 +-
 head/contrib/llvm/include/llvm/MC/MCFixup.h                               =
                        |     19 +-
 head/contrib/llvm/include/llvm/MC/MCInst.h                                =
                        |     28 +-
 head/contrib/llvm/include/llvm/MC/MCInstPrinter.h                         =
                        |     11 +-
 head/contrib/llvm/include/llvm/MC/MCInstrAnalysis.h                       =
                        |      2 +-
 head/contrib/llvm/include/llvm/MC/MCInstrDesc.h                           =
                        |    208 +-
 head/contrib/llvm/include/llvm/MC/MCInstrInfo.h                           =
                        |     17 +-
 head/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h                      =
                        |     44 +-
 head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h                      =
                        |      7 +-
 head/contrib/llvm/include/llvm/MC/MCObjectWriter.h                        =
                        |      8 +-
 head/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h                   =
                        |      1 +
 head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h                  =
                        |     14 +-
 head/contrib/llvm/include/llvm/MC/MCRegisterInfo.h                        =
                        |    184 +-
 head/contrib/llvm/include/llvm/MC/MCSection.h                             =
                        |      2 -
 head/contrib/llvm/include/llvm/MC/MCSectionCOFF.h                         =
                        |      2 +-
 head/contrib/llvm/include/llvm/MC/MCSectionELF.h                          =
                        |      1 +
 head/contrib/llvm/include/llvm/MC/MCSectionMachO.h                        =
                        |      1 +
 head/contrib/llvm/include/llvm/MC/MCStreamer.h                            =
                        |     49 +-
 head/contrib/llvm/include/llvm/Metadata.h                                 =
                        |     25 +-
 head/contrib/llvm/include/llvm/Module.h                                   =
                        |     64 +-
 head/contrib/llvm/include/llvm/Object/Archive.h                           =
                        |     59 +-
 head/contrib/llvm/include/llvm/Object/Binary.h                            =
                        |     53 +-
 head/contrib/llvm/include/llvm/Object/COFF.h                              =
                        |     77 +-
 head/contrib/llvm/include/llvm/Object/MachO.h                             =
                        |     37 +-
 head/contrib/llvm/include/llvm/Object/MachOObject.h                       =
                        |      6 +-
 head/contrib/llvm/include/llvm/Object/ObjectFile.h                        =
                        |    275 +-
 head/contrib/llvm/include/llvm/Operator.h                                 =
                        |      4 +-
 head/contrib/llvm/include/llvm/Pass.h                                     =
                        |     38 +-
 head/contrib/llvm/include/llvm/PassAnalysisSupport.h                      =
                        |      1 +
 head/contrib/llvm/include/llvm/PassManager.h                              =
                        |     22 +-
 head/contrib/llvm/include/llvm/PassManagers.h                             =
                        |     75 +-
 head/contrib/llvm/include/llvm/PassSupport.h                              =
                        |      7 +-
 head/contrib/llvm/include/llvm/Support/BlockFrequency.h                   =
                        |      2 +
 head/contrib/llvm/include/llvm/Support/BranchProbability.h                =
                        |     31 +-
 head/contrib/llvm/include/llvm/Support/CFG.h                              =
                        |      8 +
 head/contrib/llvm/include/llvm/Support/COFF.h                             =
                        |    294 +-
 head/contrib/llvm/include/llvm/Support/CallSite.h                         =
                        |     10 +
 head/contrib/llvm/include/llvm/Support/Capacity.h                         =
                        |      2 +
 head/contrib/llvm/include/llvm/Support/CodeGen.h                          =
                        |     20 +
 head/contrib/llvm/include/llvm/Support/CommandLine.h                      =
                        |    156 +-
 head/contrib/llvm/include/llvm/Support/Compiler.h                         =
                        |     27 +-
 head/contrib/llvm/include/llvm/Support/DOTGraphTraits.h                   =
                        |     30 +-
 head/contrib/llvm/include/llvm/Support/DataTypes.h.in                     =
                        |     15 +
 head/contrib/llvm/include/llvm/Support/Debug.h                            =
                        |      6 +-
 head/contrib/llvm/include/llvm/Support/Dwarf.h                            =
                        |      6 +-
 head/contrib/llvm/include/llvm/Support/DynamicLibrary.h                   =
                        |      3 +
 head/contrib/llvm/include/llvm/Support/ELF.h                              =
                        |     50 +
 head/contrib/llvm/include/llvm/Support/Endian.h                           =
                        |     12 +
 head/contrib/llvm/include/llvm/Support/FileSystem.h                       =
                        |    228 +-
 head/contrib/llvm/include/llvm/Support/GraphWriter.h                      =
                        |     14 +-
 head/contrib/llvm/include/llvm/Support/Host.h                             =
                        |      6 +-
 head/contrib/llvm/include/llvm/Support/IRReader.h                         =
                        |     10 +-
 head/contrib/llvm/include/llvm/Support/InstVisitor.h                      =
                        |    105 +-
 head/contrib/llvm/include/llvm/Support/MachO.h                            =
                        |      7 +
 head/contrib/llvm/include/llvm/Support/ManagedStatic.h                    =
                        |      5 +
 head/contrib/llvm/include/llvm/Support/MathExtras.h                       =
                        |     14 +
 head/contrib/llvm/include/llvm/Support/MemoryObject.h                     =
                        |     11 +-
 head/contrib/llvm/include/llvm/Support/PathV1.h                           =
                        |     14 -
 head/contrib/llvm/include/llvm/Support/PatternMatch.h                     =
                        |     91 +-
 head/contrib/llvm/include/llvm/Support/Process.h                          =
                        |      3 -
 head/contrib/llvm/include/llvm/Support/Program.h                          =
                        |     13 +-
 head/contrib/llvm/include/llvm/Support/Recycler.h                         =
                        |      3 +-
 head/contrib/llvm/include/llvm/Support/SMLoc.h                            =
                        |     22 +-
 head/contrib/llvm/include/llvm/Support/SourceMgr.h                        =
                        |     52 +-
 head/contrib/llvm/include/llvm/Support/TargetRegistry.h                   =
                        |     50 +-
 head/contrib/llvm/include/llvm/Support/TargetSelect.h                     =
                        |     12 +
 head/contrib/llvm/include/llvm/Support/Valgrind.h                         =
                        |     43 +
 head/contrib/llvm/include/llvm/Support/ValueHandle.h                      =
                        |     43 +-
 head/contrib/llvm/include/llvm/Support/system_error.h                     =
                        |     15 +-
 head/contrib/llvm/include/llvm/Support/type_traits.h                      =
                        |     95 +-
 head/contrib/llvm/include/llvm/TableGen/Record.h                          =
                        |    228 +-
 head/contrib/llvm/include/llvm/TableGen/TableGenAction.h                  =
                        |      1 +
 head/contrib/llvm/include/llvm/TableGen/TableGenBackend.h                 =
                        |      4 +-
 head/contrib/llvm/include/llvm/Target/Mangler.h                           =
                        |      4 +-
 head/contrib/llvm/include/llvm/Target/Target.td                           =
                        |     62 +-
 head/contrib/llvm/include/llvm/Target/TargetCallingConv.h                 =
                        |      4 +
 head/contrib/llvm/include/llvm/Target/TargetCallingConv.td                =
                        |     11 +
 head/contrib/llvm/include/llvm/Target/TargetData.h                        =
                        |     34 +-
 head/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h               =
                        |      3 -
 head/contrib/llvm/include/llvm/Target/TargetFrameLowering.h               =
                        |      4 -
 head/contrib/llvm/include/llvm/Target/TargetInstrInfo.h                   =
                        |    128 +-
 head/contrib/llvm/include/llvm/Target/TargetJITInfo.h                     =
                        |     21 +-
 head/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h                 =
                        |    248 +-
 head/contrib/llvm/include/llvm/Target/TargetLowering.h                    =
                        |    138 +-
 head/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h          =
                        |     30 +-
 head/contrib/llvm/include/llvm/Target/TargetMachine.h                     =
                        |    138 +-
 head/contrib/llvm/include/llvm/Target/TargetOpcodes.h                     =
                        |      7 +-
 head/contrib/llvm/include/llvm/Target/TargetOptions.h                     =
                        |    252 +-
 head/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h                =
                        |    124 +-
 head/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td               =
                        |     47 +
 head/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h               =
                        |      4 +-
 head/contrib/llvm/include/llvm/Transforms/IPO.h                           =
                        |      1 +
 head/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h               =
                        |     27 +-
 head/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h        =
                        |     20 +-
 head/contrib/llvm/include/llvm/Transforms/Instrumentation.h               =
                        |      9 +-
 head/contrib/llvm/include/llvm/Transforms/Scalar.h                        =
                        |     14 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h         =
                        |      5 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h           =
                        |      8 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h                 =
                        |     23 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h              =
                        |     21 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h          =
                        |     51 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/SimplifyIndVar.h          =
                        |     16 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h              =
                        |      5 +-
 head/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h             =
                        |      2 +-
 head/contrib/llvm/include/llvm/Type.h                                     =
                        |    150 +-
 head/contrib/llvm/include/llvm/User.h                                     =
                        |      6 +-
 head/contrib/llvm/include/llvm/Value.h                                    =
                        |     47 +-
 head/contrib/llvm/lib/Analysis/AliasAnalysis.cpp                          =
                        |     16 +
 head/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp                   =
                        |      6 +-
 head/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp                 =
                        |      4 -
 head/contrib/llvm/lib/Analysis/AliasSetTracker.cpp                        =
                        |      4 +-
 head/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp                     =
                        |     59 +-
 head/contrib/llvm/lib/Analysis/BlockFrequencyInfo.cpp                     =
                        |      2 +-
 head/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp                  =
                        |    395 +-
 head/contrib/llvm/lib/Analysis/CFGPrinter.cpp                             =
                        |      8 +-
 head/contrib/llvm/lib/Analysis/CaptureTracking.cpp                        =
                        |     95 +-
 head/contrib/llvm/lib/Analysis/ConstantFolding.cpp                        =
                        |    373 +-
 head/contrib/llvm/lib/Analysis/DIBuilder.cpp                              =
                        |    112 +-
 head/contrib/llvm/lib/Analysis/DebugInfo.cpp                              =
                        |    110 +-
 head/contrib/llvm/lib/Analysis/DominanceFrontier.cpp                      =
                        |      2 +
 head/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp                          =
                        |     13 +-
 head/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp                      =
                        |      6 +
 head/contrib/llvm/lib/Analysis/IVUsers.cpp                                =
                        |     67 +-
 head/contrib/llvm/lib/Analysis/InlineCost.cpp                             =
                        |   1557 +-
 head/contrib/llvm/lib/Analysis/InstructionSimplify.cpp                    =
                        |   1175 +-
 head/contrib/llvm/lib/Analysis/LazyValueInfo.cpp                          =
                        |    123 +-
 head/contrib/llvm/lib/Analysis/Lint.cpp                                   =
                        |     19 +-
 head/contrib/llvm/lib/Analysis/Loads.cpp                                  =
                        |     16 +-
 head/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp                 =
                        |      2 -
 head/contrib/llvm/lib/Analysis/LoopInfo.cpp                               =
                        |    127 +-
 head/contrib/llvm/lib/Analysis/LoopPass.cpp                               =
                        |     23 +-
 head/contrib/llvm/lib/Analysis/MemDepPrinter.cpp                          =
                        |      2 +-
 head/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp                         =
                        |      8 +-
 head/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp               =
                        |     94 +-
 head/contrib/llvm/lib/Analysis/PHITransAddr.cpp                           =
                        |     13 +-
 head/contrib/llvm/lib/Analysis/PathNumbering.cpp                          =
                        |      4 +-
 head/contrib/llvm/lib/Analysis/PathProfileVerifier.cpp                    =
                        |     16 +-
 head/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp                   =
                        |      2 +-
 head/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp                  =
                        |      4 +-
 head/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp                    =
                        |     18 +-
 head/contrib/llvm/lib/Analysis/RegionInfo.cpp                             =
                        |      8 +-
 head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp                        =
                        |    476 +-
 head/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp                =
                        |    513 +-
 head/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp           =
                        |      2 -
 head/contrib/llvm/lib/Analysis/SparsePropagation.cpp                      =
                        |      8 +-
 head/contrib/llvm/lib/Analysis/Trace.cpp                                  =
                        |      2 +-
 head/contrib/llvm/lib/Analysis/ValueTracking.cpp                          =
                        |    985 +-
 head/contrib/llvm/lib/Archive/ArchiveReader.cpp                           =
                        |     31 +-
 head/contrib/llvm/lib/Archive/ArchiveWriter.cpp                           =
                        |      6 +-
 head/contrib/llvm/lib/AsmParser/LLLexer.cpp                               =
                        |     62 +-
 head/contrib/llvm/lib/AsmParser/LLLexer.h                                 =
                        |      1 -
 head/contrib/llvm/lib/AsmParser/LLParser.cpp                              =
                        |    127 +-
 head/contrib/llvm/lib/AsmParser/LLParser.h                                =
                        |     15 +-
 head/contrib/llvm/lib/AsmParser/LLToken.h                                 =
                        |      4 +-
 head/contrib/llvm/lib/AsmParser/Parser.cpp                                =
                        |      2 +-
 head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp                    =
                        |    680 +-
 head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h                      =
                        |     40 +-
 head/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp                    =
                        |    320 +-
 head/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp                  =
                        |     44 +-
 head/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h                    =
                        |      4 +
 head/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp                =
                        |     29 +-
 head/contrib/llvm/lib/CodeGen/AllocationOrder.cpp                         =
                        |      2 +-
 head/contrib/llvm/lib/CodeGen/AllocationOrder.h                           =
                        |      3 +-
 head/contrib/llvm/lib/CodeGen/Analysis.cpp                                =
                        |     73 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp                 =
                        |     19 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp                   =
                        |    304 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp              =
                        |     45 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp          =
                        |      6 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp                          =
                        |     42 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h                            =
                        |     87 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp            =
                        |      6 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp             =
                        |    299 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h               =
                        |     68 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp                   =
                        |    427 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h                     =
                        |     56 +-
 head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp               =
                        |     46 +-
 head/contrib/llvm/lib/CodeGen/BranchFolding.cpp                           =
                        |    129 +-
 head/contrib/llvm/lib/CodeGen/CallingConvLower.cpp                        =
                        |      2 +-
 head/contrib/llvm/lib/CodeGen/CodeGen.cpp                                 =
                        |     17 +-
 head/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp                        =
                        |      9 +-
 head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp                  =
                        |     72 +-
 head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h                    =
                        |      3 +-
 head/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp              =
                        |     31 +-
 head/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp                          =
                        |    701 +-
 head/contrib/llvm/lib/CodeGen/EdgeBundles.cpp                             =
                        |      2 +-
 head/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp                        =
                        |    524 +-
 head/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp                       =
                        |     14 +-
 head/contrib/llvm/lib/CodeGen/ExpandPostRAPseudos.cpp                     =
                        |     12 +-
 head/contrib/llvm/lib/CodeGen/GCMetadata.cpp                              =
                        |      6 +-
 head/contrib/llvm/lib/CodeGen/GCStrategy.cpp                              =
                        |    160 +-
 head/contrib/llvm/lib/CodeGen/IfConversion.cpp                            =
                        |    132 +-
 head/contrib/llvm/lib/CodeGen/InlineSpiller.cpp                           =
                        |    191 +-
 head/contrib/llvm/lib/CodeGen/InterferenceCache.cpp                       =
                        |     35 +-
 head/contrib/llvm/lib/CodeGen/InterferenceCache.h                         =
                        |     15 +-
 head/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp                       =
                        |      5 -
 head/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp                       =
                        |    436 +-
 head/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp                    =
                        |      6 +-
 head/contrib/llvm/lib/CodeGen/LexicalScopes.cpp                           =
                        |      2 +
 head/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp                      =
                        |     23 +-
 head/contrib/llvm/lib/CodeGen/LiveInterval.cpp                            =
                        |     36 +-
 head/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp                    =
                        |   2144 +-
 head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp                       =
                        |      2 +
 head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h                         =
                        |      2 -
 head/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp                           =
                        |      4 +-
 head/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp                           =
                        |    110 +-
 head/contrib/llvm/lib/CodeGen/LiveVariables.cpp                           =
                        |    114 +-
 head/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp                =
                        |     10 +-
 head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp                       =
                        |    221 +-
 head/contrib/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp               =
                        |      2 +-
 head/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp            =
                        |     65 +-
 head/contrib/llvm/lib/CodeGen/MachineCSE.cpp                              =
                        |    108 +-
 head/contrib/llvm/lib/CodeGen/MachineFunction.cpp                         =
                        |     91 +-
 head/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp                 =
                        |      5 +-
 head/contrib/llvm/lib/CodeGen/MachineInstr.cpp                            =
                        |    252 +-
 head/contrib/llvm/lib/CodeGen/MachineLICM.cpp                             =
                        |    616 +-
 head/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp                       =
                        |     18 +-
 head/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp                     =
                        |      1 +
 head/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp                     =
                        |     65 +-
 head/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp                       =
                        |      7 +-
 head/contrib/llvm/lib/CodeGen/MachineSink.cpp                             =
                        |    286 +-
 head/contrib/llvm/lib/CodeGen/MachineVerifier.cpp                         =
                        |    468 +-
 head/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp                            =
                        |      9 +-
 head/contrib/llvm/lib/CodeGen/PHIElimination.cpp                          =
                        |     13 +-
 head/contrib/llvm/lib/CodeGen/Passes.cpp                                  =
                        |    609 +-
 head/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp                       =
                        |     35 +-
 head/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp                     =
                        |    256 +-
 head/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp                     =
                        |     36 +-
 head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp                    =
                        |     41 +-
 head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h                      =
                        |      4 -
 head/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp                       =
                        |      2 -
 head/contrib/llvm/lib/CodeGen/RegAllocBase.h                              =
                        |     36 +-
 head/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp                           =
                        |    316 +-
 head/contrib/llvm/lib/CodeGen/RegAllocFast.cpp                            =
                        |    323 +-
 head/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp                          =
                        |    110 +-
 head/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp                            =
                        |    171 +-
 head/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp                       =
                        |     16 +-
 head/contrib/llvm/lib/CodeGen/RegisterClassInfo.h                         =
                        |      2 +-
 head/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp                       =
                        |    252 +-
 head/contrib/llvm/lib/CodeGen/RegisterCoalescer.h                         =
                        |      6 +-
 head/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp                      =
                        |     67 +-
 head/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp                   =
                        |     19 +-
 head/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp                             =
                        |     62 +-
 head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp                       =
                        |    654 +-
 head/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp                      =
                        |     24 +-
 head/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp              =
                        |      4 -
 head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp                =
                        |   1128 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp                   =
                        |    215 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp       =
                        |     67 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp               =
                        |    117 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp                =
                        |   1263 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp         =
                        |     10 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp       =
                        |    134 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp              =
                        |     20 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h                =
                        |      2 +
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp       =
                        |     13 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp          =
                        |    140 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp        =
                        |    163 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp            =
                        |     30 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp          =
                        |    656 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp         =
                        |    130 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h           =
                        |     40 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp               =
                        |   1054 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp        =
                        |    633 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h          =
                        |     18 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp           =
                        |    268 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp        =
                        |      4 +-
 head/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp             =
                        |    215 +-
 head/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp                           =
                        |      3 +-
 head/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp                          =
                        |      7 +-
 head/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp                           =
                        |    775 +-
 head/contrib/llvm/lib/CodeGen/SlotIndexes.cpp                             =
                        |     12 +-
 head/contrib/llvm/lib/CodeGen/Spiller.cpp                                 =
                        |     81 +-
 head/contrib/llvm/lib/CodeGen/Spiller.h                                   =
                        |      1 +
 head/contrib/llvm/lib/CodeGen/SplitKit.cpp                                =
                        |     85 +-
 head/contrib/llvm/lib/CodeGen/SplitKit.h                                  =
                        |     15 +-
 head/contrib/llvm/lib/CodeGen/StackProtector.cpp                          =
                        |      7 +-
 head/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp                       =
                        |    358 +-
 head/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp                    =
                        |     18 +-
 head/contrib/llvm/lib/CodeGen/TailDuplication.cpp                         =
                        |     39 +-
 head/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp                     =
                        |    106 +-
 head/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp            =
                        |    123 +-
 head/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp               =
                        |    525 +-
 head/contrib/llvm/lib/CodeGen/VirtRegMap.cpp                              =
                        |    168 +-
 head/contrib/llvm/lib/CodeGen/VirtRegMap.h                                =
                        |    335 +-
 head/contrib/llvm/lib/DebugInfo/DWARFContext.cpp                          =
                        |      2 +
 head/contrib/llvm/lib/DebugInfo/DWARFContext.h                            =
                        |      1 +
 head/contrib/llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp                      =
                        |      2 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugAbbrev.h                        =
                        |      6 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugArangeSet.cpp                   =
                        |      5 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugAranges.cpp                     =
                        |      7 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp                   =
                        |      4 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.h                     =
                        |      4 +-
 head/contrib/llvm/lib/DebugInfo/DWARFDebugLine.cpp                        =
                        |      7 +-
 head/contrib/llvm/lib/DebugInfo/DWARFFormValue.cpp                        =
                        |     20 +-
 head/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp                 =
                        |    108 +-
 head/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp         =
                        |      2 -
 head/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp           =
                        |     29 +-
 head/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp   =
                        |     31 +-
 head/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h           =
                        |      7 +-
 head/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp                         =
                        |     45 +-
 head/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h                           =
                        |     11 +-
 head/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp             =
                        |      2 +-
 head/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp                  =
                        |     43 +-
 head/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp            =
                        |    194 +
 head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp                     =
                        |     41 +-
 head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h                       =
                        |     17 +-
 head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h          =
                        |     47 +-
 head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp         =
                        |    446 +-
 head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h       =
                        |    236 +-
 head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp    =
                        |    573 +-
 head/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp                    =
                        |     41 +-
 head/contrib/llvm/lib/Linker/LinkArchives.cpp                             =
                        |      5 +-
 head/contrib/llvm/lib/Linker/LinkModules.cpp                              =
                        |    513 +-
 head/contrib/llvm/lib/Linker/Linker.cpp                                   =
                        |      1 -
 head/contrib/llvm/lib/MC/ELFObjectWriter.cpp                              =
                        |    935 +-
 head/contrib/llvm/lib/MC/MCAsmBackend.cpp                                 =
                        |     21 +-
 head/contrib/llvm/lib/MC/MCAsmInfo.cpp                                    =
                        |      4 +-
 head/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp                                =
                        |     15 +-
 head/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp                              =
                        |      7 +-
 head/contrib/llvm/lib/MC/MCAsmStreamer.cpp                                =
                        |    106 +-
 head/contrib/llvm/lib/MC/MCAssembler.cpp                                  =
                        |    124 +-
 head/contrib/llvm/lib/MC/MCCodeGenInfo.cpp                                =
                        |      4 +-
 head/contrib/llvm/lib/MC/MCContext.cpp                                    =
                        |     60 +-
 head/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp                  =
                        |     18 +-
 head/contrib/llvm/lib/MC/MCDisassembler/Disassembler.h                    =
                        |     10 +
 head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp                =
                        |    116 +-
 head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h                  =
                        |     23 +-
 head/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp                     =
                        |     20 +-
 head/contrib/llvm/lib/MC/MCDwarf.cpp                                      =
                        |    459 +-
 head/contrib/llvm/lib/MC/MCELF.cpp                                        =
                        |      4 +-
 head/contrib/llvm/lib/MC/MCELFObjectTargetWriter.cpp                      =
                        |     29 +-
 head/contrib/llvm/lib/MC/MCELFStreamer.cpp                                =
                        |    158 +-
 head/contrib/llvm/lib/MC/MCExpr.cpp                                       =
                        |     42 +-
 head/contrib/llvm/lib/MC/MCInst.cpp                                       =
                        |      2 +
 head/contrib/llvm/lib/MC/MCInstPrinter.cpp                                =
                        |      6 +-
 head/contrib/llvm/lib/MC/MCMachOStreamer.cpp                              =
                        |     27 +-
 head/contrib/llvm/lib/MC/MCModule.cpp                                     =
                        |      2 +-
 head/contrib/llvm/lib/MC/MCNullStreamer.cpp                               =
                        |     14 +-
 head/contrib/llvm/lib/MC/MCObjectFileInfo.cpp                             =
                        |    101 +-
 head/contrib/llvm/lib/MC/MCObjectStreamer.cpp                             =
                        |     52 +-
 head/contrib/llvm/lib/MC/MCObjectWriter.cpp                               =
                        |     14 +-
 head/contrib/llvm/lib/MC/MCParser/AsmParser.cpp                           =
                        |    279 +-
 head/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp                       =
                        |     17 +
 head/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp                        =
                        |      1 +
 head/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp                          =
                        |      4 +
 head/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp                         =
                        |      4 +-
 head/contrib/llvm/lib/MC/MCPureStreamer.cpp                               =
                        |     15 +-
 head/contrib/llvm/lib/MC/MCStreamer.cpp                                   =
                        |    109 +-
 head/contrib/llvm/lib/MC/MCSymbol.cpp                                     =
                        |      7 +-
 head/contrib/llvm/lib/MC/MachObjectWriter.cpp                             =
                        |     15 +-
 head/contrib/llvm/lib/MC/SubtargetFeature.cpp                             =
                        |     24 +-
 head/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp                          =
                        |     89 +-
 head/contrib/llvm/lib/MC/WinCOFFStreamer.cpp                              =
                        |     20 +-
 head/contrib/llvm/lib/Object/Archive.cpp                                  =
                        |    142 +-
 head/contrib/llvm/lib/Object/COFFObjectFile.cpp                           =
                        |    319 +-
 head/contrib/llvm/lib/Object/ELFObjectFile.cpp                            =
                        |   1415 +-
 head/contrib/llvm/lib/Object/MachOObject.cpp                              =
                        |     35 +-
 head/contrib/llvm/lib/Object/MachOObjectFile.cpp                          =
                        |    694 +-
 head/contrib/llvm/lib/Object/Object.cpp                                   =
                        |    150 +
 head/contrib/llvm/lib/Object/ObjectFile.cpp                               =
                        |      4 +-
 head/contrib/llvm/lib/Support/APFloat.cpp                                 =
                        |    127 +-
 head/contrib/llvm/lib/Support/APInt.cpp                                   =
                        |    223 +-
 head/contrib/llvm/lib/Support/Allocator.cpp                               =
                        |      4 +-
 head/contrib/llvm/lib/Support/Atomic.cpp                                  =
                        |      2 +-
 head/contrib/llvm/lib/Support/BlockFrequency.cpp                          =
                        |     12 +-
 head/contrib/llvm/lib/Support/BranchProbability.cpp                       =
                        |     13 +-
 head/contrib/llvm/lib/Support/CommandLine.cpp                             =
                        |     26 +-
 head/contrib/llvm/lib/Support/ConstantRange.cpp                           =
                        |    100 +-
 head/contrib/llvm/lib/Support/CrashRecoveryContext.cpp                    =
                        |      1 -
 head/contrib/llvm/lib/Support/DAGDeltaAlgorithm.cpp                       =
                        |      3 +
 head/contrib/llvm/lib/Support/DataExtractor.cpp                           =
                        |      2 +-
 head/contrib/llvm/lib/Support/Dwarf.cpp                                   =
                        |      2 +
 head/contrib/llvm/lib/Support/FileUtilities.cpp                           =
                        |      1 -
 head/contrib/llvm/lib/Support/FoldingSet.cpp                              =
                        |     26 +-
 head/contrib/llvm/lib/Support/GraphWriter.cpp                             =
                        |     77 +-
 head/contrib/llvm/lib/Support/Host.cpp                                    =
                        |     13 +-
 head/contrib/llvm/lib/Support/ManagedStatic.cpp                           =
                        |      8 +-
 head/contrib/llvm/lib/Support/MemoryBuffer.cpp                            =
                        |     38 +-
 head/contrib/llvm/lib/Support/Mutex.cpp                                   =
                        |    109 +-
 head/contrib/llvm/lib/Support/Path.cpp                                    =
                        |     36 +-
 head/contrib/llvm/lib/Support/PathV2.cpp                                  =
                        |    179 +-
 head/contrib/llvm/lib/Support/Program.cpp                                 =
                        |      1 +
 head/contrib/llvm/lib/Support/RWMutex.cpp                                 =
                        |     96 +-
 head/contrib/llvm/lib/Support/SmallPtrSet.cpp                             =
                        |     51 +
 head/contrib/llvm/lib/Support/SourceMgr.cpp                               =
                        |    141 +-
 head/contrib/llvm/lib/Support/Statistic.cpp                               =
                        |     16 +-
 head/contrib/llvm/lib/Support/StringExtras.cpp                            =
                        |     21 -
 head/contrib/llvm/lib/Support/StringMap.cpp                               =
                        |     61 +-
 head/contrib/llvm/lib/Support/StringRef.cpp                               =
                        |    168 +-
 head/contrib/llvm/lib/Support/TargetRegistry.cpp                          =
                        |      2 +-
 head/contrib/llvm/lib/Support/ThreadLocal.cpp                             =
                        |      2 +-
 head/contrib/llvm/lib/Support/Threading.cpp                               =
                        |      8 +-
 head/contrib/llvm/lib/Support/Timer.cpp                                   =
                        |     16 +-
 head/contrib/llvm/lib/Support/Triple.cpp                                  =
                        |    636 +-
 head/contrib/llvm/lib/Support/Unix/Host.inc                               =
                        |     23 +-
 head/contrib/llvm/lib/Support/Unix/Path.inc                               =
                        |     16 +-
 head/contrib/llvm/lib/Support/Unix/PathV2.inc                             =
                        |     85 +-
 head/contrib/llvm/lib/Support/Unix/Process.inc                            =
                        |      8 +-
 head/contrib/llvm/lib/Support/Unix/Program.inc                            =
                        |     12 +-
 head/contrib/llvm/lib/Support/Unix/Signals.inc                            =
                        |     20 +
 head/contrib/llvm/lib/Support/Valgrind.cpp                                =
                        |     13 +
 head/contrib/llvm/lib/Support/Windows/Host.inc                            =
                        |      5 +-
 head/contrib/llvm/lib/Support/Windows/Path.inc                            =
                        |     35 +-
 head/contrib/llvm/lib/Support/Windows/PathV2.inc                          =
                        |    170 +-
 head/contrib/llvm/lib/Support/Windows/Process.inc                         =
                        |      4 -
 head/contrib/llvm/lib/Support/Windows/Program.inc                         =
                        |     36 +-
 head/contrib/llvm/lib/Support/Windows/Signals.inc                         =
                        |      4 +-
 head/contrib/llvm/lib/Support/Windows/Windows.h                           =
                        |    120 +-
 head/contrib/llvm/lib/Support/raw_ostream.cpp                             =
                        |      1 +
 head/contrib/llvm/lib/TableGen/Error.cpp                                  =
                        |      4 +-
 head/contrib/llvm/lib/TableGen/Record.cpp                                 =
                        |    173 +-
 head/contrib/llvm/lib/TableGen/TGLexer.cpp                                =
                        |     57 +-
 head/contrib/llvm/lib/TableGen/TGLexer.h                                  =
                        |      6 +-
 head/contrib/llvm/lib/TableGen/TGParser.cpp                               =
                        |    554 +-
 head/contrib/llvm/lib/TableGen/TGParser.h                                 =
                        |     73 +-
 head/contrib/llvm/lib/TableGen/TableGenBackend.cpp                        =
                        |      4 +-
 head/contrib/llvm/lib/Target/ARM/ARM.h                                    =
                        |      4 +-
 head/contrib/llvm/lib/Target/ARM/ARM.td                                   =
                        |     20 +-
 head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp                        =
                        |    165 +-
 head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h                          =
                        |      5 +-
 head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp                     =
                        |    665 +-
 head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h                       =
                        |     18 +-
 head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp                  =
                        |    220 +-
 head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h                    =
                        |     28 +-
 head/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h                          =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/ARMCallingConv.h                         =
                        |     21 +-
 head/contrib/llvm/lib/Target/ARM/ARMCallingConv.td                        =
                        |     38 +-
 head/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp                       =
                        |     25 +-
 head/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp                =
                        |   1317 +-
 head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp                 =
                        |      8 +-
 head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.cpp                     =
                        |     33 +-
 head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.h                       =
                        |      1 +
 head/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp                 =
                        |    539 +-
 head/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp                          =
                        |   1333 +-
 head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp                     =
                        |    454 +-
 head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h                       =
                        |      5 +-
 head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp                  =
                        |     28 +-
 head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.h                    =
                        |      8 +-
 head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp                      =
                        |    284 +-
 head/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp                      =
                        |   1158 +-
 head/contrib/llvm/lib/Target/ARM/ARMISelLowering.h                        =
                        |     29 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td                       =
                        |    112 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp                         =
                        |     19 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h                           =
                        |      8 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td                          =
                        |    775 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td                          =
                        |   3197 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td                         =
                        |    127 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td                        =
                        |    407 +-
 head/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td                           =
                        |    492 +-
 head/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp                           =
                        |      6 +-
 head/contrib/llvm/lib/Target/ARM/ARMJITInfo.h                             =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp                =
                        |    214 +-
 head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp                       =
                        |     10 +-
 head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h                 =
                        |     19 +-
 head/contrib/llvm/lib/Target/ARM/ARMPerfectShuffle.h                      =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.cpp                      =
                        |      6 +-
 head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.h                        =
                        |      6 +-
 head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td                       =
                        |    188 +-
 head/contrib/llvm/lib/Target/ARM/ARMRelocations.h                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/ARMSchedule.td                           =
                        |     10 +-
 head/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td                         =
                        |     19 +
 head/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td                         =
                        |     36 +
 head/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td                         =
                        |     12 +-
 head/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp                  =
                        |     10 +-
 head/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp                         =
                        |     12 +-
 head/contrib/llvm/lib/Target/ARM/ARMSubtarget.h                           =
                        |     18 +-
 head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp                     =
                        |    108 +-
 head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h                       =
                        |     24 +-
 head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp                  =
                        |     34 +-
 head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h                    =
                        |      4 +
 head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmLexer.cpp                =
                        |      9 +-
 head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp               =
                        |   3578 +-
 head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp         =
                        |   1407 +-
 head/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp           =
                        |    192 +-
 head/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h             =
                        |     34 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAddressingModes.h        =
                        |     11 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp           =
                        |    180 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMBaseInfo.h               =
                        |     36 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h             =
                        |     24 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp            =
                        |      6 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h              =
                        |     10 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp        =
                        |     76 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.cpp               =
                        |      5 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.h                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp         =
                        |     24 +-
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h           =
                        |      4 +
 head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp     =
                        |    116 +-
 head/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp                     =
                        |     10 +-
 head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp                  =
                        |     19 +-
 head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp                      =
                        |     22 +-
 head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h                        =
                        |      8 +-
 head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp                   =
                        |     35 +-
 head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h                     =
                        |      3 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp                    =
                        |     21 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp                      =
                        |     31 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h                        =
                        |      8 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.cpp                   =
                        |      6 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.h                     =
                        |      3 +-
 head/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp                  =
                        |    141 +-
 head/contrib/llvm/lib/Target/CellSPU/CellSDKIntrinsics.td                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCAsmInfo.cpp        =
                        |      2 +
 head/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCAsmInfo.h          =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCTargetDesc.cpp     =
                        |      8 +-
 head/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCTargetDesc.h       =
                        |      2 -
 head/contrib/llvm/lib/Target/CellSPU/SPU.h                                =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPU.td                               =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/SPU128InstrInfo.td                   =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/SPU64InstrInfo.td                    =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUAsmPrinter.cpp                    =
                        |      3 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUCallingConv.td                    =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.cpp                 =
                        |      5 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp                  =
                        |     18 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp                  =
                        |    140 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h                    =
                        |      5 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUInstrBuilder.h                    =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUInstrFormats.td                   =
                        |      6 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h                       =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUMachineFunction.h                 =
                        |      3 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUMathInstr.td                      =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUNodes.td                          =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUNopFiller.cpp                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUOperands.td                       =
                        |      6 +-
 head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp                  =
                        |      8 +-
 head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h                    =
                        |      4 +-
 head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.td                   =
                        |      6 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUSchedule.td                       =
                        |      6 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.cpp                     =
                        |      3 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp                 =
                        |     41 +-
 head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.h                   =
                        |     20 +-
 head/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp                    =
                        |    124 +-
 head/contrib/llvm/lib/Target/CppBackend/CPPTargetMachine.h                =
                        |      8 +-
 head/contrib/llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmLexer.cpp          =
                        |     10 +-
 head/contrib/llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp         =
                        |      3 -
 head/contrib/llvm/lib/Target/MBlaze/Disassembler/MBlazeDisassembler.cpp   =
                        |     31 +-
 head/contrib/llvm/lib/Target/MBlaze/Disassembler/MBlazeDisassembler.h     =
                        |      6 +-
 head/contrib/llvm/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.h       =
                        |      8 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlaze.td                             =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeAsmPrinter.cpp                  =
                        |      8 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeDelaySlotFiller.cpp             =
                        |     22 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp               =
                        |     12 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.h                 =
                        |      1 +
 head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp               =
                        |     39 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.h                 =
                        |      3 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp                =
                        |     24 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h                  =
                        |      6 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFPU.td                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFSL.td                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFormats.td                 =
                        |     26 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h                     =
                        |      4 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td                    =
                        |    171 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp               =
                        |     16 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.h                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsics.td                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.cpp                 =
                        |     11 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.h                   =
                        |      3 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeMachineFunction.h               =
                        |      5 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp                =
                        |     10 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h                  =
                        |      4 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.td                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeRelocations.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeSchedule.td                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeSchedule3.td                    =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeSchedule5.td                    =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeSubtarget.cpp                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeSubtarget.h                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.cpp               =
                        |     51 +-
 head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.h                 =
                        |      9 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeAsmBackend.cpp     =
                        |     53 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeBaseInfo.h         =
                        |      5 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCAsmInfo.cpp      =
                        |      2 +
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCAsmInfo.h        =
                        |      4 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCCodeEmitter.cpp  =
                        |     19 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCTargetDesc.cpp   =
                        |     13 +-
 head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCTargetDesc.h     =
                        |      8 +-
 head/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp     =
                        |      1 -
 head/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h       =
                        |      7 +-
 head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp      =
                        |      3 +
 head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.h        =
                        |      8 +-
 head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp   =
                        |     11 +-
 head/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.h     =
                        |      2 -
 head/contrib/llvm/lib/Target/MSP430/MSP430.td                             =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp                  =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430BranchSelector.cpp              =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp               =
                        |      6 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp                =
                        |     40 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h                  =
                        |      6 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430InstrFormats.td                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp                   =
                        |     32 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h                     =
                        |      4 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.td                    =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.cpp                 =
                        |     11 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.h                   =
                        |      3 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430MachineFunctionInfo.h           =
                        |      2 +
 head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp                =
                        |     14 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h                  =
                        |     11 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.td                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430Subtarget.cpp                   =
                        |      4 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430Subtarget.h                     =
                        |      6 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp               =
                        |     35 +-
 head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h                 =
                        |     10 +-
 head/contrib/llvm/lib/Target/Mangler.cpp                                  =
                        |     11 +-
 head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp         =
                        |     70 +-
 head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.h           =
                        |     16 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp         =
                        |    264 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h             =
                        |    126 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h           =
                        |    122 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp          =
                        |      7 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.h            =
                        |      5 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp      =
                        |    256 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp       =
                        |     45 +-
 head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.h         =
                        |     25 +-
 head/contrib/llvm/lib/Target/Mips/Mips.h                                  =
                        |      2 -
 head/contrib/llvm/lib/Target/Mips/Mips.td                                 =
                        |     10 +-
 head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td                      =
                        |    241 +-
 head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp                      =
                        |    230 +-
 head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.h                        =
                        |     20 +-
 head/contrib/llvm/lib/Target/Mips/MipsCallingConv.td                      =
                        |     56 +-
 head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp                     =
                        |    223 +-
 head/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp                 =
                        |     33 +-
 head/contrib/llvm/lib/Target/Mips/MipsEmitGPRestore.cpp                   =
                        |     13 +-
 head/contrib/llvm/lib/Target/Mips/MipsExpandPseudo.cpp                    =
                        |     20 +-
 head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp                   =
                        |    200 +-
 head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp                    =
                        |    474 +-
 head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp                    =
                        |   1323 +-
 head/contrib/llvm/lib/Target/Mips/MipsISelLowering.h                      =
                        |     25 +-
 head/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td                         =
                        |    268 +-
 head/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td                     =
                        |     41 +-
 head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp                       =
                        |    107 +-
 head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h                         =
                        |     91 +-
 head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td                        =
                        |    652 +-
 head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp                         =
                        |     17 +-
 head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h                           =
                        |      4 +-
 head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp                     =
                        |    325 +-
 head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.h                       =
                        |     20 +-
 head/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h                   =
                        |     26 +-
 head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp                    =
                        |    256 +-
 head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h                      =
                        |      7 +-
 head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td                     =
                        |    136 +-
 head/contrib/llvm/lib/Target/Mips/MipsRelocations.h                       =
                        |     10 +-
 head/contrib/llvm/lib/Target/Mips/MipsSchedule.td                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp                       =
                        |     22 +-
 head/contrib/llvm/lib/Target/Mips/MipsSubtarget.h                         =
                        |      8 +-
 head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp                   =
                        |    120 +-
 head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h                     =
                        |     42 +-
 head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp                =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp           =
                        |     77 +-
 head/contrib/llvm/lib/Target/PTX/InstPrinter/PTXInstPrinter.h             =
                        |      8 +-
 head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXBaseInfo.h               =
                        |     71 +
 head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXMCAsmInfo.cpp            =
                        |      2 +
 head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXMCAsmInfo.h              =
                        |      6 +-
 head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp         =
                        |     11 +-
 head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.h           =
                        |      2 -
 head/contrib/llvm/lib/Target/PTX/PTX.h                                    =
                        |      1 -
 head/contrib/llvm/lib/Target/PTX/PTX.td                                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXAsmPrinter.cpp                        =
                        |    348 +-
 head/contrib/llvm/lib/Target/PTX/PTXAsmPrinter.h                          =
                        |      4 +-
 head/contrib/llvm/lib/Target/PTX/PTXFPRoundingModePass.cpp                =
                        |      6 +-
 head/contrib/llvm/lib/Target/PTX/PTXFrameLowering.cpp                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXFrameLowering.h                       =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXISelLowering.cpp                      =
                        |    168 +-
 head/contrib/llvm/lib/Target/PTX/PTXISelLowering.h                        =
                        |      9 +-
 head/contrib/llvm/lib/Target/PTX/PTXInstrFormats.td                       =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXInstrInfo.cpp                         =
                        |     25 +-
 head/contrib/llvm/lib/Target/PTX/PTXInstrInfo.h                           =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXInstrInfo.td                          =
                        |     46 +-
 head/contrib/llvm/lib/Target/PTX/PTXInstrLoadStore.td                     =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXIntrinsicInstrInfo.td                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp                     =
                        |     30 +-
 head/contrib/llvm/lib/Target/PTX/PTXMFInfoExtract.cpp                     =
                        |     23 +-
 head/contrib/llvm/lib/Target/PTX/PTXMachineFunctionInfo.h                 =
                        |    158 +-
 head/contrib/llvm/lib/Target/PTX/PTXParamManager.cpp                      =
                        |      4 +-
 head/contrib/llvm/lib/Target/PTX/PTXParamManager.h                        =
                        |      3 +-
 head/contrib/llvm/lib/Target/PTX/PTXRegAlloc.cpp                          =
                        |      7 +-
 head/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.cpp                      =
                        |     46 +-
 head/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.h                        =
                        |      7 +-
 head/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.td                       =
                        |      3 +-
 head/contrib/llvm/lib/Target/PTX/PTXSelectionDAGInfo.cpp                  =
                        |      5 +-
 head/contrib/llvm/lib/Target/PTX/PTXSubtarget.cpp                         =
                        |      6 +-
 head/contrib/llvm/lib/Target/PTX/PTXSubtarget.h                           =
                        |      3 +-
 head/contrib/llvm/lib/Target/PTX/PTXTargetMachine.cpp                     =
                        |    342 +-
 head/contrib/llvm/lib/Target/PTX/PTXTargetMachine.h                       =
                        |     35 +-
 head/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp       =
                        |      9 +-
 head/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.h         =
                        |     10 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp       =
                        |     75 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCBaseInfo.h           =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp        =
                        |      6 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h          =
                        |     10 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp    =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp     =
                        |     12 +-
 head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h       =
                        |     10 +-
 head/contrib/llvm/lib/Target/PowerPC/PPC.h                                =
                        |      5 +-
 head/contrib/llvm/lib/Target/PowerPC/PPC.td                               =
                        |     16 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp                    =
                        |     52 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp                =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCCallingConv.td                    =
                        |     35 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp                   =
                        |     10 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp                 =
                        |     38 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp             =
                        |    189 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.h               =
                        |     28 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp                  =
                        |     12 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp                  =
                        |    256 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h                    =
                        |     36 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td                     =
                        |    102 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td                   =
                        |     54 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td                   =
                        |     63 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp                     =
                        |    129 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h                       =
                        |     13 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td                      =
                        |     97 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.cpp                       =
                        |      8 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.h                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp                   =
                        |      4 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h             =
                        |      3 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCPerfectShuffle.h                  =
                        |      2 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp                  =
                        |    288 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h                    =
                        |     10 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td                   =
                        |      6 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCRelocations.h                     =
                        |      6 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCSchedule.td                       =
                        |     71 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG3.td                     =
                        |      9 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4.td                     =
                        |      9 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4Plus.td                 =
                        |      9 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG5.td                     =
                        |      9 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp                     =
                        |     24 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h                       =
                        |     12 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp                 =
                        |     75 +-
 head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h                   =
                        |     33 +-
 head/contrib/llvm/lib/Target/Sparc/DelaySlotFiller.cpp                    =
                        |     18 +-
 head/contrib/llvm/lib/Target/Sparc/FPMover.cpp                            =
                        |      8 +-
 head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp        =
                        |      2 +
 head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.h          =
                        |      8 +-
 head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp     =
                        |      8 +-
 head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.h       =
                        |      2 -
 head/contrib/llvm/lib/Target/Sparc/Sparc.h                                =
                        |      5 +-
 head/contrib/llvm/lib/Target/Sparc/Sparc.td                               =
                        |      6 +-
 head/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp                    =
                        |     22 +-
 head/contrib/llvm/lib/Target/Sparc/SparcCallingConv.td                    =
                        |      6 +-
 head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp                 =
                        |      2 +-
 head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp                  =
                        |      1 -
 head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp                  =
                        |     50 +-
 head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h                    =
                        |      8 +-
 head/contrib/llvm/lib/Target/Sparc/SparcInstrFormats.td                   =
                        |      6 +-
 head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp                     =
                        |     19 +-
 head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h                       =
                        |     11 +-
 head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td                      =
                        |      6 +-
 head/contrib/llvm/lib/Target/Sparc/SparcMachineFunctionInfo.h             =
                        |      1 +
 head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp                  =
                        |     12 +-
 head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h                    =
                        |      4 +-
 head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.td                   =
                        |      7 +-
 head/contrib/llvm/lib/Target/Sparc/SparcSubtarget.cpp                     =
                        |      4 +-
 head/contrib/llvm/lib/Target/Sparc/SparcSubtarget.h                       =
                        |      3 +-
 head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp                 =
                        |     65 +-
 head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h                   =
                        |     18 +-
 head/contrib/llvm/lib/Target/TargetData.cpp                               =
                        |    123 +-
 head/contrib/llvm/lib/Target/TargetInstrInfo.cpp                          =
                        |     42 -
 head/contrib/llvm/lib/Target/TargetLibraryInfo.cpp                        =
                        |    112 +
 head/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp                 =
                        |     38 +-
 head/contrib/llvm/lib/Target/TargetMachine.cpp                            =
                        |    228 +-
 head/contrib/llvm/lib/Target/TargetRegisterInfo.cpp                       =
                        |      4 +-
 head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp                =
                        |      7 +-
 head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp               =
                        |    730 +-
 head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp         =
                        |    239 +-
 head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h           =
                        |     46 +-
 head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c    =
                        |     80 +-
 head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h    =
                        |     15 +-
 head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon=
.h                      |     23 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp        =
                        |     78 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h          =
                        |     10 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp          =
                        |    329 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.h            =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp      =
                        |     72 +-
 head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h        =
                        |      9 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp           =
                        |     80 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h               =
                        |    111 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86FixupKinds.h             =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp            =
                        |     25 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h              =
                        |     22 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp        =
                        |    389 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp         =
                        |    105 +-
 head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h           =
                        |     11 +
 head/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.cpp               =
                        |    193 +-
 head/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.h                 =
                        |     84 +-
 head/contrib/llvm/lib/Target/X86/X86.h                                    =
                        |      2 -
 head/contrib/llvm/lib/Target/X86/X86.td                                   =
                        |    114 +-
 head/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp                        =
                        |     48 +-
 head/contrib/llvm/lib/Target/X86/X86AsmPrinter.h                          =
                        |      5 -
 head/contrib/llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp             =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h               =
                        |      4 +-
 head/contrib/llvm/lib/Target/X86/X86CallingConv.td                        =
                        |     58 +-
 head/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp                       =
                        |     18 +-
 head/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp                     =
                        |      8 +-
 head/contrib/llvm/lib/Target/X86/X86FastISel.cpp                          =
                        |     75 +-
 head/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp                     =
                        |     33 +-
 head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp                     =
                        |    384 +-
 head/contrib/llvm/lib/Target/X86/X86FrameLowering.h                       =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp                      =
                        |    548 +-
 head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp                      =
                        |   5585 +-
 head/contrib/llvm/lib/Target/X86/X86ISelLowering.h                        =
                        |    202 +-
 head/contrib/llvm/lib/Target/X86/X86Instr3DNow.td                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td                    =
                        |    319 +-
 head/contrib/llvm/lib/Target/X86/X86InstrBuilder.h                        =
                        |      1 -
 head/contrib/llvm/lib/Target/X86/X86InstrCMovSetCC.td                     =
                        |     28 +-
 head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td                      =
                        |    288 +-
 head/contrib/llvm/lib/Target/X86/X86InstrControl.td                       =
                        |    196 +-
 head/contrib/llvm/lib/Target/X86/X86InstrExtension.td                     =
                        |     84 +-
 head/contrib/llvm/lib/Target/X86/X86InstrFMA.td                           =
                        |    204 +-
 head/contrib/llvm/lib/Target/X86/X86InstrFPStack.td                       =
                        |     63 +-
 head/contrib/llvm/lib/Target/X86/X86InstrFormats.td                       =
                        |    340 +-
 head/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td                 =
                        |    215 +-
 head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp                         =
                        |    441 +-
 head/contrib/llvm/lib/Target/X86/X86InstrInfo.h                           =
                        |      9 +-
 head/contrib/llvm/lib/Target/X86/X86InstrInfo.td                          =
                        |    221 +-
 head/contrib/llvm/lib/Target/X86/X86InstrMMX.td                           =
                        |     30 +-
 head/contrib/llvm/lib/Target/X86/X86InstrSSE.td                           =
                        |   6215 +-
 head/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td                   =
                        |    548 +-
 head/contrib/llvm/lib/Target/X86/X86InstrSystem.td                        =
                        |     72 +-
 head/contrib/llvm/lib/Target/X86/X86InstrVMX.td                           =
                        |     38 +-
 head/contrib/llvm/lib/Target/X86/X86JITInfo.cpp                           =
                        |      8 +-
 head/contrib/llvm/lib/Target/X86/X86JITInfo.h                             =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp                       =
                        |     45 +-
 head/contrib/llvm/lib/Target/X86/X86MCInstLower.h                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86MachineFunctionInfo.h                 =
                        |      8 +-
 head/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp                      =
                        |    218 +-
 head/contrib/llvm/lib/Target/X86/X86RegisterInfo.h                        =
                        |      5 +-
 head/contrib/llvm/lib/Target/X86/X86RegisterInfo.td                       =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86Relocations.h                         =
                        |      2 +-
 head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp                  =
                        |      3 +-
 head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp                         =
                        |    131 +-
 head/contrib/llvm/lib/Target/X86/X86Subtarget.h                           =
                        |     82 +-
 head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp                     =
                        |     77 +-
 head/contrib/llvm/lib/Target/X86/X86TargetMachine.h                       =
                        |     44 +-
 head/contrib/llvm/lib/Target/X86/X86TargetObjectFile.cpp                  =
                        |      3 +-
 head/contrib/llvm/lib/Target/X86/X86TargetObjectFile.h                    =
                        |      3 +-
 head/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp                        =
                        |    234 +-
 head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp        =
                        |      3 +
 head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.h          =
                        |      5 +-
 head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp     =
                        |      8 +-
 head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.h       =
                        |      2 -
 head/contrib/llvm/lib/Target/XCore/XCore.h                                =
                        |      3 +-
 head/contrib/llvm/lib/Target/XCore/XCore.td                               =
                        |      3 +-
 head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp                 =
                        |     11 +-
 head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.h                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp                  =
                        |     13 +-
 head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp                  =
                        |     69 +-
 head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h                    =
                        |      8 +-
 head/contrib/llvm/lib/Target/XCore/XCoreInstrFormats.td                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp                     =
                        |      4 +-
 head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h                       =
                        |      4 +-
 head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td                      =
                        |      2 +-
 head/contrib/llvm/lib/Target/XCore/XCoreMachineFunctionInfo.h             =
                        |      4 +-
 head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp                  =
                        |     24 +-
 head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h                    =
                        |     13 +-
 head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.td                   =
                        |      2 +-
 head/contrib/llvm/lib/Target/XCore/XCoreSubtarget.cpp                     =
                        |      4 +-
 head/contrib/llvm/lib/Target/XCore/XCoreSubtarget.h                       =
                        |      3 +-
 head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp                 =
                        |     31 +-
 head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h                   =
                        |     11 +-
 head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.h                =
                        |      2 +-
 head/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp                    =
                        |     14 +-
 head/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp          =
                        |      2 +-
 head/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp                    =
                        |    227 +-
 head/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp                        =
                        |    717 +-
 head/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp                     =
                        |    102 +-
 head/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp                     =
                        |     58 +-
 head/contrib/llvm/lib/Transforms/IPO/Inliner.cpp                          =
                        |    149 +-
 head/contrib/llvm/lib/Transforms/IPO/Internalize.cpp                      =
                        |      7 +-
 head/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp               =
                        |     27 +-
 head/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp                          =
                        |      3 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h                =
                        |     10 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp        =
                        |     74 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp      =
                        |    245 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp         =
                        |    160 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp         =
                        |     44 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp      =
                        |     89 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cp=
p                       |     71 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp     =
                        |     58 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp        =
                        |     39 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp        =
                        |     83 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.c=
pp                      |    101 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp     =
                        |    373 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstCombineWorklist.h        =
                        |      4 +-
 head/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp     =
                        |     85 +-
 head/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp        =
                        |    139 +-
 head/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp      =
                        |      2 +
 head/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp =
                        |      4 +-
 head/contrib/llvm/lib/Transforms/Instrumentation/PathProfiling.cpp        =
                        |     13 +-
 head/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp                =
                        |     47 +-
 head/contrib/llvm/lib/Transforms/Scalar/ConstantProp.cpp                  =
                        |     13 +-
 head/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp    =
                        |     92 +-
 head/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp          =
                        |    287 +-
 head/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp                      =
                        |    146 +-
 head/contrib/llvm/lib/Transforms/Scalar/GVN.cpp                           =
                        |    331 +-
 head/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp                =
                        |    557 +-
 head/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp                 =
                        |     35 +-
 head/contrib/llvm/lib/Transforms/Scalar/LICM.cpp                          =
                        |     17 +-
 head/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp              =
                        |      6 +-
 head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp                  =
                        |    166 +-
 head/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp            =
                        |    985 +-
 head/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp                =
                        |     58 +-
 head/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp                  =
                        |    467 +-
 head/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp               =
                        |     36 +-
 head/contrib/llvm/lib/Transforms/Scalar/ObjCARC.cpp                       =
                        |   1334 +-
 head/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp                   =
                        |     10 +-
 head/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp                          =
                        |    500 +-
 head/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp                        =
                        |      1 +
 head/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp          =
                        |     70 +-
 head/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp              =
                        |    182 +-
 head/contrib/llvm/lib/Transforms/Scalar/Sink.cpp                          =
                        |      3 +-
 head/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp                =
                        |      9 +-
 head/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp                =
                        |     16 +-
 head/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp             =
                        |      3 +-
 head/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp                  =
                        |     34 +-
 head/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp                  =
                        |    206 +-
 head/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp                  =
                        |      7 +-
 head/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp               =
                        |     57 +-
 head/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp                 =
                        |    607 +-
 head/contrib/llvm/lib/Transforms/Utils/Local.cpp                          =
                        |    109 +-
 head/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp                   =
                        |     61 +-
 head/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp                     =
                        |     40 +-
 head/contrib/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp           =
                        |     22 +-
 head/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp                    =
                        |     28 +-
 head/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp                    =
                        |     10 +-
 head/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp        =
                        |      9 +-
 head/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp                     =
                        |      7 +
 head/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp                    =
                        |    619 +-
 head/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp                 =
                        |     45 +-
 head/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp           =
                        |     12 +-
 head/contrib/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp         =
                        |     20 -
 head/contrib/llvm/lib/VMCore/AsmWriter.cpp                                =
                        |    133 +-
 head/contrib/llvm/lib/VMCore/Attributes.cpp                               =
                        |      8 +-
 head/contrib/llvm/lib/VMCore/AutoUpgrade.cpp                              =
                        |    594 +-
 head/contrib/llvm/lib/VMCore/BasicBlock.cpp                               =
                        |      3 +
 head/contrib/llvm/lib/VMCore/ConstantFold.cpp                             =
                        |    544 +-
 head/contrib/llvm/lib/VMCore/Constants.cpp                                =
                        |   1225 +-
 head/contrib/llvm/lib/VMCore/ConstantsContext.h                           =
                        |    234 +-
 head/contrib/llvm/lib/VMCore/Core.cpp                                     =
                        |     73 +-
 head/contrib/llvm/lib/VMCore/DebugLoc.cpp                                 =
                        |      5 +-
 head/contrib/llvm/lib/VMCore/Dominators.cpp                               =
                        |    202 +-
 head/contrib/llvm/lib/VMCore/Function.cpp                                 =
                        |     52 +-
 head/contrib/llvm/lib/VMCore/GCOV.cpp                                     =
                        |      2 +-
 head/contrib/llvm/lib/VMCore/IRBuilder.cpp                                =
                        |      4 +-
 head/contrib/llvm/lib/VMCore/Instruction.cpp                              =
                        |     56 -
 head/contrib/llvm/lib/VMCore/Instructions.cpp                             =
                        |    263 +-
 head/contrib/llvm/lib/VMCore/LLVMContext.cpp                              =
                        |     18 +-
 head/contrib/llvm/lib/VMCore/LLVMContextImpl.cpp                          =
                        |     51 +-
 head/contrib/llvm/lib/VMCore/LLVMContextImpl.h                            =
                        |    162 +-
 head/contrib/llvm/lib/VMCore/Metadata.cpp                                 =
                        |     89 +-
 head/contrib/llvm/lib/VMCore/Module.cpp                                   =
                        |     56 +
 head/contrib/llvm/lib/VMCore/Pass.cpp                                     =
                        |     24 +-
 head/contrib/llvm/lib/VMCore/PassManager.cpp                              =
                        |    161 +-
 head/contrib/llvm/lib/VMCore/Type.cpp                                     =
                        |    185 +-
 head/contrib/llvm/lib/VMCore/Use.cpp                                      =
                        |      1 +
 head/contrib/llvm/lib/VMCore/User.cpp                                     =
                        |      2 +
 head/contrib/llvm/lib/VMCore/Value.cpp                                    =
                        |    127 +-
 head/contrib/llvm/lib/VMCore/ValueTypes.cpp                               =
                        |     12 +-
 head/contrib/llvm/lib/VMCore/Verifier.cpp                                 =
                        |    284 +-
 head/contrib/llvm/tools/bugpoint/BugDriver.cpp                            =
                        |      4 +-
 head/contrib/llvm/tools/bugpoint/CrashDebugger.cpp                        =
                        |     11 +-
 head/contrib/llvm/tools/bugpoint/ExecutionDriver.cpp                      =
                        |     50 +-
 head/contrib/llvm/tools/bugpoint/ExtractFunction.cpp                      =
                        |     62 +-
 head/contrib/llvm/tools/bugpoint/Miscompilation.cpp                       =
                        |      3 +-
 head/contrib/llvm/tools/bugpoint/OptimizerDriver.cpp                      =
                        |     12 +-
 head/contrib/llvm/tools/bugpoint/ToolRunner.cpp                           =
                        |     93 +-
 head/contrib/llvm/tools/bugpoint/ToolRunner.h                             =
                        |      1 +
 head/contrib/llvm/tools/bugpoint/bugpoint.cpp                             =
                        |      1 +
 head/contrib/llvm/tools/clang/LICENSE.TXT                                 =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang-c/Index.h                     =
                        |    956 +-
 head/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMT.h            =
                        |     18 +-
 head/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMTActions.h     =
                        |     26 +
 head/contrib/llvm/tools/clang/include/clang/ARCMigrate/FileRemapper.h     =
                        |     11 +-
 head/contrib/llvm/tools/clang/include/clang/AST/APValue.h                 =
                        |    269 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h             =
                        |     24 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h              =
                        |    203 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ASTDiagnostic.h           =
                        |      4 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h             =
                        |      6 +
 head/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h     =
                        |     17 +
 head/contrib/llvm/tools/clang/include/clang/AST/Attr.h                    =
                        |     18 +-
 head/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h           =
                        |      9 +
 head/contrib/llvm/tools/clang/include/clang/AST/Decl.h                    =
                        |    868 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h                =
                        |    354 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h                 =
                        |    676 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h              =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h                =
                        |    794 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h            =
                        |    529 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclVisitor.h             =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h         =
                        |     14 +-
 head/contrib/llvm/tools/clang/include/clang/AST/DependentDiagnostic.h     =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/AST/Expr.h                    =
                        |   1197 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h                 =
                        |   1570 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h                =
                        |    517 +-
 head/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h       =
                        |     46 +
 head/contrib/llvm/tools/clang/include/clang/AST/Mangle.h                  =
                        |      4 +-
 head/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h     =
                        |    103 +-
 head/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h          =
                        |     30 +-
 head/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h           =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h            =
                        |     20 +-
 head/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h     =
                        |    270 +-
 head/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h            =
                        |     32 +-
 head/contrib/llvm/tools/clang/include/clang/AST/Stmt.h                    =
                        |    223 +-
 head/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h                 =
                        |     96 +-
 head/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h            =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/AST/StmtObjC.h                =
                        |     15 +-
 head/contrib/llvm/tools/clang/include/clang/AST/StmtVisitor.h             =
                        |      2 -
 head/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h            =
                        |     45 +-
 head/contrib/llvm/tools/clang/include/clang/AST/Type.h                    =
                        |    714 +-
 head/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h                 =
                        |    142 +-
 head/contrib/llvm/tools/clang/include/clang/AST/TypeVisitor.h             =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h           =
                        |     82 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString=
.h                      |    143 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariable=
s.h                     |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ReachableCod=
e.h                     |      5 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafety=
.h                      |     14 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/Uninitialize=
dValues.h               |     12 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h    =
                        |    207 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisDiagnostic.h =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h                =
                        |    188 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/CocoaC=
onventions.h            |     12 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h       =
                        |    113 +-
 head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDe=
clVisitor.h             |      3 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td                 =
                        |     42 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def            =
                        |    109 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def         =
                        |    271 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/ConvertUTF.h            =
                        |     14 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td            =
                        |      4 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h            =
                        |    276 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td           =
                        |      9 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td   =
                        |     98 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticAnalysisKinds.=
td                      |      3 -
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td=
                        |     13 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td=
                        |     24 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.=
td                      |     93 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td     =
                        |    127 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticIDs.h         =
                        |     65 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td   =
                        |    175 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td =
                        |    246 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td  =
                        |   1274 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/ExpressionTraits.h      =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h           =
                        |     17 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemStatCache.h   =
                        |      4 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h       =
                        |     79 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/LLVM.h                  =
                        |     22 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def         =
                        |     20 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h           =
                        |     38 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Linkage.h               =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h       =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h     =
                        |    137 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h        =
                        |      4 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h         =
                        |    206 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h            =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td            =
                        |     11 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/TargetBuiltins.h        =
                        |     49 +
 head/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h            =
                        |     47 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def          =
                        |     29 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/TypeTraits.h            =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Basic/Version.h               =
                        |     24 +-
 head/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h       =
                        |     14 +-
 head/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h       =
                        |      1 +
 head/contrib/llvm/tools/clang/include/clang/Driver/Action.h               =
                        |     24 +
 head/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h              =
                        |     12 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.td        =
                        |      9 +
 head/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td          =
                        |    131 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h          =
                        |     15 +
 head/contrib/llvm/tools/clang/include/clang/Driver/Driver.h               =
                        |     34 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/DriverDiagnostic.h     =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/Job.h                  =
                        |      2 +
 head/contrib/llvm/tools/clang/include/clang/Driver/ObjCRuntime.h          =
                        |      5 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h             =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/Options.td             =
                        |    157 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/Tool.h                 =
                        |      1 +
 head/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h            =
                        |     37 +-
 head/contrib/llvm/tools/clang/include/clang/Driver/Types.def              =
                        |      2 +
 head/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h            =
                        |    185 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/Analyses.def         =
                        |     17 +
 head/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h    =
                        |     29 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticCons=
umer.h                  |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h     =
                        |     26 +
 head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h   =
                        |     78 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h =
                        |     47 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/DependencyOutputOptio=
ns.h                    |      5 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h  =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h     =
                        |     57 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h    =
                        |     50 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendDiagnostic.h =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h    =
                        |     63 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/LangStandard.h       =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def    =
                        |     23 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/MultiplexConsumer.h  =
                        |     13 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOptions.h=
                        |     20 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter=
.h                      |     36 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h              =
                        |     23 +-
 head/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsu=
mer.h                   |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Index/ASTLocation.h           =
                        |     17 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/DirectoryLookup.h         =
                        |     21 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/ExternalPreprocessorSource=
.h                      |      3 +
 head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h            =
                        |    229 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/LexDiagnostic.h           =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h                   =
                        |     75 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h          =
                        |     54 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h               =
                        |     25 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/ModuleLoader.h            =
                        |     32 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h             =
                        |     89 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h     =
                        |    111 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h            =
                        |    210 +-
 head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h       =
                        |      1 +
 head/contrib/llvm/tools/clang/include/clang/Lex/Token.h                   =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/Parse/ParseAST.h              =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/Parse/ParseDiagnostic.h       =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h                =
                        |    585 +-
 head/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h        =
                        |      5 +
 head/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h       =
                        |     28 +-
 head/contrib/llvm/tools/clang/include/clang/Rewrite/FrontendActions.h     =
                        |     15 +-
 head/contrib/llvm/tools/clang/include/clang/Rewrite/TokenRewriter.h       =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h          =
                        |    149 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h   =
                        |    469 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h               =
                        |    153 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h      =
                        |     10 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h     =
                        |      5 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/IdentifierResolver.h     =
                        |     33 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h         =
                        |    252 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/LocInfoType.h            =
                        |     12 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Lookup.h                 =
                        |     55 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Overload.h               =
                        |    145 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h         =
                        |      6 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/PrettyDeclStackTrace.h   =
                        |      5 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h                  =
                        |     35 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h              =
                        |    274 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h                   =
                        |   1693 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/SemaConsumer.h           =
                        |      1 +
 head/contrib/llvm/tools/clang/include/clang/Sema/SemaDiagnostic.h         =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/SemaFixItUtils.h         =
                        |      2 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/Template.h               =
                        |     64 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h      =
                        |     21 +-
 head/contrib/llvm/tools/clang/include/clang/Sema/TypoCorrection.h         =
                        |    148 +-
 head/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h   =
                        |    215 +-
 head/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializati=
onListener.h            |      6 +
 head/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h     =
                        |    542 +-
 head/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h     =
                        |    235 +-
 head/contrib/llvm/tools/clang/include/clang/Serialization/ContinuousRangeM=
ap.h                    |     10 +
 head/contrib/llvm/tools/clang/include/clang/Serialization/Module.h        =
                        |    229 +-
 head/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h =
                        |     30 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporte=
r/BugReporter.h         |    199 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporte=
r/BugReporterVisitor.h  |     80 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporte=
r/BugType.h             |      1 +
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporte=
r/PathDiagnostic.h      |    394 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Checker.h =
                        |     44 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerMan=
ager.h                  |     83 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerReg=
istry.h                 |      4 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathDiagno=
sticConsumers.h         |      4 +
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/AnalysisManager.h   |     95 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/BasicValueFactory.h |      7 -
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/CheckerContext.h    |    228 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ConstraintManager.h |     27 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/CoreEngine.h        |    563 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/Environment.h       |     66 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ExplodedGraph.h     |     84 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ExprEngine.h        |    210 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/MemRegion.h         |    204 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ObjCMessage.h       |    246 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ProgramState.h      |    260 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/ProgramStateTrait.h |     19 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/SValBuilder.h       |    102 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/SVals.h             |     63 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/Store.h             |     63 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/SubEngine.h         |     51 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/SymbolManager.h     |    173 +-
 head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensit=
ive/WorkList.h          |      1 +
 head/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp                    =
                        |    165 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMTActions.cpp             =
                        |     17 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/FileRemapper.cpp             =
                        |     44 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/Internals.h                  =
                        |     19 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransARCAssign.cpp           =
                        |      3 +
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransAutoreleasePool.cpp     =
                        |      4 -
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransBlockObjCVariable.cpp   =
                        |     66 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransEmptyStatementsAndDeallo=
c.cpp                   |     43 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransProperties.cpp          =
                        |    328 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp=
                        |    112 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnbridgedCasts.cpp      =
                        |     30 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnusedInitDelegate.cpp  =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransZeroOutPropsInDealloc.cp=
p                       |     75 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp         =
                        |     33 +
 head/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.cpp               =
                        |    346 +-
 head/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.h                 =
                        |    118 +-
 head/contrib/llvm/tools/clang/lib/AST/APValue.cpp                         =
                        |    569 +-
 head/contrib/llvm/tools/clang/lib/AST/ASTConsumer.cpp                     =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp                      =
                        |    522 +-
 head/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp                   =
                        |     26 +-
 head/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp                     =
                        |    779 +-
 head/contrib/llvm/tools/clang/lib/AST/AttrImpl.cpp                        =
                        |      4 +
 head/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp                  =
                        |     15 +-
 head/contrib/llvm/tools/clang/lib/AST/Decl.cpp                            =
                        |    931 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp                        =
                        |    416 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp                         =
                        |    467 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclFriend.cpp                      =
                        |      7 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp                        =
                        |    438 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp                     =
                        |     91 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp                    =
                        |    198 +-
 head/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp                 =
                        |     16 +-
 head/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp                         =
                        |     50 +-
 head/contrib/llvm/tools/clang/lib/AST/Expr.cpp                            =
                        |   1009 +-
 head/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp                         =
                        |    538 +-
 head/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp              =
                        |     90 +-
 head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp                    =
                        |   5953 +-
 head/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp                   =
                        |    391 +-
 head/contrib/llvm/tools/clang/lib/AST/Mangle.cpp                          =
                        |     12 +-
 head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp                 =
                        |     33 +-
 head/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp             =
                        |     28 +-
 head/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp                       =
                        |      4 +
 head/contrib/llvm/tools/clang/lib/AST/RecordLayout.cpp                    =
                        |      4 +-
 head/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp             =
                        |    760 +-
 head/contrib/llvm/tools/clang/lib/AST/Stmt.cpp                            =
                        |    102 +-
 head/contrib/llvm/tools/clang/lib/AST/StmtDumper.cpp                      =
                        |     69 +-
 head/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp                     =
                        |    412 +-
 head/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp                     =
                        |     99 +-
 head/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp                    =
                        |    114 +-
 head/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp                    =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/AST/Type.cpp                            =
                        |    277 +-
 head/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp                         =
                        |    113 +-
 head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp                     =
                        |    109 +-
 head/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp                   =
                        |     17 +-
 head/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp                        =
                        |    417 +-
 head/contrib/llvm/tools/clang/lib/Analysis/CocoaConventions.cpp           =
                        |     49 +-
 head/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp               =
                        |    259 +-
 head/contrib/llvm/tools/clang/lib/Analysis/FormatStringParsing.h          =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp              =
                        |    171 +-
 head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp         =
                        |    177 +-
 head/contrib/llvm/tools/clang/lib/Analysis/ProgramPoint.cpp               =
                        |      2 -
 head/contrib/llvm/tools/clang/lib/Analysis/PseudoConstantAnalysis.cpp     =
                        |     17 +-
 head/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp              =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/Analysis/ScanfFormatString.cpp          =
                        |    290 +-
 head/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp               =
                        |   1531 +-
 head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp        =
                        |     10 +-
 head/contrib/llvm/tools/clang/lib/Basic/Builtins.cpp                      =
                        |      1 +
 head/contrib/llvm/tools/clang/lib/Basic/ConvertUTF.c                      =
                        |    143 +-
 head/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp                    =
                        |    126 +-
 head/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp                 =
                        |    231 +-
 head/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp                   =
                        |     27 +-
 head/contrib/llvm/tools/clang/lib/Basic/FileSystemStatCache.cpp           =
                        |      2 +
 head/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp               =
                        |     43 +-
 head/contrib/llvm/tools/clang/lib/Basic/LangOptions.cpp                   =
                        |      2 +
 head/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp                =
                        |      4 +
 head/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp                 =
                        |    144 +-
 head/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp                    =
                        |      5 +
 head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp                       =
                        |    962 +-
 head/contrib/llvm/tools/clang/lib/Basic/Version.cpp                       =
                        |     58 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h                       =
                        |     21 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp                 =
                        |    143 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp                    =
                        |    387 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h                      =
                        |     47 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp                   =
                        |   2692 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp                       =
                        |     29 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp                    =
                        |     43 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h                      =
                        |     34 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp                      =
                        |    627 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.h                        =
                        |    154 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp                     =
                        |    362 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp                   =
                        |     74 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp                 =
                        |    956 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h                   =
                        |     42 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp                      =
                        |    243 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp                   =
                        |    222 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp                 =
                        |    145 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp                      =
                        |   1023 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp                   =
                        |    580 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp                   =
                        |    296 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp               =
                        |     66 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp              =
                        |    923 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp                =
                        |    335 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp                      =
                        |    842 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp                   =
                        |    296 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp                   =
                        |    861 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp               =
                        |     74 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h                 =
                        |     28 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp                      =
                        |     59 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp       =
                        |    185 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp                      =
                        |     62 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp                       =
                        |     21 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp                   =
                        |     40 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CGValue.h                       =
                        |     84 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp               =
                        |    107 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp             =
                        |    180 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h               =
                        |    407 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp               =
                        |    619 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h                 =
                        |    115 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp                 =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h                   =
                        |      4 +
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp                =
                        |     44 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h                  =
                        |     97 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp               =
                        |    328 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp             =
                        |      7 +
 head/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp               =
                        |     17 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp                  =
                        |   1074 +-
 head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h                    =
                        |      5 +-
 head/contrib/llvm/tools/clang/lib/Driver/Action.cpp                       =
                        |     31 +
 head/contrib/llvm/tools/clang/lib/Driver/Arg.cpp                          =
                        |      4 +-
 head/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp                      =
                        |     30 +-
 head/contrib/llvm/tools/clang/lib/Driver/CC1AsOptions.cpp                 =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Driver/CC1Options.cpp                   =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp                  =
                        |      8 +-
 head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp                       =
                        |    364 +-
 head/contrib/llvm/tools/clang/lib/Driver/DriverOptions.cpp                =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Driver/Job.cpp                          =
                        |      2 +
 head/contrib/llvm/tools/clang/lib/Driver/Option.cpp                       =
                        |      2 -
 head/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp                    =
                        |    187 +-
 head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp                   =
                        |   1513 +-
 head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h                     =
                        |    337 +-
 head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp                        =
                        |   1696 +-
 head/contrib/llvm/tools/clang/lib/Driver/Tools.h                          =
                        |     97 +-
 head/contrib/llvm/tools/clang/lib/Driver/Types.cpp                        =
                        |      1 +
 head/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp               =
                        |      3 +-
 head/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp                   =
                        |     13 +-
 head/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp                    =
                        |    746 +-
 head/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp                =
                        |      4 +-
 head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp           =
                        |    819 +-
 head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp         =
                        |    816 +-
 head/contrib/llvm/tools/clang/lib/Frontend/CreateInvocationFromCommandLine=
.cpp                    |     17 +-
 head/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp             =
                        |     64 +-
 head/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp             =
                        |    137 +-
 head/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp            =
                        |    314 +-
 head/contrib/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp           =
                        |      5 +-
 head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp           =
                        |     46 +-
 head/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp           =
                        |    128 +-
 head/contrib/llvm/tools/clang/lib/Frontend/LangStandards.cpp              =
                        |      3 +-
 head/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp       =
                        |      8 +-
 head/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp          =
                        |     50 +-
 head/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp    =
                        |      8 +-
 head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp       =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp      =
                        |   1148 +-
 head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp   =
                        |     38 +-
 head/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp                   =
                        |    192 +-
 head/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.c=
pp                      |     43 +-
 head/contrib/llvm/tools/clang/lib/Headers/avxintrin.h                     =
                        |    319 +-
 head/contrib/llvm/tools/clang/lib/Headers/emmintrin.h                     =
                        |     56 +-
 head/contrib/llvm/tools/clang/lib/Headers/float.h                         =
                        |     11 +
 head/contrib/llvm/tools/clang/lib/Headers/immintrin.h                     =
                        |     18 +-
 head/contrib/llvm/tools/clang/lib/Headers/mm3dnow.h                       =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Headers/smmintrin.h                     =
                        |    127 +-
 head/contrib/llvm/tools/clang/lib/Headers/tgmath.h                        =
                        |     23 +-
 head/contrib/llvm/tools/clang/lib/Headers/tmmintrin.h                     =
                        |     11 +-
 head/contrib/llvm/tools/clang/lib/Headers/wmmintrin.h                     =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Headers/x86intrin.h                     =
                        |     26 +-
 head/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h                     =
                        |     21 +-
 head/contrib/llvm/tools/clang/lib/Index/ASTLocation.cpp                   =
                        |     12 +-
 head/contrib/llvm/tools/clang/lib/Index/Analyzer.cpp                      =
                        |      4 +-
 head/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp                       =
                        |      4 +-
 head/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp                    =
                        |    520 +-
 head/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp                           =
                        |    442 +-
 head/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp                  =
                        |    462 +-
 head/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp                       =
                        |      9 +-
 head/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp                       =
                        |      5 +-
 head/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp                       =
                        |     22 +-
 head/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp                    =
                        |    354 +-
 head/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp                   =
                        |     22 +-
 head/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp                   =
                        |     88 +-
 head/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp                =
                        |    134 +-
 head/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp                        =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp                          =
                        |    211 +-
 head/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp             =
                        |    265 +-
 head/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp                    =
                        |    149 +-
 head/contrib/llvm/tools/clang/lib/Lex/PreprocessorLexer.cpp               =
                        |      2 +
 head/contrib/llvm/tools/clang/lib/Lex/TokenConcatenation.cpp              =
                        |     49 +-
 head/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp                      =
                        |     12 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp                      =
                        |     35 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp         =
                        |    118 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp                     =
                        |   1566 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp                  =
                        |    695 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp                     =
                        |    365 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp                  =
                        |    618 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp                     =
                        |    179 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp                     =
                        |    526 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp                   =
                        |    118 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h                     =
                        |     10 +
 head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp                     =
                        |    252 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp                 =
                        |    182 +-
 head/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp                =
                        |    331 +-
 head/contrib/llvm/tools/clang/lib/Parse/Parser.cpp                        =
                        |    454 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/FixItRewriter.cpp               =
                        |    115 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/FrontendActions.cpp             =
                        |     75 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/HTMLPrint.cpp                   =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp                 =
                        |     10 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/RewriteMacros.cpp               =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/RewriteObjC.cpp                 =
                        |   3231 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/RewriteTest.cpp                 =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Rewrite/Rewriter.cpp                    =
                        |      3 +-
 head/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp          =
                        |    250 +-
 head/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp                  =
                        |    133 +-
 head/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp           =
                        |    186 +-
 head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp                       =
                        |     33 +-
 head/contrib/llvm/tools/clang/lib/Sema/DelayedDiagnostic.cpp              =
                        |      6 +-
 head/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp             =
                        |    162 +-
 head/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp                =
                        |    126 +-
 head/contrib/llvm/tools/clang/lib/Sema/Scope.cpp                          =
                        |     28 +-
 head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp                           =
                        |    269 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp                     =
                        |    326 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp                       =
                        |     54 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp               =
                        |    167 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp                       =
                        |    271 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp                   =
                        |   2136 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp               =
                        |   1151 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp                       =
                        |   2366 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp                   =
                        |    267 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp                    =
                        |   3299 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp                   =
                        |    781 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp              =
                        |     21 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp                       =
                        |   3570 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp                    =
                        |   1369 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp                 =
                        |    346 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp                   =
                        |   1515 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaFixItUtils.cpp                 =
                        |     44 +
 head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp                       =
                        |   2148 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp                     =
                        |    839 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp               =
                        |    382 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp                   =
                        |   2125 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp                       =
                        |    534 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp                   =
                        |   1273 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp          =
                        |    765 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp        =
                        |    303 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp    =
                        |    654 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp           =
                        |    117 +-
 head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp                       =
                        |    843 +-
 head/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.cpp           =
                        |      2 +-
 head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h                    =
                        |   1151 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp             =
                        |      3 +
 head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h               =
                        |      1 -
 head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp             =
                        |   1621 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp         =
                        |   1533 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h      =
                        |     25 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp         =
                        |    377 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp             =
                        |    931 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp         =
                        |    437 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp         =
                        |    295 +-
 head/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp           =
                        |     13 +-
 head/contrib/llvm/tools/clang/lib/Serialization/Module.cpp                =
                        |     18 +-
 head/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp         =
                        |     51 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AdjustedReturnVa=
lueChecker.cpp          |     11 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChe=
cker.cpp                |     74 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundChecke=
r.cpp                   |      9 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundChecke=
rV2.cpp                 |     63 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AttrNonNullCheck=
er.cpp                  |     13 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundat=
ionChecks.cpp           |     70 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionC=
hecker.cpp              |     21 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.c=
pp                      |    481 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CallAndMessageCh=
ecker.cpp               |    128 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastSizeChecker.=
cpp                     |      6 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastToStructChec=
ker.cpp                 |      4 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCDealloc=
.cpp                    |     21 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMet=
hSignature.cpp          |      4 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyn=
taxOnly.cpp             |    232 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSizeofPoint=
er.cpp                  |      9 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td     =
                        |    148 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cp=
p                       |     22 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangSACheckers.=
h                       |      2 +
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecke=
r.cpp                   |     56 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cp=
p                       |     70 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DereferenceCheck=
er.cpp                  |     60 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DivZeroChecker.c=
pp                      |     45 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/FixedAddressChec=
ker.cpp                 |      9 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IdempotentOperat=
ionChecker.cpp          |     34 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IteratorsChecker=
.cpp                    |     46 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/LLVMConventionsC=
hecker.cpp              |     15 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPI=
Checker.cpp             |    229 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker=
.cpp                    |     34 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cp=
p                       |   1357 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocOverflowSe=
curityChecker.cpp       |      7 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSAutoreleasePoo=
lChecker.cpp            |     31 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSErrorChecker.c=
pp                      |     14 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NoReturnFunction=
Checker.cpp             |      4 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/OSAtomicChecker.=
cpp                     |     96 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecke=
r.cpp                   |     21 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCSelfInitChec=
ker.cpp                 |     82 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsC=
hecker.cpp              |      2 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerArithChec=
ker.cpp                 |     11 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerSubChecke=
r.cpp                   |     11 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PthreadLockCheck=
er.cpp                  |     44 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountCheck=
er.cpp                  |    916 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnPointerRan=
geChecker.cpp           |     10 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefCheck=
er.cpp                  |      7 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StackAddrEscapeC=
hecker.cpp              |     64 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cp=
p                       |    109 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefBranchCheck=
er.cpp                  |     37 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefCapturedBlo=
ckVarChecker.cpp        |     20 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefResultCheck=
er.cpp                  |     20 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedArraySu=
bscriptChecker.cpp      |      7 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedAssignm=
entChecker.cpp          |      8 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnixAPIChecker.c=
pp                      |    206 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeC=
hecker.cpp              |     34 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VLASizeChecker.c=
pp                      |     87 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalysisManager.cpp =
                        |     38 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicConstraintManag=
er.cpp                  |     66 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp     =
                        |    744 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.=
cpp                     |    237 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Checker.cpp         =
                        |      9 +
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerContext.cpp  =
                        |     76 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp  =
                        |    174 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerRegistry.cpp =
                        |      5 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp      =
                        |    616 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp     =
                        |    147 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp   =
                        |    176 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp      =
                        |   1225 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp     =
                        |    609 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp   =
                        |    239 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndRet=
urn.cpp                 |    357 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp  =
                        |     92 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp =
                        |    127 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp       =
                        |    170 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ObjCMessage.cpp     =
                        |    118 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp  =
                        |    466 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp=
                        |    298 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp    =
                        |    352 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RangeConstraintManag=
er.cpp                  |     64 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp     =
                        |    388 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp     =
                        |    152 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp           =
                        |     89 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintMana=
ger.cpp                 |    174 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintMana=
ger.h                   |     36 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cp=
p                       |    337 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp           =
                        |     46 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp   =
                        |    128 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/TextPathDiagnostics.=
cpp                     |     31 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer=
.cpp                    |    414 +-
 head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistrat=
ion.cpp                 |      2 +-
 head/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp                   =
                        |     22 +-
 head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp                 =
                        |     80 +-
 head/contrib/llvm/tools/clang/tools/driver/driver.cpp                     =
                        |     38 +-
 head/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp         =
                        |    318 +-
 head/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.h           =
                        |     39 +
 head/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp  =
                        |    113 +-
 head/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp              =
                        |     91 +-
 head/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.h                =
                        |     34 +
 head/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp                 =
                        |     26 +-
 head/contrib/llvm/tools/llc/llc.cpp                                       =
                        |    224 +-
 head/contrib/llvm/tools/lli/lli.cpp                                       =
                        |     38 +-
 head/contrib/llvm/tools/llvm-as/llvm-as.cpp                               =
                        |      2 +-
 head/contrib/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp               =
                        |    123 +-
 head/contrib/llvm/tools/llvm-diff/DiffConsumer.cpp                        =
                        |      6 +
 head/contrib/llvm/tools/llvm-diff/DiffConsumer.h                          =
                        |      1 +
 head/contrib/llvm/tools/llvm-diff/DifferenceEngine.cpp                    =
                        |     18 +-
 head/contrib/llvm/tools/llvm-diff/DifferenceEngine.h                      =
                        |      4 +-
 head/contrib/llvm/tools/llvm-diff/llvm-diff.cpp                           =
                        |      2 +-
 head/contrib/llvm/tools/llvm-dis/llvm-dis.cpp                             =
                        |     19 +-
 head/contrib/llvm/tools/llvm-extract/llvm-extract.cpp                     =
                        |     12 +-
 head/contrib/llvm/tools/llvm-ld/llvm-ld.cpp                               =
                        |      4 +-
 head/contrib/llvm/tools/llvm-link/llvm-link.cpp                           =
                        |      2 +-
 head/contrib/llvm/tools/llvm-mc/Disassembler.cpp                          =
                        |     36 +-
 head/contrib/llvm/tools/llvm-mc/llvm-mc.cpp                               =
                        |     49 +-
 head/contrib/llvm/tools/llvm-nm/llvm-nm.cpp                               =
                        |    102 +-
 head/contrib/llvm/tools/llvm-objdump/MachODump.cpp                        =
                        |    404 +-
 head/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp                     =
                        |    228 +-
 head/contrib/llvm/tools/llvm-objdump/llvm-objdump.h                       =
                        |      2 +-
 head/contrib/llvm/tools/llvm-prof/llvm-prof.cpp                           =
                        |     18 +-
 head/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp                       =
                        |     31 +-
 head/contrib/llvm/tools/opt/PrintSCC.cpp                                  =
                        |      4 +-
 head/contrib/llvm/tools/opt/opt.cpp                                       =
                        |      9 +-
 head/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp                    =
                        |    471 +-
 head/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp                     =
                        |    185 +-
 head/contrib/llvm/utils/TableGen/AsmWriterEmitter.h                       =
                        |      2 -
 head/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp                   =
                        |      6 +-
 head/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp                       =
                        |     26 +-
 head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp                   =
                        |     22 +-
 head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h                     =
                        |     10 +-
 head/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp                   =
                        |     45 +-
 head/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp                     =
                        |   1024 +-
 head/contrib/llvm/utils/TableGen/CodeGenRegisters.h                       =
                        |    247 +-
 head/contrib/llvm/utils/TableGen/CodeGenTarget.cpp                        =
                        |     29 +-
 head/contrib/llvm/utils/TableGen/CodeGenTarget.h                          =
                        |     10 +
 head/contrib/llvm/utils/TableGen/DAGISelMatcher.cpp                       =
                        |      6 +
 head/contrib/llvm/utils/TableGen/DAGISelMatcher.h                         =
                        |      3 +
 head/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp                =
                        |     11 +-
 head/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp                    =
                        |      2 +-
 head/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp                  =
                        |      1 -
 head/contrib/llvm/utils/TableGen/EDEmitter.cpp                            =
                        |     36 +-
 head/contrib/llvm/utils/TableGen/FastISelEmitter.cpp                      =
                        |      3 +-
 head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp               =
                        |    334 +-
 head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.h                 =
                        |     18 +-
 head/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp                     =
                        |     49 +-
 head/contrib/llvm/utils/TableGen/InstrInfoEmitter.h                       =
                        |     10 +-
 head/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp                     =
                        |    141 +-
 head/contrib/llvm/utils/TableGen/IntrinsicEmitter.h                       =
                        |      2 -
 head/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.cpp                =
                        |      9 +-
 head/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp                  =
                        |    829 +-
 head/contrib/llvm/utils/TableGen/RegisterInfoEmitter.h                    =
                        |      6 +
 head/contrib/llvm/utils/TableGen/SetTheory.cpp                            =
                        |     23 +
 head/contrib/llvm/utils/TableGen/SetTheory.h                              =
                        |      8 +-
 head/contrib/llvm/utils/TableGen/StringToOffsetTable.h                    =
                        |     13 +-
 head/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp                     =
                        |     82 +-
 head/contrib/llvm/utils/TableGen/TableGen.cpp                             =
                        |    175 +-
 head/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp                =
                        |    148 +-
 head/contrib/llvm/utils/TableGen/X86ModRMFilters.h                        =
                        |     15 +-
 head/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp                 =
                        |    236 +-
 head/contrib/llvm/utils/TableGen/X86RecognizableInstr.h                   =
                        |     10 +-
 head/contrib/openbsm/libauditd/auditd_lib.c                               =
                        |      1 +
 head/contrib/openpam/lib/openpam_configure.c                              =
                        |     14 +-
 head/contrib/telnet/libtelnet/kerberos5.c                                 =
                        |    110 +-
 head/contrib/tzdata/antarctica                                            =
                        |     21 +-
 head/contrib/tzdata/asia                                                  =
                        |     24 +-
 head/contrib/tzdata/australasia                                           =
                        |     28 +-
 head/contrib/tzdata/europe                                                =
                        |     14 +-
 head/contrib/tzdata/leapseconds                                           =
                        |     42 +-
 head/contrib/tzdata/northamerica                                          =
                        |     93 +-
 head/contrib/tzdata/southamerica                                          =
                        |     53 +-
 head/contrib/tzdata/zone.tab                                              =
                        |      5 +-
 head/crypto/heimdal/ChangeLog                                             =
                        |   1783 +-
 head/crypto/heimdal/ChangeLog.2002                                        =
                        |      2 +-
 head/crypto/heimdal/ChangeLog.2003                                        =
                        |    286 +-
 head/crypto/heimdal/ChangeLog.2004                                        =
                        |    246 +-
 head/crypto/heimdal/ChangeLog.2005                                        =
                        |    336 +-
 head/crypto/heimdal/ChangeLog.2006                                        =
                        |    388 +-
 head/crypto/heimdal/LICENSE                                               =
                        |      5 +-
 head/crypto/heimdal/Makefile.am                                           =
                        |     14 +-
 head/crypto/heimdal/Makefile.am.common                                    =
                        |      2 +-
 head/crypto/heimdal/Makefile.in                                           =
                        |    338 +-
 head/crypto/heimdal/NEWS                                                  =
                        |    172 +
 head/crypto/heimdal/README                                                =
                        |     11 +-
 head/crypto/heimdal/acinclude.m4                                          =
                        |      3 +-
 head/crypto/heimdal/aclocal.m4                                            =
                        |   6905 +-
 head/crypto/heimdal/admin/ChangeLog                                       =
                        |     12 +-
 head/crypto/heimdal/admin/Makefile.am                                     =
                        |      7 +-
 head/crypto/heimdal/admin/Makefile.in                                     =
                        |    391 +-
 head/crypto/heimdal/admin/add.c                                           =
                        |     60 +-
 head/crypto/heimdal/admin/change.c                                        =
                        |     72 +-
 head/crypto/heimdal/admin/copy.c                                          =
                        |    106 +-
 head/crypto/heimdal/admin/get.c                                           =
                        |    107 +-
 head/crypto/heimdal/admin/ktutil-commands.in                              =
                        |     39 +-
 head/crypto/heimdal/admin/ktutil.8                                        =
                        |    178 +-
 head/crypto/heimdal/admin/ktutil.c                                        =
                        |     93 +-
 head/crypto/heimdal/admin/ktutil_locl.h                                   =
                        |     60 +-
 head/crypto/heimdal/admin/list.c                                          =
                        |     80 +-
 head/crypto/heimdal/admin/purge.c                                         =
                        |     58 +-
 head/crypto/heimdal/admin/remove.c                                        =
                        |     54 +-
 head/crypto/heimdal/admin/rename.c                                        =
                        |     70 +-
 head/crypto/heimdal/appl/Makefile.am                                      =
                        |      4 +-
 head/crypto/heimdal/appl/Makefile.in                                      =
                        |    249 +-
 head/crypto/heimdal/appl/afsutil/ChangeLog                                =
                        |     20 +-
 head/crypto/heimdal/appl/afsutil/Makefile.am                              =
                        |      4 +-
 head/crypto/heimdal/appl/afsutil/Makefile.in                              =
                        |    375 +-
 head/crypto/heimdal/appl/afsutil/afslog.1                                 =
                        |    113 +-
 head/crypto/heimdal/appl/afsutil/afslog.c                                 =
                        |     86 +-
 head/crypto/heimdal/appl/afsutil/pagsh.1                                  =
                        |     82 +-
 head/crypto/heimdal/appl/afsutil/pagsh.c                                  =
                        |     56 +-
 head/crypto/heimdal/appl/ftp/ChangeLog                                    =
                        |    108 +-
 head/crypto/heimdal/appl/ftp/Makefile.am                                  =
                        |      4 +-
 head/crypto/heimdal/appl/ftp/Makefile.in                                  =
                        |    249 +-
 head/crypto/heimdal/appl/ftp/common/Makefile.am                           =
                        |      4 +-
 head/crypto/heimdal/appl/ftp/common/Makefile.in                           =
                        |    211 +-
 head/crypto/heimdal/appl/ftp/common/buffer.c                              =
                        |     14 +-
 head/crypto/heimdal/appl/ftp/common/common.h                              =
                        |     14 +-
 head/crypto/heimdal/appl/ftp/common/sockbuf.c                             =
                        |     36 +-
 head/crypto/heimdal/appl/ftp/ftp/Makefile.am                              =
                        |     13 +-
 head/crypto/heimdal/appl/ftp/ftp/Makefile.in                              =
                        |    399 +-
 head/crypto/heimdal/appl/ftp/ftp/cmds.c                                   =
                        |     33 +-
 head/crypto/heimdal/appl/ftp/ftp/cmdtab.c                                 =
                        |     24 +-
 head/crypto/heimdal/appl/ftp/ftp/domacro.c                                =
                        |      2 +-
 head/crypto/heimdal/appl/ftp/ftp/extern.h                                 =
                        |      4 +-
 head/crypto/heimdal/appl/ftp/ftp/ftp.1                                    =
                        |      8 +-
 head/crypto/heimdal/appl/ftp/ftp/ftp.c                                    =
                        |     84 +-
 head/crypto/heimdal/appl/ftp/ftp/ftp_locl.h                               =
                        |     15 +-
 head/crypto/heimdal/appl/ftp/ftp/globals.c                                =
                        |      4 +-
 head/crypto/heimdal/appl/ftp/ftp/gssapi.c                                 =
                        |    145 +-
 head/crypto/heimdal/appl/ftp/ftp/kauth.c                                  =
                        |    152 +-
 head/crypto/heimdal/appl/ftp/ftp/main.c                                   =
                        |     11 +-
 head/crypto/heimdal/appl/ftp/ftp/ruserpass.c                              =
                        |     12 +-
 head/crypto/heimdal/appl/ftp/ftp/security.c                               =
                        |     78 +-
 head/crypto/heimdal/appl/ftp/ftp/security.h                               =
                        |     65 +-
 head/crypto/heimdal/appl/ftp/ftpd/Makefile.am                             =
                        |     13 +-
 head/crypto/heimdal/appl/ftp/ftpd/Makefile.in                             =
                        |    474 +-
 head/crypto/heimdal/appl/ftp/ftpd/extern.h                                =
                        |      4 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpcmd.c                                =
                        |    279 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y                                =
                        |     68 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpd.8                                  =
                        |     16 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpd.c                                  =
                        |    164 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h                             =
                        |     60 +-
 head/crypto/heimdal/appl/ftp/ftpd/ftpusers.5                              =
                        |      2 +-
 head/crypto/heimdal/appl/ftp/ftpd/gss_userok.c                            =
                        |    174 +-
 head/crypto/heimdal/appl/ftp/ftpd/gssapi.c                                =
                        |    145 +-
 head/crypto/heimdal/appl/ftp/ftpd/kauth.c                                 =
                        |    242 +-
 head/crypto/heimdal/appl/ftp/ftpd/klist.c                                 =
                        |     22 +-
 head/crypto/heimdal/appl/ftp/ftpd/logwtmp.c                               =
                        |     85 +-
 head/crypto/heimdal/appl/ftp/ftpd/ls.c                                    =
                        |     78 +-
 head/crypto/heimdal/appl/ftp/ftpd/popen.c                                 =
                        |     14 +-
 head/crypto/heimdal/appl/ftp/ftpd/security.c                              =
                        |     78 +-
 head/crypto/heimdal/appl/gssmask/Makefile.am                              =
                        |      5 +-
 head/crypto/heimdal/appl/gssmask/Makefile.in                              =
                        |    229 +-
 head/crypto/heimdal/appl/gssmask/common.c                                 =
                        |     28 +-
 head/crypto/heimdal/appl/gssmask/common.h                                 =
                        |     30 +-
 head/crypto/heimdal/appl/gssmask/gssmaestro.c                             =
                        |    212 +-
 head/crypto/heimdal/appl/gssmask/gssmask.c                                =
                        |    279 +-
 head/crypto/heimdal/appl/gssmask/protocol.h                               =
                        |     81 +-
 head/crypto/heimdal/appl/kf/Makefile.am                                   =
                        |      4 +-
 head/crypto/heimdal/appl/kf/Makefile.in                                   =
                        |    503 +-
 head/crypto/heimdal/appl/kf/kf.1                                          =
                        |     72 +-
 head/crypto/heimdal/appl/kf/kf.c                                          =
                        |     83 +-
 head/crypto/heimdal/appl/kf/kf_locl.h                                     =
                        |     52 +-
 head/crypto/heimdal/appl/kf/kfd.8                                         =
                        |     64 +-
 head/crypto/heimdal/appl/kf/kfd.c                                         =
                        |     65 +-
 head/crypto/heimdal/appl/login/ChangeLog                                  =
                        |     31 +-
 head/crypto/heimdal/appl/login/Makefile.am                                =
                        |     15 +-
 head/crypto/heimdal/appl/login/Makefile.in                                =
                        |    472 +-
 head/crypto/heimdal/appl/login/conf.c                                     =
                        |     24 +-
 head/crypto/heimdal/appl/login/env.c                                      =
                        |     69 +-
 head/crypto/heimdal/appl/login/limits_conf.c                              =
                        |     60 +-
 head/crypto/heimdal/appl/login/login.1                                    =
                        |     57 +-
 head/crypto/heimdal/appl/login/login.access.5                             =
                        |     11 +-
 head/crypto/heimdal/appl/login/login.c                                    =
                        |    240 +-
 head/crypto/heimdal/appl/login/login_access.c                             =
                        |      6 +-
 head/crypto/heimdal/appl/login/login_locl.h                               =
                        |     65 +-
 head/crypto/heimdal/appl/login/loginpaths.h                               =
                        |     52 +-
 head/crypto/heimdal/appl/login/osfc2.c                                    =
                        |     66 +-
 head/crypto/heimdal/appl/login/read_string.c                              =
                        |     62 +-
 head/crypto/heimdal/appl/login/shadow.c                                   =
                        |     56 +-
 head/crypto/heimdal/appl/login/stty_default.c                             =
                        |     16 +-
 head/crypto/heimdal/appl/login/tty.c                                      =
                        |     16 +-
 head/crypto/heimdal/appl/login/utmp_login.c                               =
                        |     26 +-
 head/crypto/heimdal/appl/login/utmpx_login.c                              =
                        |      4 +-
 head/crypto/heimdal/appl/push/ChangeLog                                   =
                        |      4 +-
 head/crypto/heimdal/appl/push/Makefile.am                                 =
                        |      7 +-
 head/crypto/heimdal/appl/push/Makefile.in                                 =
                        |    491 +-
 head/crypto/heimdal/appl/push/pfrom.1                                     =
                        |     64 +-
 head/crypto/heimdal/appl/push/pfrom.in                                    =
                        |      2 +-
 head/crypto/heimdal/appl/push/push.8                                      =
                        |     34 +-
 head/crypto/heimdal/appl/push/push.c                                      =
                        |    175 +-
 head/crypto/heimdal/appl/push/push_locl.h                                 =
                        |     56 +-
 head/crypto/heimdal/appl/rcp/ChangeLog                                    =
                        |     23 +-
 head/crypto/heimdal/appl/rcp/Makefile.am                                  =
                        |      4 +-
 head/crypto/heimdal/appl/rcp/Makefile.in                                  =
                        |    375 +-
 head/crypto/heimdal/appl/rcp/extern.h                                     =
                        |      5 +-
 head/crypto/heimdal/appl/rcp/rcp.1                                        =
                        |     21 +-
 head/crypto/heimdal/appl/rcp/rcp.c                                        =
                        |     69 +-
 head/crypto/heimdal/appl/rcp/rcp_locl.h                                   =
                        |     52 +-
 head/crypto/heimdal/appl/rcp/util.c                                       =
                        |     24 +-
 head/crypto/heimdal/appl/rsh/ChangeLog                                    =
                        |     36 +-
 head/crypto/heimdal/appl/rsh/Makefile.am                                  =
                        |      7 +-
 head/crypto/heimdal/appl/rsh/Makefile.in                                  =
                        |    515 +-
 head/crypto/heimdal/appl/rsh/common.c                                     =
                        |     74 +-
 head/crypto/heimdal/appl/rsh/limits_conf.c                                =
                        |     60 +-
 head/crypto/heimdal/appl/rsh/login_access.c                               =
                        |      6 +-
 head/crypto/heimdal/appl/rsh/rsh.1                                        =
                        |     95 +-
 head/crypto/heimdal/appl/rsh/rsh.c                                        =
                        |    222 +-
 head/crypto/heimdal/appl/rsh/rsh_locl.h                                   =
                        |     71 +-
 head/crypto/heimdal/appl/rsh/rshd.8                                       =
                        |     71 +-
 head/crypto/heimdal/appl/rsh/rshd.c                                       =
                        |    250 +-
 head/crypto/heimdal/appl/su/ChangeLog                                     =
                        |     22 +-
 head/crypto/heimdal/appl/su/Makefile.am                                   =
                        |      6 +-
 head/crypto/heimdal/appl/su/Makefile.in                                   =
                        |    378 +-
 head/crypto/heimdal/appl/su/su.1                                          =
                        |     82 +-
 head/crypto/heimdal/appl/su/su.c                                          =
                        |    208 +-
 head/crypto/heimdal/appl/su/supaths.h                                     =
                        |     50 +-
 head/crypto/heimdal/appl/telnet/ChangeLog                                 =
                        |     95 +-
 head/crypto/heimdal/appl/telnet/Makefile.am                               =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/Makefile.in                               =
                        |    250 +-
 head/crypto/heimdal/appl/telnet/libtelnet/Makefile.am                     =
                        |      7 +-
 head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in                     =
                        |    221 +-
 head/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h                    =
                        |     27 +-
 head/crypto/heimdal/appl/telnet/libtelnet/auth.c                          =
                        |     42 +-
 head/crypto/heimdal/appl/telnet/libtelnet/auth.h                          =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/libtelnet/enc-proto.h                     =
                        |     10 +-
 head/crypto/heimdal/appl/telnet/libtelnet/enc_des.c                       =
                        |     59 +-
 head/crypto/heimdal/appl/telnet/libtelnet/encrypt.c                       =
                        |     29 +-
 head/crypto/heimdal/appl/telnet/libtelnet/encrypt.h                       =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/libtelnet/genget.c                        =
                        |      9 +-
 head/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c                     =
                        |     69 +-
 head/crypto/heimdal/appl/telnet/libtelnet/misc-proto.h                    =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/libtelnet/misc.c                          =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c                     =
                        |      9 +-
 head/crypto/heimdal/appl/telnet/libtelnet/spx.c                           =
                        |     21 +-
 head/crypto/heimdal/appl/telnet/telnet/Makefile.am                        =
                        |      7 +-
 head/crypto/heimdal/appl/telnet/telnet/Makefile.in                        =
                        |    387 +-
 head/crypto/heimdal/appl/telnet/telnet/authenc.c                          =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/telnet/commands.c                         =
                        |     33 +-
 head/crypto/heimdal/appl/telnet/telnet/externs.h                          =
                        |      5 +-
 head/crypto/heimdal/appl/telnet/telnet/main.c                             =
                        |     32 +-
 head/crypto/heimdal/appl/telnet/telnet/network.c                          =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/telnet/ring.c                             =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/telnet/ring.h                             =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/telnet/sys_bsd.c                          =
                        |     12 +-
 head/crypto/heimdal/appl/telnet/telnet/telnet.c                           =
                        |     12 +-
 head/crypto/heimdal/appl/telnet/telnet/telnet_locl.h                      =
                        |     14 +-
 head/crypto/heimdal/appl/telnet/telnet/terminal.c                         =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/telnet/utilities.c                        =
                        |     69 +-
 head/crypto/heimdal/appl/telnet/telnetd/Makefile.am                       =
                        |      7 +-
 head/crypto/heimdal/appl/telnet/telnetd/Makefile.in                       =
                        |    385 +-
 head/crypto/heimdal/appl/telnet/telnetd/authenc.c                         =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/telnetd/defs.h                            =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/telnetd/ext.h                             =
                        |      6 +-
 head/crypto/heimdal/appl/telnet/telnetd/global.c                          =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/telnetd/slc.c                             =
                        |      8 +-
 head/crypto/heimdal/appl/telnet/telnetd/state.c                           =
                        |      4 +-
 head/crypto/heimdal/appl/telnet/telnetd/sys_term.c                        =
                        |     75 +-
 head/crypto/heimdal/appl/telnet/telnetd/telnetd.c                         =
                        |     12 +-
 head/crypto/heimdal/appl/telnet/telnetd/telnetd.h                         =
                        |      4 -
 head/crypto/heimdal/appl/telnet/telnetd/termstat.c                        =
                        |      2 +-
 head/crypto/heimdal/appl/telnet/telnetd/utility.c                         =
                        |     69 +-
 head/crypto/heimdal/appl/test/Makefile.am                                 =
                        |      4 +-
 head/crypto/heimdal/appl/test/Makefile.in                                 =
                        |    232 +-
 head/crypto/heimdal/appl/test/common.c                                    =
                        |     60 +-
 head/crypto/heimdal/appl/test/gss_common.c                                =
                        |     58 +-
 head/crypto/heimdal/appl/test/gss_common.h                                =
                        |     52 +-
 head/crypto/heimdal/appl/test/gssapi_client.c                             =
                        |    103 +-
 head/crypto/heimdal/appl/test/gssapi_server.c                             =
                        |     79 +-
 head/crypto/heimdal/appl/test/http_client.c                               =
                        |     76 +-
 head/crypto/heimdal/appl/test/nt_gss_client.c                             =
                        |     52 +-
 head/crypto/heimdal/appl/test/nt_gss_common.c                             =
                        |     58 +-
 head/crypto/heimdal/appl/test/nt_gss_common.h                             =
                        |     52 +-
 head/crypto/heimdal/appl/test/nt_gss_server.c                             =
                        |     85 +-
 head/crypto/heimdal/appl/test/tcp_client.c                                =
                        |     52 +-
 head/crypto/heimdal/appl/test/tcp_server.c                                =
                        |     58 +-
 head/crypto/heimdal/appl/test/test_locl.h                                 =
                        |     52 +-
 head/crypto/heimdal/appl/test/uu_client.c                                 =
                        |     66 +-
 head/crypto/heimdal/appl/test/uu_server.c                                 =
                        |     92 +-
 head/crypto/heimdal/autogen.sh                                            =
                        |      1 +
 head/crypto/heimdal/compile                                               =
                        |     21 +-
 head/crypto/heimdal/config.guess                                          =
                        |    291 +-
 head/crypto/heimdal/config.sub                                            =
                        |    149 +-
 head/crypto/heimdal/configure                                             =
                        |  55953 ++-------
 head/crypto/heimdal/doc/Makefile.am                                       =
                        |    105 +-
 head/crypto/heimdal/doc/Makefile.in                                       =
                        |    389 +-
 head/crypto/heimdal/doc/ack.texi                                          =
                        |     66 +-
 head/crypto/heimdal/doc/apps.texi                                         =
                        |     28 +-
 head/crypto/heimdal/doc/doxytmpl.dxy                                      =
                        |      1 -
 head/crypto/heimdal/doc/hcrypto.din                                       =
                        |      3 +-
 head/crypto/heimdal/doc/heimdal.texi                                      =
                        |    247 +-
 head/crypto/heimdal/doc/hx509.din                                         =
                        |      2 +-
 head/crypto/heimdal/doc/hx509.texi                                        =
                        |    424 +-
 head/crypto/heimdal/doc/install.texi                                      =
                        |    103 +-
 head/crypto/heimdal/doc/intro.texi                                        =
                        |      5 +-
 head/crypto/heimdal/doc/kerberos4.texi                                    =
                        |     63 +-
 head/crypto/heimdal/doc/krb5.din                                          =
                        |      2 +-
 head/crypto/heimdal/doc/migration.texi                                    =
                        |     12 +-
 head/crypto/heimdal/doc/misc.texi                                         =
                        |      2 +-
 head/crypto/heimdal/doc/ntlm.din                                          =
                        |      3 +-
 head/crypto/heimdal/doc/programming.texi                                  =
                        |    643 +-
 head/crypto/heimdal/doc/setup.texi                                        =
                        |    549 +-
 head/crypto/heimdal/doc/vars.texi                                         =
                        |      2 +-
 head/crypto/heimdal/doc/whatis.texi                                       =
                        |      2 +-
 head/crypto/heimdal/doc/win2k.texi                                        =
                        |    112 +-
 head/crypto/heimdal/etc/Makefile.am                                       =
                        |      4 +-
 head/crypto/heimdal/etc/Makefile.in                                       =
                        |    148 +-
 head/crypto/heimdal/etc/services.append                                   =
                        |      2 +-
 head/crypto/heimdal/include/Makefile.am                                   =
                        |     94 +-
 head/crypto/heimdal/include/Makefile.in                                   =
                        |    433 +-
 head/crypto/heimdal/include/bits.c                                        =
                        |    117 +-
 head/crypto/heimdal/include/config.h.in                                   =
                        |    254 +-
 head/crypto/heimdal/include/gssapi/Makefile.am                            =
                        |      5 +-
 head/crypto/heimdal/include/gssapi/Makefile.in                            =
                        |    149 +-
 head/crypto/heimdal/include/hcrypto/Makefile.am                           =
                        |      9 +-
 head/crypto/heimdal/include/hcrypto/Makefile.in                           =
                        |    152 +-
 head/crypto/heimdal/include/kadm5/Makefile.am                             =
                        |      7 +-
 head/crypto/heimdal/include/kadm5/Makefile.in                             =
                        |    150 +-
 head/crypto/heimdal/install-sh                                            =
                        |    225 +-
 head/crypto/heimdal/kadmin/ChangeLog                                      =
                        |    130 +-
 head/crypto/heimdal/kadmin/Makefile.am                                    =
                        |     19 +-
 head/crypto/heimdal/kadmin/Makefile.in                                    =
                        |    556 +-
 head/crypto/heimdal/kadmin/add-random-users.c                             =
                        |     59 +-
 head/crypto/heimdal/kadmin/add_enctype.c                                  =
                        |     53 +-
 head/crypto/heimdal/kadmin/ank.c                                          =
                        |     90 +-
 head/crypto/heimdal/kadmin/check.c                                        =
                        |     63 +-
 head/crypto/heimdal/kadmin/cpw.c                                          =
                        |     58 +-
 head/crypto/heimdal/kadmin/del.c                                          =
                        |     52 +-
 head/crypto/heimdal/kadmin/del_enctype.c                                  =
                        |     54 +-
 head/crypto/heimdal/kadmin/dump.c                                         =
                        |     58 +-
 head/crypto/heimdal/kadmin/ext.c                                          =
                        |     60 +-
 head/crypto/heimdal/kadmin/get.c                                          =
                        |    142 +-
 head/crypto/heimdal/kadmin/init.c                                         =
                        |    103 +-
 head/crypto/heimdal/kadmin/kadm_conn.c                                    =
                        |    193 +-
 head/crypto/heimdal/kadmin/kadmin-commands.in                             =
                        |     14 +-
 head/crypto/heimdal/kadmin/kadmin.8                                       =
                        |    181 +-
 head/crypto/heimdal/kadmin/kadmin.c                                       =
                        |    126 +-
 head/crypto/heimdal/kadmin/kadmin_locl.h                                  =
                        |     75 +-
 head/crypto/heimdal/kadmin/kadmind.8                                      =
                        |    102 +-
 head/crypto/heimdal/kadmin/kadmind.c                                      =
                        |    142 +-
 head/crypto/heimdal/kadmin/load.c                                         =
                        |     92 +-
 head/crypto/heimdal/kadmin/mod.c                                          =
                        |    126 +-
 head/crypto/heimdal/kadmin/pw_quality.c                                   =
                        |     52 +-
 head/crypto/heimdal/kadmin/random_password.c                              =
                        |     64 +-
 head/crypto/heimdal/kadmin/rename.c                                       =
                        |     52 +-
 head/crypto/heimdal/kadmin/server.c                                       =
                        |    369 +-
 head/crypto/heimdal/kadmin/stash.c                                        =
                        |     81 +-
 head/crypto/heimdal/kadmin/test_util.c                                    =
                        |     30 +-
 head/crypto/heimdal/kadmin/util.c                                         =
                        |    110 +-
 head/crypto/heimdal/kcm/Makefile.am                                       =
                        |     19 +-
 head/crypto/heimdal/kcm/Makefile.in                                       =
                        |    411 +-
 head/crypto/heimdal/kcm/acl.c                                             =
                        |     61 +-
 head/crypto/heimdal/kcm/acquire.c                                         =
                        |    424 +-
 head/crypto/heimdal/kcm/cache.c                                           =
                        |    327 +-
 head/crypto/heimdal/kcm/client.c                                          =
                        |     32 +-
 head/crypto/heimdal/kcm/config.c                                          =
                        |     83 +-
 head/crypto/heimdal/kcm/connect.c                                         =
                        |    718 +-
 head/crypto/heimdal/kcm/events.c                                          =
                        |     11 +-
 head/crypto/heimdal/kcm/glue.c                                            =
                        |      3 +-
 head/crypto/heimdal/kcm/headers.h                                         =
                        |     21 +-
 head/crypto/heimdal/kcm/kcm.8                                             =
                        |    178 +-
 head/crypto/heimdal/kcm/kcm_locl.h                                        =
                        |     45 +-
 head/crypto/heimdal/kcm/log.c                                             =
                        |     52 +-
 head/crypto/heimdal/kcm/main.c                                            =
                        |     70 +-
 head/crypto/heimdal/kcm/protocol.c                                        =
                        |   1026 +-
 head/crypto/heimdal/kcm/renew.c                                           =
                        |      2 +-
 head/crypto/heimdal/kdc/Makefile.am                                       =
                        |     45 +-
 head/crypto/heimdal/kdc/Makefile.in                                       =
                        |    752 +-
 head/crypto/heimdal/kdc/config.c                                          =
                        |    193 +-
 head/crypto/heimdal/kdc/connect.c                                         =
                        |    309 +-
 head/crypto/heimdal/kdc/default_config.c                                  =
                        |    314 +-
 head/crypto/heimdal/kdc/digest.c                                          =
                        |    667 +-
 head/crypto/heimdal/kdc/headers.h                                         =
                        |     67 +-
 head/crypto/heimdal/kdc/hprop.8                                           =
                        |    162 +-
 head/crypto/heimdal/kdc/hprop.c                                           =
                        |    473 +-
 head/crypto/heimdal/kdc/hprop.h                                           =
                        |     52 +-
 head/crypto/heimdal/kdc/hpropd.8                                          =
                        |     95 +-
 head/crypto/heimdal/kdc/hpropd.c                                          =
                        |    132 +-
 head/crypto/heimdal/kdc/kdc-private.h                                     =
                        |    152 +-
 head/crypto/heimdal/kdc/kdc-protos.h                                      =
                        |     25 +
 head/crypto/heimdal/kdc/kdc-replay.c                                      =
                        |     77 +-
 head/crypto/heimdal/kdc/kdc.8                                             =
                        |    150 +-
 head/crypto/heimdal/kdc/kdc.h                                             =
                        |     97 +-
 head/crypto/heimdal/kdc/kdc_locl.h                                        =
                        |     70 +-
 head/crypto/heimdal/kdc/kerberos5.c                                       =
                        |   1081 +-
 head/crypto/heimdal/kdc/krb5tgs.c                                         =
                        |   1373 +-
 head/crypto/heimdal/kdc/kstash.8                                          =
                        |     90 +-
 head/crypto/heimdal/kdc/kstash.c                                          =
                        |     88 +-
 head/crypto/heimdal/kdc/kx509.c                                           =
                        |    184 +-
 head/crypto/heimdal/kdc/log.c                                             =
                        |     76 +-
 head/crypto/heimdal/kdc/main.c                                            =
                        |    124 +-
 head/crypto/heimdal/kdc/misc.c                                            =
                        |    148 +-
 head/crypto/heimdal/kdc/mit_dump.c                                        =
                        |    112 +-
 head/crypto/heimdal/kdc/pkinit.c                                          =
                        |   1257 +-
 head/crypto/heimdal/kdc/process.c                                         =
                        |    285 +-
 head/crypto/heimdal/kdc/rx.h                                              =
                        |     52 +-
 head/crypto/heimdal/kdc/set_dbinfo.c                                      =
                        |    107 +-
 head/crypto/heimdal/kdc/string2key.8                                      =
                        |    111 +-
 head/crypto/heimdal/kdc/string2key.c                                      =
                        |    105 +-
 head/crypto/heimdal/kdc/version-script.map                                =
                        |      9 +-
 head/crypto/heimdal/kdc/windc.c                                           =
                        |    112 +-
 head/crypto/heimdal/kdc/windc_plugin.h                                    =
                        |     75 +-
 head/crypto/heimdal/kpasswd/Makefile.am                                   =
                        |      5 +-
 head/crypto/heimdal/kpasswd/Makefile.in                                   =
                        |    524 +-
 head/crypto/heimdal/kpasswd/kpasswd-generator.c                           =
                        |     65 +-
 head/crypto/heimdal/kpasswd/kpasswd.1                                     =
                        |     60 +-
 head/crypto/heimdal/kpasswd/kpasswd.c                                     =
                        |    100 +-
 head/crypto/heimdal/kpasswd/kpasswd_locl.h                                =
                        |     52 +-
 head/crypto/heimdal/kpasswd/kpasswdd.8                                    =
                        |     74 +-
 head/crypto/heimdal/kpasswd/kpasswdd.c                                    =
                        |    214 +-
 head/crypto/heimdal/kuser/Makefile.am                                     =
                        |     50 +-
 head/crypto/heimdal/kuser/Makefile.in                                     =
                        |    614 +-
 head/crypto/heimdal/kuser/copy_cred_cache.1                               =
                        |     35 +-
 head/crypto/heimdal/kuser/copy_cred_cache.c                               =
                        |    176 +-
 head/crypto/heimdal/kuser/generate-requests.c                             =
                        |     80 +-
 head/crypto/heimdal/kuser/kdecode_ticket.c                                =
                        |     61 +-
 head/crypto/heimdal/kuser/kdestroy.1                                      =
                        |     78 +-
 head/crypto/heimdal/kuser/kdestroy.c                                      =
                        |    158 +-
 head/crypto/heimdal/kuser/kdigest-commands.in                             =
                        |      4 +-
 head/crypto/heimdal/kuser/kdigest.c                                       =
                        |    211 +-
 head/crypto/heimdal/kuser/kgetcred.1                                      =
                        |     94 +-
 head/crypto/heimdal/kuser/kgetcred.c                                      =
                        |     95 +-
 head/crypto/heimdal/kuser/kimpersonate.c                                  =
                        |    120 +-
 head/crypto/heimdal/kuser/kinit.1                                         =
                        |    230 +-
 head/crypto/heimdal/kuser/kinit.c                                         =
                        |    530 +-
 head/crypto/heimdal/kuser/klist.1                                         =
                        |    103 +-
 head/crypto/heimdal/kuser/klist.c                                         =
                        |    439 +-
 head/crypto/heimdal/kuser/kuser_locl.h                                    =
                        |     79 +-
 head/crypto/heimdal/kuser/kverify.c                                       =
                        |     68 +-
 head/crypto/heimdal/lib/Makefile.am                                       =
                        |     33 +-
 head/crypto/heimdal/lib/Makefile.in                                       =
                        |    278 +-
 head/crypto/heimdal/lib/asn1/ChangeLog                                    =
                        |    614 +-
 head/crypto/heimdal/lib/asn1/Makefile.am                                  =
                        |    592 +-
 head/crypto/heimdal/lib/asn1/Makefile.in                                  =
                        |   1370 +-
 head/crypto/heimdal/lib/asn1/asn1-common.h                                =
                        |     19 +-
 head/crypto/heimdal/lib/asn1/asn1_err.et                                  =
                        |      6 +-
 head/crypto/heimdal/lib/asn1/asn1_gen.c                                   =
                        |     75 +-
 head/crypto/heimdal/lib/asn1/asn1_print.c                                 =
                        |    130 +-
 head/crypto/heimdal/lib/asn1/asn1_queue.h                                 =
                        |      2 +-
 head/crypto/heimdal/lib/asn1/canthandle.asn1                              =
                        |      3 +-
 head/crypto/heimdal/lib/asn1/check-common.c                               =
                        |    136 +-
 head/crypto/heimdal/lib/asn1/check-common.h                               =
                        |     74 +-
 head/crypto/heimdal/lib/asn1/check-der.c                                  =
                        |    150 +-
 head/crypto/heimdal/lib/asn1/check-gen.c                                  =
                        |    500 +-
 head/crypto/heimdal/lib/asn1/check-timegm.c                               =
                        |     61 +-
 head/crypto/heimdal/lib/asn1/der-protos.h                                 =
                        |     67 +-
 head/crypto/heimdal/lib/asn1/der.c                                        =
                        |     52 +-
 head/crypto/heimdal/lib/asn1/der.h                                        =
                        |     56 +-
 head/crypto/heimdal/lib/asn1/der_cmp.c                                    =
                        |     70 +-
 head/crypto/heimdal/lib/asn1/der_copy.c                                   =
                        |    102 +-
 head/crypto/heimdal/lib/asn1/der_format.c                                 =
                        |     60 +-
 head/crypto/heimdal/lib/asn1/der_free.c                                   =
                        |     85 +-
 head/crypto/heimdal/lib/asn1/der_get.c                                    =
                        |    229 +-
 head/crypto/heimdal/lib/asn1/der_length.c                                 =
                        |     76 +-
 head/crypto/heimdal/lib/asn1/der_locl.h                                   =
                        |     59 +-
 head/crypto/heimdal/lib/asn1/der_put.c                                    =
                        |    114 +-
 head/crypto/heimdal/lib/asn1/digest.asn1                                  =
                        |     17 +
 head/crypto/heimdal/lib/asn1/extra.c                                      =
                        |    112 +-
 head/crypto/heimdal/lib/asn1/gen.c                                        =
                        |    479 +-
 head/crypto/heimdal/lib/asn1/gen_copy.c                                   =
                        |     96 +-
 head/crypto/heimdal/lib/asn1/gen_decode.c                                 =
                        |    295 +-
 head/crypto/heimdal/lib/asn1/gen_encode.c                                 =
                        |    139 +-
 head/crypto/heimdal/lib/asn1/gen_free.c                                   =
                        |     91 +-
 head/crypto/heimdal/lib/asn1/gen_glue.c                                   =
                        |     88 +-
 head/crypto/heimdal/lib/asn1/gen_length.c                                 =
                        |    102 +-
 head/crypto/heimdal/lib/asn1/gen_locl.h                                   =
                        |     73 +-
 head/crypto/heimdal/lib/asn1/gen_seq.c                                    =
                        |     74 +-
 head/crypto/heimdal/lib/asn1/hash.c                                       =
                        |     52 +-
 head/crypto/heimdal/lib/asn1/hash.h                                       =
                        |     54 +-
 head/crypto/heimdal/lib/asn1/heim_asn1.h                                  =
                        |     50 +-
 head/crypto/heimdal/lib/asn1/kx509.asn1                                   =
                        |     12 +
 head/crypto/heimdal/lib/asn1/lex.c                                        =
                        |    186 +-
 head/crypto/heimdal/lib/asn1/lex.h                                        =
                        |     54 +-
 head/crypto/heimdal/lib/asn1/lex.l                                        =
                        |     80 +-
 head/crypto/heimdal/lib/asn1/main.c                                       =
                        |    130 +-
 head/crypto/heimdal/lib/asn1/pkcs12.asn1                                  =
                        |      3 +-
 head/crypto/heimdal/lib/asn1/pkcs8.asn1                                   =
                        |      3 +-
 head/crypto/heimdal/lib/asn1/pkcs9.asn1                                   =
                        |      1 +
 head/crypto/heimdal/lib/asn1/pkinit.asn1                                  =
                        |     34 +-
 head/crypto/heimdal/lib/asn1/rfc2459.asn1                                 =
                        |     86 +-
 head/crypto/heimdal/lib/asn1/setchgpw2.asn1                               =
                        |      3 +-
 head/crypto/heimdal/lib/asn1/symbol.c                                     =
                        |      8 +-
 head/crypto/heimdal/lib/asn1/symbol.h                                     =
                        |     85 +-
 head/crypto/heimdal/lib/asn1/test.asn1                                    =
                        |     60 +-
 head/crypto/heimdal/lib/asn1/test.gen                                     =
                        |      2 +-
 head/crypto/heimdal/lib/asn1/timegm.c                                     =
                        |    124 +-
 head/crypto/heimdal/lib/com_err/ChangeLog                                 =
                        |     22 +-
 head/crypto/heimdal/lib/com_err/Makefile.am                               =
                        |     15 +-
 head/crypto/heimdal/lib/com_err/Makefile.in                               =
                        |    371 +-
 head/crypto/heimdal/lib/com_err/com_err.c                                 =
                        |     91 +-
 head/crypto/heimdal/lib/com_err/com_err.h                                 =
                        |     80 +-
 head/crypto/heimdal/lib/com_err/com_right.h                               =
                        |     86 +-
 head/crypto/heimdal/lib/com_err/compile_et.c                              =
                        |     96 +-
 head/crypto/heimdal/lib/com_err/compile_et.h                              =
                        |     54 +-
 head/crypto/heimdal/lib/com_err/error.c                                   =
                        |     93 +-
 head/crypto/heimdal/lib/com_err/lex.c                                     =
                        |    237 +-
 head/crypto/heimdal/lib/com_err/lex.h                                     =
                        |     54 +-
 head/crypto/heimdal/lib/com_err/lex.l                                     =
                        |     59 +-
 head/crypto/heimdal/lib/com_err/parse.c                                   =
                        |     89 +-
 head/crypto/heimdal/lib/com_err/parse.h                                   =
                        |      2 +-
 head/crypto/heimdal/lib/com_err/parse.y                                   =
                        |     63 +-
 head/crypto/heimdal/lib/com_err/roken_rename.h                            =
                        |     66 +-
 head/crypto/heimdal/lib/com_err/version-script.map                        =
                        |      2 +
 head/crypto/heimdal/lib/gssapi/ChangeLog                                  =
                        |    513 +-
 head/crypto/heimdal/lib/gssapi/Makefile.am                                =
                        |     99 +-
 head/crypto/heimdal/lib/gssapi/Makefile.in                                =
                        |   1484 +-
 head/crypto/heimdal/lib/gssapi/gss-commands.in                            =
                        |     17 +-
 head/crypto/heimdal/lib/gssapi/gss_acquire_cred.3                         =
                        |      6 +-
 head/crypto/heimdal/lib/gssapi/gssapi.3                                   =
                        |    153 +-
 head/crypto/heimdal/lib/gssapi/gssapi.h                                   =
                        |     52 +-
 head/crypto/heimdal/lib/gssapi/gssapi/gssapi.h                            =
                        |    555 +-
 head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h                       =
                        |    177 +-
 head/crypto/heimdal/lib/gssapi/gssapi/gssapi_spnego.h                     =
                        |     63 +-
 head/crypto/heimdal/lib/gssapi/gssapi_mech.h                              =
                        |    309 +-
 head/crypto/heimdal/lib/gssapi/krb5/8003.c                                =
                        |    127 +-
 head/crypto/heimdal/lib/gssapi/krb5/accept_sec_context.c                  =
                        |    376 +-
 head/crypto/heimdal/lib/gssapi/krb5/acquire_cred.c                        =
                        |    310 +-
 head/crypto/heimdal/lib/gssapi/krb5/add_cred.c                            =
                        |    101 +-
 head/crypto/heimdal/lib/gssapi/krb5/address_to_krb5addr.c                 =
                        |     70 +-
 head/crypto/heimdal/lib/gssapi/krb5/arcfour.c                             =
                        |    190 +-
 head/crypto/heimdal/lib/gssapi/krb5/canonicalize_name.c                   =
                        |     72 +-
 head/crypto/heimdal/lib/gssapi/krb5/ccache_name.c                         =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/cfx.c                                 =
                        |   1249 +-
 head/crypto/heimdal/lib/gssapi/krb5/cfx.h                                 =
                        |      2 +-
 head/crypto/heimdal/lib/gssapi/krb5/compare_name.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/compat.c                              =
                        |     67 +-
 head/crypto/heimdal/lib/gssapi/krb5/context_time.c                        =
                        |     62 +-
 head/crypto/heimdal/lib/gssapi/krb5/copy_ccache.c                         =
                        |     70 +-
 head/crypto/heimdal/lib/gssapi/krb5/decapsulate.c                         =
                        |     66 +-
 head/crypto/heimdal/lib/gssapi/krb5/delete_sec_context.c                  =
                        |     61 +-
 head/crypto/heimdal/lib/gssapi/krb5/display_name.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/display_status.c                      =
                        |     97 +-
 head/crypto/heimdal/lib/gssapi/krb5/duplicate_name.c                      =
                        |     63 +-
 head/crypto/heimdal/lib/gssapi/krb5/encapsulate.c                         =
                        |     64 +-
 head/crypto/heimdal/lib/gssapi/krb5/export_name.c                         =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/export_sec_context.c                  =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/external.c                            =
                        |    424 +-
 head/crypto/heimdal/lib/gssapi/krb5/get_mic.c                             =
                        |    100 +-
 head/crypto/heimdal/lib/gssapi/krb5/gkrb5_err.et                          =
                        |      2 +-
 head/crypto/heimdal/lib/gssapi/krb5/gsskrb5-private.h                     =
                        |    297 +-
 head/crypto/heimdal/lib/gssapi/krb5/gsskrb5_locl.h                        =
                        |     80 +-
 head/crypto/heimdal/lib/gssapi/krb5/import_name.c                         =
                        |    142 +-
 head/crypto/heimdal/lib/gssapi/krb5/import_sec_context.c                  =
                        |     70 +-
 head/crypto/heimdal/lib/gssapi/krb5/indicate_mechs.c                      =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/init.c                                =
                        |     54 +-
 head/crypto/heimdal/lib/gssapi/krb5/init_sec_context.c                    =
                        |    740 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_context.c                     =
                        |     58 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_cred.c                        =
                        |     68 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c                =
                        |     60 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c                 =
                        |      6 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c              =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c              =
                        |     75 +-
 head/crypto/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c          =
                        |    106 +-
 head/crypto/heimdal/lib/gssapi/krb5/prf.c                                 =
                        |     93 +-
 head/crypto/heimdal/lib/gssapi/krb5/process_context_token.c               =
                        |     64 +-
 head/crypto/heimdal/lib/gssapi/krb5/release_buffer.c                      =
                        |     54 +-
 head/crypto/heimdal/lib/gssapi/krb5/release_cred.c                        =
                        |     62 +-
 head/crypto/heimdal/lib/gssapi/krb5/release_name.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/krb5/sequence.c                            =
                        |    102 +-
 head/crypto/heimdal/lib/gssapi/krb5/set_cred_option.c                     =
                        |     41 +-
 head/crypto/heimdal/lib/gssapi/krb5/set_sec_context_option.c              =
                        |     84 +-
 head/crypto/heimdal/lib/gssapi/krb5/test_cfx.c                            =
                        |     78 +-
 head/crypto/heimdal/lib/gssapi/krb5/ticket_flags.c                        =
                        |     54 +-
 head/crypto/heimdal/lib/gssapi/krb5/unwrap.c                              =
                        |    191 +-
 head/crypto/heimdal/lib/gssapi/krb5/verify_mic.c                          =
                        |    144 +-
 head/crypto/heimdal/lib/gssapi/krb5/wrap.c                                =
                        |    191 +-
 head/crypto/heimdal/lib/gssapi/ntlm/accept_sec_context.c                  =
                        |    102 +-
 head/crypto/heimdal/lib/gssapi/ntlm/acquire_cred.c                        =
                        |     77 +-
 head/crypto/heimdal/lib/gssapi/ntlm/add_cred.c                            =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/canonicalize_name.c                   =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/compare_name.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/context_time.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/crypto.c                              =
                        |    135 +-
 head/crypto/heimdal/lib/gssapi/ntlm/delete_sec_context.c                  =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/display_name.c                        =
                        |     63 +-
 head/crypto/heimdal/lib/gssapi/ntlm/display_status.c                      =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/duplicate_name.c                      =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/export_name.c                         =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/export_sec_context.c                  =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/external.c                            =
                        |    121 +-
 head/crypto/heimdal/lib/gssapi/ntlm/import_name.c                         =
                        |     84 +-
 head/crypto/heimdal/lib/gssapi/ntlm/import_sec_context.c                  =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/indicate_mechs.c                      =
                        |     54 +-
 head/crypto/heimdal/lib/gssapi/ntlm/init_sec_context.c                    =
                        |    187 +-
 head/crypto/heimdal/lib/gssapi/ntlm/inquire_context.c                     =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/inquire_cred_by_mech.c                =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/inquire_mechs_for_name.c              =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/ntlm/inquire_names_for_mech.c              =
                        |     58 +-
 head/crypto/heimdal/lib/gssapi/ntlm/ntlm-private.h                        =
                        |     74 +-
 head/crypto/heimdal/lib/gssapi/ntlm/ntlm.h                                =
                        |     66 +-
 head/crypto/heimdal/lib/gssapi/ntlm/process_context_token.c               =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/release_cred.c                        =
                        |     56 +-
 head/crypto/heimdal/lib/gssapi/ntlm/release_name.c                        =
                        |     57 +-
 head/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c                =
                        |    299 +-
 head/crypto/heimdal/lib/gssapi/spnego/compat.c                            =
                        |     31 +-
 head/crypto/heimdal/lib/gssapi/spnego/context_stubs.c                     =
                        |    374 +-
 head/crypto/heimdal/lib/gssapi/spnego/cred_stubs.c                        =
                        |    167 +-
 head/crypto/heimdal/lib/gssapi/spnego/external.c                          =
                        |    100 +-
 head/crypto/heimdal/lib/gssapi/spnego/init_sec_context.c                  =
                        |    165 +-
 head/crypto/heimdal/lib/gssapi/spnego/spnego-private.h                    =
                        |    183 +-
 head/crypto/heimdal/lib/gssapi/spnego/spnego.asn1                         =
                        |      1 +
 head/crypto/heimdal/lib/gssapi/spnego/spnego_locl.h                       =
                        |     20 +-
 head/crypto/heimdal/lib/gssapi/test_acquire_cred.c                        =
                        |    142 +-
 head/crypto/heimdal/lib/gssapi/test_common.c                              =
                        |     43 +-
 head/crypto/heimdal/lib/gssapi/test_common.h                              =
                        |     24 +-
 head/crypto/heimdal/lib/gssapi/test_context.c                             =
                        |    586 +-
 head/crypto/heimdal/lib/gssapi/test_cred.c                                =
                        |     43 +-
 head/crypto/heimdal/lib/gssapi/test_kcred.c                               =
                        |     38 +-
 head/crypto/heimdal/lib/gssapi/test_names.c                               =
                        |     41 +-
 head/crypto/heimdal/lib/gssapi/test_ntlm.c                                =
                        |     40 +-
 head/crypto/heimdal/lib/gssapi/test_oid.c                                 =
                        |     60 +-
 head/crypto/heimdal/lib/gssapi/version-script.map                         =
                        |    255 +-
 head/crypto/heimdal/lib/hdb/Makefile.am                                   =
                        |     63 +-
 head/crypto/heimdal/lib/hdb/Makefile.in                                   =
                        |    558 +-
 head/crypto/heimdal/lib/hdb/common.c                                      =
                        |    166 +-
 head/crypto/heimdal/lib/hdb/db.c                                          =
                        |    113 +-
 head/crypto/heimdal/lib/hdb/db3.c                                         =
                        |     97 +-
 head/crypto/heimdal/lib/hdb/dbinfo.c                                      =
                        |     74 +-
 head/crypto/heimdal/lib/hdb/ext.c                                         =
                        |    172 +-
 head/crypto/heimdal/lib/hdb/hdb-ldap.c                                    =
                        |    553 +-
 head/crypto/heimdal/lib/hdb/hdb-private.h                                 =
                        |      9 +-
 head/crypto/heimdal/lib/hdb/hdb-protos.h                                  =
                        |     22 +-
 head/crypto/heimdal/lib/hdb/hdb.asn1                                      =
                        |     17 +-
 head/crypto/heimdal/lib/hdb/hdb.c                                         =
                        |    211 +-
 head/crypto/heimdal/lib/hdb/hdb.h                                         =
                        |    297 +-
 head/crypto/heimdal/lib/hdb/hdb.schema                                    =
                        |      2 +-
 head/crypto/heimdal/lib/hdb/hdb_err.et                                    =
                        |      4 +-
 head/crypto/heimdal/lib/hdb/hdb_locl.h                                    =
                        |     53 +-
 head/crypto/heimdal/lib/hdb/keys.c                                        =
                        |    156 +-
 head/crypto/heimdal/lib/hdb/keytab.c                                      =
                        |    376 +-
 head/crypto/heimdal/lib/hdb/mkey.c                                        =
                        |    181 +-
 head/crypto/heimdal/lib/hdb/ndbm.c                                        =
                        |    204 +-
 head/crypto/heimdal/lib/hdb/print.c                                       =
                        |     61 +-
 head/crypto/heimdal/lib/hdb/test_dbinfo.c                                 =
                        |     70 +-
 head/crypto/heimdal/lib/hx509/ChangeLog                                   =
                        |    440 +-
 head/crypto/heimdal/lib/hx509/Makefile.am                                 =
                        |    104 +-
 head/crypto/heimdal/lib/hx509/Makefile.in                                 =
                        |    955 +-
 head/crypto/heimdal/lib/hx509/ca.c                                        =
                        |    273 +-
 head/crypto/heimdal/lib/hx509/cert.c                                      =
                        |   1036 +-
 head/crypto/heimdal/lib/hx509/cms.c                                       =
                        |    591 +-
 head/crypto/heimdal/lib/hx509/collector.c                                 =
                        |     83 +-
 head/crypto/heimdal/lib/hx509/crmf.asn1                                   =
                        |      1 +
 head/crypto/heimdal/lib/hx509/crypto.c                                    =
                        |   1757 +-
 head/crypto/heimdal/lib/hx509/doxygen.c                                   =
                        |     54 +-
 head/crypto/heimdal/lib/hx509/env.c                                       =
                        |    254 +-
 head/crypto/heimdal/lib/hx509/error.c                                     =
                        |     68 +-
 head/crypto/heimdal/lib/hx509/file.c                                      =
                        |    156 +-
 head/crypto/heimdal/lib/hx509/hx509-private.h                             =
                        |    146 +-
 head/crypto/heimdal/lib/hx509/hx509-protos.h                              =
                        |    220 +-
 head/crypto/heimdal/lib/hx509/hx509.h                                     =
                        |     96 +-
 head/crypto/heimdal/lib/hx509/hx509_err.et                                =
                        |      8 +-
 head/crypto/heimdal/lib/hx509/hx_locl.h                                   =
                        |     91 +-
 head/crypto/heimdal/lib/hx509/hxtool-commands.in                          =
                        |     71 +-
 head/crypto/heimdal/lib/hx509/hxtool.c                                    =
                        |    913 +-
 head/crypto/heimdal/lib/hx509/keyset.c                                    =
                        |    242 +-
 head/crypto/heimdal/lib/hx509/ks_dir.c                                    =
                        |     66 +-
 head/crypto/heimdal/lib/hx509/ks_file.c                                   =
                        |    281 +-
 head/crypto/heimdal/lib/hx509/ks_keychain.c                               =
                        |    152 +-
 head/crypto/heimdal/lib/hx509/ks_mem.c                                    =
                        |     71 +-
 head/crypto/heimdal/lib/hx509/ks_null.c                                   =
                        |     53 +-
 head/crypto/heimdal/lib/hx509/ks_p11.c                                    =
                        |    216 +-
 head/crypto/heimdal/lib/hx509/ks_p12.c                                    =
                        |    163 +-
 head/crypto/heimdal/lib/hx509/lock.c                                      =
                        |     73 +-
 head/crypto/heimdal/lib/hx509/name.c                                      =
                        |    486 +-
 head/crypto/heimdal/lib/hx509/ocsp.asn1                                   =
                        |      1 +
 head/crypto/heimdal/lib/hx509/peer.c                                      =
                        |     87 +-
 head/crypto/heimdal/lib/hx509/pkcs10.asn1                                 =
                        |      1 +
 head/crypto/heimdal/lib/hx509/print.c                                     =
                        |    263 +-
 head/crypto/heimdal/lib/hx509/req.c                                       =
                        |     93 +-
 head/crypto/heimdal/lib/hx509/revoke.c                                    =
                        |    238 +-
 head/crypto/heimdal/lib/hx509/softp11.c                                   =
                        |    278 +-
 head/crypto/heimdal/lib/hx509/test_ca.in                                  =
                        |      4 +-
 head/crypto/heimdal/lib/hx509/test_cert.in                                =
                        |     17 +-
 head/crypto/heimdal/lib/hx509/test_chain.in                               =
                        |     18 +-
 head/crypto/heimdal/lib/hx509/test_cms.in                                 =
                        |    141 +-
 head/crypto/heimdal/lib/hx509/test_crypto.in                              =
                        |     33 +-
 head/crypto/heimdal/lib/hx509/test_java_pkcs11.in                         =
                        |      2 +-
 head/crypto/heimdal/lib/hx509/test_name.c                                 =
                        |    310 +-
 head/crypto/heimdal/lib/hx509/test_nist.in                                =
                        |      6 +-
 head/crypto/heimdal/lib/hx509/test_nist2.in                               =
                        |     26 +-
 head/crypto/heimdal/lib/hx509/test_nist_cert.in                           =
                        |      4 +-
 head/crypto/heimdal/lib/hx509/test_nist_pkcs12.in                         =
                        |      4 +-
 head/crypto/heimdal/lib/hx509/test_pkcs11.in                              =
                        |      2 +-
 head/crypto/heimdal/lib/hx509/test_query.in                               =
                        |     63 +-
 head/crypto/heimdal/lib/hx509/test_req.in                                 =
                        |      4 +-
 head/crypto/heimdal/lib/hx509/test_soft_pkcs11.c                          =
                        |     68 +-
 head/crypto/heimdal/lib/hx509/test_windows.in                             =
                        |      4 +-
 head/crypto/heimdal/lib/hx509/tst-crypto-available2                       =
                        |      3 +-
 head/crypto/heimdal/lib/hx509/tst-crypto-select1                          =
                        |      2 +-
 head/crypto/heimdal/lib/hx509/tst-crypto-select2                          =
                        |      2 +-
 head/crypto/heimdal/lib/hx509/version-script.map                          =
                        |    107 +-
 head/crypto/heimdal/lib/kadm5/ChangeLog                                   =
                        |    200 +-
 head/crypto/heimdal/lib/kadm5/Makefile.am                                 =
                        |     21 +-
 head/crypto/heimdal/lib/kadm5/Makefile.in                                 =
                        |    665 +-
 head/crypto/heimdal/lib/kadm5/acl.c                                       =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/ad.c                                        =
                        |    195 +-
 head/crypto/heimdal/lib/kadm5/admin.h                                     =
                        |     70 +-
 head/crypto/heimdal/lib/kadm5/bump_pw_expire.c                            =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/check-cracklib.pl                           =
                        |     14 +-
 head/crypto/heimdal/lib/kadm5/chpass_c.c                                  =
                        |     72 +-
 head/crypto/heimdal/lib/kadm5/chpass_s.c                                  =
                        |    130 +-
 head/crypto/heimdal/lib/kadm5/client_glue.c                               =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/common_glue.c                               =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/context_s.c                                 =
                        |     88 +-
 head/crypto/heimdal/lib/kadm5/create_c.c                                  =
                        |     62 +-
 head/crypto/heimdal/lib/kadm5/create_s.c                                  =
                        |     99 +-
 head/crypto/heimdal/lib/kadm5/default_keys.c                              =
                        |     56 +-
 head/crypto/heimdal/lib/kadm5/delete_c.c                                  =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/delete_s.c                                  =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/destroy_c.c                                 =
                        |     54 +-
 head/crypto/heimdal/lib/kadm5/destroy_s.c                                 =
                        |     62 +-
 head/crypto/heimdal/lib/kadm5/ent_setup.c                                 =
                        |     79 +-
 head/crypto/heimdal/lib/kadm5/error.c                                     =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/flush.c                                     =
                        |     56 +-
 head/crypto/heimdal/lib/kadm5/flush_c.c                                   =
                        |     26 +-
 head/crypto/heimdal/lib/kadm5/flush_s.c                                   =
                        |     26 +-
 head/crypto/heimdal/lib/kadm5/free.c                                      =
                        |     64 +-
 head/crypto/heimdal/lib/kadm5/get_c.c                                     =
                        |     64 +-
 head/crypto/heimdal/lib/kadm5/get_princs_c.c                              =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/get_princs_s.c                              =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/get_s.c                                     =
                        |    136 +-
 head/crypto/heimdal/lib/kadm5/init_c.c                                    =
                        |    234 +-
 head/crypto/heimdal/lib/kadm5/init_s.c                                    =
                        |    130 +-
 head/crypto/heimdal/lib/kadm5/iprop-commands.in                           =
                        |      4 +-
 head/crypto/heimdal/lib/kadm5/iprop-log.8                                 =
                        |    137 +-
 head/crypto/heimdal/lib/kadm5/iprop-log.c                                 =
                        |     91 +-
 head/crypto/heimdal/lib/kadm5/iprop.8                                     =
                        |    200 +-
 head/crypto/heimdal/lib/kadm5/iprop.h                                     =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/ipropd_common.c                             =
                        |     54 +-
 head/crypto/heimdal/lib/kadm5/ipropd_master.c                             =
                        |    219 +-
 head/crypto/heimdal/lib/kadm5/ipropd_slave.c                              =
                        |    450 +-
 head/crypto/heimdal/lib/kadm5/kadm5-private.h                             =
                        |     20 +-
 head/crypto/heimdal/lib/kadm5/kadm5-pwcheck.h                             =
                        |     54 +-
 head/crypto/heimdal/lib/kadm5/kadm5_err.et                                =
                        |      2 +-
 head/crypto/heimdal/lib/kadm5/kadm5_locl.h                                =
                        |     56 +-
 head/crypto/heimdal/lib/kadm5/kadm5_pwcheck.3                             =
                        |     35 +-
 head/crypto/heimdal/lib/kadm5/keys.c                                      =
                        |    100 +-
 head/crypto/heimdal/lib/kadm5/log.c                                       =
                        |    211 +-
 head/crypto/heimdal/lib/kadm5/marshall.c                                  =
                        |     84 +-
 head/crypto/heimdal/lib/kadm5/modify_c.c                                  =
                        |     60 +-
 head/crypto/heimdal/lib/kadm5/modify_s.c                                  =
                        |     70 +-
 head/crypto/heimdal/lib/kadm5/password_quality.c                          =
                        |    146 +-
 head/crypto/heimdal/lib/kadm5/private.h                                   =
                        |     64 +-
 head/crypto/heimdal/lib/kadm5/privs_c.c                                   =
                        |     58 +-
 head/crypto/heimdal/lib/kadm5/privs_s.c                                   =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/randkey_c.c                                 =
                        |     62 +-
 head/crypto/heimdal/lib/kadm5/randkey_s.c                                 =
                        |     62 +-
 head/crypto/heimdal/lib/kadm5/rename_c.c                                  =
                        |     54 +-
 head/crypto/heimdal/lib/kadm5/rename_s.c                                  =
                        |     63 +-
 head/crypto/heimdal/lib/kadm5/sample_passwd_check.c                       =
                        |     24 +-
 head/crypto/heimdal/lib/kadm5/send_recv.c                                 =
                        |     70 +-
 head/crypto/heimdal/lib/kadm5/server_glue.c                               =
                        |     52 +-
 head/crypto/heimdal/lib/kadm5/set_keys.c                                  =
                        |     78 +-
 head/crypto/heimdal/lib/kadm5/set_modifier.c                              =
                        |     54 +-
 head/crypto/heimdal/lib/kadm5/test_pw_quality.c                           =
                        |     54 +-
 head/crypto/heimdal/lib/kafs/ChangeLog                                    =
                        |     84 +-
 head/crypto/heimdal/lib/kafs/Makefile.am                                  =
                        |     26 +-
 head/crypto/heimdal/lib/kafs/Makefile.in                                  =
                        |    427 +-
 head/crypto/heimdal/lib/kafs/afskrb5.c                                    =
                        |     87 +-
 head/crypto/heimdal/lib/kafs/afslib.c                                     =
                        |     18 +-
 head/crypto/heimdal/lib/kafs/afssys.c                                     =
                        |     58 +-
 head/crypto/heimdal/lib/kafs/afssysdefs.h                                 =
                        |     14 +-
 head/crypto/heimdal/lib/kafs/common.c                                     =
                        |    141 +-
 head/crypto/heimdal/lib/kafs/kafs.3                                       =
                        |     68 +-
 head/crypto/heimdal/lib/kafs/kafs.h                                       =
                        |     22 +-
 head/crypto/heimdal/lib/kafs/kafs_locl.h                                  =
                        |     24 +-
 head/crypto/heimdal/lib/kafs/roken_rename.h                               =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/Makefile.am                                  =
                        |    154 +-
 head/crypto/heimdal/lib/krb5/Makefile.in                                  =
                        |   2278 +-
 head/crypto/heimdal/lib/krb5/acache.c                                     =
                        |    447 +-
 head/crypto/heimdal/lib/krb5/acl.c                                        =
                        |     42 +-
 head/crypto/heimdal/lib/krb5/add_et_list.c                                =
                        |     64 +-
 head/crypto/heimdal/lib/krb5/addr_families.c                              =
                        |    398 +-
 head/crypto/heimdal/lib/krb5/aes-test.c                                   =
                        |    788 +-
 head/crypto/heimdal/lib/krb5/aname_to_localname.c                         =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/appdefault.c                                 =
                        |    130 +-
 head/crypto/heimdal/lib/krb5/asn1_glue.c                                  =
                        |     72 +-
 head/crypto/heimdal/lib/krb5/auth_context.c                               =
                        |    165 +-
 head/crypto/heimdal/lib/krb5/build_ap_req.c                               =
                        |     60 +-
 head/crypto/heimdal/lib/krb5/build_auth.c                                 =
                        |    170 +-
 head/crypto/heimdal/lib/krb5/cache.c                                      =
                        |   1254 +-
 head/crypto/heimdal/lib/krb5/changepw.c                                   =
                        |    285 +-
 head/crypto/heimdal/lib/krb5/codec.c                                      =
                        |    102 +-
 head/crypto/heimdal/lib/krb5/config_file.c                                =
                        |    866 +-
 head/crypto/heimdal/lib/krb5/constants.c                                  =
                        |     82 +-
 head/crypto/heimdal/lib/krb5/context.c                                    =
                        |    871 +-
 head/crypto/heimdal/lib/krb5/convert_creds.c                              =
                        |    193 +-
 head/crypto/heimdal/lib/krb5/copy_host_realm.c                            =
                        |     71 +-
 head/crypto/heimdal/lib/krb5/crc.c                                        =
                        |     56 +-
 head/crypto/heimdal/lib/krb5/creds.c                                      =
                        |    128 +-
 head/crypto/heimdal/lib/krb5/crypto.c                                     =
                        |   4353 +-
 head/crypto/heimdal/lib/krb5/data.c                                       =
                        |    130 +-
 head/crypto/heimdal/lib/krb5/derived-key-test.c                           =
                        |     26 +-
 head/crypto/heimdal/lib/krb5/digest.c                                     =
                        |    422 +-
 head/crypto/heimdal/lib/krb5/doxygen.c                                    =
                        |    697 +-
 head/crypto/heimdal/lib/krb5/eai_to_heim_errno.c                          =
                        |     64 +-
 head/crypto/heimdal/lib/krb5/error_string.c                               =
                        |    329 +-
 head/crypto/heimdal/lib/krb5/expand_hostname.c                            =
                        |     97 +-
 head/crypto/heimdal/lib/krb5/fcache.c                                     =
                        |    593 +-
 head/crypto/heimdal/lib/krb5/free.c                                       =
                        |     56 +-
 head/crypto/heimdal/lib/krb5/free_host_realm.c                            =
                        |     63 +-
 head/crypto/heimdal/lib/krb5/generate_seq_number.c                        =
                        |     80 +-
 head/crypto/heimdal/lib/krb5/generate_subkey.c                            =
                        |     77 +-
 head/crypto/heimdal/lib/krb5/get_addrs.c                                  =
                        |    132 +-
 head/crypto/heimdal/lib/krb5/get_cred.c                                   =
                        |   1067 +-
 head/crypto/heimdal/lib/krb5/get_default_principal.c                      =
                        |    116 +-
 head/crypto/heimdal/lib/krb5/get_default_realm.c                          =
                        |     61 +-
 head/crypto/heimdal/lib/krb5/get_for_creds.c                              =
                        |    121 +-
 head/crypto/heimdal/lib/krb5/get_host_realm.c                             =
                        |     99 +-
 head/crypto/heimdal/lib/krb5/get_in_tkt.c                                 =
                        |    456 +-
 head/crypto/heimdal/lib/krb5/get_port.c                                   =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/heim_err.et                                  =
                        |      5 +-
 head/crypto/heimdal/lib/krb5/init_creds.c                                 =
                        |    270 +-
 head/crypto/heimdal/lib/krb5/init_creds_pw.c                              =
                        |   1696 +-
 head/crypto/heimdal/lib/krb5/k524_err.et                                  =
                        |      2 +-
 head/crypto/heimdal/lib/krb5/kcm.c                                        =
                        |    825 +-
 head/crypto/heimdal/lib/krb5/kcm.h                                        =
                        |     29 +-
 head/crypto/heimdal/lib/krb5/kerberos.8                                   =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/keyblock.c                                   =
                        |    157 +-
 head/crypto/heimdal/lib/krb5/keytab.c                                     =
                        |    677 +-
 head/crypto/heimdal/lib/krb5/keytab_any.c                                 =
                        |    106 +-
 head/crypto/heimdal/lib/krb5/keytab_file.c                                =
                        |    342 +-
 head/crypto/heimdal/lib/krb5/keytab_keyfile.c                             =
                        |    216 +-
 head/crypto/heimdal/lib/krb5/keytab_memory.c                              =
                        |    110 +-
 head/crypto/heimdal/lib/krb5/krb5-private.h                               =
                        |    508 +-
 head/crypto/heimdal/lib/krb5/krb5-protos.h                                =
                        |   2207 +-
 head/crypto/heimdal/lib/krb5/krb5-v4compat.h                              =
                        |     75 +-
 head/crypto/heimdal/lib/krb5/krb5.conf.5                                  =
                        |     59 +-
 head/crypto/heimdal/lib/krb5/krb5.h                                       =
                        |    452 +-
 head/crypto/heimdal/lib/krb5/krb5.moduli                                  =
                        |      2 +-
 head/crypto/heimdal/lib/krb5/krb524_convert_creds_kdc.3                   =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3                    =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_acl_match_file.3                        =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_aname_to_localname.3                    =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_appdefault.3                            =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_auth_context.3                          =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_c_make_checksum.3                       =
                        |     20 +-
 head/crypto/heimdal/lib/krb5/krb5_ccapi.h                                 =
                        |     75 +-
 head/crypto/heimdal/lib/krb5/krb5_check_transited.3                       =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_create_checksum.3                       =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_creds.3                                 =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_digest.3                                =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_eai_to_heim_errno.3                     =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_encrypt.3                               =
                        |     10 +-
 head/crypto/heimdal/lib/krb5/krb5_err.et                                  =
                        |     14 +-
 head/crypto/heimdal/lib/krb5/krb5_find_padata.3                           =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_generate_random_block.3                 =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3                  =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_get_credentials.3                       =
                        |     35 +-
 head/crypto/heimdal/lib/krb5/krb5_get_creds.3                             =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_get_forwarded_creds.3                   =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_get_in_cred.3                           =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_get_init_creds.3                        =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_get_krbhst.3                            =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_getportbyname.3                         =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_init_context.3                          =
                        |     14 +-
 head/crypto/heimdal/lib/krb5/krb5_is_thread_safe.3                        =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_krbhst_init.3                           =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_locl.h                                  =
                        |    165 +-
 head/crypto/heimdal/lib/krb5/krb5_mk_req.3                                =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_mk_safe.3                               =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_openlog.3                               =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_parse_name.3                            =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_principal.3                             =
                        |     24 +-
 head/crypto/heimdal/lib/krb5/krb5_rcache.3                                =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_rd_error.3                              =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_rd_safe.3                               =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_set_default_realm.3                     =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_set_password.3                          =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_string_to_key.3                         =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_timeofday.3                             =
                        |      6 +-
 head/crypto/heimdal/lib/krb5/krb5_verify_init_creds.3                     =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krb5_verify_user.3                           =
                        |      4 +-
 head/crypto/heimdal/lib/krb5/krbhst-test.c                                =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/krbhst.c                                     =
                        |    355 +-
 head/crypto/heimdal/lib/krb5/kuserok.c                                    =
                        |    135 +-
 head/crypto/heimdal/lib/krb5/locate_plugin.h                              =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/log.c                                        =
                        |    165 +-
 head/crypto/heimdal/lib/krb5/mcache.c                                     =
                        |    193 +-
 head/crypto/heimdal/lib/krb5/misc.c                                       =
                        |    114 +-
 head/crypto/heimdal/lib/krb5/mit_glue.c                                   =
                        |    221 +-
 head/crypto/heimdal/lib/krb5/mk_error.c                                   =
                        |     64 +-
 head/crypto/heimdal/lib/krb5/mk_priv.c                                    =
                        |     70 +-
 head/crypto/heimdal/lib/krb5/mk_rep.c                                     =
                        |     72 +-
 head/crypto/heimdal/lib/krb5/mk_req.c                                     =
                        |     60 +-
 head/crypto/heimdal/lib/krb5/mk_req_ext.c                                 =
                        |     77 +-
 head/crypto/heimdal/lib/krb5/mk_safe.c                                    =
                        |     68 +-
 head/crypto/heimdal/lib/krb5/n-fold-test.c                                =
                        |     24 +-
 head/crypto/heimdal/lib/krb5/n-fold.c                                     =
                        |     54 +-
 head/crypto/heimdal/lib/krb5/net_read.c                                   =
                        |     59 +-
 head/crypto/heimdal/lib/krb5/net_write.c                                  =
                        |     97 +-
 head/crypto/heimdal/lib/krb5/pac.c                                        =
                        |    566 +-
 head/crypto/heimdal/lib/krb5/padata.c                                     =
                        |     67 +-
 head/crypto/heimdal/lib/krb5/parse-name-test.c                            =
                        |     26 +-
 head/crypto/heimdal/lib/krb5/pkinit.c                                     =
                        |   1739 +-
 head/crypto/heimdal/lib/krb5/plugin.c                                     =
                        |    641 +-
 head/crypto/heimdal/lib/krb5/principal.c                                  =
                        |   1110 +-
 head/crypto/heimdal/lib/krb5/prog_setup.c                                 =
                        |     62 +-
 head/crypto/heimdal/lib/krb5/prompter_posix.c                             =
                        |     54 +-
 head/crypto/heimdal/lib/krb5/rd_cred.c                                    =
                        |    138 +-
 head/crypto/heimdal/lib/krb5/rd_error.c                                   =
                        |    104 +-
 head/crypto/heimdal/lib/krb5/rd_priv.c                                    =
                        |     99 +-
 head/crypto/heimdal/lib/krb5/rd_rep.c                                     =
                        |     89 +-
 head/crypto/heimdal/lib/krb5/rd_req.c                                     =
                        |    509 +-
 head/crypto/heimdal/lib/krb5/rd_safe.c                                    =
                        |    104 +-
 head/crypto/heimdal/lib/krb5/read_message.c                               =
                        |     66 +-
 head/crypto/heimdal/lib/krb5/recvauth.c                                   =
                        |     93 +-
 head/crypto/heimdal/lib/krb5/replay.c                                     =
                        |    168 +-
 head/crypto/heimdal/lib/krb5/send_to_kdc.c                                =
                        |    227 +-
 head/crypto/heimdal/lib/krb5/sendauth.c                                   =
                        |     71 +-
 head/crypto/heimdal/lib/krb5/set_default_realm.c                          =
                        |     64 +-
 head/crypto/heimdal/lib/krb5/sock_principal.c                             =
                        |     62 +-
 head/crypto/heimdal/lib/krb5/store-int.h                                  =
                        |     52 +-
 head/crypto/heimdal/lib/krb5/store-test.c                                 =
                        |     35 +-
 head/crypto/heimdal/lib/krb5/store.c                                      =
                        |    818 +-
 head/crypto/heimdal/lib/krb5/store_emem.c                                 =
                        |    122 +-
 head/crypto/heimdal/lib/krb5/store_fd.c                                   =
                        |     47 +-
 head/crypto/heimdal/lib/krb5/store_mem.c                                  =
                        |    125 +-
 head/crypto/heimdal/lib/krb5/string-to-key-test.c                         =
                        |     50 +-
 head/crypto/heimdal/lib/krb5/test_acl.c                                   =
                        |     31 +-
 head/crypto/heimdal/lib/krb5/test_addr.c                                  =
                        |     97 +-
 head/crypto/heimdal/lib/krb5/test_alname.c                                =
                        |     40 +-
 head/crypto/heimdal/lib/krb5/test_cc.c                                    =
                        |    348 +-
 head/crypto/heimdal/lib/krb5/test_config.c                                =
                        |    174 +-
 head/crypto/heimdal/lib/krb5/test_crypto.c                                =
                        |     39 +-
 head/crypto/heimdal/lib/krb5/test_crypto_wrapping.c                       =
                        |     32 +-
 head/crypto/heimdal/lib/krb5/test_forward.c                               =
                        |     30 +-
 head/crypto/heimdal/lib/krb5/test_get_addrs.c                             =
                        |     31 +-
 head/crypto/heimdal/lib/krb5/test_hostname.c                              =
                        |     26 +-
 head/crypto/heimdal/lib/krb5/test_keytab.c                                =
                        |    134 +-
 head/crypto/heimdal/lib/krb5/test_kuserok.c                               =
                        |     28 +-
 head/crypto/heimdal/lib/krb5/test_mem.c                                   =
                        |     28 +-
 head/crypto/heimdal/lib/krb5/test_pac.c                                   =
                        |    174 +-
 head/crypto/heimdal/lib/krb5/test_pkinit_dh2key.c                         =
                        |     30 +-
 head/crypto/heimdal/lib/krb5/test_plugin.c                                =
                        |     58 +-
 head/crypto/heimdal/lib/krb5/test_prf.c                                   =
                        |     28 +-
 head/crypto/heimdal/lib/krb5/test_princ.c                                 =
                        |     57 +-
 head/crypto/heimdal/lib/krb5/test_renew.c                                 =
                        |     31 +-
 head/crypto/heimdal/lib/krb5/test_store.c                                 =
                        |    133 +-
 head/crypto/heimdal/lib/krb5/test_time.c                                  =
                        |     26 +-
 head/crypto/heimdal/lib/krb5/ticket.c                                     =
                        |    692 +-
 head/crypto/heimdal/lib/krb5/time.c                                       =
                        |     95 +-
 head/crypto/heimdal/lib/krb5/transited.c                                  =
                        |    219 +-
 head/crypto/heimdal/lib/krb5/verify_init.c                                =
                        |    112 +-
 head/crypto/heimdal/lib/krb5/verify_krb5_conf.8                           =
                        |      8 +-
 head/crypto/heimdal/lib/krb5/verify_krb5_conf.c                           =
                        |    107 +-
 head/crypto/heimdal/lib/krb5/verify_user.c                                =
                        |    115 +-
 head/crypto/heimdal/lib/krb5/version-script.map                           =
                        |    110 +-
 head/crypto/heimdal/lib/krb5/version.c                                    =
                        |     54 +-
 head/crypto/heimdal/lib/krb5/warn.c                                       =
                        |    262 +-
 head/crypto/heimdal/lib/krb5/write_message.c                              =
                        |     60 +-
 head/crypto/heimdal/lib/ntlm/ChangeLog                                    =
                        |     38 +-
 head/crypto/heimdal/lib/ntlm/Makefile.am                                  =
                        |     32 +-
 head/crypto/heimdal/lib/ntlm/Makefile.in                                  =
                        |    425 +-
 head/crypto/heimdal/lib/ntlm/heimntlm-protos.h                            =
                        |     71 +-
 head/crypto/heimdal/lib/ntlm/heimntlm.h                                   =
                        |     93 +-
 head/crypto/heimdal/lib/ntlm/ntlm.c                                       =
                        |    907 +-
 head/crypto/heimdal/lib/ntlm/test_ntlm.c                                  =
                        |    115 +-
 head/crypto/heimdal/lib/ntlm/version-script.map                           =
                        |      5 +-
 head/crypto/heimdal/lib/roken/ChangeLog                                   =
                        |    219 +-
 head/crypto/heimdal/lib/roken/Makefile.am                                 =
                        |     75 +-
 head/crypto/heimdal/lib/roken/Makefile.in                                 =
                        |   1225 +-
 head/crypto/heimdal/lib/roken/base64-test.c                               =
                        |     21 +-
 head/crypto/heimdal/lib/roken/base64.c                                    =
                        |     28 +-
 head/crypto/heimdal/lib/roken/base64.h                                    =
                        |     22 +-
 head/crypto/heimdal/lib/roken/bswap.c                                     =
                        |     20 +-
 head/crypto/heimdal/lib/roken/chown.c                                     =
                        |     17 +-
 head/crypto/heimdal/lib/roken/closefrom.c                                 =
                        |     55 +-
 head/crypto/heimdal/lib/roken/concat.c                                    =
                        |     28 +-
 head/crypto/heimdal/lib/roken/copyhostent.c                               =
                        |     17 +-
 head/crypto/heimdal/lib/roken/daemon.c                                    =
                        |      6 +-
 head/crypto/heimdal/lib/roken/dumpdata.c                                  =
                        |     61 +-
 head/crypto/heimdal/lib/roken/ecalloc.3                                   =
                        |     58 +-
 head/crypto/heimdal/lib/roken/ecalloc.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/emalloc.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/environment.c                               =
                        |     27 +-
 head/crypto/heimdal/lib/roken/eread.c                                     =
                        |     20 +-
 head/crypto/heimdal/lib/roken/erealloc.c                                  =
                        |     17 +-
 head/crypto/heimdal/lib/roken/err.c                                       =
                        |     19 +-
 head/crypto/heimdal/lib/roken/err.hin                                     =
                        |     24 +-
 head/crypto/heimdal/lib/roken/errx.c                                      =
                        |     19 +-
 head/crypto/heimdal/lib/roken/esetenv.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/estrdup.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/ewrite.c                                    =
                        |     20 +-
 head/crypto/heimdal/lib/roken/fchown.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/flock.c                                     =
                        |     93 +-
 head/crypto/heimdal/lib/roken/fnmatch.c                                   =
                        |     12 +-
 head/crypto/heimdal/lib/roken/fnmatch.hin                                 =
                        |      4 +-
 head/crypto/heimdal/lib/roken/freeaddrinfo.c                              =
                        |     17 +-
 head/crypto/heimdal/lib/roken/freehostent.c                               =
                        |     17 +-
 head/crypto/heimdal/lib/roken/gai_strerror.c                              =
                        |     17 +-
 head/crypto/heimdal/lib/roken/get_default_username.c                      =
                        |     61 +-
 head/crypto/heimdal/lib/roken/get_window_size.c                           =
                        |     98 +-
 head/crypto/heimdal/lib/roken/getaddrinfo-test.c                          =
                        |     57 +-
 head/crypto/heimdal/lib/roken/getaddrinfo.c                               =
                        |     17 +-
 head/crypto/heimdal/lib/roken/getaddrinfo_hostspec.c                      =
                        |     35 +-
 head/crypto/heimdal/lib/roken/getarg.3                                    =
                        |     70 +-
 head/crypto/heimdal/lib/roken/getarg.c                                    =
                        |    186 +-
 head/crypto/heimdal/lib/roken/getarg.h                                    =
                        |     80 +-
 head/crypto/heimdal/lib/roken/getcap.c                                    =
                        |    107 +-
 head/crypto/heimdal/lib/roken/getcwd.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/getdtablesize.c                             =
                        |     23 +-
 head/crypto/heimdal/lib/roken/getegid.c                                   =
                        |     19 +-
 head/crypto/heimdal/lib/roken/geteuid.c                                   =
                        |     19 +-
 head/crypto/heimdal/lib/roken/getgid.c                                    =
                        |     18 +-
 head/crypto/heimdal/lib/roken/gethostname.c                               =
                        |     16 +-
 head/crypto/heimdal/lib/roken/getifaddrs.c                                =
                        |    171 +-
 head/crypto/heimdal/lib/roken/getipnodebyaddr.c                           =
                        |     17 +-
 head/crypto/heimdal/lib/roken/getipnodebyname.c                           =
                        |     17 +-
 head/crypto/heimdal/lib/roken/getnameinfo.c                               =
                        |     17 +-
 head/crypto/heimdal/lib/roken/getnameinfo_verified.c                      =
                        |     26 +-
 head/crypto/heimdal/lib/roken/getopt.c                                    =
                        |     20 +-
 head/crypto/heimdal/lib/roken/getprogname.c                               =
                        |     19 +-
 head/crypto/heimdal/lib/roken/gettimeofday.c                              =
                        |     45 +-
 head/crypto/heimdal/lib/roken/getuid.c                                    =
                        |     18 +-
 head/crypto/heimdal/lib/roken/getusershell.c                              =
                        |     10 +-
 head/crypto/heimdal/lib/roken/glob.c                                      =
                        |     62 +-
 head/crypto/heimdal/lib/roken/glob.hin                                    =
                        |      4 +-
 head/crypto/heimdal/lib/roken/h_errno.c                                   =
                        |     15 +-
 head/crypto/heimdal/lib/roken/hex-test.c                                  =
                        |     18 +-
 head/crypto/heimdal/lib/roken/hex.c                                       =
                        |     29 +-
 head/crypto/heimdal/lib/roken/hex.h                                       =
                        |     22 +-
 head/crypto/heimdal/lib/roken/hostent_find_fqdn.c                         =
                        |     17 +-
 head/crypto/heimdal/lib/roken/hstrerror.c                                 =
                        |     17 +-
 head/crypto/heimdal/lib/roken/ifaddrs.hin                                 =
                        |      8 +-
 head/crypto/heimdal/lib/roken/inet_aton.c                                 =
                        |     17 +-
 head/crypto/heimdal/lib/roken/inet_ntop.c                                 =
                        |     38 +-
 head/crypto/heimdal/lib/roken/inet_pton.c                                 =
                        |     87 +-
 head/crypto/heimdal/lib/roken/initgroups.c                                =
                        |     17 +-
 head/crypto/heimdal/lib/roken/innetgr.c                                   =
                        |     30 +-
 head/crypto/heimdal/lib/roken/iruserok.c                                  =
                        |      5 +-
 head/crypto/heimdal/lib/roken/issuid.c                                    =
                        |     55 +-
 head/crypto/heimdal/lib/roken/k_getpwnam.c                                =
                        |     17 +-
 head/crypto/heimdal/lib/roken/k_getpwuid.c                                =
                        |     17 +-
 head/crypto/heimdal/lib/roken/localtime_r.c                               =
                        |     25 +-
 head/crypto/heimdal/lib/roken/lstat.c                                     =
                        |     17 +-
 head/crypto/heimdal/lib/roken/memmove.c                                   =
                        |     21 +-
 head/crypto/heimdal/lib/roken/mini_inetd.c                                =
                        |    135 +-
 head/crypto/heimdal/lib/roken/mkstemp.c                                   =
                        |     20 +-
 head/crypto/heimdal/lib/roken/ndbm_wrap.c                                 =
                        |     56 +-
 head/crypto/heimdal/lib/roken/ndbm_wrap.h                                 =
                        |     36 +-
 head/crypto/heimdal/lib/roken/net_read.c                                  =
                        |     82 +-
 head/crypto/heimdal/lib/roken/net_write.c                                 =
                        |     71 +-
 head/crypto/heimdal/lib/roken/parse_bytes-test.c                          =
                        |     55 +-
 head/crypto/heimdal/lib/roken/parse_bytes.c                               =
                        |     59 +-
 head/crypto/heimdal/lib/roken/parse_bytes.h                               =
                        |     62 +-
 head/crypto/heimdal/lib/roken/parse_reply-test.c                          =
                        |     53 +-
 head/crypto/heimdal/lib/roken/parse_time-test.c                           =
                        |     71 +-
 head/crypto/heimdal/lib/roken/parse_time.3                                =
                        |     74 +-
 head/crypto/heimdal/lib/roken/parse_time.c                                =
                        |     61 +-
 head/crypto/heimdal/lib/roken/parse_time.h                                =
                        |     64 +-
 head/crypto/heimdal/lib/roken/parse_units.c                               =
                        |     77 +-
 head/crypto/heimdal/lib/roken/parse_units.h                               =
                        |     70 +-
 head/crypto/heimdal/lib/roken/putenv.c                                    =
                        |     21 +-
 head/crypto/heimdal/lib/roken/rcmd.c                                      =
                        |     17 +-
 head/crypto/heimdal/lib/roken/readv.c                                     =
                        |     17 +-
 head/crypto/heimdal/lib/roken/realloc.c                                   =
                        |     20 +-
 head/crypto/heimdal/lib/roken/recvmsg.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/resolve-test.c                              =
                        |    192 +-
 head/crypto/heimdal/lib/roken/resolve.c                                   =
                        |    473 +-
 head/crypto/heimdal/lib/roken/resolve.h                                   =
                        |    165 +-
 head/crypto/heimdal/lib/roken/roken-common.h                              =
                        |    221 +-
 head/crypto/heimdal/lib/roken/roken.awk                                   =
                        |     11 +-
 head/crypto/heimdal/lib/roken/roken.h.in                                  =
                        |    718 +-
 head/crypto/heimdal/lib/roken/roken_gethostby.c                           =
                        |     91 +-
 head/crypto/heimdal/lib/roken/rtbl.3                                      =
                        |      6 +-
 head/crypto/heimdal/lib/roken/rtbl.c                                      =
                        |     64 +-
 head/crypto/heimdal/lib/roken/rtbl.h                                      =
                        |     50 +-
 head/crypto/heimdal/lib/roken/sendmsg.c                                   =
                        |    105 +-
 head/crypto/heimdal/lib/roken/setegid.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/setenv.c                                    =
                        |     36 +-
 head/crypto/heimdal/lib/roken/seteuid.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/setprogname.c                               =
                        |     52 +-
 head/crypto/heimdal/lib/roken/signal.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/simple_exec.c                               =
                        |    124 +-
 head/crypto/heimdal/lib/roken/snprintf-test.c                             =
                        |     33 +-
 head/crypto/heimdal/lib/roken/snprintf.c                                  =
                        |     78 +-
 head/crypto/heimdal/lib/roken/socket.c                                    =
                        |    152 +-
 head/crypto/heimdal/lib/roken/socket_wrapper.c                            =
                        |     96 +-
 head/crypto/heimdal/lib/roken/socket_wrapper.h                            =
                        |     10 +-
 head/crypto/heimdal/lib/roken/strcasecmp.c                                =
                        |     55 +-
 head/crypto/heimdal/lib/roken/strcollect.c                                =
                        |     57 +-
 head/crypto/heimdal/lib/roken/strdup.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strerror.c                                  =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strftime.c                                  =
                        |     40 +-
 head/crypto/heimdal/lib/roken/strlcat.c                                   =
                        |     30 +-
 head/crypto/heimdal/lib/roken/strlcpy.c                                   =
                        |     25 +-
 head/crypto/heimdal/lib/roken/strlwr.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strncasecmp.c                               =
                        |     57 +-
 head/crypto/heimdal/lib/roken/strndup.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strnlen.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strpftime-test.c                            =
                        |     28 +-
 head/crypto/heimdal/lib/roken/strpftime-test.h                            =
                        |     29 +-
 head/crypto/heimdal/lib/roken/strpool.c                                   =
                        |     64 +-
 head/crypto/heimdal/lib/roken/strptime.c                                  =
                        |     32 +-
 head/crypto/heimdal/lib/roken/strsep.c                                    =
                        |     55 +-
 head/crypto/heimdal/lib/roken/strsep_copy.c                               =
                        |     57 +-
 head/crypto/heimdal/lib/roken/strtok_r.c                                  =
                        |     17 +-
 head/crypto/heimdal/lib/roken/strupr.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/swab.c                                      =
                        |     18 +-
 head/crypto/heimdal/lib/roken/test-mem.c                                  =
                        |     93 +-
 head/crypto/heimdal/lib/roken/test-mem.h                                  =
                        |     54 +-
 head/crypto/heimdal/lib/roken/test-readenv.c                              =
                        |     57 +-
 head/crypto/heimdal/lib/roken/timegm.c                                    =
                        |     65 +-
 head/crypto/heimdal/lib/roken/timeval.c                                   =
                        |     25 +-
 head/crypto/heimdal/lib/roken/tm2time.c                                   =
                        |     17 +-
 head/crypto/heimdal/lib/roken/unsetenv.c                                  =
                        |     21 +-
 head/crypto/heimdal/lib/roken/unvis.c                                     =
                        |     45 +-
 head/crypto/heimdal/lib/roken/verify.c                                    =
                        |     19 +-
 head/crypto/heimdal/lib/roken/verr.c                                      =
                        |     21 +-
 head/crypto/heimdal/lib/roken/verrx.c                                     =
                        |     21 +-
 head/crypto/heimdal/lib/roken/vis.c                                       =
                        |    395 +-
 head/crypto/heimdal/lib/roken/vis.hin                                     =
                        |     74 +-
 head/crypto/heimdal/lib/roken/vsyslog.c                                   =
                        |     22 +-
 head/crypto/heimdal/lib/roken/vwarn.c                                     =
                        |     21 +-
 head/crypto/heimdal/lib/roken/vwarnx.c                                    =
                        |     21 +-
 head/crypto/heimdal/lib/roken/warn.c                                      =
                        |     17 +-
 head/crypto/heimdal/lib/roken/warnerr.c                                   =
                        |     21 +-
 head/crypto/heimdal/lib/roken/warnx.c                                     =
                        |     19 +-
 head/crypto/heimdal/lib/roken/write_pid.c                                 =
                        |     69 +-
 head/crypto/heimdal/lib/roken/writev.c                                    =
                        |     17 +-
 head/crypto/heimdal/lib/roken/xdbm.h                                      =
                        |     14 +-
 head/crypto/heimdal/lib/sl/ChangeLog                                      =
                        |     44 +-
 head/crypto/heimdal/lib/sl/Makefile.am                                    =
                        |     28 +-
 head/crypto/heimdal/lib/sl/Makefile.in                                    =
                        |    568 +-
 head/crypto/heimdal/lib/sl/roken_rename.h                                 =
                        |     70 +-
 head/crypto/heimdal/lib/sl/sl.c                                           =
                        |     35 +-
 head/crypto/heimdal/lib/sl/sl.h                                           =
                        |     20 +-
 head/crypto/heimdal/lib/sl/sl_locl.h                                      =
                        |     16 +-
 head/crypto/heimdal/lib/sl/slc-gram.c                                     =
                        |    163 +-
 head/crypto/heimdal/lib/sl/slc-gram.h                                     =
                        |      2 +-
 head/crypto/heimdal/lib/sl/slc-gram.y                                     =
                        |    143 +-
 head/crypto/heimdal/lib/sl/slc-lex.c                                      =
                        |    226 +-
 head/crypto/heimdal/lib/sl/slc-lex.l                                      =
                        |     68 +-
 head/crypto/heimdal/lib/sl/slc.h                                          =
                        |     52 +-
 head/crypto/heimdal/lib/sl/test_sl.c                                      =
                        |     26 +-
 head/crypto/heimdal/lib/vers/ChangeLog                                    =
                        |     16 +-
 head/crypto/heimdal/lib/vers/Makefile.am                                  =
                        |     25 +-
 head/crypto/heimdal/lib/vers/Makefile.in                                  =
                        |    268 +-
 head/crypto/heimdal/lib/vers/print_version.c                              =
                        |     71 +-
 head/crypto/heimdal/lib/vers/vers.h                                       =
                        |     14 +-
 head/crypto/heimdal/ltmain.sh                                             =
                        |  10743 +-
 head/crypto/heimdal/missing                                               =
                        |     49 +-
 head/crypto/heimdal/tools/Makefile.am                                     =
                        |      5 +-
 head/crypto/heimdal/tools/Makefile.in                                     =
                        |    328 +-
 head/crypto/heimdal/tools/heimdal-gssapi.pc.in                            =
                        |      4 +-
 head/crypto/heimdal/tools/kdc-log-analyze.pl                              =
                        |      4 +-
 head/crypto/heimdal/tools/krb5-config.1                                   =
                        |     68 +-
 head/crypto/heimdal/tools/krb5-config.in                                  =
                        |     38 +-
 head/etc/defaults/rc.conf                                                 =
                        |      4 +-
 head/etc/mtree/BSD.include.dist                                           =
                        |      8 +-
 head/etc/mtree/BSD.usr.dist                                               =
                        |      4 +-
 head/etc/rc.d/Makefile                                                    =
                        |      3 +-
 head/etc/root/dot.cshrc                                                   =
                        |     25 +-
 head/etc/services                                                         =
                        |      4 +-
 head/games/pom/pom.6                                                      =
                        |      4 +-
 head/gnu/lib/csu/Makefile                                                 =
                        |      3 +-
 head/gnu/lib/libgcc/Makefile                                              =
                        |      4 +-
 head/gnu/lib/libstdc++/Makefile                                           =
                        |      4 +-
 head/gnu/lib/libsupc++/Makefile                                           =
                        |      9 +-
 head/gnu/usr.bin/binutils/Makefile.inc0                                   =
                        |      7 +-
 head/gnu/usr.bin/binutils/as/Makefile                                     =
                        |      9 +-
 head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h                      =
                        |      7 +-
 head/gnu/usr.bin/cc/Makefile.tgt                                          =
                        |      7 +-
 head/gnu/usr.bin/gdb/Makefile.inc                                         =
                        |      4 +-
 head/gnu/usr.bin/gdb/libgdb/Makefile                                      =
                        |      4 +-
 head/include/ctype.h                                                      =
                        |      4 +-
 head/include/inttypes.h                                                   =
                        |      5 +-
 head/include/langinfo.h                                                   =
                        |      4 +-
 head/include/malloc_np.h                                                  =
                        |     29 +-
 head/include/monetary.h                                                   =
                        |      5 +-
 head/include/stdio.h                                                      =
                        |      5 +-
 head/include/stdlib.h                                                     =
                        |     12 +-
 head/include/string.h                                                     =
                        |      4 +-
 head/include/time.h                                                       =
                        |      4 +-
 head/include/wchar.h                                                      =
                        |      4 +-
 head/kerberos5/Makefile.inc                                               =
                        |      8 +-
 head/kerberos5/include/config.h                                           =
                        |    294 +-
 head/kerberos5/include/crypto-headers.h                                   =
                        |     16 +-
 head/kerberos5/include/krb5-types.h                                       =
                        |     52 +-
 head/kerberos5/include/version.h                                          =
                        |      9 +-
 head/kerberos5/lib/Makefile                                               =
                        |      4 +-
 head/kerberos5/lib/Makefile.inc                                           =
                        |      4 +-
 head/kerberos5/lib/libasn1/Makefile                                       =
                        |    493 +-
 head/kerberos5/lib/libgssapi_krb5/Makefile                                =
                        |     15 +-
 head/kerberos5/lib/libgssapi_krb5/gss_krb5.c                              =
                        |      3 +-
 head/kerberos5/lib/libgssapi_ntlm/Makefile                                =
                        |     15 +-
 head/kerberos5/lib/libgssapi_ntlm/prefix.c                                =
                        |      9 +-
 head/kerberos5/lib/libgssapi_spnego/Makefile                              =
                        |     48 +-
 head/kerberos5/lib/libhdb/Makefile                                        =
                        |     81 +-
 head/kerberos5/lib/libheimntlm/Makefile                                   =
                        |     40 +-
 head/kerberos5/lib/libhx509/Makefile                                      =
                        |    244 +-
 head/kerberos5/lib/libkadm5clnt/Makefile                                  =
                        |      8 +-
 head/kerberos5/lib/libkadm5srv/Makefile                                   =
                        |      7 +-
 head/kerberos5/lib/libkafs5/Makefile                                      =
                        |     16 +-
 head/kerberos5/lib/libkrb5/Makefile                                       =
                        |    373 +-
 head/kerberos5/lib/libroken/Makefile                                      =
                        |     56 +-
 head/kerberos5/lib/libvers/Makefile                                       =
                        |     15 +-
 head/kerberos5/libexec/Makefile                                           =
                        |      5 +-
 head/kerberos5/libexec/hprop/Makefile                                     =
                        |      4 +-
 head/kerberos5/libexec/ipropd-master/Makefile                             =
                        |      4 +-
 head/kerberos5/libexec/kadmind/Makefile                                   =
                        |     17 +-
 head/kerberos5/libexec/kcm/Makefile                                       =
                        |     16 +-
 head/kerberos5/libexec/kdc/Makefile                                       =
                        |     29 +-
 head/kerberos5/tools/Makefile                                             =
                        |      4 +-
 head/kerberos5/tools/Makefile.inc                                         =
                        |      4 +-
 head/kerberos5/tools/asn1_compile/Makefile                                =
                        |     56 +-
 head/kerberos5/tools/make-roken/Makefile                                  =
                        |      6 +-
 head/kerberos5/tools/slc/Makefile                                         =
                        |     33 +-
 head/kerberos5/usr.bin/Makefile                                           =
                        |      6 +-
 head/kerberos5/usr.bin/kadmin/Makefile                                    =
                        |      9 +-
 head/kerberos5/usr.bin/kdestroy/Makefile                                  =
                        |     11 +-
 head/kerberos5/usr.bin/kinit/Makefile                                     =
                        |      8 +-
 head/kerberos5/usr.bin/krb5-config/Makefile                               =
                        |      3 +-
 head/kerberos5/usr.sbin/Makefile                                          =
                        |      4 +-
 head/kerberos5/usr.sbin/kstash/Makefile                                   =
                        |     10 +-
 head/kerberos5/usr.sbin/ktutil/Makefile                                   =
                        |     21 +-
 head/lib/Makefile                                                         =
                        |     12 +-
 head/lib/bind/config.h                                                    =
                        |      7 +-
 head/lib/bind/dns/code.h                                                  =
                        |      4 +-
 head/lib/bind/dns/dns/enumclass.h                                         =
                        |      4 +-
 head/lib/bind/dns/dns/enumtype.h                                          =
                        |      4 +-
 head/lib/bind/dns/dns/rdatastruct.h                                       =
                        |    126 +-
 head/lib/bind/lwres/lwres/netdb.h                                         =
                        |      4 +-
 head/lib/bind/lwres/lwres/platform.h                                      =
                        |      4 +-
 head/lib/clang/Makefile                                                   =
                        |      8 +-
 head/lib/clang/clang.build.mk                                             =
                        |     27 +-
 head/lib/clang/include/Makefile                                           =
                        |      7 +-
 head/lib/clang/include/clang/Basic/Version.inc                            =
                        |     10 +-
 head/lib/clang/include/llvm/Config/config.h                               =
                        |     65 +-
 head/lib/clang/include/llvm/Config/llvm-config.h                          =
                        |     20 +-
 head/lib/clang/libclanganalysis/Makefile                                  =
                        |      7 +-
 head/lib/clang/libclangarcmigrate/Makefile                                =
                        |      6 +-
 head/lib/clang/libclangast/Makefile                                       =
                        |      4 +-
 head/lib/clang/libclangbasic/Makefile                                     =
                        |      4 +-
 head/lib/clang/libclangcodegen/Makefile                                   =
                        |      3 +-
 head/lib/clang/libclangdriver/Makefile                                    =
                        |      6 +-
 head/lib/clang/libclangfrontend/Makefile                                  =
                        |     10 +-
 head/lib/clang/libclangindex/Makefile                                     =
                        |      3 +-
 head/lib/clang/libclanglex/Makefile                                       =
                        |      4 +-
 head/lib/clang/libclangparse/Makefile                                     =
                        |      3 +-
 head/lib/clang/libclangrewrite/Makefile                                   =
                        |      4 +-
 head/lib/clang/libclangsema/Makefile                                      =
                        |     11 +-
 head/lib/clang/libclangserialization/Makefile                             =
                        |      5 +-
 head/lib/clang/libclangstaticanalyzercheckers/Makefile                    =
                        |     14 +-
 head/lib/clang/libclangstaticanalyzercore/Makefile                        =
                        |      7 +-
 head/lib/clang/libllvmanalysis/Makefile                                   =
                        |     11 +-
 head/lib/clang/libllvmarmcodegen/Makefile                                 =
                        |      4 +-
 head/lib/clang/libllvmarmdesc/Makefile                                    =
                        |      3 +-
 head/lib/clang/libllvmasmprinter/Makefile                                 =
                        |      3 +-
 head/lib/clang/libllvmcodegen/Makefile                                    =
                        |     22 +-
 head/lib/clang/libllvmcore/Makefile                                       =
                        |      3 +-
 head/lib/clang/libllvminstrumentation/Makefile                            =
                        |      9 +-
 head/lib/clang/libllvmjit/Makefile                                        =
                        |      9 +-
 head/lib/clang/libllvmmc/Makefile                                         =
                        |      3 +-
 head/lib/clang/libllvmmcjit/Makefile                                      =
                        |     11 +-
 head/lib/clang/libllvmmipscodegen/Makefile                                =
                        |      7 +-
 head/lib/clang/libllvmmipsdesc/Makefile                                   =
                        |      4 +-
 head/lib/clang/libllvmpowerpccodegen/Makefile                             =
                        |      3 +-
 head/lib/clang/libllvmpowerpcdesc/Makefile                                =
                        |      5 +-
 head/lib/clang/libllvmruntimedyld/Makefile                                =
                        |      3 +-
 head/lib/clang/libllvmscalaropts/Makefile                                 =
                        |      5 +-
 head/lib/clang/libllvmselectiondag/Makefile                               =
                        |      6 +-
 head/lib/clang/libllvmsupport/Makefile                                    =
                        |      9 +-
 head/lib/clang/libllvmtablegen/Makefile                                   =
                        |      3 +-
 head/lib/clang/libllvmtarget/Makefile                                     =
                        |      5 +-
 head/lib/clang/libllvmtransformutils/Makefile                             =
                        |      7 +-
 head/lib/clang/libllvmx86codegen/Makefile                                 =
                        |      3 +-
 head/lib/clang/libllvmx86desc/Makefile                                    =
                        |      6 +-
 head/lib/csu/powerpc/Makefile                                             =
                        |      5 +-
 head/lib/libarchive/Makefile                                              =
                        |      3 +-
 head/lib/libbluetooth/bluetooth.3                                         =
                        |      6 +-
 head/lib/libc/Makefile                                                    =
                        |      3 +-
 head/lib/libc/arm/gen/Makefile.inc                                        =
                        |      4 +-
 head/lib/libc/gen/fstab.c                                                 =
                        |      4 +-
 head/lib/libc/gen/fts.3                                                   =
                        |      8 +-
 head/lib/libc/gen/getpagesizes.3                                          =
                        |      4 +-
 head/lib/libc/gen/getutxent.c                                             =
                        |      7 +-
 head/lib/libc/gen/psignal.3                                               =
                        |      4 +-
 head/lib/libc/gen/sem_new.c                                               =
                        |     40 +-
 head/lib/libc/gen/sysconf.3                                               =
                        |      4 +-
 head/lib/libc/gen/tls.c                                                   =
                        |     25 +-
 head/lib/libc/gen/utxdb.c                                                 =
                        |      6 +-
 head/lib/libc/i386/sys/i386_get_ioperm.2                                  =
                        |      4 +-
 head/lib/libc/i386/sys/i386_set_watch.3                                   =
                        |      4 +-
 head/lib/libc/i386/sys/i386_vm86.2                                        =
                        |      4 +-
 head/lib/libc/iconv/iconv.3                                               =
                        |      4 +-
 head/lib/libc/iconv/iconvctl.3                                            =
                        |      6 +-
 head/lib/libc/iconv/iconvlist.3                                           =
                        |      4 +-
 head/lib/libc/locale/ctype.3                                              =
                        |      4 +-
 head/lib/libc/locale/ctype_l.3                                            =
                        |      6 +-
 head/lib/libc/locale/digittoint.3                                         =
                        |      4 +-
 head/lib/libc/locale/duplocale.3                                          =
                        |     21 +-
 head/lib/libc/locale/isalnum.3                                            =
                        |     30 +-
 head/lib/libc/locale/isalpha.3                                            =
                        |     28 +-
 head/lib/libc/locale/isblank.3                                            =
                        |      4 +-
 head/lib/libc/locale/iscntrl.3                                            =
                        |     19 +-
 head/lib/libc/locale/isdigit.3                                            =
                        |      7 +-
 head/lib/libc/locale/isgraph.3                                            =
                        |     41 +-
 head/lib/libc/locale/islower.3                                            =
                        |     15 +-
 head/lib/libc/locale/isprint.3                                            =
                        |     41 +-
 head/lib/libc/locale/ispunct.3                                            =
                        |     17 +-
 head/lib/libc/locale/isspace.3                                            =
                        |      5 +-
 head/lib/libc/locale/isupper.3                                            =
                        |     15 +-
 head/lib/libc/locale/isxdigit.3                                           =
                        |     13 +-
 head/lib/libc/locale/newlocale.3                                          =
                        |      8 +-
 head/lib/libc/locale/xlocale.3                                            =
                        |     33 +-
 head/lib/libc/net/getaddrinfo.c                                           =
                        |      4 +-
 head/lib/libc/net/getipnodebyname.3                                       =
                        |     14 +-
 head/lib/libc/net/if_nametoindex.c                                        =
                        |      5 +-
 head/lib/libc/net/inet_net.3                                              =
                        |      3 +-
 head/lib/libc/net/name6.c                                                 =
                        |      4 +-
 head/lib/libc/net/nsdispatch.3                                            =
                        |     11 +-
 head/lib/libc/net/sctp_bindx.3                                            =
                        |      6 +-
 head/lib/libc/net/sctp_connectx.3                                         =
                        |     10 +-
 head/lib/libc/net/sctp_freepaddrs.3                                       =
                        |      6 +-
 head/lib/libc/net/sctp_getaddrlen.3                                       =
                        |      4 +-
 head/lib/libc/net/sctp_getassocid.3                                       =
                        |      5 +-
 head/lib/libc/net/sctp_getpaddrs.3                                        =
                        |      4 +-
 head/lib/libc/net/sctp_opt_info.3                                         =
                        |      6 +-
 head/lib/libc/net/sctp_recvmsg.3                                          =
                        |     36 +-
 head/lib/libc/net/sctp_send.3                                             =
                        |     40 +-
 head/lib/libc/net/sctp_sendmsg.3                                          =
                        |     36 +-
 head/lib/libc/net/sourcefilter.3                                          =
                        |      4 +-
 head/lib/libc/posix1e/acl_add_flag_np.3                                   =
                        |     12 +-
 head/lib/libc/posix1e/acl_add_perm.3                                      =
                        |     34 +-
 head/lib/libc/posix1e/acl_create_entry.3                                  =
                        |      4 +-
 head/lib/libc/posix1e/acl_set_entry_type_np.3                             =
                        |      6 +-
 head/lib/libc/posix1e/acl_set_tag_type.3                                  =
                        |     18 +-
 head/lib/libc/posix1e/acl_to_text.3                                       =
                        |      9 +-
 head/lib/libc/powerpc/gen/_setjmp.S                                       =
                        |      3 +-
 head/lib/libc/powerpc/gen/setjmp.S                                        =
                        |      3 +-
 head/lib/libc/powerpc/gen/sigsetjmp.S                                     =
                        |      3 +-
 head/lib/libc/powerpc64/gen/_setjmp.S                                     =
                        |      3 +-
 head/lib/libc/powerpc64/gen/makecontext.c                                 =
                        |      4 +-
 head/lib/libc/powerpc64/gen/setjmp.S                                      =
                        |      3 +-
 head/lib/libc/powerpc64/gen/sigsetjmp.S                                   =
                        |      3 +-
 head/lib/libc/rpc/rpc_soc.3                                               =
                        |     19 +-
 head/lib/libc/stdio/getline.3                                             =
                        |      4 +-
 head/lib/libc/stdlib/Makefile.inc                                         =
                        |     18 +-
 head/lib/libc/stdlib/Symbol.map                                           =
                        |     14 +-
 head/lib/libc/stdlib/at_quick_exit.3                                      =
                        |     14 +-
 head/lib/libc/stdlib/getenv.3                                             =
                        |      4 +-
 head/lib/libc/string/memchr.3                                             =
                        |      4 +-
 head/lib/libc/sys/cap_new.2                                               =
                        |     12 +-
 head/lib/libc/sys/chflags.2                                               =
                        |     25 +-
 head/lib/libc/sys/cpuset.2                                                =
                        |     10 +-
 head/lib/libc/sys/cpuset_getaffinity.2                                    =
                        |      5 +-
 head/lib/libc/sys/dup.2                                                   =
                        |     19 +-
 head/lib/libc/sys/fcntl.2                                                 =
                        |      4 +-
 head/lib/libc/sys/jail.2                                                  =
                        |      6 +-
 head/lib/libc/sys/kldstat.2                                               =
                        |      6 +-
 head/lib/libc/sys/kqueue.2                                                =
                        |     10 +-
 head/lib/libc/sys/kse.2                                                   =
                        |      4 +-
 head/lib/libc/sys/ktrace.2                                                =
                        |     36 +-
 head/lib/libc/sys/pathconf.2                                              =
                        |      5 +-
 head/lib/libc/sys/posix_fadvise.2                                         =
                        |      3 +-
 head/lib/libc/sys/posix_fallocate.2                                       =
                        |      3 +-
 head/lib/libc/sys/ptrace.2                                                =
                        |      4 +-
 head/lib/libc/sys/quotactl.2                                              =
                        |      6 +-
 head/lib/libc/sys/sctp_generic_sendmsg.2                                  =
                        |      6 +-
 head/lib/libc/sys/sctp_peeloff.2                                          =
                        |      5 +-
 head/lib/libc/sys/select.2                                                =
                        |      4 +-
 head/lib/libc/sys/sendfile.2                                              =
                        |      4 +-
 head/lib/libc/sys/shm_open.2                                              =
                        |      3 +-
 head/lib/libcom_err/Makefile                                              =
                        |      5 +-
 head/lib/libcrypt/crypt.3                                                 =
                        |      8 +-
 head/lib/libcxxrt/Version.map                                             =
                        |      7 +-
 head/lib/libelf/elf.3                                                     =
                        |      4 +-
 head/lib/libelf/elf_getdata.3                                             =
                        |      4 +-
 head/lib/libelf/elf_getphdrnum.3                                          =
                        |      5 +-
 head/lib/libelf/elf_getphnum.3                                            =
                        |      3 +-
 head/lib/libelf/elf_getshdrnum.3                                          =
                        |      5 +-
 head/lib/libelf/elf_getshdrstrndx.3                                       =
                        |      5 +-
 head/lib/libelf/elf_getshnum.3                                            =
                        |      3 +-
 head/lib/libelf/elf_getshstrndx.3                                         =
                        |      3 +-
 head/lib/libelf/libelf_data.c                                             =
                        |      6 +-
 head/lib/libfetch/fetch.3                                                 =
                        |      4 +-
 head/lib/libfetch/fetch.c                                                 =
                        |     53 +-
 head/lib/libgpib/gpib.3                                                   =
                        |      3 +-
 head/lib/libgssapi/Symbol.map                                             =
                        |      3 +-
 head/lib/libgssapi/gss_accept_sec_context.3                               =
                        |      4 +-
 head/lib/libgssapi/gss_display_status.c                                   =
                        |     14 +-
 head/lib/libgssapi/gss_release_buffer.3                                   =
                        |      4 +-
 head/lib/libgssapi/gss_release_oid_set.3                                  =
                        |      4 +-
 head/lib/libgssapi/mech.5                                                 =
                        |      6 +-
 head/lib/libgssapi/mech_switch.h                                          =
                        |      3 +-
 head/lib/libpam/modules/pam_exec/pam_exec.8                               =
                        |     86 +-
 head/lib/libpam/modules/pam_exec/pam_exec.c                               =
                        |    364 +-
 head/lib/libpam/modules/pam_krb5/pam_krb5.c                               =
                        |    171 +-
 head/lib/libpam/modules/pam_ksu/pam_ksu.c                                 =
                        |     40 +-
 head/lib/libpam/modules/pam_nologin/pam_nologin.8                         =
                        |      4 +-
 head/lib/libpmc/Makefile                                                  =
                        |      6 +-
 head/lib/libpmc/libpmc.c                                                  =
                        |    158 +-
 head/lib/libpmc/pmc.3                                                     =
                        |      6 +-
 head/lib/libpmc/pmc.atom.3                                                =
                        |      3 +-
 head/lib/libpmc/pmc.core.3                                                =
                        |      7 +-
 head/lib/libpmc/pmc.core2.3                                               =
                        |      3 +-
 head/lib/libpmc/pmc.corei7.3                                              =
                        |      3 +-
 head/lib/libpmc/pmc.corei7uc.3                                            =
                        |      3 +-
 head/lib/libpmc/pmc.h                                                     =
                        |      4 +-
 head/lib/libpmc/pmc.iaf.3                                                 =
                        |      3 +-
 head/lib/libpmc/pmc.k7.3                                                  =
                        |      4 +-
 head/lib/libpmc/pmc.k8.3                                                  =
                        |      4 +-
 head/lib/libpmc/pmc.p4.3                                                  =
                        |      4 +-
 head/lib/libpmc/pmc.p5.3                                                  =
                        |      3 +-
 head/lib/libpmc/pmc.p6.3                                                  =
                        |      3 +-
 head/lib/libpmc/pmc.sandybridge.3                                         =
                        |      3 +-
 head/lib/libpmc/pmc.sandybridgeuc.3                                       =
                        |      3 +-
 head/lib/libpmc/pmc.tsc.3                                                 =
                        |      3 +-
 head/lib/libpmc/pmc.ucf.3                                                 =
                        |      3 +-
 head/lib/libpmc/pmc.westmere.3                                            =
                        |      3 +-
 head/lib/libpmc/pmc.westmereuc.3                                          =
                        |      3 +-
 head/lib/libpmc/pmc.xscale.3                                              =
                        |     19 +-
 head/lib/libpmc/pmc_capabilities.3                                        =
                        |      4 +-
 head/lib/libpmc/pmclog.c                                                  =
                        |      8 +-
 head/lib/libpmc/pmclog.h                                                  =
                        |     10 +-
 head/lib/libproc/proc_bkpt.c                                              =
                        |      5 +-
 head/lib/libproc/proc_regs.c                                              =
                        |     10 +-
 head/lib/libprocstat/Symbol.map                                           =
                        |      6 +-
 head/lib/libprocstat/Versions.def                                         =
                        |      7 +-
 head/lib/libprocstat/libprocstat.3                                        =
                        |     17 +-
 head/lib/libprocstat/libprocstat.c                                        =
                        |     74 +-
 head/lib/libprocstat/libprocstat.h                                        =
                        |      8 +-
 head/lib/librpcsec_gss/rpc_gss_seccreate.3                                =
                        |      4 +-
 head/lib/librt/sigev_thread.c                                             =
                        |     12 +-
 head/lib/librt/sigev_thread.h                                             =
                        |      4 +-
 head/lib/libtacplus/libtacplus.3                                          =
                        |      5 +-
 head/lib/libthr/thread/thr_private.h                                      =
                        |      4 +-
 head/lib/libthr/thread/thr_sig.c                                          =
                        |      8 +-
 head/lib/libthr/thread/thr_umtx.h                                         =
                        |     23 +-
 head/lib/libulog/utempter_add_record.3                                    =
                        |      4 +-
 head/lib/libusb/Makefile                                                  =
                        |      3 +-
 head/lib/libusb/libusb.3                                                  =
                        |     22 +-
 head/lib/libusb/libusb.h                                                  =
                        |      3 +-
 head/lib/libusb/libusb10.c                                                =
                        |     26 +-
 head/lib/libusb/libusb20.3                                                =
                        |      7 +-
 head/lib/libutil/kinfo_getallproc.3                                       =
                        |      4 +-
 head/lib/libutil/kinfo_getproc.3                                          =
                        |      4 +-
 head/lib/libutil/login.conf.5                                             =
                        |    150 +-
 head/lib/libutil/login_cap.3                                              =
                        |      6 +-
 head/lib/libutil/quotafile.3                                              =
                        |      6 +-
 head/lib/msun/man/csqrt.3                                                 =
                        |     16 +-
 head/lib/msun/man/ieee.3                                                  =
                        |      3 +-
 head/lib/msun/src/s_remquo.c                                              =
                        |      9 +-
 head/lib/msun/src/s_remquof.c                                             =
                        |      5 +-
 head/lib/msun/src/s_remquol.c                                             =
                        |      5 +-
 head/libexec/bootpd/bootpd.8                                              =
                        |     36 +-
 head/libexec/getty/gettytab.5                                             =
                        |      6 +-
 head/libexec/rtld-elf/Makefile                                            =
                        |      9 +-
 head/libexec/rtld-elf/amd64/reloc.c                                       =
                        |     36 +-
 head/libexec/rtld-elf/arm/reloc.c                                         =
                        |     28 +-
 head/libexec/rtld-elf/i386/reloc.c                                        =
                        |     32 +-
 head/libexec/rtld-elf/ia64/reloc.c                                        =
                        |     39 +-
 head/libexec/rtld-elf/malloc.c                                            =
                        |     20 +-
 head/libexec/rtld-elf/mips/reloc.c                                        =
                        |     20 +-
 head/libexec/rtld-elf/mips/rtld_start.S                                   =
                        |      5 +-
 head/libexec/rtld-elf/powerpc/reloc.c                                     =
                        |     27 +-
 head/libexec/rtld-elf/powerpc64/reloc.c                                   =
                        |     29 +-
 head/libexec/rtld-elf/rtld.c                                              =
                        |    161 +-
 head/libexec/rtld-elf/rtld.h                                              =
                        |     36 +-
 head/libexec/rtld-elf/sparc64/reloc.c                                     =
                        |     21 +-
 head/libexec/rtld-elf/xmalloc.c                                           =
                        |     34 +-
 head/libexec/tftpd/tftpd.8                                                =
                        |      8 +-
 head/sbin/bsdlabel/bsdlabel.c                                             =
                        |      5 +-
 head/sbin/camcontrol/camcontrol.8                                         =
                        |      7 +-
 head/sbin/devfs/devfs.8                                                   =
                        |      6 +-
 head/sbin/fdisk/fdisk.c                                                   =
                        |      3 +-
 head/sbin/geom/class/eli/geli.8                                           =
                        |      4 +-
 head/sbin/geom/class/multipath/gmultipath.8                               =
                        |      4 +-
 head/sbin/geom/class/sched/gsched.8                                       =
                        |      3 +-
 head/sbin/growfs/debug.c                                                  =
                        |      6 +-
 head/sbin/growfs/growfs.c                                                 =
                        |   1191 +-
 head/sbin/gvinum/gvinum.8                                                 =
                        |     13 +-
 head/sbin/hastd/hastd.c                                                   =
                        |     14 +-
 head/sbin/hastd/nv.c                                                      =
                        |     16 +-
 head/sbin/ifconfig/ifconfig.8                                             =
                        |     48 +-
 head/sbin/ifconfig/ifieee80211.c                                          =
                        |      6 +-
 head/sbin/ifconfig/ifpfsync.c                                             =
                        |     30 +-
 head/sbin/init/init.8                                                     =
                        |      4 +-
 head/sbin/init/init.c                                                     =
                        |      8 +-
 head/sbin/ipfw/ipfw.8                                                     =
                        |    117 +-
 head/sbin/ipfw/ipfw2.c                                                    =
                        |     14 +-
 head/sbin/iscontrol/Makefile                                              =
                        |      4 +-
 head/sbin/iscontrol/iscontrol.8                                           =
                        |      4 +-
 head/sbin/iscontrol/iscontrol.c                                           =
                        |     22 +-
 head/sbin/iscontrol/iscsi.conf.5                                          =
                        |      4 +-
 head/sbin/kldload/kldload.8                                               =
                        |      3 +-
 head/sbin/mdconfig/mdconfig.8                                             =
                        |     51 +-
 head/sbin/mdmfs/mdmfs.8                                                   =
                        |     10 +-
 head/sbin/mount_unionfs/mount_unionfs.8                                   =
                        |      4 +-
 head/sbin/ping6/ping6.8                                                   =
                        |      6 +-
 head/sbin/quotacheck/quotacheck.8                                         =
                        |      4 +-
 head/sbin/rcorder/rcorder.8                                               =
                        |      4 +-
 head/sbin/route/route.8                                                   =
                        |     38 +-
 head/sbin/savecore/savecore.c                                             =
                        |      3 +-
 head/sbin/setkey/setkey.8                                                 =
                        |     19 +-
 head/sbin/sunlabel/sunlabel.8                                             =
                        |     18 +-
 head/sbin/sysctl/sysctl.8                                                 =
                        |    134 +-
 head/sbin/sysctl/sysctl.c                                                 =
                        |      4 +-
 head/secure/usr.bin/ssh/Makefile                                          =
                        |      6 +-
 head/secure/usr.sbin/sshd/Makefile                                        =
                        |      6 +-
 head/share/doc/bind9/Makefile                                             =
                        |      8 +-
 head/share/examples/Makefile                                              =
                        |      4 +-
 head/share/examples/cvsup/cvs-supfile                                     =
                        |     19 +-
 head/share/examples/cvsup/doc-supfile                                     =
                        |     19 +-
 head/share/examples/cvsup/gnats-supfile                                   =
                        |     19 +-
 head/share/examples/cvsup/ports-supfile                                   =
                        |     19 +-
 head/share/examples/cvsup/stable-supfile                                  =
                        |     19 +-
 head/share/examples/cvsup/standard-supfile                                =
                        |     19 +-
 head/share/examples/cvsup/www-supfile                                     =
                        |     19 +-
 head/share/man/man3/pthread_attr_affinity_np.3                            =
                        |      4 +-
 head/share/man/man3/pthread_cond_destroy.3                                =
                        |      8 +-
 head/share/man/man3/pthread_cond_timedwait.3                              =
                        |      6 +-
 head/share/man/man3/pthread_cond_wait.3                                   =
                        |      6 +-
 head/share/man/man3/tgmath.3                                              =
                        |      6 +-
 head/share/man/man4/acpi.4                                                =
                        |     14 +-
 head/share/man/man4/acpi_hp.4                                             =
                        |     27 +-
 head/share/man/man4/acpi_wmi.4                                            =
                        |      4 +-
 head/share/man/man4/ada.4                                                 =
                        |      4 +-
 head/share/man/man4/adv.4                                                 =
                        |     78 +-
 head/share/man/man4/ahc.4                                                 =
                        |     33 +-
 head/share/man/man4/aibs.4                                                =
                        |      8 +-
 head/share/man/man4/amdsmb.4                                              =
                        |      4 +-
 head/share/man/man4/ath.4                                                 =
                        |     10 +-
 head/share/man/man4/atkbd.4                                               =
                        |      3 +-
 head/share/man/man4/atp.4                                                 =
                        |      8 +-
 head/share/man/man4/bce.4                                                 =
                        |      4 +-
 head/share/man/man4/bpf.4                                                 =
                        |     33 +-
 head/share/man/man4/bridge.4                                              =
                        |      3 +-
 head/share/man/man4/bt.4                                                  =
                        |     71 +-
 head/share/man/man4/bwi.4                                                 =
                        |      9 +-
 head/share/man/man4/bwn.4                                                 =
                        |      9 +-
 head/share/man/man4/carp.4                                                =
                        |      4 +-
 head/share/man/man4/cas.4                                                 =
                        |      8 +-
 head/share/man/man4/cc_vegas.4                                            =
                        |      4 +-
 head/share/man/man4/cd.4                                                  =
                        |      4 +-
 head/share/man/man4/coda.4                                                =
                        |      4 +-
 head/share/man/man4/cy.4                                                  =
                        |      3 +-
 head/share/man/man4/dpms.4                                                =
                        |      3 +-
 head/share/man/man4/ed.4                                                  =
                        |      3 +-
 head/share/man/man4/em.4                                                  =
                        |      3 +-
 head/share/man/man4/epair.4                                               =
                        |      5 +-
 head/share/man/man4/fdc.4                                                 =
                        |      3 +-
 head/share/man/man4/fwohci.4                                              =
                        |      3 +-
 head/share/man/man4/gem.4                                                 =
                        |     17 +-
 head/share/man/man4/geom_fox.4                                            =
                        |      3 +-
 head/share/man/man4/geom_uzip.4                                           =
                        |      3 +-
 head/share/man/man4/gre.4                                                 =
                        |      4 +-
 head/share/man/man4/hptiop.4                                              =
                        |      3 +-
 head/share/man/man4/igb.4                                                 =
                        |      3 +-
 head/share/man/man4/ip.4                                                  =
                        |      4 +-
 head/share/man/man4/ipmi.4                                                =
                        |      4 +-
 head/share/man/man4/ipw.4                                                 =
                        |      4 +-
 head/share/man/man4/isci.4                                                =
                        |     12 +-
 head/share/man/man4/iscsi_initiator.4                                     =
                        |     35 +-
 head/share/man/man4/isp.4                                                 =
                        |      3 +-
 head/share/man/man4/iwi.4                                                 =
                        |      4 +-
 head/share/man/man4/iwn.4                                                 =
                        |     36 +-
 head/share/man/man4/iwnfw.4                                               =
                        |      4 +-
 head/share/man/man4/ixgbe.4                                               =
                        |      8 +-
 head/share/man/man4/ksyms.4                                               =
                        |     40 +-
 head/share/man/man4/ktr.4                                                 =
                        |      4 +-
 head/share/man/man4/lmc.4                                                 =
                        |      4 +-
 head/share/man/man4/malo.4                                                =
                        |     13 +-
 head/share/man/man4/man4.i386/apm.4                                       =
                        |     24 +-
 head/share/man/man4/man4.i386/glxsb.4                                     =
                        |      4 +-
 head/share/man/man4/man4.powerpc/abtn.4                                   =
                        |      4 +-
 head/share/man/man4/man4.powerpc/akbd.4                                   =
                        |     10 +-
 head/share/man/man4/man4.powerpc/bm.4                                     =
                        |      8 +-
 head/share/man/man4/man4.powerpc/cuda.4                                   =
                        |      4 +-
 head/share/man/man4/man4.powerpc/smu.4                                    =
                        |      4 +-
 head/share/man/man4/man4.powerpc/snd_ai2s.4                               =
                        |      6 +-
 head/share/man/man4/man4.powerpc/snd_davbus.4                             =
                        |      4 +-
 head/share/man/man4/md.4                                                  =
                        |      4 +-
 head/share/man/man4/mld.4                                                 =
                        |      4 +-
 head/share/man/man4/mmc.4                                                 =
                        |      4 +-
 head/share/man/man4/mos.4                                                 =
                        |      4 +-
 head/share/man/man4/mps.4                                                 =
                        |     14 +-
 head/share/man/man4/mwl.4                                                 =
                        |      8 +-
 head/share/man/man4/net80211.4                                            =
                        |     12 +-
 head/share/man/man4/netmap.4                                              =
                        |     11 +-
 head/share/man/man4/ng_car.4                                              =
                        |      4 +-
 head/share/man/man4/ng_deflate.4                                          =
                        |      8 +-
 head/share/man/man4/ng_nat.4                                              =
                        |      6 +-
 head/share/man/man4/ng_netflow.4                                          =
                        |     11 +-
 head/share/man/man4/ng_patch.4                                            =
                        |      4 +-
 head/share/man/man4/ng_ppp.4                                              =
                        |     22 +-
 head/share/man/man4/ng_pred1.4                                            =
                        |      8 +-
 head/share/man/man4/ng_tty.4                                              =
                        |      4 +-
 head/share/man/man4/nvram2env.4                                           =
                        |      9 +-
 head/share/man/man4/nxge.4                                                =
                        |      6 +-
 head/share/man/man4/oce.4                                                 =
                        |      3 +-
 head/share/man/man4/pcm.4                                                 =
                        |     10 +-
 head/share/man/man4/ppbus.4                                               =
                        |      5 +-
 head/share/man/man4/psm.4                                                 =
                        |     22 +-
 head/share/man/man4/pts.4                                                 =
                        |      4 +-
 head/share/man/man4/ral.4                                                 =
                        |      4 +-
 head/share/man/man4/run.4                                                 =
                        |      4 +-
 head/share/man/man4/runfw.4                                               =
                        |      4 +-
 head/share/man/man4/sfxge.4                                               =
                        |      4 +-
 head/share/man/man4/smp.4                                                 =
                        |      4 +-
 head/share/man/man4/snd_emu10kx.4                                         =
                        |      6 +-
 head/share/man/man4/snd_hda.4                                             =
                        |      5 +-
 head/share/man/man4/snd_ich.4                                             =
                        |      4 +-
 head/share/man/man4/syscons.4                                             =
                        |     12 +-
 head/share/man/man4/tcp.4                                                 =
                        |      3 +-
 head/share/man/man4/tpm.4                                                 =
                        |      4 +-
 head/share/man/man4/u3g.4                                                 =
                        |      3 +-
 head/share/man/man4/uark.4                                                =
                        |      4 +-
 head/share/man/man4/uath.4                                                =
                        |      9 +-
 head/share/man/man4/ufoma.4                                               =
                        |      4 +-
 head/share/man/man4/uipaq.4                                               =
                        |      8 +-
 head/share/man/man4/ulpt.4                                                =
                        |      4 +-
 head/share/man/man4/umcs.4                                                =
                        |      8 +-
 head/share/man/man4/upgt.4                                                =
                        |     12 +-
 head/share/man/man4/vge.4                                                 =
                        |      4 +-
 head/share/man/man4/virtio.4                                              =
                        |      6 +-
 head/share/man/man4/vxge.4                                                =
                        |      4 +-
 head/share/man/man4/wbwd.4                                                =
                        |      6 +-
 head/share/man/man4/wi.4                                                  =
                        |      4 +-
 head/share/man/man4/wlan_acl.4                                            =
                        |      4 +-
 head/share/man/man4/wlan_amrr.4                                           =
                        |      4 +-
 head/share/man/man4/wpi.4                                                 =
                        |     10 +-
 head/share/man/man4/xen.4                                                 =
                        |      6 +-
 head/share/man/man4/xnb.4                                                 =
                        |     53 +-
 head/share/man/man5/ar.5                                                  =
                        |      6 +-
 head/share/man/man5/fdescfs.5                                             =
                        |      4 +-
 head/share/man/man5/fs.5                                                  =
                        |      6 +-
 head/share/man/man5/fstab.5                                               =
                        |      8 +-
 head/share/man/man5/nsmb.conf.5                                           =
                        |      6 +-
 head/share/man/man5/quota.user.5                                          =
                        |     12 +-
 head/share/man/man5/services.5                                            =
                        |      4 +-
 head/share/man/man5/src.conf.5                                            =
                        |      8 +-
 head/share/man/man5/style.Makefile.5                                      =
                        |      4 +-
 head/share/man/man7/mailaddr.7                                            =
                        |      8 +-
 head/share/man/man7/operator.7                                            =
                        |      4 +-
 head/share/man/man7/release.7                                             =
                        |     18 +-
 head/share/man/man8/picobsd.8                                             =
                        |      4 +-
 head/share/man/man9/BUS_DESCRIBE_INTR.9                                   =
                        |      4 +-
 head/share/man/man9/BUS_SETUP_INTR.9                                      =
                        |      6 +-
 head/share/man/man9/DB_COMMAND.9                                          =
                        |     17 +-
 head/share/man/man9/DEVICE_PROBE.9                                        =
                        |      8 +-
 head/share/man/man9/Makefile                                              =
                        |      4 +-
 head/share/man/man9/SYSINIT.9                                             =
                        |      4 +-
 head/share/man/man9/buf_ring.9                                            =
                        |      4 +-
 head/share/man/man9/condvar.9                                             =
                        |      6 +-
 head/share/man/man9/crypto.9                                              =
                        |      4 +-
 head/share/man/man9/devclass_get_maxunit.9                                =
                        |      4 +-
 head/share/man/man9/device_get_children.9                                 =
                        |      6 +-
 head/share/man/man9/drbr.9                                                =
                        |     10 +-
 head/share/man/man9/eventtimers.9                                         =
                        |      4 +-
 head/share/man/man9/fail.9                                                =
                        |      3 +-
 head/share/man/man9/firmware.9                                            =
                        |      4 +-
 head/share/man/man9/ieee80211.9                                           =
                        |     22 +-
 head/share/man/man9/ieee80211_amrr.9                                      =
                        |      8 +-
 head/share/man/man9/ieee80211_bmiss.9                                     =
                        |      6 +-
 head/share/man/man9/ieee80211_crypto.9                                    =
                        |      8 +-
 head/share/man/man9/ieee80211_input.9                                     =
                        |      4 +-
 head/share/man/man9/ieee80211_node.9                                      =
                        |     14 +-
 head/share/man/man9/ieee80211_output.9                                    =
                        |     10 +-
 head/share/man/man9/ieee80211_proto.9                                     =
                        |     14 +-
 head/share/man/man9/ieee80211_radiotap.9                                  =
                        |      6 +-
 head/share/man/man9/ieee80211_regdomain.9                                 =
                        |      6 +-
 head/share/man/man9/ieee80211_scan.9                                      =
                        |      4 +-
 head/share/man/man9/ieee80211_vap.9                                       =
                        |      6 +-
 head/share/man/man9/ifnet.9                                               =
                        |    299 +-
 head/share/man/man9/kproc.9                                               =
                        |      8 +-
 head/share/man/man9/kqueue.9                                              =
                        |     25 +-
 head/share/man/man9/kthread.9                                             =
                        |     10 +-
 head/share/man/man9/lock.9                                                =
                        |      5 +-
 head/share/man/man9/locking.9                                             =
                        |     25 +-
 head/share/man/man9/make_dev.9                                            =
                        |      3 +-
 head/share/man/man9/malloc.9                                              =
                        |      4 +-
 head/share/man/man9/mi_switch.9                                           =
                        |      4 +-
 head/share/man/man9/osd.9                                                 =
                        |      4 +-
 head/share/man/man9/rmlock.9                                              =
                        |     12 +-
 head/share/man/man9/shm_map.9                                             =
                        |      4 +-
 head/share/man/man9/sleep.9                                               =
                        |      6 +-
 head/share/man/man9/spl.9                                                 =
                        |      6 +-
 head/share/man/man9/swi.9                                                 =
                        |     33 +-
 head/share/man/man9/sysctl_ctx_init.9                                     =
                        |      4 +-
 head/share/man/man9/taskqueue.9                                           =
                        |     10 +-
 head/share/man/man9/timeout.9                                             =
                        |      6 +-
 head/share/man/man9/usbdi.9                                               =
                        |     20 +-
 head/share/man/man9/vm_map_find.9                                         =
                        |      4 +-
 head/share/man/man9/watchdog.9                                            =
                        |      4 +-
 head/share/misc/committers-ports.dot                                      =
                        |     10 +-
 head/share/misc/committers-src.dot                                        =
                        |      7 +-
 head/share/mk/bsd.endian.mk                                               =
                        |      4 +-
 head/share/mk/bsd.libnames.mk                                             =
                        |      6 +-
 head/share/mk/bsd.sys.mk                                                  =
                        |     15 +-
 head/share/mk/sys.mk                                                      =
                        |      4 +-
 head/share/termcap/termcap.5                                              =
                        |      3 +-
 head/sys/Makefile                                                         =
                        |      4 +-
 head/sys/amd64/acpica/acpi_wakeup.c                                       =
                        |     10 +-
 head/sys/amd64/amd64/identcpu.c                                           =
                        |      4 +-
 head/sys/amd64/amd64/initcpu.c                                            =
                        |     31 +-
 head/sys/amd64/amd64/machdep.c                                            =
                        |      9 +-
 head/sys/amd64/amd64/mp_machdep.c                                         =
                        |      9 +-
 head/sys/amd64/amd64/pmap.c                                               =
                        |     88 +-
 head/sys/amd64/amd64/trap.c                                               =
                        |     86 +-
 head/sys/amd64/conf/GENERIC                                               =
                        |      9 +-
 head/sys/amd64/conf/NOTES                                                 =
                        |     54 +-
 head/sys/amd64/include/intr_machdep.h                                     =
                        |      6 +-
 head/sys/amd64/include/pmc_mdep.h                                         =
                        |     25 +-
 head/sys/amd64/include/proc.h                                             =
                        |      3 +-
 head/sys/amd64/include/vm.h                                               =
                        |      4 +-
 head/sys/amd64/linux32/linux32_dummy.c                                    =
                        |      3 +-
 head/sys/amd64/linux32/linux32_machdep.c                                  =
                        |     21 +-
 head/sys/amd64/linux32/linux32_proto.h                                    =
                        |     20 +-
 head/sys/amd64/linux32/linux32_syscall.h                                  =
                        |      4 +-
 head/sys/amd64/linux32/linux32_syscalls.c                                 =
                        |      4 +-
 head/sys/amd64/linux32/linux32_sysent.c                                   =
                        |      6 +-
 head/sys/amd64/linux32/linux32_systrace_args.c                            =
                        |     58 +-
 head/sys/amd64/linux32/syscalls.master                                    =
                        |     20 +-
 head/sys/arm/at91/at91_pio.c                                              =
                        |     49 +-
 head/sys/arm/at91/at91_piovar.h                                           =
                        |     18 +-
 head/sys/arm/at91/at91_pit.c                                              =
                        |     35 +-
 head/sys/arm/at91/at91_pmc.c                                              =
                        |     49 +-
 head/sys/arm/at91/at91_rst.c                                              =
                        |     21 +-
 head/sys/arm/at91/at91_twi.c                                              =
                        |     31 +-
 head/sys/arm/at91/at91_twireg.h                                           =
                        |     82 +-
 head/sys/arm/at91/at91_wdt.c                                              =
                        |     36 +-
 head/sys/arm/at91/at91reg.h                                               =
                        |     50 +-
 head/sys/arm/at91/at91sam9260.c                                           =
                        |     63 +-
 head/sys/arm/at91/at91var.h                                               =
                        |     25 +-
 head/sys/arm/at91/if_ate.c                                                =
                        |     74 +-
 head/sys/arm/conf/AVILA                                                   =
                        |      3 +-
 head/sys/arm/conf/BWCT                                                    =
                        |      3 +-
 head/sys/arm/conf/CAMBRIA                                                 =
                        |      3 +-
 head/sys/arm/conf/CNS11XXNAS                                              =
                        |      3 +-
 head/sys/arm/conf/CRB                                                     =
                        |      3 +-
 head/sys/arm/conf/DB-78XXX                                                =
                        |      3 +-
 head/sys/arm/conf/DB-88F5XXX                                              =
                        |      3 +-
 head/sys/arm/conf/DB-88F6XXX                                              =
                        |      3 +-
 head/sys/arm/conf/DOCKSTAR                                                =
                        |      3 +-
 head/sys/arm/conf/EP80219                                                 =
                        |      3 +-
 head/sys/arm/conf/GUMSTIX                                                 =
                        |      4 +-
 head/sys/arm/conf/HL200                                                   =
                        |      3 +-
 head/sys/arm/conf/HL201                                                   =
                        |      3 +-
 head/sys/arm/conf/IQ31244                                                 =
                        |      3 +-
 head/sys/arm/conf/KB920X                                                  =
                        |      3 +-
 head/sys/arm/conf/LN2410SBC                                               =
                        |      3 +-
 head/sys/arm/conf/NSLU                                                    =
                        |      3 +-
 head/sys/arm/conf/QILA9G20                                                =
                        |      3 +-
 head/sys/arm/conf/SAM9G20EK                                               =
                        |      3 +-
 head/sys/arm/conf/SHEEVAPLUG                                              =
                        |      3 +-
 head/sys/arm/conf/TS7800                                                  =
                        |      3 +-
 head/sys/arm/include/armreg.h                                             =
                        |      7 +-
 head/sys/arm/include/pmc_mdep.h                                           =
                        |      4 +-
 head/sys/arm/include/sysarch.h                                            =
                        |      4 +-
 head/sys/arm/xscale/pxa/uart_bus_pxa.c                                    =
                        |     22 +-
 head/sys/boot/common/crc32.c                                              =
                        |      4 +-
 head/sys/boot/common/gpt.c                                                =
                        |     16 +-
 head/sys/boot/common/loader.8                                             =
                        |      4 +-
 head/sys/boot/fdt/fdt_loader_cmd.c                                        =
                        |    212 +-
 head/sys/boot/forth/loader.conf.5                                         =
                        |      4 +-
 head/sys/boot/forth/menu-commands.4th                                     =
                        |     23 +-
 head/sys/boot/i386/zfsboot/zfsboot.c                                      =
                        |     12 +-
 head/sys/boot/powerpc/ps3/start.S                                         =
                        |      4 +-
 head/sys/boot/uboot/common/metadata.c                                     =
                        |     15 +-
 head/sys/boot/uboot/lib/Makefile                                          =
                        |      8 +-
 head/sys/boot/uboot/lib/glue.c                                            =
                        |     72 +-
 head/sys/cam/ctl/ctl.c                                                    =
                        |     84 +-
 head/sys/cam/ctl/ctl_backend.c                                            =
                        |      3 +-
 head/sys/cam/ctl/ctl_cmd_table.c                                          =
                        |      3 +-
 head/sys/cam/ctl/ctl_error.c                                              =
                        |      3 +-
 head/sys/cam/ctl/ctl_frontend.c                                           =
                        |      3 +-
 head/sys/cam/ctl/ctl_frontend_internal.c                                  =
                        |      3 +-
 head/sys/cam/ctl/ctl_private.h                                            =
                        |      5 +-
 head/sys/cam/scsi/scsi_da.c                                               =
                        |    262 +-
 head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c              =
                        |      6 +-
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c           =
                        |     12 +-
 head/sys/cddl/dev/dtrace/dtrace_ioctl.c                                   =
                        |      8 +-
 head/sys/cddl/dev/lockstat/lockstat.c                                     =
                        |      4 +-
 head/sys/cddl/dev/profile/profile.c                                       =
                        |      9 +-
 head/sys/cddl/dev/sdt/sdt.c                                               =
                        |      9 +-
 head/sys/compat/linux/linux_file.c                                        =
                        |     51 +-
 head/sys/conf/NOTES                                                       =
                        |     21 +-
 head/sys/conf/files                                                       =
                        |    171 +-
 head/sys/conf/files.amd64                                                 =
                        |      7 +-
 head/sys/conf/files.arm                                                   =
                        |      3 +-
 head/sys/conf/files.i386                                                  =
                        |      7 +-
 head/sys/conf/files.ia64                                                  =
                        |      3 +-
 head/sys/conf/files.mips                                                  =
                        |      5 +-
 head/sys/conf/files.pc98                                                  =
                        |      6 +-
 head/sys/conf/files.powerpc                                               =
                        |      5 +-
 head/sys/conf/files.sparc64                                               =
                        |      3 +-
 head/sys/conf/kern.mk                                                     =
                        |      3 +-
 head/sys/conf/kern.post.mk                                                =
                        |     16 +-
 head/sys/conf/kern.pre.mk                                                 =
                        |     10 +-
 head/sys/conf/kmod.mk                                                     =
                        |      4 +-
 head/sys/conf/makeLINT.mk                                                 =
                        |      3 +-
 head/sys/conf/options                                                     =
                        |      6 +-
 head/sys/conf/options.amd64                                               =
                        |      4 +-
 head/sys/conf/options.arm                                                 =
                        |      3 +-
 head/sys/conf/options.i386                                                =
                        |      3 +-
 head/sys/contrib/dev/acpica/acpica_prep.sh                                =
                        |      4 +-
 head/sys/contrib/dev/acpica/changes.txt                                   =
                        |     92 +
 head/sys/contrib/dev/acpica/common/adisasm.c                              =
                        |     48 +-
 head/sys/contrib/dev/acpica/common/getopt.c                               =
                        |     31 +-
 head/sys/contrib/dev/acpica/compiler/aslcodegen.c                         =
                        |      2 +-
 head/sys/contrib/dev/acpica/compiler/aslcompile.c                         =
                        |     42 +-
 head/sys/contrib/dev/acpica/compiler/aslcompiler.h                        =
                        |     13 +-
 head/sys/contrib/dev/acpica/compiler/aslcompiler.y                        =
                        |      5 +
 head/sys/contrib/dev/acpica/compiler/aslerror.c                           =
                        |    213 +-
 head/sys/contrib/dev/acpica/compiler/aslfiles.c                           =
                        |     34 +-
 head/sys/contrib/dev/acpica/compiler/aslglobal.h                          =
                        |      9 +-
 head/sys/contrib/dev/acpica/compiler/aslmain.c                            =
                        |    115 +-
 head/sys/contrib/dev/acpica/compiler/aslmessages.h                        =
                        |     31 +-
 head/sys/contrib/dev/acpica/compiler/aslstartup.c                         =
                        |     30 +-
 head/sys/contrib/dev/acpica/compiler/asltypes.h                           =
                        |      6 +-
 head/sys/contrib/dev/acpica/compiler/aslutils.c                           =
                        |      8 +
 head/sys/contrib/dev/acpica/compiler/dtcompile.c                          =
                        |     11 +
 head/sys/contrib/dev/acpica/compiler/dtcompiler.h                         =
                        |      4 +
 head/sys/contrib/dev/acpica/compiler/dtexpress.c                          =
                        |     11 +-
 head/sys/contrib/dev/acpica/compiler/dtio.c                               =
                        |      4 -
 head/sys/contrib/dev/acpica/compiler/dtparser.y                           =
                        |      4 +
 head/sys/contrib/dev/acpica/components/debugger/dbcmds.c                  =
                        |      4 +-
 head/sys/contrib/dev/acpica/components/hardware/hwesleep.c                =
                        |     40 +-
 head/sys/contrib/dev/acpica/components/hardware/hwsleep.c                 =
                        |     32 +-
 head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c               =
                        |     28 +-
 head/sys/contrib/dev/acpica/components/namespace/nsdump.c                 =
                        |     16 +-
 head/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c               =
                        |      2 +-
 head/sys/contrib/dev/acpica/components/namespace/nspredef.c               =
                        |      2 +-
 head/sys/contrib/dev/acpica/components/namespace/nsrepair.c               =
                        |    164 +-
 head/sys/contrib/dev/acpica/components/namespace/nsutils.c                =
                        |      2 +-
 head/sys/contrib/dev/acpica/components/parser/psargs.c                    =
                        |      2 +
 head/sys/contrib/dev/acpica/components/tables/tbfadt.c                    =
                        |     11 +-
 head/sys/contrib/dev/acpica/components/tables/tbinstal.c                  =
                        |      4 +-
 head/sys/contrib/dev/acpica/components/tables/tbutils.c                   =
                        |     19 +-
 head/sys/contrib/dev/acpica/include/achware.h                             =
                        |     18 +-
 head/sys/contrib/dev/acpica/include/aclocal.h                             =
                        |      1 +
 head/sys/contrib/dev/acpica/include/acnames.h                             =
                        |     12 +-
 head/sys/contrib/dev/acpica/include/acnamesp.h                            =
                        |      3 +-
 head/sys/contrib/dev/acpica/include/acoutput.h                            =
                        |      1 +
 head/sys/contrib/dev/acpica/include/acpixf.h                              =
                        |      8 +-
 head/sys/contrib/dev/acpica/include/actypes.h                             =
                        |     10 +-
 head/sys/contrib/dev/ral/LICENSE                                          =
                        |      2 +-
 head/sys/contrib/dev/ral/rt2561.fw.uu                                     =
                        |      2 +-
 head/sys/contrib/dev/ral/rt2561s.fw.uu                                    =
                        |      2 +-
 head/sys/contrib/dev/ral/rt2661.fw.uu                                     =
                        |      2 +-
 head/sys/contrib/dev/ral/rt2860.fw.uu                                     =
                        |      2 +-
 head/sys/contrib/dev/run/rt2870.fw.uu                                     =
                        |    274 +-
 head/sys/contrib/pf/net/if_pfsync.c                                       =
                        |     42 +-
 head/sys/contrib/pf/net/if_pfsync.h                                       =
                        |      2 +-
 head/sys/ddb/db_main.c                                                    =
                        |     18 +-
 head/sys/dev/acpica/acpi.c                                                =
                        |     32 +-
 head/sys/dev/acpica/acpi_pcib_acpi.c                                      =
                        |     53 +-
 head/sys/dev/acpica/acpivar.h                                             =
                        |      7 +-
 head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c                               =
                        |      4 +-
 head/sys/dev/ale/if_ale.c                                                 =
                        |    121 +-
 head/sys/dev/ale/if_alevar.h                                              =
                        |      3 +-
 head/sys/dev/ata/ata-all.c                                                =
                        |     46 +-
 head/sys/dev/ata/ata-all.h                                                =
                        |      6 +-
 head/sys/dev/ata/ata-card.c                                               =
                        |      8 +-
 head/sys/dev/ata/ata-cbus.c                                               =
                        |     14 +-
 head/sys/dev/ata/ata-disk.c                                               =
                        |      4 +-
 head/sys/dev/ata/ata-pci.c                                                =
                        |     26 +-
 head/sys/dev/ata/ata-pci.h                                                =
                        |     19 +-
 head/sys/dev/ata/ata-queue.c                                              =
                        |     34 +-
 head/sys/dev/ata/ata-raid.c                                               =
                        |      4 +-
 head/sys/dev/ata/atapi-cam.c                                              =
                        |      4 +-
 head/sys/dev/ata/atapi-cd.c                                               =
                        |      4 +-
 head/sys/dev/ata/atapi-fd.c                                               =
                        |      4 +-
 head/sys/dev/ata/atapi-tape.c                                             =
                        |      4 +-
 head/sys/dev/ata/chipsets/ata-acard.c                                     =
                        |     21 +-
 head/sys/dev/ata/chipsets/ata-acerlabs.c                                  =
                        |     11 +-
 head/sys/dev/ata/chipsets/ata-adaptec.c                                   =
                        |      5 +-
 head/sys/dev/ata/chipsets/ata-ahci.c                                      =
                        |      7 +-
 head/sys/dev/ata/chipsets/ata-amd.c                                       =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-ati.c                                       =
                        |     26 +-
 head/sys/dev/ata/chipsets/ata-cyrix.c                                     =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-highpoint.c                                 =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-intel.c                                     =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-ite.c                                       =
                        |     15 +-
 head/sys/dev/ata/chipsets/ata-jmicron.c                                   =
                        |      6 +-
 head/sys/dev/ata/chipsets/ata-marvell.c                                   =
                        |      4 +-
 head/sys/dev/ata/chipsets/ata-national.c                                  =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-nvidia.c                                    =
                        |     10 +-
 head/sys/dev/ata/chipsets/ata-promise.c                                   =
                        |      8 +-
 head/sys/dev/ata/chipsets/ata-serverworks.c                               =
                        |      8 +-
 head/sys/dev/ata/chipsets/ata-siliconimage.c                              =
                        |     21 +-
 head/sys/dev/ata/chipsets/ata-sis.c                                       =
                        |     40 +-
 head/sys/dev/ata/chipsets/ata-via.c                                       =
                        |     18 +-
 head/sys/dev/ath/ah_osdep.c                                               =
                        |      6 +-
 head/sys/dev/ath/ath_hal/ah.h                                             =
                        |      5 +-
 head/sys/dev/ath/ath_hal/ah_decode.h                                      =
                        |      3 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416.h                                  =
                        |      6 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c                       =
                        |     13 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c                            =
                        |      3 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c                            =
                        |     20 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c                             =
                        |     22 +-
 head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h                               =
                        |      5 +-
 head/sys/dev/ath/if_ath.c                                                 =
                        |    116 +-
 head/sys/dev/ath/if_ath_debug.c                                           =
                        |      7 +-
 head/sys/dev/ath/if_ath_pci.c                                             =
                        |    208 +-
 head/sys/dev/ath/if_ath_sysctl.c                                          =
                        |     28 +-
 head/sys/dev/ath/if_ath_tx.c                                              =
                        |    604 +-
 head/sys/dev/ath/if_ath_tx_ht.c                                           =
                        |     76 +-
 head/sys/dev/ath/if_athioctl.h                                            =
                        |      7 +-
 head/sys/dev/ath/if_athvar.h                                              =
                        |     42 +-
 head/sys/dev/atkbdc/atkbdc_isa.c                                          =
                        |      3 +-
 head/sys/dev/atkbdc/psm.c                                                 =
                        |    275 +-
 head/sys/dev/bce/if_bce.c                                                 =
                        |    115 +-
 head/sys/dev/bce/if_bcereg.h                                              =
                        |      3 +-
 head/sys/dev/cfi/cfi_core.c                                               =
                        |      2 +
 head/sys/dev/e1000/e1000_osdep.h                                          =
                        |      5 +-
 head/sys/dev/e1000/if_em.c                                                =
                        |     98 +-
 head/sys/dev/e1000/if_igb.c                                               =
                        |    128 +-
 head/sys/dev/e1000/if_igb.h                                               =
                        |      3 +-
 head/sys/dev/fb/s3_pci.c                                                  =
                        |      4 +-
 head/sys/dev/fb/vesa.c                                                    =
                        |     51 +-
 head/sys/dev/fb/vga.c                                                     =
                        |      6 +-
 head/sys/dev/fxp/if_fxp.c                                                 =
                        |     98 +-
 head/sys/dev/fxp/if_fxpreg.h                                              =
                        |     20 +-
 head/sys/dev/fxp/if_fxpvar.h                                              =
                        |      4 +-
 head/sys/dev/gpio/gpioc.c                                                 =
                        |      4 +-
 head/sys/dev/hwpmc/hwpmc_amd.c                                            =
                        |     12 +-
 head/sys/dev/hwpmc/hwpmc_core.c                                           =
                        |     14 +-
 head/sys/dev/hwpmc/hwpmc_intel.c                                          =
                        |     11 +-
 head/sys/dev/hwpmc/hwpmc_logging.c                                        =
                        |     36 +-
 head/sys/dev/hwpmc/hwpmc_mips.c                                           =
                        |    451 +-
 head/sys/dev/hwpmc/hwpmc_mips24k.c                                        =
                        |    642 +-
 head/sys/dev/hwpmc/hwpmc_mod.c                                            =
                        |    277 +-
 head/sys/dev/hwpmc/hwpmc_piv.c                                            =
                        |      6 +-
 head/sys/dev/hwpmc/hwpmc_powerpc.c                                        =
                        |      5 +-
 head/sys/dev/hwpmc/hwpmc_ppro.c                                           =
                        |      4 +-
 head/sys/dev/hwpmc/hwpmc_tsc.c                                            =
                        |      5 +-
 head/sys/dev/hwpmc/hwpmc_x86.c                                            =
                        |      9 +-
 head/sys/dev/hwpmc/hwpmc_xscale.c                                         =
                        |      6 +-
 head/sys/dev/hwpmc/pmc_events.h                                           =
                        |     77 +-
 head/sys/dev/ipw/if_ipw.c                                                 =
                        |     16 +-
 head/sys/dev/isci/isci.h                                                  =
                        |     12 +-
 head/sys/dev/isci/isci_controller.c                                       =
                        |     57 +-
 head/sys/dev/isci/isci_domain.c                                           =
                        |     22 +-
 head/sys/dev/isci/isci_io_request.c                                       =
                        |     64 +-
 head/sys/dev/isci/isci_remote_device.c                                    =
                        |     36 +-
 head/sys/dev/isci/isci_task_request.c                                     =
                        |      4 +-
 head/sys/dev/isci/scil/sati_read_capacity.c                               =
                        |      6 +-
 head/sys/dev/iscsi/initiator/isc_subr.c                                   =
                        |    102 +-
 head/sys/dev/iscsi/initiator/iscsi.c                                      =
                        |     23 +-
 head/sys/dev/iscsi/initiator/iscsi_subr.c                                 =
                        |     12 +-
 head/sys/dev/iscsi/initiator/iscsivar.h                                   =
                        |     12 +-
 head/sys/dev/iwi/if_iwi.c                                                 =
                        |     14 +-
 head/sys/dev/iwn/if_iwn.c                                                 =
                        |    101 +-
 head/sys/dev/ixgbe/ixgbe.c                                                =
                        |     20 +-
 head/sys/dev/mfi/mfi.c                                                    =
                        |   1469 +-
 head/sys/dev/mfi/mfi_cam.c                                                =
                        |      8 +-
 head/sys/dev/mfi/mfi_debug.c                                              =
                        |     22 +-
 head/sys/dev/mfi/mfi_disk.c                                               =
                        |     23 +-
 head/sys/dev/mfi/mfi_ioctl.h                                              =
                        |     12 +-
 head/sys/dev/mfi/mfi_linux.c                                              =
                        |      3 +-
 head/sys/dev/mfi/mfi_pci.c                                                =
                        |     41 +-
 head/sys/dev/mfi/mfireg.h                                                 =
                        |    661 +-
 head/sys/dev/mfi/mfivar.h                                                 =
                        |    199 +-
 head/sys/dev/mpt/mpilib/mpi.h                                             =
                        |     12 +-
 head/sys/dev/mpt/mpilib/mpi_cnfg.h                                        =
                        |     71 +-
 head/sys/dev/mpt/mpilib/mpi_fc.h                                          =
                        |      4 +-
 head/sys/dev/mpt/mpilib/mpi_init.h                                        =
                        |      4 +-
 head/sys/dev/mpt/mpilib/mpi_ioc.h                                         =
                        |      5 +-
 head/sys/dev/mpt/mpilib/mpi_lan.h                                         =
                        |      4 +-
 head/sys/dev/mpt/mpilib/mpi_raid.h                                        =
                        |     11 +-
 head/sys/dev/mpt/mpilib/mpi_sas.h                                         =
                        |     20 +-
 head/sys/dev/mpt/mpilib/mpi_targ.h                                        =
                        |      4 +-
 head/sys/dev/mpt/mpilib/mpi_tool.h                                        =
                        |      4 +-
 head/sys/dev/mpt/mpilib/mpi_type.h                                        =
                        |      4 +-
 head/sys/dev/mpt/mpt.h                                                    =
                        |      4 +-
 head/sys/dev/mpt/mpt_pci.c                                                =
                        |    245 +-
 head/sys/dev/mwl/if_mwl.c                                                 =
                        |     29 +-
 head/sys/dev/mwl/if_mwlvar.h                                              =
                        |      6 +-
 head/sys/dev/netmap/if_re_netmap.h                                        =
                        |      6 +-
 head/sys/dev/netmap/ixgbe_netmap.h                                        =
                        |    102 +-
 head/sys/dev/netmap/netmap.c                                              =
                        |    620 +-
 head/sys/dev/netmap/netmap_kern.h                                         =
                        |     56 +-
 head/sys/dev/pci/pci.c                                                    =
                        |     34 +-
 head/sys/dev/sfxge/sfxge_rx.c                                             =
                        |      8 +-
 head/sys/dev/smc/if_smc.c                                                 =
                        |      7 +-
 head/sys/dev/sound/pci/emu10kx.c                                          =
                        |      4 +-
 head/sys/dev/sound/pci/hda/hdaa.c                                         =
                        |     11 +-
 head/sys/dev/sound/pci/hda/hdac.c                                         =
                        |      5 +-
 head/sys/dev/sound/usb/uaudio.c                                           =
                        |     32 +-
 head/sys/dev/sound/usb/uaudioreg.h                                        =
                        |      6 +-
 head/sys/dev/syscons/syscons.c                                            =
                        |     26 +-
 head/sys/dev/uart/uart_bus.h                                              =
                        |      3 +-
 head/sys/dev/uart/uart_core.c                                             =
                        |     17 +-
 head/sys/dev/uart/uart_if.m                                               =
                        |      3 +-
 head/sys/dev/usb/controller/at91dci.c                                     =
                        |      9 +-
 head/sys/dev/usb/controller/atmegadci.c                                   =
                        |      9 +-
 head/sys/dev/usb/controller/avr32dci.c                                    =
                        |      9 +-
 head/sys/dev/usb/controller/dwc_otg.c                                     =
                        |      9 +-
 head/sys/dev/usb/controller/ehci.c                                        =
                        |     11 +-
 head/sys/dev/usb/controller/musb_otg.c                                    =
                        |      9 +-
 head/sys/dev/usb/controller/ohci.c                                        =
                        |     11 +-
 head/sys/dev/usb/controller/uhci.c                                        =
                        |     14 +-
 head/sys/dev/usb/controller/uss820dci.c                                   =
                        |      9 +-
 head/sys/dev/usb/controller/xhci.c                                        =
                        |      9 +-
 head/sys/dev/usb/input/atp.c                                              =
                        |     29 +-
 head/sys/dev/usb/input/uep.c                                              =
                        |      6 +-
 head/sys/dev/usb/input/uhid.c                                             =
                        |      8 +-
 head/sys/dev/usb/input/ukbd.c                                             =
                        |      4 +-
 head/sys/dev/usb/input/ums.c                                              =
                        |      8 +-
 head/sys/dev/usb/misc/ufm.c                                               =
                        |      4 +-
 head/sys/dev/usb/net/if_aue.c                                             =
                        |      6 +-
 head/sys/dev/usb/net/if_axe.c                                             =
                        |      6 +-
 head/sys/dev/usb/net/if_cdce.c                                            =
                        |     26 +-
 head/sys/dev/usb/net/if_cue.c                                             =
                        |      4 +-
 head/sys/dev/usb/net/if_ipheth.c                                          =
                        |      4 +-
 head/sys/dev/usb/net/if_kue.c                                             =
                        |      4 +-
 head/sys/dev/usb/net/if_rue.c                                             =
                        |      4 +-
 head/sys/dev/usb/net/if_udav.c                                            =
                        |      6 +-
 head/sys/dev/usb/net/if_usie.c                                            =
                        |      4 +-
 head/sys/dev/usb/net/ruephy.c                                             =
                        |      8 +-
 head/sys/dev/usb/net/uhso.c                                               =
                        |     10 +-
 head/sys/dev/usb/serial/ubsa.c                                            =
                        |      4 +-
 head/sys/dev/usb/serial/uchcom.c                                          =
                        |      8 +-
 head/sys/dev/usb/serial/ucycom.c                                          =
                        |      4 +-
 head/sys/dev/usb/serial/ufoma.c                                           =
                        |      4 +-
 head/sys/dev/usb/serial/ulpt.c                                            =
                        |      8 +-
 head/sys/dev/usb/serial/umodem.c                                          =
                        |      8 +-
 head/sys/dev/usb/serial/uplcom.c                                          =
                        |      4 +-
 head/sys/dev/usb/serial/usb_serial.c                                      =
                        |     15 +-
 head/sys/dev/usb/serial/usb_serial.h                                      =
                        |      6 +-
 head/sys/dev/usb/storage/umass.c                                          =
                        |      8 +-
 head/sys/dev/usb/storage/urio.c                                           =
                        |      4 +-
 head/sys/dev/usb/storage/ustorage_fs.c                                    =
                        |     42 +-
 head/sys/dev/usb/template/usb_template.c                                  =
                        |      4 +-
 head/sys/dev/usb/usb.h                                                    =
                        |     18 +-
 head/sys/dev/usb/usb_busdma.c                                             =
                        |      6 +-
 head/sys/dev/usb/usb_compat_linux.c                                       =
                        |      4 +-
 head/sys/dev/usb/usb_dev.c                                                =
                        |      8 +-
 head/sys/dev/usb/usb_device.c                                             =
                        |      4 +-
 head/sys/dev/usb/usb_handle_request.c                                     =
                        |      6 +-
 head/sys/dev/usb/usb_hid.c                                                =
                        |      6 +-
 head/sys/dev/usb/usb_hub.c                                                =
                        |      8 +-
 head/sys/dev/usb/usb_msctest.c                                            =
                        |      7 +-
 head/sys/dev/usb/usb_request.c                                            =
                        |     58 +-
 head/sys/dev/usb/usb_request.h                                            =
                        |      4 +-
 head/sys/dev/usb/usb_transfer.c                                           =
                        |      5 +-
 head/sys/dev/usb/usbdi.h                                                  =
                        |      4 +-
 head/sys/dev/usb/usbhid.h                                                 =
                        |      6 +-
 head/sys/dev/usb/wlan/if_rum.c                                            =
                        |     15 +-
 head/sys/dev/usb/wlan/if_run.c                                            =
                        |     45 +-
 head/sys/dev/usb/wlan/if_uath.c                                           =
                        |     25 +-
 head/sys/dev/usb/wlan/if_upgt.c                                           =
                        |     27 +-
 head/sys/dev/usb/wlan/if_ural.c                                           =
                        |     12 +-
 head/sys/dev/usb/wlan/if_urtw.c                                           =
                        |     30 +-
 head/sys/dev/usb/wlan/if_zyd.c                                            =
                        |     60 +-
 head/sys/dev/virtio/balloon/virtio_balloon.c                              =
                        |      9 +-
 head/sys/dev/virtio/block/virtio_blk.c                                    =
                        |    235 +-
 head/sys/dev/virtio/network/if_vtnet.c                                    =
                        |      4 +-
 head/sys/dev/virtio/pci/virtio_pci.c                                      =
                        |      4 +-
 head/sys/dev/virtio/virtio_ring.h                                         =
                        |     25 +-
 head/sys/dev/virtio/virtqueue.c                                           =
                        |     86 +-
 head/sys/dev/virtio/virtqueue.h                                           =
                        |      3 +-
 head/sys/dev/wpi/if_wpi.c                                                 =
                        |     15 +-
 head/sys/dev/xen/balloon/balloon.c                                        =
                        |      4 +-
 head/sys/dev/xen/blkfront/blkfront.c                                      =
                        |     36 +-
 head/sys/fs/ext2fs/ext2_vnops.c                                           =
                        |     16 +-
 head/sys/fs/msdosfs/msdosfs_vfsops.c                                      =
                        |      6 +-
 head/sys/fs/tmpfs/tmpfs.h                                                 =
                        |     64 +-
 head/sys/fs/tmpfs/tmpfs_subr.c                                            =
                        |     96 +-
 head/sys/fs/tmpfs/tmpfs_vfsops.c                                          =
                        |     83 +-
 head/sys/fs/tmpfs/tmpfs_vnops.c                                           =
                        |      4 +-
 head/sys/gdb/gdb_main.c                                                   =
                        |      4 +-
 head/sys/geom/geom_vfs.c                                                  =
                        |     45 +-
 head/sys/geom/part/g_part.c                                               =
                        |     25 +-
 head/sys/geom/part/g_part_ldm.c                                           =
                        |     37 +-
 head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c                                =
                        |     16 +-
 head/sys/i386/acpica/acpi_wakeup.c                                        =
                        |      4 +-
 head/sys/i386/conf/GENERIC                                                =
                        |      9 +-
 head/sys/i386/conf/NOTES                                                  =
                        |     44 +-
 head/sys/i386/conf/XBOX                                                   =
                        |      3 +-
 head/sys/i386/conf/XEN                                                    =
                        |      3 +-
 head/sys/i386/i386/identcpu.c                                             =
                        |      4 +-
 head/sys/i386/i386/machdep.c                                              =
                        |      9 +-
 head/sys/i386/i386/mp_machdep.c                                           =
                        |      8 +-
 head/sys/i386/i386/pmap.c                                                 =
                        |      3 +-
 head/sys/i386/i386/trap.c                                                 =
                        |     91 +-
 head/sys/i386/i386/vm86.c                                                 =
                        |     25 +-
 head/sys/i386/include/intr_machdep.h                                      =
                        |      6 +-
 head/sys/i386/include/pmc_mdep.h                                          =
                        |     31 +-
 head/sys/i386/include/proc.h                                              =
                        |      3 +-
 head/sys/i386/include/vm.h                                                =
                        |      4 +-
 head/sys/i386/linux/linux_dummy.c                                         =
                        |      3 +-
 head/sys/i386/linux/linux_machdep.c                                       =
                        |     21 +-
 head/sys/i386/linux/linux_proto.h                                         =
                        |     20 +-
 head/sys/i386/linux/linux_syscall.h                                       =
                        |      4 +-
 head/sys/i386/linux/linux_syscalls.c                                      =
                        |      4 +-
 head/sys/i386/linux/linux_sysent.c                                        =
                        |      6 +-
 head/sys/i386/linux/linux_systrace_args.c                                 =
                        |     58 +-
 head/sys/i386/linux/syscalls.master                                       =
                        |     20 +-
 head/sys/i386/xbox/xboxfb.c                                               =
                        |      4 +-
 head/sys/ia64/conf/GENERIC                                                =
                        |      3 +-
 head/sys/ia64/conf/SKI                                                    =
                        |      3 +-
 head/sys/kern/kern_clock.c                                                =
                        |     14 +-
 head/sys/kern/kern_descrip.c                                              =
                        |     32 +-
 head/sys/kern/kern_event.c                                                =
                        |     44 +-
 head/sys/kern/kern_exit.c                                                 =
                        |     40 +-
 head/sys/kern/kern_ktrace.c                                               =
                        |     42 +-
 head/sys/kern/kern_linker.c                                               =
                        |     23 +-
 head/sys/kern/kern_lock.c                                                 =
                        |     17 +-
 head/sys/kern/kern_mutex.c                                                =
                        |     17 +-
 head/sys/kern/kern_pmc.c                                                  =
                        |    163 +-
 head/sys/kern/kern_proc.c                                                 =
                        |     52 +-
 head/sys/kern/kern_rwlock.c                                               =
                        |     14 +-
 head/sys/kern/kern_sdt.c                                                  =
                        |     76 +-
 head/sys/kern/kern_sig.c                                                  =
                        |     49 +-
 head/sys/kern/kern_sx.c                                                   =
                        |     14 +-
 head/sys/kern/kern_sysctl.c                                               =
                        |     14 +-
 head/sys/kern/kern_umtx.c                                                 =
                        |    609 +-
 head/sys/kern/sched_ule.c                                                 =
                        |     54 +-
 head/sys/kern/subr_bus.c                                                  =
                        |     20 +-
 head/sys/kern/subr_firmware.c                                             =
                        |     12 +-
 head/sys/kern/subr_kdb.c                                                  =
                        |     29 +-
 head/sys/kern/subr_syscall.c                                              =
                        |     12 +-
 head/sys/kern/subr_trap.c                                                 =
                        |     12 +-
 head/sys/kern/subr_turnstile.c                                            =
                        |     10 +-
 head/sys/kern/subr_uio.c                                                  =
                        |     10 +-
 head/sys/kern/subr_witness.c                                              =
                        |      6 +-
 head/sys/kern/sys_pipe.c                                                  =
                        |     26 +-
 head/sys/kern/uipc_shm.c                                                  =
                        |     16 +-
 head/sys/kern/uipc_socket.c                                               =
                        |     13 +-
 head/sys/kern/vfs_mount.c                                                 =
                        |     44 +-
 head/sys/kern/vfs_subr.c                                                  =
                        |      5 +-
 head/sys/libkern/crc32.c                                                  =
                        |     22 +-
 head/sys/mips/atheros/apb.c                                               =
                        |     25 +-
 head/sys/mips/atheros/ar71xx_chip.c                                       =
                        |      4 +-
 head/sys/mips/atheros/ar71xx_chip.h                                       =
                        |      3 +-
 head/sys/mips/atheros/ar71xx_pci.c                                        =
                        |    221 +-
 head/sys/mips/atheros/ar91xx_chip.c                                       =
                        |     12 +-
 head/sys/mips/atheros/files.ar71xx                                        =
                        |      4 +-
 head/sys/mips/atheros/std.ar71xx                                          =
                        |      4 +-
 head/sys/mips/cavium/cvmx_config.h                                        =
                        |      5 +-
 head/sys/mips/cavium/files.octeon1                                        =
                        |      6 +-
 head/sys/mips/cavium/octeon_ebt3000_cf.c                                  =
                        |    114 +-
 head/sys/mips/cavium/octeon_irq.h                                         =
                        |      4 +-
 head/sys/mips/cavium/octeon_machdep.c                                     =
                        |     16 +-
 head/sys/mips/cavium/std.octeon1                                          =
                        |      4 +-
 head/sys/mips/conf/AR71XX_BASE                                            =
                        |      4 +-
 head/sys/mips/conf/AR91XX_BASE                                            =
                        |      4 +-
 head/sys/mips/conf/OCTEON1                                                =
                        |      3 +-
 head/sys/mips/conf/RT305X                                                 =
                        |      3 +-
 head/sys/mips/conf/SWARM                                                  =
                        |      4 +-
 head/sys/mips/conf/SWARM64                                                =
                        |      4 +-
 head/sys/mips/conf/SWARM64_SMP                                            =
                        |      4 +-
 head/sys/mips/conf/SWARM_SMP                                              =
                        |      4 +-
 head/sys/mips/conf/XLP                                                    =
                        |      4 +-
 head/sys/mips/conf/XLP64                                                  =
                        |      4 +-
 head/sys/mips/conf/XLPN32                                                 =
                        |      4 +-
 head/sys/mips/conf/XLR                                                    =
                        |      5 +-
 head/sys/mips/conf/XLR64                                                  =
                        |      5 +-
 head/sys/mips/conf/XLRN32                                                 =
                        |      5 +-
 head/sys/mips/conf/std.XLP                                                =
                        |     38 +-
 head/sys/mips/include/param.h                                             =
                        |     10 +-
 head/sys/mips/include/pmap.h                                              =
                        |      4 +-
 head/sys/mips/include/pmc_mdep.h                                          =
                        |     58 +-
 head/sys/mips/include/vm.h                                                =
                        |      4 +-
 head/sys/mips/mips/bus_space_generic.c                                    =
                        |      6 +-
 head/sys/mips/mips/exception.S                                            =
                        |     23 +-
 head/sys/mips/mips/intr_machdep.c                                         =
                        |     11 +-
 head/sys/mips/mips/machdep.c                                              =
                        |      4 +-
 head/sys/mips/mips/pmap.c                                                 =
                        |      4 +-
 head/sys/mips/mips/trap.c                                                 =
                        |     75 +-
 head/sys/mips/nlm/board.c                                                 =
                        |    460 +-
 head/sys/mips/nlm/board.h                                                 =
                        |     98 +-
 head/sys/mips/nlm/cms.c                                                   =
                        |     46 +-
 head/sys/mips/nlm/files.xlp                                               =
                        |     32 +-
 head/sys/mips/nlm/hal/iomap.h                                             =
                        |     15 +-
 head/sys/mips/nlm/hal/nlm_hal.c                                           =
                        |    161 +-
 head/sys/mips/nlm/hal/pcibus.h                                            =
                        |     44 +-
 head/sys/mips/nlm/hal/pic.h                                               =
                        |      4 +-
 head/sys/mips/nlm/hal/sys.h                                               =
                        |     23 +-
 head/sys/mips/nlm/intr_machdep.c                                          =
                        |      6 +-
 head/sys/mips/nlm/mpreset.S                                               =
                        |     16 +-
 head/sys/mips/nlm/msgring.h                                               =
                        |     14 +-
 head/sys/mips/nlm/uart_cpu_xlp.c                                          =
                        |     13 +-
 head/sys/mips/nlm/xlp.h                                                   =
                        |     61 +-
 head/sys/mips/nlm/xlp_machdep.c                                           =
                        |     33 +-
 head/sys/mips/nlm/xlp_pci.c                                               =
                        |    558 +-
 head/sys/modules/cyclic/Makefile                                          =
                        |      4 +-
 head/sys/modules/dtrace/Makefile                                          =
                        |      6 +-
 head/sys/modules/hwpmc/Makefile                                           =
                        |      4 +-
 head/sys/modules/iscsi/initiator/Makefile                                 =
                        |     14 +-
 head/sys/modules/mfi/Makefile                                             =
                        |      6 +-
 head/sys/modules/mlx4/Makefile                                            =
                        |     19 +-
 head/sys/modules/mlx4ib/Makefile                                          =
                        |     20 +-
 head/sys/modules/mlxen/Makefile                                           =
                        |     19 +-
 head/sys/modules/mps/Makefile                                             =
                        |      5 +-
 head/sys/modules/mthca/Makefile                                           =
                        |     20 +-
 head/sys/modules/ral/Makefile                                             =
                        |      6 +-
 head/sys/modules/ralfw/Makefile.inc                                       =
                        |      2 +-
 head/sys/modules/ralfw/rt2561/Makefile                                    =
                        |      2 +-
 head/sys/modules/ralfw/rt2561s/Makefile                                   =
                        |      2 +-
 head/sys/modules/ralfw/rt2661/Makefile                                    =
                        |      2 +-
 head/sys/net/bpf.c                                                        =
                        |    349 +-
 head/sys/net/bpf.h                                                        =
                        |     10 +-
 head/sys/net/bpf_buffer.c                                                 =
                        |      8 +-
 head/sys/net/bpf_zerocopy.c                                               =
                        |     12 +-
 head/sys/net/bpfdesc.h                                                    =
                        |     26 +-
 head/sys/net/if_lagg.c                                                    =
                        |     18 +-
 head/sys/net/if_media.h                                                   =
                        |     11 +-
 head/sys/net/netmap.h                                                     =
                        |     16 +-
 head/sys/net/netmap_user.h                                                =
                        |      4 +-
 head/sys/net80211/ieee80211.c                                             =
                        |     10 +-
 head/sys/net80211/ieee80211_ddb.c                                         =
                        |      6 +-
 head/sys/net80211/ieee80211_freebsd.c                                     =
                        |      4 +-
 head/sys/net80211/ieee80211_ht.c                                          =
                        |     90 +-
 head/sys/net80211/ieee80211_ht.h                                          =
                        |      6 +-
 head/sys/net80211/ieee80211_ioctl.h                                       =
                        |      9 +-
 head/sys/net80211/ieee80211_node.c                                        =
                        |     10 +-
 head/sys/net80211/ieee80211_node.h                                        =
                        |      5 +-
 head/sys/net80211/ieee80211_output.c                                      =
                        |      8 +-
 head/sys/net80211/ieee80211_proto.c                                       =
                        |     16 +-
 head/sys/net80211/ieee80211_regdomain.c                                   =
                        |     72 +-
 head/sys/net80211/ieee80211_sta.c                                         =
                        |     15 +-
 head/sys/net80211/ieee80211_superg.c                                      =
                        |     16 +-
 head/sys/net80211/ieee80211_var.h                                         =
                        |      7 +-
 head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c                          =
                        |     14 +-
 head/sys/netgraph/ng_source.c                                             =
                        |      3 +-
 head/sys/netinet/in.c                                                     =
                        |      4 +-
 head/sys/netinet/ip_carp.c                                                =
                        |     87 +-
 head/sys/netinet/ip_fw.h                                                  =
                        |      5 +-
 head/sys/netinet/ipfw/ip_fw2.c                                            =
                        |     47 +-
 head/sys/netinet/ipfw/ip_fw_private.h                                     =
                        |      7 +-
 head/sys/netinet/ipfw/ip_fw_sockopt.c                                     =
                        |      6 +-
 head/sys/netinet/ipfw/ip_fw_table.c                                       =
                        |     64 +-
 head/sys/netinet/sctp.h                                                   =
                        |     20 +-
 head/sys/netinet/sctp_constants.h                                         =
                        |      5 +-
 head/sys/netinet/sctp_header.h                                            =
                        |      4 +-
 head/sys/netinet/sctp_input.c                                             =
                        |    140 +-
 head/sys/netinet/sctp_output.c                                            =
                        |    163 +-
 head/sys/netinet/sctp_output.h                                            =
                        |     12 +-
 head/sys/netinet/sctp_pcb.h                                               =
                        |      3 +-
 head/sys/netinet/sctp_peeloff.c                                           =
                        |      4 +-
 head/sys/netinet/sctp_structs.h                                           =
                        |      7 +-
 head/sys/netinet/sctp_timer.c                                             =
                        |     20 +-
 head/sys/netinet/sctp_uio.h                                               =
                        |     75 +-
 head/sys/netinet/sctp_usrreq.c                                            =
                        |    292 +-
 head/sys/netinet/sctputil.c                                               =
                        |    251 +-
 head/sys/netinet/sctputil.h                                               =
                        |      8 +-
 head/sys/netinet/tcp_input.c                                              =
                        |     21 +-
 head/sys/netinet/tcp_output.c                                             =
                        |      4 +-
 head/sys/netinet/tcp_subr.c                                               =
                        |     31 +-
 head/sys/netinet/tcp_var.h                                                =
                        |      5 +-
 head/sys/netinet/udp_usrreq.c                                             =
                        |     10 +-
 head/sys/netinet/udp_var.h                                                =
                        |      4 +-
 head/sys/netinet6/in6_pcb.c                                               =
                        |      6 +-
 head/sys/ofed/drivers/infiniband/core/addr.c                              =
                        |     21 +-
 head/sys/ofed/drivers/infiniband/core/cma.c                               =
                        |     17 +-
 head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c                     =
                        |     15 +-
 head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c                     =
                        |      1 -
 head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c                   =
                        |      2 +-
 head/sys/ofed/drivers/net/mlx4/en_frag.c                                  =
                        |      4 +
 head/sys/ofed/drivers/net/mlx4/en_netdev.c                                =
                        |     18 +-
 head/sys/ofed/drivers/net/mlx4/en_port.c                                  =
                        |     16 +-
 head/sys/ofed/drivers/net/mlx4/en_port.h                                  =
                        |     11 +-
 head/sys/ofed/drivers/net/mlx4/en_rx.c                                    =
                        |     13 +
 head/sys/ofed/include/linux/in.h                                          =
                        |      2 +
 head/sys/ofed/include/linux/in6.h                                         =
                        |      2 -
 head/sys/ofed/include/linux/io.h                                          =
                        |      2 +-
 head/sys/ofed/include/linux/page.h                                        =
                        |      2 +-
 head/sys/ofed/include/net/ip.h                                            =
                        |      4 +
 head/sys/ofed/include/net/ipv6.h                                          =
                        |      2 -
 head/sys/pc98/conf/GENERIC                                                =
                        |      3 +-
 head/sys/pci/intpm.c                                                      =
                        |     14 +-
 head/sys/powerpc/aim/machdep.c                                            =
                        |     35 +-
 head/sys/powerpc/aim/mmu_oea.c                                            =
                        |     46 +-
 head/sys/powerpc/aim/mmu_oea64.c                                          =
                        |    363 +-
 head/sys/powerpc/aim/moea64_native.c                                      =
                        |     45 +-
 head/sys/powerpc/conf/GENERIC                                             =
                        |      3 +-
 head/sys/powerpc/conf/GENERIC64                                           =
                        |      3 +-
 head/sys/powerpc/conf/MPC85XX                                             =
                        |      3 +-
 head/sys/powerpc/include/cpu.h                                            =
                        |      3 +-
 head/sys/powerpc/include/pmap.h                                           =
                        |      7 +-
 head/sys/powerpc/include/pmc_mdep.h                                       =
                        |      5 +-
 head/sys/powerpc/include/trap.h                                           =
                        |      6 +-
 head/sys/powerpc/include/trap_aim.h                                       =
                        |      7 +-
 head/sys/powerpc/include/trap_booke.h                                     =
                        |      7 +-
 head/sys/powerpc/include/vm.h                                             =
                        |      3 +-
 head/sys/powerpc/powerpc/exec_machdep.c                                   =
                        |     16 +-
 head/sys/security/mac/mac_net.c                                           =
                        |      4 +-
 head/sys/security/mac/mac_syscalls.c                                      =
                        |     43 +-
 head/sys/sparc64/conf/GENERIC                                             =
                        |      5 +-
 head/sys/sparc64/pci/fire.c                                               =
                        |      9 +-
 head/sys/sparc64/pci/firereg.h                                            =
                        |      9 +-
 head/sys/sparc64/sparc64/intr_machdep.c                                   =
                        |      5 +-
 head/sys/sparc64/sparc64/machdep.c                                        =
                        |      9 +-
 head/sys/sparc64/sparc64/trap.c                                           =
                        |     13 +-
 head/sys/sys/bus.h                                                        =
                        |      3 +-
 head/sys/sys/conf.h                                                       =
                        |      6 +-
 head/sys/sys/elf_common.h                                                 =
                        |      4 +-
 head/sys/sys/event.h                                                      =
                        |      4 +-
 head/sys/sys/kdb.h                                                        =
                        |     16 +-
 head/sys/sys/ktrace.h                                                     =
                        |     23 +-
 head/sys/sys/libkern.h                                                    =
                        |      8 +-
 head/sys/sys/mman.h                                                       =
                        |      8 +-
 head/sys/sys/mount.h                                                      =
                        |     14 +-
 head/sys/sys/param.h                                                      =
                        |      4 +-
 head/sys/sys/pmc.h                                                        =
                        |     72 +-
 head/sys/sys/pmckern.h                                                    =
                        |     99 +-
 head/sys/sys/pmclog.h                                                     =
                        |     19 +-
 head/sys/sys/proc.h                                                       =
                        |      4 +-
 head/sys/sys/sdt.h                                                        =
                        |      6 +-
 head/sys/sys/signal.h                                                     =
                        |      3 +-
 head/sys/sys/sysctl.h                                                     =
                        |      3 +-
 head/sys/sys/tty.h                                                        =
                        |      2 +-
 head/sys/sys/umtx.h                                                       =
                        |      7 +-
 head/sys/sys/vnode.h                                                      =
                        |      4 +-
 head/sys/ufs/ffs/ffs_balloc.c                                             =
                        |     10 +-
 head/sys/ufs/ffs/ffs_extern.h                                             =
                        |      9 +-
 head/sys/ufs/ffs/ffs_inode.c                                              =
                        |     31 +-
 head/sys/ufs/ffs/ffs_rawread.c                                            =
                        |      4 +-
 head/sys/ufs/ffs/ffs_snapshot.c                                           =
                        |     41 +-
 head/sys/ufs/ffs/ffs_softdep.c                                            =
                        |    105 +-
 head/sys/ufs/ffs/ffs_vfsops.c                                             =
                        |    103 +-
 head/sys/ufs/ffs/ffs_vnops.c                                              =
                        |     16 +-
 head/sys/ufs/ufs/ufs_quota.c                                              =
                        |      5 +-
 head/sys/ufs/ufs/ufs_vnops.c                                              =
                        |     46 +-
 head/sys/vm/vm_fault.c                                                    =
                        |     31 +-
 head/sys/vm/vm_mmap.c                                                     =
                        |      5 +-
 head/sys/vm/vm_page.c                                                     =
                        |     31 +-
 head/sys/vm/vm_page.h                                                     =
                        |      8 +-
 head/sys/vm/vm_reserv.c                                                   =
                        |     14 +-
 head/sys/vm/vnode_pager.c                                                 =
                        |      6 +-
 head/sys/x86/acpica/madt.c                                                =
                        |     16 +-
 head/sys/x86/include/endian.h                                             =
                        |      6 +-
 head/sys/x86/include/mca.h                                                =
                        |      4 +-
 head/sys/x86/include/segments.h                                           =
                        |      4 +-
 head/sys/x86/include/specialreg.h                                         =
                        |     39 +-
 head/sys/x86/isa/isa_dma.c                                                =
                        |      7 +-
 head/sys/x86/pci/pci_bus.c                                                =
                        |     25 +-
 head/sys/x86/x86/intr_machdep.c                                           =
                        |      5 +-
 head/sys/x86/x86/mca.c                                                    =
                        |    122 +-
 head/sys/x86/x86/mptable_pci.c                                            =
                        |     16 +-
 head/tools/build/mk/OptionalObsoleteFiles.inc                             =
                        |    658 +-
 head/tools/make_libdeps.sh                                                =
                        |      4 +-
 head/tools/regression/lib/msun/test-rem.c                                 =
                        |     42 +-
 head/tools/tools/ath/athdecode/main.c                                     =
                        |      4 +-
 head/tools/tools/ath/athrd/athrd.1                                        =
                        |     12 +-
 head/tools/tools/ath/common/dumpregs_5416.c                               =
                        |      4 +-
 head/tools/tools/ether_reflect/ether_reflect.1                            =
                        |      4 +-
 head/tools/tools/net80211/wlanstats/wlanstats.c                           =
                        |     14 +-
 head/tools/tools/netmap/bridge.c                                          =
                        |     90 +-
 head/tools/tools/netmap/pcap.c                                            =
                        |      3 +-
 head/tools/tools/vimage/vimage.8                                          =
                        |      8 +-
 head/usr.bin/Makefile                                                     =
                        |      7 +-
 head/usr.bin/bsdiff/bsdiff/bsdiff.1                                       =
                        |      4 +-
 head/usr.bin/calendar/calendar.1                                          =
                        |      7 +-
 head/usr.bin/calendar/calendars/calendar.freebsd                          =
                        |      4 +-
 head/usr.bin/clang/bugpoint/Makefile                                      =
                        |      4 +-
 head/usr.bin/clang/bugpoint/bugpoint.1                                    =
                        |      4 +-
 head/usr.bin/clang/clang/Makefile                                         =
                        |     28 +-
 head/usr.bin/clang/clang/clang.1                                          =
                        |      6 +-
 head/usr.bin/clang/llc/llc.1                                              =
                        |      6 +-
 head/usr.bin/clang/lli/Makefile                                           =
                        |      4 +-
 head/usr.bin/clang/lli/lli.1                                              =
                        |      4 +-
 head/usr.bin/clang/llvm-ar/llvm-ar.1                                      =
                        |      4 +-
 head/usr.bin/clang/llvm-as/llvm-as.1                                      =
                        |      4 +-
 head/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1                      =
                        |      4 +-
 head/usr.bin/clang/llvm-diff/llvm-diff.1                                  =
                        |      4 +-
 head/usr.bin/clang/llvm-dis/llvm-dis.1                                    =
                        |      4 +-
 head/usr.bin/clang/llvm-extract/llvm-extract.1                            =
                        |      4 +-
 head/usr.bin/clang/llvm-ld/Makefile                                       =
                        |      4 +-
 head/usr.bin/clang/llvm-ld/llvm-ld.1                                      =
                        |      4 +-
 head/usr.bin/clang/llvm-link/llvm-link.1                                  =
                        |      4 +-
 head/usr.bin/clang/llvm-nm/llvm-nm.1                                      =
                        |      4 +-
 head/usr.bin/clang/llvm-prof/llvm-prof.1                                  =
                        |      4 +-
 head/usr.bin/clang/llvm-ranlib/llvm-ranlib.1                              =
                        |      4 +-
 head/usr.bin/clang/opt/Makefile                                           =
                        |      4 +-
 head/usr.bin/clang/opt/opt.1                                              =
                        |      4 +-
 head/usr.bin/clang/tblgen/Makefile                                        =
                        |      8 +-
 head/usr.bin/clang/tblgen/tblgen.1                                        =
                        |     50 +-
 head/usr.bin/comm/comm.1                                                  =
                        |      4 +-
 head/usr.bin/compile_et/Makefile                                          =
                        |      8 +-
 head/usr.bin/csup/cpasswd.1                                               =
                        |      4 +-
 head/usr.bin/csup/csup.1                                                  =
                        |     26 +-
 head/usr.bin/find/find.1                                                  =
                        |     27 +-
 head/usr.bin/fstat/fstat.c                                                =
                        |     31 +-
 head/usr.bin/fstat/fuser.1                                                =
                        |      4 +-
 head/usr.bin/hexdump/hexdump.1                                            =
                        |     32 +-
 head/usr.bin/hexdump/od.1                                                 =
                        |      4 +-
 head/usr.bin/indent/indent.1                                              =
                        |      5 +-
 head/usr.bin/ipcrm/ipcrm.1                                                =
                        |      4 +-
 head/usr.bin/jot/jot.1                                                    =
                        |      3 +-
 head/usr.bin/kdump/Makefile                                               =
                        |      4 +-
 head/usr.bin/kdump/kdump.1                                                =
                        |      6 +-
 head/usr.bin/kdump/kdump.c                                                =
                        |     35 +-
 head/usr.bin/kdump/mkioctls                                               =
                        |      4 +-
 head/usr.bin/kdump/mksubr                                                 =
                        |     25 +-
 head/usr.bin/killall/killall.1                                            =
                        |      4 +-
 head/usr.bin/ktrace/ktrace.1                                              =
                        |      8 +-
 head/usr.bin/ktrace/ktrace.h                                              =
                        |      5 +-
 head/usr.bin/ktrace/subr.c                                                =
                        |      5 +-
 head/usr.bin/lex/flex.skl                                                 =
                        |      8 +-
 head/usr.bin/locale/locale.1                                              =
                        |      6 +-
 head/usr.bin/lockf/lockf.1                                                =
                        |      4 +-
 head/usr.bin/m4/eval.c                                                    =
                        |      7 +-
 head/usr.bin/m4/extern.h                                                  =
                        |      3 +-
 head/usr.bin/m4/main.c                                                    =
                        |      6 +-
 head/usr.bin/man/man.conf.5                                               =
                        |      4 +-
 head/usr.bin/ministat/ministat.1                                          =
                        |      6 +-
 head/usr.bin/mkulzma/mkulzma.8                                            =
                        |      4 +-
 head/usr.bin/netstat/if.c                                                 =
                        |      6 +-
 head/usr.bin/netstat/inet.c                                               =
                        |      6 +-
 head/usr.bin/printf/printf.1                                              =
                        |      4 +-
 head/usr.bin/procstat/procstat.1                                          =
                        |      8 +-
 head/usr.bin/procstat/procstat_bin.c                                      =
                        |     18 +-
 head/usr.bin/procstat/procstat_files.c                                    =
                        |     12 +-
 head/usr.bin/rctl/rctl.8                                                  =
                        |     51 +-
 head/usr.bin/sed/sed.1                                                    =
                        |      6 +-
 head/usr.bin/setchannel/setchannel.1                                      =
                        |      3 +-
 head/usr.bin/tftp/tftp.1                                                  =
                        |     23 +-
 head/usr.bin/top/top.local.1                                              =
                        |     20 +-
 head/usr.bin/touch/touch.1                                                =
                        |     14 +-
 head/usr.bin/tr/tr.1                                                      =
                        |     50 +-
 head/usr.bin/truss/Makefile                                               =
                        |      4 +-
 head/usr.bin/unifdef/unifdef.1                                            =
                        |      3 +-
 head/usr.bin/units/units.1                                                =
                        |     36 +-
 head/usr.bin/unzip/unzip.1                                                =
                        |      5 +-
 head/usr.bin/unzip/unzip.c                                                =
                        |    113 +-
 head/usr.bin/vgrind/vgrindefs.5                                           =
                        |      5 +-
 head/usr.bin/vmstat/vmstat.c                                              =
                        |     24 +-
 head/usr.bin/wall/wall.1                                                  =
                        |      8 +-
 head/usr.bin/wall/wall.c                                                  =
                        |     84 +-
 head/usr.bin/xlint/Makefile.inc                                           =
                        |      4 +-
 head/usr.sbin/Makefile                                                    =
                        |      3 +-
 head/usr.sbin/Makefile.mips                                               =
                        |      6 +-
 head/usr.sbin/ac/ac.8                                                     =
                        |      4 +-
 head/usr.sbin/acpi/iasl/Makefile                                          =
                        |     15 +-
 head/usr.sbin/adduser/adduser.conf.5                                      =
                        |      4 +-
 head/usr.sbin/apmd/apmd.8                                                 =
                        |      4 +-
 head/usr.sbin/arp/arp.4                                                   =
                        |      4 +-
 head/usr.sbin/arp/arp.c                                                   =
                        |      6 +-
 head/usr.sbin/bluetooth/ath3kfw/ath3kfw.8                                 =
                        |      6 +-
 head/usr.sbin/boot0cfg/boot0cfg.8                                         =
                        |      3 +-
 head/usr.sbin/bootparamd/bootparamd/bootparamd.8                          =
                        |      4 +-
 head/usr.sbin/bsdinstall/bsdinstall.8                                     =
                        |      6 +-
 head/usr.sbin/bsdinstall/partedit/gpart_ops.c                             =
                        |      4 +-
 head/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3                =
                        |      5 +-
 head/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3                        =
                        |     14 +-
 head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1                          =
                        |      5 +-
 head/usr.sbin/cdcontrol/cdcontrol.1                                       =
                        |      4 +-
 head/usr.sbin/config/config.8                                             =
                        |      8 +-
 head/usr.sbin/ctladm/ctladm.8                                             =
                        |     33 +-
 head/usr.sbin/edquota/edquota.8                                           =
                        |      4 +-
 head/usr.sbin/faithd/faithd.8                                             =
                        |     16 +-
 head/usr.sbin/fdwrite/fdwrite.1                                           =
                        |      4 +-
 head/usr.sbin/freebsd-update/freebsd-update.8                             =
                        |      4 +-
 head/usr.sbin/fwcontrol/fwcontrol.8                                       =
                        |      8 +-
 head/usr.sbin/gpioctl/gpioctl.8                                           =
                        |      7 +-
 head/usr.sbin/i2c/i2c.8                                                   =
                        |     10 +-
 head/usr.sbin/ifmcstat/ifmcstat.8                                         =
                        |      3 +-
 head/usr.sbin/lmcconfig/lmcconfig.8                                       =
                        |      6 +-
 head/usr.sbin/lpr/lpc/cmds.c                                              =
                        |     10 +-
 head/usr.sbin/lpr/lpr/printcap.5                                          =
                        |      4 +-
 head/usr.sbin/makefs/cd9660/cd9660_eltorito.c                             =
                        |     38 +-
 head/usr.sbin/mfiutil/mfi_config.c                                        =
                        |      9 +-
 head/usr.sbin/mfiutil/mfi_drive.c                                         =
                        |      4 +-
 head/usr.sbin/mfiutil/mfiutil.8                                           =
                        |      7 +-
 head/usr.sbin/mountd/exports.5                                            =
                        |      6 +-
 head/usr.sbin/mptutil/mptutil.8                                           =
                        |      7 +-
 head/usr.sbin/mtest/mtest.8                                               =
                        |      3 +-
 head/usr.sbin/mtree/mtree.5                                               =
                        |      3 +-
 head/usr.sbin/newsyslog/newsyslog.c                                       =
                        |      9 +-
 head/usr.sbin/newsyslog/newsyslog.conf.5                                  =
                        |      8 +-
 head/usr.sbin/nfsd/nfsv4.4                                                =
                        |      4 +-
 head/usr.sbin/ntp/doc/ntp-keygen.8                                        =
                        |      3 +-
 head/usr.sbin/ntp/doc/ntpdate.8                                           =
                        |      3 +-
 head/usr.sbin/pciconf/pciconf.8                                           =
                        |      4 +-
 head/usr.sbin/pkg_install/updating/pkg_updating.1                         =
                        |      8 +-
 head/usr.sbin/pmcstat/pmcpl_calltree.c                                    =
                        |    626 +-
 head/usr.sbin/pmcstat/pmcstat.8                                           =
                        |      4 +-
 head/usr.sbin/pmcstat/pmcstat_log.c                                       =
                        |     42 +-
 head/usr.sbin/powerd/powerd.c                                             =
                        |      5 +-
 head/usr.sbin/rtadvd/rtadvd.8                                             =
                        |      4 +-
 head/usr.sbin/rtadvd/rtadvd.conf.5                                        =
                        |     10 +-
 head/usr.sbin/setfib/setfib.1                                             =
                        |      4 +-
 head/usr.sbin/tcpdump/tcpdump/tcpdump.1                                   =
                        |     18 +-
 head/usr.sbin/timed/timed/timed.8                                         =
                        |      8 +-
 head/usr.sbin/utx/utx.8                                                   =
                        |      3 +-
 head/usr.sbin/wlandebug/wlandebug.8                                       =
                        |      4 +-
 head/usr.sbin/wlconfig/wlconfig.8                                         =
                        |     10 +-
 head/usr.sbin/ypserv/ypserv.8                                             =
                        |      4 +-
 5218 files changed, 303068 insertions(+), 216015 deletions(-)

diffs (901657 lines):

diff -r 428842767fa6 -r f2935497fa04 head/Makefile
--- a/head/Makefile	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/Makefile	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/Makefile 232907 2012-03-13 00:38:49Z jmallett $
+# $FreeBSD: head/Makefile 233644 2012-03-29 02:54:35Z jmallett $
 #
 # The user-driven targets are:
 #
@@ -132,20 +132,19 @@
=20
 # Guess machine architecture from machine type, and vice versa.
 .if !defined(TARGET_ARCH) && defined(TARGET)
-_TARGET_ARCH=3D	${TARGET:S/pc98/i386/:S/mips/mipsel/}
+_TARGET_ARCH=3D	${TARGET:S/pc98/i386/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} !=3D ${MACHINE_ARCH}
-_TARGET=3D		${TARGET_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/}
+_TARGET=3D		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/}
 .endif
-# Legacy names, for a transition period mips:mips -> mipsel:mips
+# Legacy names, for another transition period mips:mips(n32|64)?eb -> mips=
:mips\1
 .if defined(TARGET) && defined(TARGET_ARCH) && \
-    ${TARGET_ARCH} =3D=3D "mips" && ${TARGET} =3D=3D "mips"
-.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
-.if defined(TARGET_BIG_ENDIAN)
-_TARGET_ARCH=3Dmipseb
-.else
-_TARGET_ARCH=3Dmipsel
+    ${TARGET} =3D=3D "mips" && ${TARGET_ARCH:Mmips*eb}
+_TARGET_ARCH=3D		${TARGET_ARCH:C/eb$//}
+.warning "TARGET_ARCH of ${TARGET_ARCH} is deprecated in favor of ${_TARGE=
T_ARCH}"
 .endif
+.if defined(TARGET) && ${TARGET} =3D=3D "mips" && defined(TARGET_BIG_ENDIA=
N)
+.warning "TARGET_BIG_ENDIAN is no longer necessary for MIPS.  Big-endian i=
s not the default."
 .endif
 # arm with TARGET_BIG_ENDIAN -> armeb
 .if defined(TARGET_ARCH) && ${TARGET_ARCH} =3D=3D "arm" && defined(TARGET_=
BIG_ENDIAN)
@@ -331,7 +330,7 @@
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(ta=
rgets)
 TARGETS?=3Damd64 arm i386 ia64 mips pc98 powerpc sparc64
 TARGET_ARCHES_arm?=3D	arm armeb
-TARGET_ARCHES_mips?=3D	mipsel mipseb mips64el mips64eb mipsn32eb
+TARGET_ARCHES_mips?=3D	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=3D	powerpc powerpc64
 TARGET_ARCHES_pc98?=3D	i386
 .for target in ${TARGETS}
diff -r 428842767fa6 -r f2935497fa04 head/Makefile.inc1
--- a/head/Makefile.inc1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/Makefile.inc1	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/Makefile.inc1 233098 2012-03-17 22:12:09Z peter $
+# $FreeBSD: head/Makefile.inc1 233645 2012-03-29 03:04:59Z jmallett $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -137,7 +137,7 @@
 VERSION+=3D	${OSRELDATE}
 .endif
=20
-KNOWN_ARCHES?=3D	amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipse=
b/mips mips64el/mips mips64eb/mips mipsn32el/mips mipsn32eb/mips powerpc po=
werpc64/powerpc sparc64
+KNOWN_ARCHES?=3D	amd64 arm armeb/arm i386 i386/pc98 ia64 mips mipsel/mips =
mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/pow=
erpc sparc64
 .if ${TARGET} =3D=3D ${TARGET_ARCH}
 _t=3D		${TARGET}
 .else
@@ -471,13 +471,6 @@
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if ${MK_KERBEROS} !=3D "no"
-.for _t in obj depend all
-	cd ${.CURDIR}/kerberos5/tools; \
-	    MAKEOBJDIRPREFIX=3D${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS=3D DESTDIR=3D \
-	    DIRPRFX=3Dkerberos5/tools/ ${_t}
-.endfor
-.endif
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=3Dinclude/ ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=3Dlib/ ${_t}
@@ -1071,9 +1064,11 @@
 	usr.bin/clang/clang-tblgen
 .endif
=20
+# dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} !=3D "no" && \
-    ${BOOTSTRAPPING} < 800038 && \
-    !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < 799999)
+    ((${BOOTSTRAPPING} < 800038 && \
+          !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < 799999)) \
+      || (${MACHINE} !=3D ${TARGET} || ${MACHINE_ARCH} !=3D ${TARGET_ARCH}=
))
 _dtrace_tools=3D cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
@@ -1082,12 +1077,22 @@
 _dtc=3D gnu/usr.bin/dtc
 .endif
=20
+.if ${MK_KERBEROS} !=3D "no"
+_kerberos5_bootstrap_tools=3D \
+	kerberos5/tools/make-roken \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libvers \
+	kerberos5/tools/asn1_compile \
+	kerberos5/tools/slc
+.endif
+
 #	Please document (add comment) why something is in 'bootstrap-tools'.
 #	Try to bound the building of the bootstrap-tool to just the
 #	FreeBSD versions that need the tool built at this stage of the build.
 bootstrap-tools:
 .for _tool in \
     ${_clang_tblgen} \
+    ${_kerberos5_bootstrap_tools} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
@@ -1129,10 +1134,6 @@
 _gcc_tools=3D gnu/usr.bin/cc/cc_tools
 .endif
=20
-.if ${MK_KERBEROS} !=3D "no"
-_kerberos5_tools=3D kerberos5/tools
-.endif
-
 .if ${MK_RESCUE} !=3D "no"
 _rescue=3D rescue/rescue
 .endif
@@ -1157,8 +1158,7 @@
 		${MAKE} DIRPRFX=3D${_tool}/ build-tools
 .endfor
 .for _tool in \
-    ${_gcc_tools} \
-    ${_kerberos5_tools}
+    ${_gcc_tools}
 	${_+_}@${ECHODIR} "=3D=3D=3D> ${_tool} (obj,depend,all)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=3D${_tool}/ obj; \
@@ -1264,11 +1264,16 @@
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
=20
-_prebuild_libs=3D	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
+_prebuild_libs=3D	${_kerberos5_lib_libasn1} \
+		${_kerberos5_lib_libhdb} \
+		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
+		${_kerberos5_lib_libheimsqlite} \
+		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
-		lib/libbz2 lib/libcom_err lib/libcrypt \
+		${_kerberos5_lib_libwind} \
+		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
@@ -1318,14 +1323,21 @@
 .if ${MK_KERBEROS} !=3D "no"
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
-    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
-kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb=
5__L
+    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
+    kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L=20
+kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb=
5__L \
+    kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
-    secure/lib/libcrypto__L kerberos5/lib/libroken__L
+    secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwin=
d__L
 kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
-    kerberos5/lib/libroken__L
+    kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
+    kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
 kerberos5/lib/libroken__L: lib/libcrypt__L
+kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
+kerberos5/lib/libheimbase__L: lib/libthr__L
+kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libh=
eimbase__L lib/libthr__L
+kerberos5/lib/libheimsqlite__L: lib/libthr__L
 .endif
=20
 .if ${MK_GSSAPI} !=3D "no"
@@ -1340,10 +1352,15 @@
 _kerberos5_lib=3D	kerberos5/lib
 _kerberos5_lib_libasn1=3D kerberos5/lib/libasn1
 _kerberos5_lib_libhdb=3D kerberos5/lib/libhdb
+_kerberos5_lib_libheimbase=3D kerberos5/lib/libheimbase
 _kerberos5_lib_libkrb5=3D kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509=3D kerberos5/lib/libhx509
 _kerberos5_lib_libroken=3D kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm=3D kerberos5/lib/libheimntlm
+_kerberos5_lib_libheimsqlite=3D kerberos5/lib/libheimsqlite
+_kerberos5_lib_libheimipcc=3D kerberos5/lib/libheimipcc
+_kerberos5_lib_libwind=3D kerberos5/lib/libwind
+_libcom_err=3D lib/libcom_err
 .endif
=20
 .if ${MK_NIS} !=3D "no"
diff -r 428842767fa6 -r f2935497fa04 head/ObsoleteFiles.inc
--- a/head/ObsoleteFiles.inc	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/ObsoleteFiles.inc	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/ObsoleteFiles.inc 233010 2012-03-15 17:01:25Z pluknet $
+# $FreeBSD: head/ObsoleteFiles.inc 234353 2012-04-16 21:23:25Z dim $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -38,6 +38,63 @@
 #   xargs -n1 | sort | uniq -d;
 # done
=20
+# 20120415: new clang import which bumps version from 3.0 to 3.1
+OLD_FILES+=3Dusr/include/clang/3.0/altivec.h
+OLD_FILES+=3Dusr/include/clang/3.0/avxintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/emmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/immintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/mm3dnow.h
+OLD_FILES+=3Dusr/include/clang/3.0/mm_malloc.h
+OLD_FILES+=3Dusr/include/clang/3.0/mmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/nmmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/pmmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/smmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/tmmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/wmmintrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/x86intrin.h
+OLD_FILES+=3Dusr/include/clang/3.0/xmmintrin.h
+OLD_DIRS+=3Dusr/include/clang/3.0
+# 20120322: Update heimdal to 1.5.1.
+OLD_FILES+=3Dusr/include/krb5-v4compat.h \
+	usr/include/krb_err.h \
+	usr/include/hdb-private.h \
+        usr/share/man/man3/krb5_addresses.3.gz \
+        usr/share/man/man3/krb5_cc_cursor.3.gz \
+        usr/share/man/man3/krb5_cc_ops.3.gz \
+        usr/share/man/man3/krb5_config.3.gz \
+        usr/share/man/man3/krb5_config_get_int_default.3.gz \
+        usr/share/man/man3/krb5_context.3.gz \
+        usr/share/man/man3/krb5_data.3.gz \
+        usr/share/man/man3/krb5_err.3.gz \
+        usr/share/man/man3/krb5_errx.3.gz \
+        usr/share/man/man3/krb5_keyblock.3.gz \
+        usr/share/man/man3/krb5_keytab_entry.3.gz \
+        usr/share/man/man3/krb5_kt_cursor.3.gz \
+        usr/share/man/man3/krb5_kt_ops.3.gz \
+        usr/share/man/man3/krb5_set_warn_dest.3.gz \
+        usr/share/man/man3/krb5_verr.3.gz \
+        usr/share/man/man3/krb5_verrx.3.gz \
+        usr/share/man/man3/krb5_vwarnx.3.gz \
+        usr/share/man/man3/krb5_warn.3.gz \
+        usr/share/man/man3/krb5_warnx.3.gz
+OLD_LIBS+=3Dusr/lib/libasn1.so.10 \
+	usr/lib/libhdb.so.10 \
+	usr/lib/libheimntlm.so.10 \
+	usr/lib/libhx509.so.10 \
+	usr/lib/libkadm5clnt.so.10 \
+	usr/lib/libkadm5srv.so.10 \
+	usr/lib/libkafs5.so.10 \
+	usr/lib/libkrb5.so.10 \
+	usr/lib/libroken.so.10 \
+	usr/lib32/libasn1.so.10 \
+	usr/lib32/libhdb.so.10 \
+	usr/lib32/libheimntlm.so.10 \
+	usr/lib32/libhx509.so.10 \
+	usr/lib32/libkadm5clnt.so.10 \
+	usr/lib32/libkadm5srv.so.10 \
+	usr/lib32/libkafs5.so.10 \
+	usr/lib32/libkrb5.so.10 \
+	usr/lib32/libroken.so.10
 # 20120309: Remove fifofs header files.
 OLD_FILES+=3Dusr/include/fs/fifofs/fifo.h
 OLD_DIRS+=3Dusr/include/fs/fifofs
@@ -4567,9 +4624,7 @@
 OLD_FILES+=3Dusr/share/man/man3/SSL_COMP_add_compression_method.3.gz
 OLD_FILES+=3Dusr/share/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=3Dusr/share/man/man3/archive_entry_dup.3.gz
-OLD_FILES+=3Dusr/share/man/man3/archive_entry_hardlink_w.3.gz
 OLD_FILES+=3Dusr/share/man/man3/archive_entry_set_tartype.3.gz
-OLD_FILES+=3Dusr/share/man/man3/archive_entry_symlink_w.3.gz
 OLD_FILES+=3Dusr/share/man/man3/archive_entry_tartype.3.gz
 OLD_FILES+=3Dusr/share/man/man3/archive_read_data_into_file.3.gz
 OLD_FILES+=3Dusr/share/man/man3/archive_read_open_tar.3.gz
diff -r 428842767fa6 -r f2935497fa04 head/UPDATING
--- a/head/UPDATING	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/UPDATING	Tue Apr 17 11:51:51 2012 +0300
@@ -22,6 +22,13 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
=20
+20120328:
+	Big-endian MIPS TARGET_ARCH values no longer end in "eb".  mips64eb
+	is now spelled mips64.  mipsn32eb is now spelled mipsn32.  mipseb is
+	now spelled mips.  This is to aid compatibility with third-party
+	software that expects this naming scheme in uname(3).  Little-endian
+	settings are unchanged.
+
 20120306:
 	Disable by default the option VFS_ALLOW_NONMPSAFE for all supported
 	platforms.
@@ -1569,4 +1576,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
=20
-$FreeBSD: head/UPDATING 232619 2012-03-06 20:01:25Z attilio $
+$FreeBSD: head/UPDATING 233644 2012-03-29 02:54:35Z jmallett $
diff -r 428842767fa6 -r f2935497fa04 head/bin/kenv/kenv.1
--- a/head/bin/kenv/kenv.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/kenv/kenv.1	Tue Apr 17 11:51:51 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/bin/kenv/kenv.1 233457 2012-03-25 09:20:14Z joel $
 .\"
 .Dd January 13, 2009
 .Dt KENV 1
@@ -84,7 +84,6 @@
 character except '=3D' is acceptable as part of a name.  Quotes
 are optional and necessary only if the value contains
 whitespace.
-.Pp
 .Sh SEE ALSO
 .Xr kenv 2 ,
 .Xr config 5 ,
diff -r 428842767fa6 -r f2935497fa04 head/bin/ps/ps.1
--- a/head/bin/ps/ps.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/ps/ps.1	Tue Apr 17 11:51:51 2012 +0300
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: head/bin/ps/ps.1 232694 2012-03-08 13:00:49Z kib $
+.\" $FreeBSD: head/bin/ps/ps.1 233665 2012-03-29 16:02:40Z joel $
 .\"
 .Dd March 8, 2012
 .Dt PS 1
@@ -292,37 +292,37 @@
 the include file
 .In sys/proc.h :
 .Bl -column P_SINGLE_BOUNDARY 0x40000000
-.It Dv "P_ADVLOCK" Ta No "0x00001	Process may hold a POSIX advisory lock"
-.It Dv "P_CONTROLT" Ta No "0x00002	Has a controlling terminal"
-.It Dv "P_KTHREAD" Ta No "0x00004	Kernel thread"
-.It Dv "P_FOLLOWFORK" Ta No "0x00008	Attach debugger to new children"
-.It Dv "P_PPWAIT" Ta No "0x00010	Parent is waiting for child to exec/exit"
-.It Dv "P_PROFIL" Ta No "0x00020	Has started profiling"
-.It Dv "P_STOPPROF" Ta No "0x00040	Has thread in requesting to stop prof"
-.It Dv "P_HADTHREADS" Ta No "0x00080	Has had threads (no cleanup shortcuts=
)"
-.It Dv "P_SUGID" Ta No "0x00100		Had set id privileges since last exec"
-.It Dv "P_SYSTEM" Ta No "0x00200	System proc: no sigs, stats or swapping"
-.It Dv "P_SINGLE_EXIT" Ta No "0x00400	Threads suspending should exit, not =
wait"
-.It Dv "P_TRACED" Ta No "0x00800	Debugged process being traced"
-.It Dv "P_WAITED" Ta No "0x01000	Someone is waiting for us"
-.It Dv "P_WEXIT" Ta No "0x02000		Working on exiting"
-.It Dv "P_EXEC" Ta No "0x04000		Process called exec"
-.It Dv "P_WKILLED" Ta No "0x08000	Killed, shall go to kernel/user boundary=
 ASAP"
-.It Dv "P_CONTINUED" Ta No "0x10000	Proc has continued from a stopped stat=
e"
-.It Dv "P_STOPPED_SIG" Ta No "0x20000	Stopped due to SIGSTOP/SIGTSTP"
-.It Dv "P_STOPPED_TRACE" Ta No "0x40000	Stopped because of tracing"
-.It Dv "P_STOPPED_SINGLE" Ta No "0x80000	Only one thread can continue"
-.It Dv "P_PROTECTED" Ta No "0x100000	Do not kill on memory overcommit"
-.It Dv "P_SIGEVENT" Ta No "0x200000	Process pending signals changed"
-.It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000	Threads should suspend at user =
boundary"
-.It Dv "P_HWPMC" Ta No "0x800000	Process is using HWPMCs"
-.It Dv "P_JAILED" Ta No "0x1000000	Process is in jail"
-.It Dv "P_ORPHAN" Ta No "0x2000000	Orphaned by original parent, reparented=
 to debugger"
-.It Dv "P_INEXEC" Ta No "0x4000000	Process is in execve()"
-.It Dv "P_STATCHILD" Ta No "0x8000000	Child process stopped or exited"
-.It Dv "P_INMEM" Ta No "0x10000000	Loaded into memory"
-.It Dv "P_SWAPPINGOUT" Ta No "0x20000000	Process is being swapped out"
-.It Dv "P_SWAPPINGIN" Ta No "0x40000000	Process is being swapped in"
+.It Dv "P_ADVLOCK" Ta No "0x00001" Ta "Process may hold a POSIX advisory l=
ock"
+.It Dv "P_CONTROLT" Ta No "0x00002" Ta "Has a controlling terminal"
+.It Dv "P_KTHREAD" Ta No "0x00004" Ta "Kernel thread"
+.It Dv "P_FOLLOWFORK" Ta No "0x00008" Ta "Attach debugger to new children"
+.It Dv "P_PPWAIT" Ta No "0x00010" Ta "Parent is waiting for child to exec/=
exit"
+.It Dv "P_PROFIL" Ta No "0x00020" Ta "Has started profiling"
+.It Dv "P_STOPPROF" Ta No "0x00040" Ta "Has thread in requesting to stop p=
rof"
+.It Dv "P_HADTHREADS" Ta No "0x00080" Ta "Has had threads (no cleanup shor=
tcuts)"
+.It Dv "P_SUGID" Ta No "0x00100" Ta "Had set id privileges since last exec"
+.It Dv "P_SYSTEM" Ta No "0x00200" Ta "System proc: no sigs, stats or swapp=
ing"
+.It Dv "P_SINGLE_EXIT" Ta No "0x00400" Ta "Threads suspending should exit,=
 not wait"
+.It Dv "P_TRACED" Ta No "0x00800" Ta "Debugged process being traced"
+.It Dv "P_WAITED" Ta No "0x01000" Ta "Someone is waiting for us"
+.It Dv "P_WEXIT" Ta No "0x02000" Ta "Working on exiting"
+.It Dv "P_EXEC" Ta No "0x04000" Ta "Process called exec"
+.It Dv "P_WKILLED" Ta No "0x08000" Ta "Killed, shall go to kernel/user bou=
ndary ASAP"
+.It Dv "P_CONTINUED" Ta No "0x10000" Ta "Proc has continued from a stopped=
 state"
+.It Dv "P_STOPPED_SIG" Ta No "0x20000" Ta "Stopped due to SIGSTOP/SIGTSTP"
+.It Dv "P_STOPPED_TRACE" Ta No "0x40000" Ta "Stopped because of tracing"
+.It Dv "P_STOPPED_SINGLE" Ta No "0x80000" Ta "Only one thread can continue"
+.It Dv "P_PROTECTED" Ta No "0x100000" Ta "Do not kill on memory overcommit"
+.It Dv "P_SIGEVENT" Ta No "0x200000" Ta "Process pending signals changed"
+.It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000" Ta "Threads should suspend at =
user boundary"
+.It Dv "P_HWPMC" Ta No "0x800000" Ta "Process is using HWPMCs"
+.It Dv "P_JAILED" Ta No "0x1000000" Ta "Process is in jail"
+.It Dv "P_ORPHAN" Ta No "0x2000000" Ta "Orphaned by original parent, repar=
ented to debugger"
+.It Dv "P_INEXEC" Ta No "0x4000000" Ta "Process is in execve()"
+.It Dv "P_STATCHILD" Ta No "0x8000000" Ta "Child process stopped or exited"
+.It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory"
+.It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out"
+.It Dv "P_SWAPPINGIN" Ta No "0x40000000" Ta "Process is being swapped in"
 .El
 .It Cm label
 The MAC label of the process.
diff -r 428842767fa6 -r f2935497fa04 head/bin/pwait/pwait.1
--- a/head/bin/pwait/pwait.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/pwait/pwait.1	Tue Apr 17 11:51:51 2012 +0300
@@ -30,7 +30,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/bin/pwait/pwait.1 233648 2012-03-29 05:02:12Z eadler $
 .\"
 .Dd November 1, 2009
 .Dt PWAIT 1
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility will wait until each of the given processes has terminated.=20
+utility will wait until each of the given processes has terminated.
 .Pp
 The following option is available:
 .Bl -tag -width indent
@@ -54,7 +54,6 @@
 Print the exit status when each process terminates.
 .El
 .Sh DIAGNOSTICS
-.Pp
 The
 .Nm
 utility returns 0 on success, and >0 if an error occurs.
diff -r 428842767fa6 -r f2935497fa04 head/bin/setfacl/setfacl.1
--- a/head/bin/setfacl/setfacl.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/setfacl/setfacl.1	Tue Apr 17 11:51:51 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/bin/setfacl/setfacl.1 220465 2011-04-09 07:42:25Z trasz=
 $
+.\" $FreeBSD: head/bin/setfacl/setfacl.1 233648 2012-03-29 05:02:12Z eadle=
r $
 .\"
 .Dd April 9, 2011
 .Dt SETFACL 1
@@ -295,7 +295,7 @@
 the ACL entry.
 It may consist of one of the following: uid or
 user name, or gid or group name.  In entries whose tag type is
-one of=20
+one of
 .Dq Li owner@ ,
 .Dq Li group@ ,
 or
diff -r 428842767fa6 -r f2935497fa04 head/bin/sh/jobs.c
--- a/head/bin/sh/jobs.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/sh/jobs.c	Tue Apr 17 11:51:51 2012 +0300
@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/jobs.c 230998 2012-02-04 23:12:14Z jilles =
$");
+__FBSDID("$FreeBSD: head/bin/sh/jobs.c 233792 2012-04-02 17:16:24Z jilles =
$");
=20
 #include <sys/ioctl.h>
 #include <sys/param.h>
@@ -893,8 +893,8 @@
 	struct jmploc jmploc;
 	struct jmploc *savehandler;
=20
-	TRACE(("vforkexecshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n,
-	    mode));
+	TRACE(("vforkexecshell(%%%td, %s, %p) called\n", jp - jobtab, argv[0],
+	    (void *)pip));
 	INTOFF;
 	flushall();
 	savehandler =3D handler;
diff -r 428842767fa6 -r f2935497fa04 head/bin/sh/sh.1
--- a/head/bin/sh/sh.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/sh/sh.1	Tue Apr 17 11:51:51 2012 +0300
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: head/bin/sh/sh.1 227122 2011-11-05 21:56:45Z jilles $
+.\" $FreeBSD: head/bin/sh/sh.1 233992 2012-04-07 09:05:30Z joel $
 .\"
 .Dd November 5, 2011
 .Dt SH 1
@@ -381,7 +381,7 @@
 .It Redirection operators:
 .Bl -column "XXX" "XXX" "XXX" "XXX" "XXX" -offset center -compact
 .It Li < Ta Li > Ta Li << Ta Li >> Ta Li <>
-.It Li <& Ta Li >& Ta Li <<- Ta Li >|
+.It Li <& Ta Li >& Ta Li <<- Ta Li >| Ta \&
 .El
 .El
 .Pp
@@ -1027,7 +1027,6 @@
 .Pp
 The first form executes the commands in a subshell environment.
 A subshell environment has its own copy of:
-.Pp
 .Bl -enum
 .It
 The current working directory as set by
@@ -1632,7 +1631,7 @@
 .It Constants
 Decimal, octal (starting with
 .Li 0 )
-and hexadecimal (starting with=20
+and hexadecimal (starting with
 .Li 0x )
 integer constants.
 .It Variables
diff -r 428842767fa6 -r f2935497fa04 head/bin/stty/stty.1
--- a/head/bin/stty/stty.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/bin/stty/stty.1	Tue Apr 17 11:51:51 2012 +0300
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: head/bin/stty/stty.1 233992 2012-04-07 09:05:30Z joel $
 .\"
 .Dd August 23, 2008
 .Dt STTY 1
@@ -90,7 +90,6 @@
 The following arguments are available to set the terminal
 characteristics:
 .Ss Control Modes:
-.Pp
 Control mode flags affect hardware characteristics associated with the
 terminal.
 This corresponds to the c_cflag in the termios structure.
@@ -256,7 +255,6 @@
 On the terminal NL performs (does not perform) the CR function.
 .El
 .Ss Local Modes:
-.Pp
 Local mode flags (lflags) affect various and sundry characteristics of ter=
minal
 processing.
 Historically the term "local" pertained to new job control features
@@ -386,7 +384,7 @@
 Recognized control-characters:
 .Bd -ragged -offset indent
 .Bl -column character Subscript
-.It control-
+.It control- Ta \& Ta \&
 .It character Ta Subscript Ta Description
 .It _________ Ta _________ Ta _______________
 .It eof Ta Tn VEOF Ta EOF No character
@@ -513,7 +511,6 @@
 first rows, then columns.
 .El
 .Ss Compatibility Modes:
-.Pp
 These modes remain for compatibility with the previous version of
 the
 .Nm
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/cmd/zpoo=
l/zpool.8
--- a/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Apr 17 11:36:47 2=
012 +0300
+++ b/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Apr 17 11:51:51 2=
012 +0300
@@ -21,7 +21,7 @@
 .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2011, Justin T. Gibbs <gibbs at FreeBSD.org>
 .\"
-.\" $FreeBSD: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 228206 2011-=
12-02 19:56:46Z mm $
+.\" $FreeBSD: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 234336 2012-=
04-16 08:19:43Z mm $
 .\"
 .Dd November 28, 2011
 .Dt ZPOOL 8
@@ -1779,7 +1779,7 @@
 storage pool consisting of two, two-way
 mirrors and mirrored log devices:
 .Bd -literal -offset 2n
-.Li # Ic zpool create pool mirror da0 da1 mirror da2 da3 log miror da4 da5
+.Li # Ic zpool create pool mirror da0 da1 mirror da2 da3 log mirror da4 da5
 .Ed
 .It Sy Example 14 No Adding Cache Devices to a Tn ZFS No Pool
 .Pp
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/lib/libd=
trace/common/dt_proc.c
--- a/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c	Tue Apr =
17 11:36:47 2012 +0300
+++ b/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c	Tue Apr =
17 11:51:51 2012 +0300
@@ -811,7 +811,7 @@
 #if defined(sun)
 		(void) _lwp_kill(dpr->dpr_tid, SIGCANCEL);
 #else
-		pthread_kill(dpr->dpr_tid, SIGUSR1);
+		pthread_kill(dpr->dpr_tid, SIGTHR);
 #endif
=20
 		/*
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/tools/ct=
f/cvt/ctf.c
--- a/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Tue Apr 17 11:51:51=
 2012 +0300
@@ -62,6 +62,18 @@
 	int ntholes;		/* number of type holes */
 };
=20
+/*
+ * Macros to reverse byte order
+ */
+#define	BSWAP_8(x)	((x) & 0xff)
+#define	BSWAP_16(x)	((BSWAP_8(x) << 8) | BSWAP_8((x) >> 8))
+#define	BSWAP_32(x)	((BSWAP_16(x) << 16) | BSWAP_16((x) >> 16))
+
+#define	SWAP_16(x)	(x) =3D BSWAP_16(x)
+#define	SWAP_32(x)	(x) =3D BSWAP_32(x)
+
+static int target_requires_swap;
+
 /*PRINTFLIKE1*/
 static void
 parseterminate(const char *fmt, ...)
@@ -140,6 +152,11 @@
 	ctl.ctl_label =3D strtab_insert(&b->ctb_strtab, le->le_name);
 	ctl.ctl_typeidx =3D le->le_idx;
=20
+	if (target_requires_swap) {
+		SWAP_32(ctl.ctl_label);
+		SWAP_32(ctl.ctl_typeidx);
+	}
+
 	ctf_buf_write(b, &ctl, sizeof (ctl));
=20
 	return (1);
@@ -152,6 +169,10 @@
=20
 	ctf_buf_write(b, &id, sizeof (id));
=20
+	if (target_requires_swap) {
+		SWAP_16(id);
+	}
+
 	debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
 }
=20
@@ -180,10 +201,21 @@
=20
 	fdata[0] =3D CTF_TYPE_INFO(CTF_K_FUNCTION, 1, nargs);
 	fdata[1] =3D idp->ii_dtype->t_id;
+
+	if (target_requires_swap) {
+		SWAP_16(fdata[0]);
+		SWAP_16(fdata[1]);
+	}
+
 	ctf_buf_write(b, fdata, sizeof (fdata));
=20
 	for (i =3D 0; i < idp->ii_nargs; i++) {
 		id =3D idp->ii_args[i]->t_id;
+
+		if (target_requires_swap) {
+			SWAP_16(id);
+		}
+
 		ctf_buf_write(b, &id, sizeof (id));
 	}
=20
@@ -208,11 +240,25 @@
 		ctt->ctt_size =3D CTF_LSIZE_SENT;
 		ctt->ctt_lsizehi =3D CTF_SIZE_TO_LSIZE_HI(size);
 		ctt->ctt_lsizelo =3D CTF_SIZE_TO_LSIZE_LO(size);
+		if (target_requires_swap) {
+			SWAP_32(ctt->ctt_name);
+			SWAP_16(ctt->ctt_info);
+			SWAP_16(ctt->ctt_size);
+			SWAP_32(ctt->ctt_lsizehi);
+			SWAP_32(ctt->ctt_lsizelo);
+		}
 		ctf_buf_write(b, ctt, sizeof (*ctt));
 	} else {
 		ctf_stype_t *cts =3D (ctf_stype_t *)ctt;
=20
 		cts->ctt_size =3D (ushort_t)size;
+
+		if (target_requires_swap) {
+			SWAP_32(cts->ctt_name);
+			SWAP_16(cts->ctt_info);
+			SWAP_16(cts->ctt_size);
+		}
+
 		ctf_buf_write(b, cts, sizeof (*cts));
 	}
 }
@@ -222,6 +268,12 @@
 {
 	ctf_stype_t *cts =3D (ctf_stype_t *)ctt;
=20
+	if (target_requires_swap) {
+		SWAP_32(cts->ctt_name);
+		SWAP_16(cts->ctt_info);
+		SWAP_16(cts->ctt_size);
+	}
+
 	ctf_buf_write(b, cts, sizeof (*cts));
 }
=20
@@ -296,6 +348,9 @@
 			encoding =3D ip->intr_fformat;
=20
 		data =3D CTF_INT_DATA(encoding, ip->intr_offset, ip->intr_nbits);
+		if (target_requires_swap) {
+			SWAP_32(data);
+		}
 		ctf_buf_write(b, &data, sizeof (data));
 		break;
=20
@@ -312,6 +367,11 @@
 		cta.cta_contents =3D tp->t_ardef->ad_contents->t_id;
 		cta.cta_index =3D tp->t_ardef->ad_idxtype->t_id;
 		cta.cta_nelems =3D tp->t_ardef->ad_nelems;
+		if (target_requires_swap) {
+			SWAP_16(cta.cta_contents);
+			SWAP_16(cta.cta_index);
+			SWAP_32(cta.cta_nelems);
+		}
 		ctf_buf_write(b, &cta, sizeof (cta));
 		break;
=20
@@ -341,6 +401,11 @@
 				    offset);
 				ctm.ctm_type =3D mp->ml_type->t_id;
 				ctm.ctm_offset =3D mp->ml_offset;
+				if (target_requires_swap) {
+					SWAP_32(ctm.ctm_name);
+					SWAP_16(ctm.ctm_type);
+					SWAP_16(ctm.ctm_offset);
+				}
 				ctf_buf_write(b, &ctm, sizeof (ctm));
 			}
 		} else {
@@ -355,6 +420,14 @@
 				    CTF_OFFSET_TO_LMEMHI(mp->ml_offset);
 				ctlm.ctlm_offsetlo =3D
 				    CTF_OFFSET_TO_LMEMLO(mp->ml_offset);
+
+				if (target_requires_swap) {
+					SWAP_32(ctlm.ctlm_name);
+					SWAP_16(ctlm.ctlm_type);
+					SWAP_32(ctlm.ctlm_offsethi);
+					SWAP_32(ctlm.ctlm_offsetlo);
+				}
+
 				ctf_buf_write(b, &ctlm, sizeof (ctlm));
 			}
 		}
@@ -377,6 +450,12 @@
 			offset =3D strtab_insert(&b->ctb_strtab, ep->el_name);
 			cte.cte_name =3D CTF_TYPE_NAME(CTF_STRTAB_0, offset);
 			cte.cte_value =3D ep->el_number;
+
+			if (target_requires_swap) {
+				SWAP_32(cte.cte_name);
+				SWAP_32(cte.cte_value);
+			}
+
 			ctf_buf_write(b, &cte, sizeof (cte));
 			i--;
 		}
@@ -420,6 +499,11 @@
=20
 		for (i =3D 0; i < (int) tp->t_fndef->fn_nargs; i++) {
 			id =3D tp->t_fndef->fn_args[i]->t_id;
+
+			if (target_requires_swap) {
+				SWAP_16(id);
+			}
+
 			ctf_buf_write(b, &id, sizeof (id));
 		}
=20
@@ -613,6 +697,9 @@
=20
 	int i;
=20
+	target_requires_swap =3D do_compress & CTF_SWAP_BYTES;
+	do_compress &=3D ~CTF_SWAP_BYTES;
+
 	/*
 	 * Prepare the header, and create the CTF output buffers.  The data
 	 * object section and function section are both lists of 2-byte
@@ -649,6 +736,18 @@
 	h.cth_stroff =3D ctf_buf_cur(buf);
 	h.cth_strlen =3D strtab_size(&buf->ctb_strtab);
=20
+	if (target_requires_swap) {
+		SWAP_16(h.cth_preamble.ctp_magic);
+		SWAP_32(h.cth_parlabel);
+		SWAP_32(h.cth_parname);
+		SWAP_32(h.cth_lbloff);
+		SWAP_32(h.cth_objtoff);
+		SWAP_32(h.cth_funcoff);
+		SWAP_32(h.cth_typeoff);
+		SWAP_32(h.cth_stroff);
+		SWAP_32(h.cth_strlen);
+	}
+
 	/*
 	 * We only do compression for ctfmerge, as ctfconvert is only
 	 * supposed to be used on intermediary build objects. This is
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/tools/ct=
f/cvt/ctfmerge.c
--- a/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Tue Apr 17 11:=
36:47 2012 +0300
+++ b/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Tue Apr 17 11:=
51:51 2012 +0300
@@ -620,7 +620,7 @@
 		terminate("No CTF data found in source file %s\n", srcfile);
=20
 	tmpname =3D mktmpname(destfile, ".ctf");
-	write_ctf(srctd, destfile, tmpname, CTF_COMPRESS | keep_stabs);
+	write_ctf(srctd, destfile, tmpname, CTF_COMPRESS | CTF_SWAP_BYTES | keep_=
stabs);
 	if (rename(tmpname, destfile) !=3D 0) {
 		terminate("Couldn't rename temp file %s to %s", tmpname,
 		    destfile);
@@ -1015,7 +1015,7 @@
=20
 	tmpname =3D mktmpname(outfile, ".ctf");
 	write_ctf(savetd, outfile, tmpname,
-	    CTF_COMPRESS | write_fuzzy_match | dynsym | keep_stabs);
+	    CTF_COMPRESS | CTF_SWAP_BYTES | write_fuzzy_match | dynsym | keep_sta=
bs);
 	if (rename(tmpname, outfile) !=3D 0)
 		terminate("Couldn't rename output temp file %s", tmpname);
 	free(tmpname);
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/tools/ct=
f/cvt/ctftools.h
--- a/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h	Tue Apr 17 11:=
36:47 2012 +0300
+++ b/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h	Tue Apr 17 11:=
51:51 2012 +0300
@@ -391,6 +391,7 @@
 #define	CTF_USE_DYNSYM	0x2 /* use .dynsym not .symtab */
 #define	CTF_COMPRESS	0x4 /* compress CTF output */
 #define	CTF_KEEP_STABS	0x8 /* keep .stabs sections */
+#define	CTF_SWAP_BYTES	0x10 /* target byte order is different from host */
=20
 void write_ctf(tdata_t *, const char *, const char *, int);
=20
diff -r 428842767fa6 -r f2935497fa04 head/cddl/contrib/opensolaris/tools/ct=
f/cvt/output.c
--- a/head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Tue Apr 17 11:51=
:51 2012 +0300
@@ -717,7 +717,7 @@
=20
 	iiburst =3D sort_iidescs(elf, file, td, flags & CTF_FUZZY_MATCH,
 	    flags & CTF_USE_DYNSYM);
-	data =3D ctf_gen(iiburst, lenp, flags & CTF_COMPRESS);
+	data =3D ctf_gen(iiburst, lenp, flags & (CTF_COMPRESS |  CTF_SWAP_BYTES));
=20
 	iiburst_free(iiburst);
=20
@@ -730,10 +730,12 @@
 	struct stat st;
 	Elf *elf =3D NULL;
 	Elf *telf =3D NULL;
+	GElf_Ehdr ehdr;
 	caddr_t data;
 	size_t len;
 	int fd =3D -1;
 	int tfd =3D -1;
+	int byteorder;
=20
 	(void) elf_version(EV_CURRENT);
 	if ((fd =3D open(curname, O_RDONLY)) < 0 || fstat(fd, &st) < 0)
@@ -746,6 +748,22 @@
 	if ((telf =3D elf_begin(tfd, ELF_C_WRITE, NULL)) =3D=3D NULL)
 		elfterminate(curname, "Cannot write");
=20
+	if (gelf_getehdr(elf, &ehdr)) {
+#if BYTE_ORDER =3D=3D _BIG_ENDIAN
+		byteorder =3D ELFDATA2MSB;
+#else
+		byteorder =3D ELFDATA2LSB;
+#endif
+		/*
+		 * If target and host has the same byte order
+		 * clear byte swapping request
+		 */
+		if  (ehdr.e_ident[EI_DATA] =3D=3D byteorder)
+			flags &=3D ~CTF_SWAP_BYTES;
+	}
+	else=20
+		elfterminate(curname, "Failed to get EHDR");
+
 	data =3D make_ctf_data(td, elf, curname, &len, flags);
 	write_file(elf, curname, telf, newname, data, len, flags);
 	free(data);
diff -r 428842767fa6 -r f2935497fa04 head/cddl/lib/Makefile
--- a/head/cddl/lib/Makefile	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/cddl/lib/Makefile	Tue Apr 17 11:51:51 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/cddl/lib/Makefile 233415 2012-03-24 05:29:07Z gonzo $
=20
 .include <bsd.own.mk>
=20
@@ -19,7 +19,7 @@
 .endif
 .endif
=20
-.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386"
+.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" ||  ${=
MACHINE_CPUARCH} =3D=3D "mips"
 _drti=3D		drti
 _libdtrace=3D	libdtrace
 .endif
diff -r 428842767fa6 -r f2935497fa04 head/cddl/lib/libdtrace/Makefile
--- a/head/cddl/lib/libdtrace/Makefile	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/cddl/lib/libdtrace/Makefile	Tue Apr 17 11:51:51 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/cddl/lib/libdtrace/Makefile 233415 2012-03-24 05:29:07Z g=
onzo $
=20
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common
@@ -42,8 +42,7 @@
 		dt_subr.c \
 		dt_work.c \
 		dt_xlator.c \
-		gmatch.c \
-		dis_tables.c
+		gmatch.c
=20
 DSRCS=3D		errno.d			\
 		psinfo.d		\
@@ -70,12 +69,17 @@
 .elif ${MACHINE_CPUARCH} =3D=3D "sparc64"
 CFLAGS+=3D	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc
+.elif ${MACHINE_CPUARCH} =3D=3D "mips"
+CFLAGS+=3D	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
+.PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
 .else
 # temporary hack
 CFLAGS+=3D	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
=20
 .if ${MACHINE_ARCH} =3D=3D "i386" || ${MACHINE_ARCH} =3D=3D "amd64"
+SRCS+=3D		dis_tables.c
 DSRCS+=3D		regs_x86.d
 .endif
=20
diff -r 428842767fa6 -r f2935497fa04 head/cddl/usr.sbin/Makefile
--- a/head/cddl/usr.sbin/Makefile	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/cddl/usr.sbin/Makefile	Tue Apr 17 11:51:51 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/cddl/usr.sbin/Makefile 233415 2012-03-24 05:29:07Z gonzo $
=20
 .include <bsd.own.mk>
=20
@@ -19,4 +19,8 @@
 _lockstat=3D	lockstat
 .endif
=20
+.if ${MACHINE_CPUARCH} =3D=3D "mips"
+_dtrace=3D	dtrace
+.endif
+
 .include <bsd.subdir.mk>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/CHANGES
--- a/head/contrib/bind9/CHANGES	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/CHANGES	Tue Apr 17 11:51:51 2012 +0300
@@ -1,9 +1,309 @@
-	--- 9.8.1-P1 released ---
+	--- 9.8.2 released ---
+
+3298.	[bug]		Named could dereference a NULL pointer in
+			zmgr_start_xfrin_ifquota if the zone was being removed.
+			[RT #28419]
+
+3297.	[bug]		Named could die on a malformed master file. [RT #28467]
+
+3295.	[bug]		Adjust isc_time_secondsastimet range check to be more
+			portable. [RT # 26542]
+
+3294.	[bug]		isccc/cc.c:table_fromwire failed to free alist on
+			error. [RT #28265]
+
+3291.	[port]		Fixed a build error on systems without ENOTSUP.
+			[RT #28200]
+
+3290.	[bug]		<isc/hmacsha.h> was not being installed. [RT #28169]
+
+3288.	[bug]		dlz_destroy() function wasn't correctly registered
+			by the DLZ dlopen driver. [RT #28056]
+
+3287.	[port]		Update ans.pl to work with Net::DNS 0.68. [RT #28028]
+
+3286.	[bug]		Managed key maintenance timer could fail to start
+			after 'rndc reconfig'. [RT #26786]
+
+	--- 9.8.2rc2 released ---
+
+3285.	[bug]		val-frdataset was incorrectly disassociated in
+			proveunsecure after calling startfinddlvsep.
+			[RT #27928]
+
+3284.	[bug]		Address race conditions with the handling of
+			rbtnode.deadlink. [RT #27738]
+
+3283.	[bug]		Raw zones with with more than 512 records in a RRset
+			failed to load. [RT #27863]
+
+3282.	[bug]		Restrict the TTL of NS RRset to no more than that
+			of the old NS RRset when replacing it.
+			[RT #27792] [RT #27884]
+
+3281.	[bug]		SOA refresh queries could be treated as cancelled
+			despite succeeding over the loopback interface.
+			[RT #27782]
+
+3280.	[bug]		Potential double free of a rdataset on out of memory
+			with DNS64. [RT #27762]
+
+3278.	[bug]		Make sure automatic key maintenance is started
+			when "auto-dnssec maintain" is turned on during
+			"rndc reconfig". [RT #26805]
+
+3276.	[bug]		win32: ns_os_openfile failed to return NULL on
+			safe_open failure. [RT #27696]
+
+3274.	[bug]		Log when a zone is not reusable.  Only set loadtime
+			on successful loads.  [RT #27650]
+
+3273.   [bug]           AAAA responses could be returned in the additional
+                        section even when filter-aaaa-on-v4 was in use.
+                        [RT #27292]
+
+3271.	[port]		darwin: mksymtbl is not always stable, loop several
+			times before giving up.  mksymtbl was using non
+			portable perl to covert 64 bit hex strings. [RT #27653]
+
+3268.	[bug]		Convert RRSIG expiry times to 64 timestamps to work
+			out the earliest expiry time. [RT #23311]
+
+3267.	[bug]		Memory allocation failures could be mis-reported as
+			unexpected error.  New ISC_R_UNSET result code.
+			[RT #27336]
+
+3266.	[bug]		The maximum number of NSEC3 iterations for a
+			DNSKEY RRset was not being properly computed.
+			[RT #26543]
+
+3262.	[bug]		Signed responses were handled incorrectly by RPZ.
+			[RT #27316]
+
+	--- 9.8.2rc1 released ---
+
+3260.	[bug]		"rrset-order cyclic" could appear not to rotate
+			for some query patterns.  [RT #27170/27185]
+
+3259.	[bug]		named-compilezone: Suppress "dump zone to <file>"
+			message when writing to stdout. [RT #27109]
+
+3258.	[test]		Add "forcing full sign with unreadable keys" test.
+			[RT #27153]
+
+3257.	[bug]		Do not generate a error message when calling fsync()
+			in a pipe or socket. [RT #27109]
+
+3256.	[bug]		Disable empty zones for lwresd -C. [RT #27139]
+
+3254.	[bug]		Set isc_socket_ipv6only() on the IPv6 control channels.
+			[RT #22249]
+
+3253.	[bug]		Return DNS_R_SYNTAX when the input to a text field is
+			too long. [RT #26956]
+
+3251.	[bug]		Enforce a upper bound (65535 bytes) on the amount of
+			memory dns_sdlz_putrr() can allocate per record to
+			prevent run away memory consumption on ISC_R_NOSPACE.
+			[RT #26956]
+
+3250.	[func]		'configure --enable-developer'; turn on various
+			configure options, normally off by default, that
+			we want developers to build and test with. [RT #27103]
+
+3249.	[bug]		Update log message when saving slave zones files for
+			analysis after load failures. [RT #27087]
+
+3248.	[bug]		Configure options --enable-fixed-rrset and
+			--enable-exportlib were incompatible with each
+			other. [RT #27087]
+
+3247.	[bug]		'raw' format zones failed to preserve load order
+			breaking 'fixed' sort order. [RT #27087]
+
+3243.	[port]		netbsd,bsdi: the thread defaults were not being
+			properly set.
+
+3241.	[bug]		Address race conditions in the resolver code.
+			[RT #26889]
+
+3240.	[bug]		DNSKEY state change events could be missed. [RT #26874]
+
+3239.	[bug]		dns_dnssec_findmatchingkeys needs to use a consistent
+			timestamp. [RT #26883]
+
+3238.	[bug]		keyrdata was not being reinitialized in
+			lib/dns/rbtdb.c:iszonesecure. [RT#26913]
+
+3237.	[bug]		dig -6 didn't work with +trace. [RT #26906]
+
+	--- 9.8.2b1 released ---
+
+3234.	[bug]		'make depend' produced invalid makefiles. [RT #26830]
+
+3231.	[bug]		named could fail to send a uncompressable zone.
+			[RT #26796]
+
+3230.	[bug]		'dig axfr' failed to properly handle a multi-message
+			axfr with a serial of 0. [RT #26796]
+
+3229.	[bug]		Fix local variable to struct var assignment
+			found by CLANG warning.
+
+3228.	[tuning]	Dynamically grow symbol table to improve zone
+			loading performance. [RT #26523]
+
+3227.	[bug]		Interim fix to make WKS's use of getprotobyname()
+			and getservbyname() self thread safe. [RT #26232]
+
+3226.	[bug]		Address minor resource leakages. [RT #26624]
+
+3221.	[bug]		Fixed a potential coredump on shutdown due to
+			referencing fetch context after it's been freed.
+			[RT #26720]
+
+3220.	[bug]		Change #3186 was incomplete; dns_db_rpz_findips()
+			could fail to set the database version correctly,
+			causing an assertion failure. [RT #26180]
=20
 3218.	[security]	Cache lookup could return RRSIG data associated with
 			nonexistent records, leading to an assertion
 			failure. [RT #26590]
=20
+3217.	[cleanup]	Fix build problem with --disable-static. [RT #26476]
+
+3216.	[bug]		resolver.c:validated() was not thread-safe. [RT #26478]
+
+3213.	[doc]		Clarify ixfr-from-differences behavior. [RT #25188]
+
+3212.	[bug]		rbtdb.c: failed to remove a node from the deadnodes
+			list prior to adding a reference to it leading a
+			possible assertion failure. [RT #23219]
+
+3209.	[func]		Add "dnssec-lookaside 'no'".  [RT #24858]
+
+3208.	[bug]		'dig -y' handle unknown tsig alorithm better.
+			[RT #25522]
+
+3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
+
+3206.	[cleanup]	Add ISC information to log at start time. [RT #25484]
+
+3204.	[bug]		When a master server that has been marked as
+			unreachable sends a NOTIFY, mark it reachable
+			again. [RT #25960]
+
+3203.	[bug]		Increase log level to 'info' for validation failures
+			from expired or not-yet-valid RRSIGs. [RT #21796]
+
+3200.	[doc]		Some rndc functions were undocumented or were
+			missing from 'rndc -h' output. [RT #25555]
+
+3198.	[doc]		Clarified that dnssec-settime can alter keyfile
+			permissions. [RT #24866]
+
+3196.	[bug]		nsupdate: return nonzero exit code when target zone
+			doesn't exist. [RT #25783]
+
+3195.	[cleanup]	Silence "file not found" warnings when loading
+			managed-keys zone. [RT #26340]
+
+3194.	[doc]		Updated RFC references in the 'empty-zones-enable'
+			documentation. [RT #25203]
+
+3193.	[cleanup]	Changed MAXZONEKEYS to DNS_MAXZONEKEYS, moved to
+			dnssec.h. [RT #26415]
+
+3192.	[bug]		A query structure could be used after being freed.
+			[RT #22208]
+
+3191.	[bug]		Print NULL records using "unknown" format. [RT #26392]
+
+3190.	[bug]		Underflow in error handling in isc_mutexblock_init.
+			[RT #26397]
+
+3189.	[test]		Added a summary report after system tests. [RT #25517]
+
+3188.	[bug]		zone.c:zone_refreshkeys() could fail to detach
+			references correctly when errors occurred, causing
+			a hang on shutdown. [RT #26372]
+
+3187.	[port]		win32: support for Visual Studio 2008.  [RT #26356]
+
+3186.	[bug]		Version/db mis-match in rpz code. [RT #26180]
+
+3179.	[port]		kfreebsd: build issues. [RT #26273]
+
+3175.	[bug]		Fix how DNSSEC positive wildcard responses from a
+			NSEC3 signed zone are validated.  Stop sending a
+			unnecessary NSEC3 record when generating such
+			responses. [RT #26200]
+
+3174.	[bug]		Always compute to revoked key tag from scratch.
+			[RT #26186]
+
+3173.	[port]		Correctly validate root DS responses. [RT #25726]
+
+3171.	[bug]		Exclusively lock the task when adding a zone using
+			'rndc addzone'.  [RT #25600]
+
+3170.	[func]		RPZ update:
+			- fix precedence among competing rules
+			- improve ARM text including documenting rule precedence
+			- try to rewrite CNAME chains until first hit
+			- new "rpz" logging channel
+			- RDATA for CNAME rules can include wildcards
+			- replace "NO-OP" named.conf policy override with
+			  "PASSTHRU" and add "DISABLED" override ("NO-OP"
+			  is still recognized)
+			[RT #25172]
+
+3169.	[func]		Catch db/version mis-matches when calling dns_db_*().
+			[RT #26017]
+
+3167.	[bug]		Negative answers from forwarders were not being
+			correctly tagged making them appear to not be cached.
+			[RT #25380]
+
+3162.	[test]		start.pl: modified to allow for "named.args" in
+			ns*/ subdirectory to override stock arguments to
+			named. Largely from RT#26044, but no separate ticket.
+
+3161.	[bug]		zone.c:del_sigs failed to always reset rdata leading
+			assertion failures. [RT #25880]
+
+3157.	[tuning]	Reduce the time spent in "rndc reconfig" by parsing
+			the config file before pausing the server. [RT #21373]
+
+3155.	[bug]		Fixed a build failure when using contrib DLZ
+			drivers (e.g., mysql, postgresql, etc). [RT #25710]
+
+3154.	[bug]		Attempting to print an empty rdataset could trigger
+			an assert. [RT #25452]
+
+3152.	[cleanup]	Some versions of gcc and clang failed due to
+			incorrect use of __builtin_expect. [RT #25183]
+
+3151.	[bug]		Queries for type RRSIG or SIG could be handled
+			incorrectly.  [RT #21050]
+
+3148.	[bug]		Processing of normal queries could be stalled when
+			forwarding a UPDATE message. [RT #24711]
+
+3146.	[test]		Fixed gcc4.6.0 errors in ATF. [RT #25598]
+
+3145.	[test]		Capture output of ATF unit tests in "./atf.out" if
+			there were any errors while running them. [RT #25527]
+
+3144.	[bug]		dns_dbiterator_seek() could trigger an assert when
+			used with a nonexistent database node. [RT #25358]
+
+3143.	[bug]		Silence clang compiler warnings. [RT #25174]
+
+3139.	[test]		Added tests from RFC 6234, RFC 2202, and RFC 1321
+			for the hashing algorithms (md5, sha1 - sha512, and
+			their hmac counterparts).  [RT #25067]
+
 	--- 9.8.1 released ---
=20
 	--- 9.8.1rc1 released ---
@@ -14,7 +314,7 @@
 3138.	[bug]		Address memory leaks and out-of-order operations when
 			shutting named down. [RT #25210]
=20
-3136.	[func]		Add RFC 1918 reverse zones to the list of built-in=20
+3136.	[func]		Add RFC 1918 reverse zones to the list of built-in
 			empty zones switched on by the 'empty-zones-enable'
 			option. [RT #24990]
=20
@@ -34,9 +334,9 @@
=20
 3133.	[bug]		Change #3114 was incomplete. [RT #24577]
=20
-3131.   [tuning]        Improve scalability by allocating one zone task
-                        per 100 zones at startup time, rather than using a
-                        fixed-size task table. [RT #24406]
+3131.	[tuning]	Improve scalability by allocating one zone task
+			per 100 zones at startup time, rather than using a
+			fixed-size task table. [RT #24406]
=20
 3129.	[bug]		Named could crash on 'rndc reconfig' when
 			allow-new-zones was set to yes and named ACLs
@@ -62,10 +362,10 @@
=20
 3122.	[cleanup]	dnssec-settime: corrected usage message. [RT #24664]
=20
-3121.   [security]      An authoritative name server sending a negative
-                        response containing a very large RRset could
-                        trigger an off-by-one error in the ncache code
-                        and crash named. [RT #24650]
+3121.	[security]	An authoritative name server sending a negative
+			response containing a very large RRset could
+			trigger an off-by-one error in the ncache code
+			and crash named. [RT #24650]
=20
 3120.	[bug]		Named could fail to validate zones listed in a DLV
 			that validated insecure without using DLV and had
@@ -99,9 +399,9 @@
 			"krb5-subdomain", which allow machines to update
 			their own records, to the BIND 9 ARM.
=20
-3111.   [bug]           Improved consistency checks for dnssec-enable and
-                        dnssec-validation, added test cases to the
-                        checkconf system test. [RT #24398]
+3111.	[bug]		Improved consistency checks for dnssec-enable and
+			dnssec-validation, added test cases to the
+			checkconf system test. [RT #24398]
=20
 3110.	[bug]		dnssec-signzone: Wrong error message could appear
 			when attempting to sign with no KSK. [RT #24369]
@@ -109,10 +409,10 @@
 3107.	[bug]		dnssec-signzone: Report the correct number of ZSKs
 			when using -x. [RT #20852]
=20
-3105.   [bug]           GOST support can be suppressed by "configure
-                        --without-gost" [RT #24367]
-
-3104.   [bug]           Better support for cross-compiling. [RT #24367]
+3105.	[bug]		GOST support can be suppressed by "configure
+			--without-gost" [RT #24367]
+
+3104.	[bug]		Better support for cross-compiling. [RT #24367]
=20
 3103.	[bug]		Configuring 'dnssec-validation auto' in a view
 			instead of in the options statement could trigger
@@ -142,7 +442,7 @@
=20
 3094.	[doc]		Expand dns64 documentation.
=20
-3093.   [bug]           Fix gssapi/kerberos dependencies [RT #23836]
+3093.	[bug]		Fix gssapi/kerberos dependencies [RT #23836]
=20
 3092.	[bug]		Signatures for records at the zone apex could go
 			stale due to an incorrect timer setting. [RT #23769]
@@ -151,7 +451,7 @@
 			and then subsequently activated could fail to trigger
 			automatic signing. [RT #22911]
=20
-3090.   [func]          Make --with-gssapi default [RT #23738]
+3090.	[func]		Make --with-gssapi default [RT #23738]
=20
 3088.	[bug]		Remove bin/tests/system/logfileconfig/ns1/named.conf
 			and add setup.sh in order to resolve changing
@@ -269,9 +569,9 @@
=20
 3043.	[test]		Merged in the NetBSD ATF test framework (currently
 			version 0.12) for development of future unit tests.
-                        Use configure --with-atf to build ATF internally
-                        or configure --with-atf=3Dprefix to use an external
-                        copy.  [RT #23209]
+			Use configure --with-atf to build ATF internally
+			or configure --with-atf=3Dprefix to use an external
+			copy.  [RT #23209]
=20
 3042.	[bug]		dig +trace could fail attempting to use IPv6
 			addresses on systems with only IPv4 connectivity.
@@ -706,7 +1006,7 @@
 2929.	[bug]		Improved handling of GSS security contexts:
 			 - added LRU expiration for generated TSIGs
 			 - added the ability to use a non-default realm
-                         - added new "realm" keyword in nsupdate
+			 - added new "realm" keyword in nsupdate
 			 - limited lifetime of generated keys to 1 hour
 			   or the lifetime of the context (whichever is
 			   smaller)
@@ -1535,7 +1835,7 @@
 			--with-export-includedir. [RT #20252]
=20
 2675.	[bug]		dnssec-signzone could crash if the key directory
-                        did not exist. [RT #20232]
+			did not exist. [RT #20232]
=20
 	--- 9.7.0a3 released ---
=20
@@ -1626,7 +1926,7 @@
 			64-bit systems. [RT #20076]
=20
 2650.	[bug]		Assertion failure in dnssec-signzone when trying
-                        to read keyset-* files. [RT #20075]
+			to read keyset-* files. [RT #20075]
=20
 2649.	[bug]		Set the domain for forward only zones. [RT #19944]
=20
@@ -1698,7 +1998,7 @@
 2630.	[func]		Improved syntax for DDNS autoconfiguration:  use
 			"update-policy local;" to switch on local DDNS in a
 			zone. (The "ddns-autoconf" option has been removed.)
-                        [RT #19875]
+			[RT #19875]
=20
 2629.	[port]		Check for seteuid()/setegid(), use setresuid()/
 			setresgid() if not present. [RT #19932]
@@ -2383,10 +2683,10 @@
 			time. [RT #18277]
=20
 2423.	[security]	Randomize server selection on queries, so as to
-                        make forgery a little more difficult.  Instead of
-                        always preferring the server with the lowest RTT,
-                        pick a server with RTT within the same 128
-                        millisecond band.  [RT #18441]
+			make forgery a little more difficult.  Instead of
+			always preferring the server with the lowest RTT,
+			pick a server with RTT within the same 128
+			millisecond band.  [RT #18441]
=20
 2422.	[bug]		Handle the special return value of a empty node as
 			if it was a NXRRSET in the validator. [RT #18447]
@@ -2467,7 +2767,7 @@
=20
 2399.	[placeholder]
=20
-2398.	[bug]           Improve file descriptor management.  New,
+2398.	[bug]		Improve file descriptor management.  New,
 			temporary, named.conf option reserved-sockets,
 			default 512. [RT #18344]
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/COPYRIGHT
--- a/head/contrib/bind9/COPYRIGHT	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/COPYRIGHT	Tue Apr 17 11:51:51 2012 +0300
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
=20
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
=20
-$Id: COPYRIGHT,v 1.17.14.1 2011-02-22 06:34:47 marka Exp $
+$Id: COPYRIGHT,v 1.17.14.2 2012/01/04 23:46:18 tbox Exp $
=20
 	Portions of this code release fall under one or more of the
 	following Copyright notices.  Please see individual source
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/FAQ.xml
--- a/head/contrib/bind9/FAQ.xml	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/FAQ.xml	Tue Apr 17 11:51:51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: FAQ.xml,v 1.54 2010-01-19 23:48:55 tbox Exp $ -->
+<!-- $Id: FAQ.xml,v 1.54 2010/01/19 23:48:55 tbox Exp $ -->
=20
 <article class=3D"faq">
   <title>Frequently Asked Questions about BIND 9</title>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/Makefile.in
--- a/head/contrib/bind9/Makefile.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/Makefile.in	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.58.250.2 2011-02-28 01:19:57 tbox Exp $
+# $Id: Makefile.in,v 1.58.250.4 2011/09/06 04:06:11 marka Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
@@ -64,8 +64,10 @@
 check: test
=20
 test:
-	(cd bin/tests && ${MAKE} ${MAKEDEFS} test)
-	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh)
+	status=3D0; \
+	(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=3D1; \
+	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=3D1; \
+	exit $$status
=20
 FAQ: FAQ.xml
 	${XSLTPROC} doc/xsl/isc-docbook-text.xsl FAQ.xml | \
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/README
--- a/head/contrib/bind9/README	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/README	Tue Apr 17 11:51:51 2012 +0300
@@ -48,6 +48,14 @@
 	For a detailed list of user-visible changes from
 	previous releases, see the CHANGES file.
=20
+        For up-to-date release notes and errata, see
+        http://www.isc.org/software/bind9/releasenotes
+
+BIND 9.8.2
+
+	BIND 9.8.2 includes a number of bug fixes and prevents a security
+	problem described in CVE-2011-4313
+
 BIND 9.8.1
=20
         BIND 9.8.1 includes a number of bug fixes and enhancements from
@@ -314,6 +322,7 @@
 	libraries.  sh-utils-1.16 provides a "printf" which compiles
 	on SunOS 4.
=20
+
 Documentation
=20
 	The BIND 9 Administrator Reference Manual is included with the
@@ -336,6 +345,48 @@
         in the other README files.
=20
=20
+Change Log
+
+	A detailed list of all changes to BIND 9 is included in the=20
+	file CHANGES, with the most recent changes listed first.
+	Change notes include tags indicating the category of the
+	change that was made; these categories are:
+
+	   [func]	  New feature
+
+	   [bug]	  General bug fix
+
+	   [security]	  Fix for a significant security flaw
+
+	   [experimental] Used for new features when the syntax
+	   		  or other aspects of the design are still
+			  in flux and may change
+
+	   [port]	  Portability enhancement
+
+	   [maint]	  Updates to built-in data such as root
+			  server addresses and keys
+
+	   [tuning]	  Changes to built-in configuration defaults
+	   		  and constants to improve performanceo
+
+	   [protocol]	  Updates to the DNS protocol such as new
+			  RR types
+
+           [test]         Changes to the automatic tests, not
+                          affecting server functionality
+
+           [cleanup]      Minor corrections and refactoring
+
+	   [doc]	  Documentation
+
+	In general, [func] and [experimental] tags will only appear
+	in new-feature releases (i.e., those with version numbers
+	ending in zero).  Some new functionality may be backported to
+	older releases on a case-by-case basis.  All other change
+	types may be applied to all currently-supported releases.
+
+
 Bug Reports and Mailing Lists
=20
 	Bugs reports should be sent to
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/acconfig.h
--- a/head/contrib/bind9/acconfig.h	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/acconfig.h	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $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 $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/Makefile.in
--- a/head/contrib/bind9/bin/Makefile.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/Makefile.in	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.29 2009-10-05 12:07:08 fdupont Exp $
+# $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/Makefile.=
in
--- a/head/contrib/bind9/bin/check/Makefile.in	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/check/Makefile.in	Tue Apr 17 11:51:51 2012 +03=
00
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.36 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/check-too=
l.c
--- a/head/contrib/bind9/bin/check/check-tool.c	Tue Apr 17 11:36:47 2012 +0=
300
+++ b/head/contrib/bind9/bin/check/check-tool.c	Tue Apr 17 11:51:51 2012 +0=
300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: check-tool.c,v 1.41 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: check-tool.c,v 1.41 2010/09/07 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/check-too=
l.h
--- a/head/contrib/bind9/bin/check/check-tool.h	Tue Apr 17 11:36:47 2012 +0=
300
+++ b/head/contrib/bind9/bin/check/check-tool.h	Tue Apr 17 11:51:51 2012 +0=
300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: check-tool.h,v 1.16 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: check-tool.h,v 1.16 2010/09/07 23:46:59 tbox Exp $ */
=20
 #ifndef CHECK_TOOL_H
 #define CHECK_TOOL_H
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckconf.8
--- a/head/contrib/bind9/bin/check/named-checkconf.8	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/check/named-checkconf.8	Tue Apr 17 11:51:51 20=
12 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkconf.8,v 1.33 2009-12-29 01:14:03 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckconf.c
--- a/head/contrib/bind9/bin/check/named-checkconf.c	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/check/named-checkconf.c	Tue Apr 17 11:51:51 20=
12 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: named-checkconf.c,v 1.54.62.2 2011-03-12 04:59:13 tbox Exp $ */
+/* $Id: named-checkconf.c,v 1.54.62.2 2011/03/12 04:59:13 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckconf.docbook
--- a/head/contrib/bind9/bin/check/named-checkconf.docbook	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/check/named-checkconf.docbook	Tue Apr 17 11:51=
:51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: named-checkconf.docbook,v 1.22 2009-12-28 23:21:16 each Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.22 2009/12/28 23:21:16 each Exp $ -->
 <refentry id=3D"man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckconf.html
--- a/head/contrib/bind9/bin/check/named-checkconf.html	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/check/named-checkconf.html	Tue Apr 17 11:51:51=
 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkconf.html,v 1.33 2009-12-29 01:14:03 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">named-checkconf</cod=
e>  [<code class=3D"option">-h</code>] [<code class=3D"option">-v</code>] [=
<code class=3D"option">-j</code>] [<code class=3D"option">-t <em class=3D"r=
eplaceable"><code>directory</code></em></code>] {filename} [<code class=3D"=
option">-p</code>] [<code class=3D"option">-z</code>]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543395"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543396"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">named-checkconf</strong></span>
       checks the syntax, but not the semantics, of a
       <span><strong class=3D"command">named</strong></span> configuration =
file.  The file is parsed
@@ -52,7 +52,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543444"></a><h2>OPTIONS</h2>
+<a name=3D"id2543445"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-h</span></dt>
 <dd><p>
@@ -91,21 +91,21 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543568"></a><h2>RETURN VALUES</h2>
+<a name=3D"id2543569"></a><h2>RETURN VALUES</h2>
 <p><span><strong class=3D"command">named-checkconf</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543579"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543580"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">named</span>=
(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named-che=
ckzone</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543609"></a><h2>AUTHOR</h2>
+<a name=3D"id2543610"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckzone.8
--- a/head/contrib/bind9/bin/check/named-checkzone.8	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/check/named-checkzone.8	Tue Apr 17 11:51:51 20=
12 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkzone.8,v 1.47 2010-01-17 01:14:02 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckzone.c
--- a/head/contrib/bind9/bin/check/named-checkzone.c	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/check/named-checkzone.c	Tue Apr 17 11:51:51 20=
12 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: named-checkzone.c,v 1.61 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: named-checkzone.c,v 1.61.62.2 2011/12/22 23:45:54 tbox Exp $ */
=20
 /*! \file */
=20
@@ -112,6 +112,7 @@
 	const char *outputformatstr =3D NULL;
 	dns_masterformat_t inputformat =3D dns_masterformat_text;
 	dns_masterformat_t outputformat =3D dns_masterformat_text;
+	isc_boolean_t logdump =3D ISC_FALSE;
 	FILE *errout =3D stdout;
=20
 	outputstyle =3D &dns_master_style_full;
@@ -418,6 +419,7 @@
=20
 	if (progmode =3D=3D progmode_compile) {
 		dumpzone =3D 1;	/* always dump */
+		logdump =3D !quiet;
 		if (output_filename =3D=3D NULL) {
 			fprintf(stderr,
 				"output file required, but not specified\n");
@@ -436,8 +438,10 @@
 	    (output_filename =3D=3D NULL ||
 	     strcmp(output_filename, "-") =3D=3D 0 ||
 	     strcmp(output_filename, "/dev/fd/1") =3D=3D 0 ||
-	     strcmp(output_filename, "/dev/stdout") =3D=3D 0))
+	     strcmp(output_filename, "/dev/stdout") =3D=3D 0)) {
 		errout =3D stderr;
+		logdump =3D ISC_FALSE;
+	}
=20
 	if (isc_commandline_index + 2 !=3D argc)
 		usage();
@@ -462,13 +466,13 @@
 			   &zone);
=20
 	if (result =3D=3D ISC_R_SUCCESS && dumpzone) {
-		if (!quiet && progmode =3D=3D progmode_compile) {
+		if (logdump) {
 			fprintf(errout, "dump zone to %s...", output_filename);
 			fflush(errout);
 		}
 		result =3D dump_zone(origin, zone, output_filename,
 				   outputformat, outputstyle);
-		if (!quiet && progmode =3D=3D progmode_compile)
+		if (logdump)
 			fprintf(errout, "done\n");
 	}
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckzone.docbook
--- a/head/contrib/bind9/bin/check/named-checkzone.docbook	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/check/named-checkzone.docbook	Tue Apr 17 11:51=
:51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: named-checkzone.docbook,v 1.40 2010-01-16 23:48:15 tbox Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.40 2010/01/16 23:48:15 tbox Exp $ -->
 <refentry id=3D"man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/check/named-che=
ckzone.html
--- a/head/contrib/bind9/bin/check/named-checkzone.html	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/check/named-checkzone.html	Tue Apr 17 11:51:51=
 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkzone.html,v 1.47 2010-01-17 01:14:02 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -33,7 +33,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">named-compilezone</c=
ode>  [<code class=3D"option">-d</code>] [<code class=3D"option">-j</code>]=
 [<code class=3D"option">-q</code>] [<code class=3D"option">-v</code>] [<co=
de class=3D"option">-c <em class=3D"replaceable"><code>class</code></em></c=
ode>] [<code class=3D"option">-C <em class=3D"replaceable"><code>mode</code=
></em></code>] [<code class=3D"option">-f <em class=3D"replaceable"><code>f=
ormat</code></em></code>] [<code class=3D"option">-F <em class=3D"replaceab=
le"><code>format</code></em></code>] [<code class=3D"option">-i <em class=
=3D"replaceable"><code>mode</code></em></code>] [<code class=3D"option">-k =
<em class=3D"replaceable"><code>mode</code></em></code>] [<code class=3D"op=
tion">-m <em class=3D"replaceable"><code>mode</code></em></code>] [<code cl=
ass=3D"option">-n <em class=3D"replaceable"><code>mode</code></em></code>] =
[<code class=3D"option">-r <em class=3D"replaceable"><code>mode</code></em>=
</code>] [<code class=3D"option">-s <em class=3D"replaceable"><code>style</=
code></em></code>] [<code class=3D"option">-t <em class=3D"replaceable"><co=
de>directory</code></em></code>] [<code class=3D"option">-w <em class=3D"re=
placeable"><code>directory</code></em></code>] [<code class=3D"option">-D</=
code>] [<code class=3D"option">-W <em class=3D"replaceable"><code>mode</cod=
e></em></code>] {<code class=3D"option">-o <em class=3D"replaceable"><code>=
filename</code></em></code>} {zonename} {filename}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543694"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543696"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">named-checkzone</strong></span>
       checks the syntax and integrity of a zone file.  It performs the
       same checks as <span><strong class=3D"command">named</strong></span>=
 does when loading a
@@ -53,7 +53,7 @@
      </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543730"></a><h2>OPTIONS</h2>
+<a name=3D"id2543731"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-d</span></dt>
 <dd><p>
@@ -247,14 +247,14 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544377"></a><h2>RETURN VALUES</h2>
+<a name=3D"id2544446"></a><h2>RETURN VALUES</h2>
 <p><span><strong class=3D"command">named-checkzone</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544389"></a><h2>SEE ALSO</h2>
+<a name=3D"id2544458"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">named</span>=
(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named-che=
ckconf</span>(8)</span>,
       <em class=3D"citetitle">RFC 1035</em>,
@@ -262,7 +262,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544422"></a><h2>AUTHOR</h2>
+<a name=3D"id2544491"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/Makefil=
e.in
--- a/head/contrib/bind9/bin/confgen/Makefile.in	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/confgen/Makefile.in	Tue Apr 17 11:51:51 2012 +=
0300
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.8 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.8 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/ddns-co=
nfgen.8
--- a/head/contrib/bind9/bin/confgen/ddns-confgen.8	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/confgen/ddns-confgen.8	Tue Apr 17 11:51:51 201=
2 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ddns-confgen.8,v 1.10 2009-09-19 01:14:52 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/ddns-co=
nfgen.c
--- a/head/contrib/bind9/bin/confgen/ddns-confgen.c	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/confgen/ddns-confgen.c	Tue Apr 17 11:51:51 201=
2 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: ddns-confgen.c,v 1.9.308.2 2011-03-12 04:59:13 tbox Exp $ */
+/* $Id: ddns-confgen.c,v 1.9.308.2 2011/03/12 04:59:13 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/ddns-co=
nfgen.docbook
--- a/head/contrib/bind9/bin/confgen/ddns-confgen.docbook	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/ddns-confgen.docbook	Tue Apr 17 11:51:=
51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: ddns-confgen.docbook,v 1.6 2009-09-18 22:08:55 fdupont Exp $ -->
+<!-- $Id: ddns-confgen.docbook,v 1.6 2009/09/18 22:08:55 fdupont Exp $ -->
 <refentry id=3D"man.ddns-confgen">
   <refentryinfo>
     <date>Jan 29, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/ddns-co=
nfgen.html
--- a/head/contrib/bind9/bin/confgen/ddns-confgen.html	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/confgen/ddns-confgen.html	Tue Apr 17 11:51:51 =
2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: ddns-confgen.html,v 1.10 2009-09-19 01:14:52 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">ddns-confgen</code> =
 [<code class=3D"option">-a <em class=3D"replaceable"><code>algorithm</code=
></em></code>] [<code class=3D"option">-h</code>] [<code class=3D"option">-=
k <em class=3D"replaceable"><code>keyname</code></em></code>] [<code class=
=3D"option">-r <em class=3D"replaceable"><code>randomfile</code></em></code=
>] [ -s <em class=3D"replaceable"><code>name</code></em>  |   -z <em class=
=3D"replaceable"><code>zone</code></em> ] [<code class=3D"option">-q</code>=
] [name]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543395"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543396"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">ddns-confgen</strong></span>
       generates a key for use by <span><strong class=3D"command">nsupdate<=
/strong></span>
       and <span><strong class=3D"command">named</strong></span>.  It simpl=
ifies configuration
@@ -58,7 +58,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543454"></a><h2>OPTIONS</h2>
+<a name=3D"id2543456"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-a <em class=3D"replaceable"><code>algorithm</cod=
e></em></span></dt>
 <dd><p>
@@ -125,7 +125,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543642"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543643"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">nsupdate</sp=
an>(1)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named.con=
f</span>(5)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>,
@@ -133,7 +133,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543681"></a><h2>AUTHOR</h2>
+<a name=3D"id2543682"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/include=
/confgen/os.h
--- a/head/contrib/bind9/bin/confgen/include/confgen/os.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/include/confgen/os.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: os.h,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: os.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/keygen.c
--- a/head/contrib/bind9/bin/confgen/keygen.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/keygen.c	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: keygen.c,v 1.4 2009-11-12 14:02:38 marka Exp $ */
+/* $Id: keygen.c,v 1.4 2009/11/12 14:02:38 marka Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/keygen.h
--- a/head/contrib/bind9/bin/confgen/keygen.h	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/keygen.h	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: keygen.h,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: keygen.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
=20
 #ifndef RNDC_KEYGEN_H
 #define RNDC_KEYGEN_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/rndc-co=
nfgen.8
--- a/head/contrib/bind9/bin/confgen/rndc-confgen.8	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/confgen/rndc-confgen.8	Tue Apr 17 11:51:51 201=
2 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: rndc-confgen.8,v 1.7 2009-07-11 01:12:45 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/rndc-co=
nfgen.c
--- a/head/contrib/bind9/bin/confgen/rndc-confgen.c	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/confgen/rndc-confgen.c	Tue Apr 17 11:51:51 201=
2 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: rndc-confgen.c,v 1.5.308.2 2011-03-12 04:59:13 tbox Exp $ */
+/* $Id: rndc-confgen.c,v 1.5.308.2 2011/03/12 04:59:13 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/rndc-co=
nfgen.docbook
--- a/head/contrib/bind9/bin/confgen/rndc-confgen.docbook	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/rndc-confgen.docbook	Tue Apr 17 11:51:=
51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: rndc-confgen.docbook,v 1.4 2009-06-15 23:47:59 tbox Exp $ -->
+<!-- $Id: rndc-confgen.docbook,v 1.4 2009/06/15 23:47:59 tbox Exp $ -->
 <refentry id=3D"man.rndc-confgen">
   <refentryinfo>
     <date>Aug 27, 2001</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/rndc-co=
nfgen.html
--- a/head/contrib/bind9/bin/confgen/rndc-confgen.html	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/confgen/rndc-confgen.html	Tue Apr 17 11:51:51 =
2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc-confgen.html,v 1.7 2009-07-11 01:12:45 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">rndc-confgen</code> =
 [<code class=3D"option">-a</code>] [<code class=3D"option">-b <em class=3D=
"replaceable"><code>keysize</code></em></code>] [<code class=3D"option">-c =
<em class=3D"replaceable"><code>keyfile</code></em></code>] [<code class=3D=
"option">-h</code>] [<code class=3D"option">-k <em class=3D"replaceable"><c=
ode>keyname</code></em></code>] [<code class=3D"option">-p <em class=3D"rep=
laceable"><code>port</code></em></code>] [<code class=3D"option">-r <em cla=
ss=3D"replaceable"><code>randomfile</code></em></code>] [<code class=3D"opt=
ion">-s <em class=3D"replaceable"><code>address</code></em></code>] [<code =
class=3D"option">-t <em class=3D"replaceable"><code>chrootdir</code></em></=
code>] [<code class=3D"option">-u <em class=3D"replaceable"><code>user</cod=
e></em></code>]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543432"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543433"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">rndc-confgen</strong></span>
       generates configuration files
       for <span><strong class=3D"command">rndc</strong></span>.  It can be=
 used as a
@@ -48,7 +48,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543477"></a><h2>OPTIONS</h2>
+<a name=3D"id2543478"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-a</span></dt>
 <dd>
@@ -155,7 +155,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543790"></a><h2>EXAMPLES</h2>
+<a name=3D"id2543792"></a><h2>EXAMPLES</h2>
 <p>
       To allow <span><strong class=3D"command">rndc</strong></span> to be =
used with
       no manual configuration, run
@@ -172,7 +172,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543832"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543833"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">rndc</span>(=
8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">rndc.conf=
</span>(5)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>,
@@ -180,7 +180,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543870"></a><h2>AUTHOR</h2>
+<a name=3D"id2543872"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/unix/Ma=
kefile.in
--- a/head/contrib/bind9/bin/confgen/unix/Makefile.in	Tue Apr 17 11:36:47 2=
012 +0300
+++ b/head/contrib/bind9/bin/confgen/unix/Makefile.in	Tue Apr 17 11:51:51 2=
012 +0300
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.3 2009-06-11 23:47:55 tbox Exp $
+# $Id: Makefile.in,v 1.3 2009/06/11 23:47:55 tbox Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/unix/os=
.c
--- a/head/contrib/bind9/bin/confgen/unix/os.c	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/confgen/unix/os.c	Tue Apr 17 11:51:51 2012 +03=
00
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: os.c,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/util.c
--- a/head/contrib/bind9/bin/confgen/util.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/util.c	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: util.c,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: util.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/confgen/util.h
--- a/head/contrib/bind9/bin/confgen/util.h	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/confgen/util.h	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: util.h,v 1.4 2009-09-29 15:06:05 fdupont Exp $ */
+/* $Id: util.h,v 1.4 2009/09/29 15:06:05 fdupont Exp $ */
=20
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/Makefile.in
--- a/head/contrib/bind9/bin/dig/Makefile.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/Makefile.in	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.47 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.47 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/dig.1
--- a/head/contrib/bind9/bin/dig/dig.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/dig.1	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dig.1,v 1.54 2010-03-05 01:14:15 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/dig.c
--- a/head/contrib/bind9/bin/dig/dig.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/dig.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dig.c,v 1.237.124.3 2011-03-11 06:46:58 marka Exp $ */
+/* $Id: dig.c,v 1.237.124.4 2011/12/07 17:23:55 each Exp $ */
=20
 /*! \file */
=20
@@ -1527,7 +1527,7 @@
 		if (strncmp(rv[0], "%", 1) =3D=3D 0)
 			break;
 		if (strncmp(rv[0], "@", 1) =3D=3D 0) {
-			addresscount =3D getaddresses(lookup, &rv[0][1]);
+			addresscount =3D getaddresses(lookup, &rv[0][1], NULL);
 		} else if (rv[0][0] =3D=3D '+') {
 			plus_option(&rv[0][1], is_batchfile,
 				    lookup);
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/dig.docbook
--- a/head/contrib/bind9/bin/dig/dig.docbook	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/dig.docbook	Tue Apr 17 11:51:51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dig.docbook,v 1.47 2010-03-04 23:50:34 tbox Exp $ -->
+<!-- $Id: dig.docbook,v 1.47 2010/03/04 23:50:34 tbox Exp $ -->
 <refentry id=3D"man.dig">
=20
   <refentryinfo>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/dig.html
--- a/head/contrib/bind9/bin/dig/dig.html	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/dig.html	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dig.html,v 1.49 2010-03-05 01:14:15 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -34,7 +34,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dig</code>  [global-=
queryopt...] [query...]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543522"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543524"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dig</strong></span>
       (domain information groper) is a flexible tool
       for interrogating DNS name servers.  It performs DNS lookups and
@@ -80,7 +80,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543595"></a><h2>SIMPLE USAGE</h2>
+<a name=3D"id2543597"></a><h2>SIMPLE USAGE</h2>
 <p>
       A typical invocation of <span><strong class=3D"command">dig</strong>=
</span> looks like:
       </p>
@@ -126,7 +126,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543686"></a><h2>OPTIONS</h2>
+<a name=3D"id2543688"></a><h2>OPTIONS</h2>
 <p>
       The <code class=3D"option">-b</code> option sets the source IP addre=
ss of the query
       to <em class=3D"parameter"><code>address</code></em>.  This must be =
a valid
@@ -230,7 +230,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544035"></a><h2>QUERY OPTIONS</h2>
+<a name=3D"id2544037"></a><h2>QUERY OPTIONS</h2>
 <p><span><strong class=3D"command">dig</strong></span>
       provides a number of query options which affect
       the way in which lookups are made and the results displayed.  Some of
@@ -561,7 +561,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545184"></a><h2>MULTIPLE QUERIES</h2>
+<a name=3D"id2545186"></a><h2>MULTIPLE QUERIES</h2>
 <p>
       The BIND 9 implementation of <span><strong class=3D"command">dig </s=
trong></span>
       supports
@@ -607,7 +607,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545245"></a><h2>IDN SUPPORT</h2>
+<a name=3D"id2545248"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class=3D"command">dig</strong></span> has been buil=
t with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain nam=
es.
@@ -621,14 +621,14 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545336"></a><h2>FILES</h2>
+<a name=3D"id2545338"></a><h2>FILES</h2>
 <p><code class=3D"filename">/etc/resolv.conf</code>
     </p>
 <p><code class=3D"filename">${HOME}/.digrc</code>
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545353"></a><h2>SEE ALSO</h2>
+<a name=3D"id2545355"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">host</span>(=
1)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-ke=
ygen</span>(8)</span>,
@@ -636,7 +636,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545390"></a><h2>BUGS</h2>
+<a name=3D"id2545393"></a><h2>BUGS</h2>
 <p>
       There are probably too many query options.
     </p>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/dighost.c
--- a/head/contrib/bind9/bin/dig/dighost.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/dighost.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dighost.c,v 1.336.22.4 2011-03-11 06:46:58 marka Exp $ */
+/* $Id: dighost.c,v 1.336.22.9 2011/12/07 17:23:55 each Exp $ */
=20
 /*! \file
  *  \note
@@ -66,6 +66,7 @@
 #include <dns/tsig.h>
=20
 #include <dst/dst.h>
+#include <dst/result.h>
=20
 #include <isc/app.h>
 #include <isc/base64.h>
@@ -81,6 +82,7 @@
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/result.h>
+#include <isc/serial.h>
 #include <isc/string.h>
 #include <isc/task.h>
 #include <isc/timer.h>
@@ -360,6 +362,8 @@
 static void
 launch_next_query(dig_query_t *query, isc_boolean_t include_question);
=20
+static void
+send_tcp_connect(dig_query_t *query);
=20
 static void *
 mem_alloc(void *arg, size_t size) {
@@ -742,7 +746,7 @@
 	looknew->xfr_q =3D NULL;
 	looknew->current_query =3D NULL;
 	looknew->doing_xfr =3D ISC_FALSE;
-	looknew->ixfr_serial =3D ISC_FALSE;
+	looknew->ixfr_serial =3D 0;
 	looknew->trace =3D ISC_FALSE;
 	looknew->trace_root =3D ISC_FALSE;
 	looknew->identify =3D ISC_FALSE;
@@ -787,6 +791,7 @@
 	looknew->new_search =3D ISC_FALSE;
 	looknew->done_as_is =3D ISC_FALSE;
 	looknew->need_search =3D ISC_FALSE;
+	dns_fixedname_init(&looknew->fdomain);
 	ISC_LINK_INIT(looknew, link);
 	ISC_LIST_INIT(looknew->q);
 	ISC_LIST_INIT(looknew->my_server_list);
@@ -862,6 +867,8 @@
 	looknew->tsigctx =3D NULL;
 	looknew->need_search =3D lookold->need_search;
 	looknew->done_as_is =3D lookold->done_as_is;
+	dns_name_copy(dns_fixedname_name(&lookold->fdomain),
+		      dns_fixedname_name(&looknew->fdomain), NULL);
=20
 	if (servers)
 		clone_server_list(lookold->my_server_list,
@@ -925,6 +932,11 @@
=20
 	secretsize =3D isc_buffer_usedlength(&secretbuf);
=20
+	if (hmacname =3D=3D NULL) {
+		result =3D DST_R_UNSUPPORTEDALG;
+		goto failure;
+	}
+
 	result =3D dns_name_fromtext(&keyname, namebuf, dns_rootname, 0, namebuf);
 	if (result !=3D ISC_R_SUCCESS)
 		goto failure;
@@ -1698,6 +1710,9 @@
 	isc_result_t result;
 	isc_boolean_t success =3D ISC_FALSE;
 	int numLookups =3D 0;
+	int num;
+	isc_result_t lresult, addresses_result;
+	char bad_namestr[DNS_NAME_FORMATSIZE];
 	dns_name_t *domain;
 	isc_boolean_t horizontal =3D ISC_FALSE, bad =3D ISC_FALSE;
=20
@@ -1705,6 +1720,8 @@
=20
 	debug("following up %s", query->lookup->textname);
=20
+	addresses_result =3D ISC_R_SUCCESS;
+	bad_namestr[0] =3D '\0';
 	for (result =3D dns_message_firstname(msg, section);
 	     result =3D=3D ISC_R_SUCCESS;
 	     result =3D dns_message_nextname(msg, section)) {
@@ -1783,15 +1800,27 @@
 				lookup->trace_root =3D ISC_FALSE;
 				if (lookup->ns_search_only)
 					lookup->recurse =3D ISC_FALSE;
-				dns_fixedname_init(&lookup->fdomain);
 				domain =3D dns_fixedname_name(&lookup->fdomain);
 				dns_name_copy(name, domain, NULL);
 			}
 			debug("adding server %s", namestr);
-			numLookups +=3D getaddresses(lookup, namestr);
+			num =3D getaddresses(lookup, namestr, &lresult);
+			if (lresult !=3D ISC_R_SUCCESS) {
+				debug("couldn't get address for '%s': %s",
+				      namestr, isc_result_totext(lresult));
+				if (addresses_result =3D=3D ISC_R_SUCCESS) {
+					addresses_result =3D lresult;
+					strcpy(bad_namestr, namestr);
+				}
+			}
+			numLookups +=3D num;
 			dns_rdata_reset(&rdata);
 		}
 	}
+	if (numLookups =3D=3D 0 && addresses_result !=3D ISC_R_SUCCESS) {
+		fatal("couldn't get address for '%s': %s",
+		      bad_namestr, isc_result_totext(result));
+	}
=20
 	if (lookup =3D=3D NULL &&
 	    section =3D=3D DNS_SECTION_ANSWER &&
@@ -1838,12 +1867,10 @@
  * Return ISC_TRUE iff there was another searchlist entry.
  */
 static isc_boolean_t
-next_origin(dns_message_t *msg, dig_query_t *query) {
+next_origin(dig_query_t *query) {
 	dig_lookup_t *lookup;
 	dig_searchlist_t *search;
=20
-	UNUSED(msg);
-
 	INSIST(!free_now);
=20
 	debug("next_origin()");
@@ -2318,7 +2345,7 @@
 	query->waiting_senddone =3D ISC_FALSE;
 	l =3D query->lookup;
=20
-	if (l->ns_search_only && !l->trace_root) {
+	if (l->ns_search_only && !l->trace_root && !l->tcp_mode) {
 		debug("sending next, since searching");
 		next =3D ISC_LIST_NEXT(query, link);
 		if (next !=3D NULL)
@@ -2865,8 +2892,10 @@
 	dns_rdataset_t *rdataset =3D NULL;
 	dns_rdata_t rdata =3D DNS_RDATA_INIT;
 	dns_rdata_soa_t soa;
-	isc_uint32_t serial;
+	isc_uint32_t ixfr_serial =3D query->lookup->ixfr_serial, serial;
 	isc_result_t result;
+	isc_boolean_t ixfr =3D query->lookup->rdtype =3D=3D dns_rdatatype_ixfr;
+	isc_boolean_t axfr =3D query->lookup->rdtype =3D=3D dns_rdatatype_axfr;
=20
 	debug("check_for_more_data()");
=20
@@ -2916,6 +2945,7 @@
 					query->second_rr_rcvd =3D ISC_TRUE;
 					query->second_rr_serial =3D 0;
 					debug("got the second rr as nonsoa");
+					axfr =3D ISC_TRUE;
 					goto next_rdata;
 				}
=20
@@ -2925,6 +2955,7 @@
 				 */
 				if (rdata.type !=3D dns_rdatatype_soa)
 					goto next_rdata;
+
 				/* Now we have an SOA.  Work with it. */
 				debug("got an SOA");
 				result =3D dns_rdata_tostruct(&rdata, &soa, NULL);
@@ -2934,15 +2965,17 @@
 				if (!query->first_soa_rcvd) {
 					query->first_soa_rcvd =3D ISC_TRUE;
 					query->first_rr_serial =3D serial;
-					debug("this is the first %d",
-					       query->lookup->ixfr_serial);
-					if (query->lookup->ixfr_serial >=3D
-					    serial)
+					debug("this is the first serial %u",
+					      serial);
+					if (ixfr && isc_serial_ge(ixfr_serial,
+								  serial)) {
+						debug("got up to date "
+						      "response");
 						goto doexit;
+					}
 					goto next_rdata;
 				}
-				if (query->lookup->rdtype =3D=3D
-				    dns_rdatatype_axfr) {
+				if (axfr) {
 					debug("doing axfr, got second SOA");
 					goto doexit;
 				}
@@ -2952,22 +2985,12 @@
 						      "empty zone");
 						goto doexit;
 					}
-					debug("this is the second %d",
-					       query->lookup->ixfr_serial);
+					debug("this is the second serial %u",
+					      serial);
 					query->second_rr_rcvd =3D ISC_TRUE;
 					query->second_rr_serial =3D serial;
 					goto next_rdata;
 				}
-				if (query->second_rr_serial =3D=3D 0) {
-					/*
-					 * If the second RR was a non-SOA
-					 * record, and we're getting any
-					 * other SOA, then this is an
-					 * AXFR, and we're done.
-					 */
-					debug("done, since axfr");
-					goto doexit;
-				}
 				/*
 				 * If we get to this point, we're doing an
 				 * IXFR and have to start really looking
@@ -2983,7 +3006,7 @@
 					debug("done with ixfr");
 					goto doexit;
 				}
-				debug("meaningless soa %d", serial);
+				debug("meaningless soa %u", serial);
 			next_rdata:
 				result =3D dns_rdataset_next(rdataset);
 			} while (result =3D=3D ISC_R_SUCCESS);
@@ -3360,7 +3383,7 @@
 	if (!l->doing_xfr || l->xfr_q =3D=3D query) {
 		if (msg->rcode !=3D dns_rcode_noerror &&
 		    (l->origin !=3D NULL || l->need_search)) {
-			if (!next_origin(msg, query) || showsearch) {
+			if (!next_origin(query) || showsearch) {
 				printmessage(query, msg, ISC_TRUE);
 				received(b->used, &sevent->address, query);
 			}
@@ -3546,7 +3569,7 @@
 }
=20
 int
-getaddresses(dig_lookup_t *lookup, const char *host) {
+getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp=
) {
 	isc_result_t result;
 	isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
 	isc_netaddr_t netaddr;
@@ -3556,9 +3579,14 @@
=20
 	result =3D bind9_getaddresses(host, 0, sockaddrs,
 				    DIG_MAX_ADDRESSES, &count);
-	if (result !=3D ISC_R_SUCCESS)
-		fatal("couldn't get address for '%s': %s",
-		      host, isc_result_totext(result));
+	if (resultp !=3D NULL)
+		*resultp =3D result;
+	if (result !=3D ISC_R_SUCCESS) {
+		if (resultp =3D=3D NULL)
+			fatal("couldn't get address for '%s': %s",
+			      host, isc_result_totext(result));
+		return 0;
+	}
=20
 	for (i =3D 0; i < count; i++) {
 		isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);
@@ -4208,7 +4236,6 @@
 	return (result);
 }
=20
-
 isc_result_t
 get_trusted_key(isc_mem_t *mctx)
 {
@@ -4270,6 +4297,7 @@
 		if (key !=3D NULL)
 			dst_key_free(&key);
 	}
+	fclose(fp);
 	return (ISC_R_SUCCESS);
 }
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/host.1
--- a/head/contrib/bind9/bin/dig/host.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/host.1	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: host.1,v 1.31 2009-07-11 01:12:45 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/host.c
--- a/head/contrib/bind9/bin/dig/host.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/host.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: host.c,v 1.124.40.3 2011-03-11 06:46:59 marka Exp $ */
+/* $Id: host.c,v 1.124.40.3 2011/03/11 06:46:59 marka Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/host.docbook
--- a/head/contrib/bind9/bin/dig/host.docbook	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/host.docbook	Tue Apr 17 11:51:51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: host.docbook,v 1.20 2009-01-20 23:47:56 tbox Exp $ -->
+<!-- $Id: host.docbook,v 1.20 2009/01/20 23:47:56 tbox Exp $ -->
 <refentry id=3D"man.host">
=20
   <refentryinfo>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/host.html
--- a/head/contrib/bind9/bin/dig/host.html	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/host.html	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: host.html,v 1.30 2009-07-11 01:12:45 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">host</code>  [<code =
class=3D"option">-aCdlnrsTwv</code>] [<code class=3D"option">-c <em class=
=3D"replaceable"><code>class</code></em></code>] [<code class=3D"option">-N=
 <em class=3D"replaceable"><code>ndots</code></em></code>] [<code class=3D"=
option">-R <em class=3D"replaceable"><code>number</code></em></code>] [<cod=
e class=3D"option">-t <em class=3D"replaceable"><code>type</code></em></cod=
e>] [<code class=3D"option">-W <em class=3D"replaceable"><code>wait</code><=
/em></code>] [<code class=3D"option">-m <em class=3D"replaceable"><code>fla=
g</code></em></code>] [<code class=3D"option">-4</code>] [<code class=3D"op=
tion">-6</code>] {name} [server]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543434"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543436"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">host</strong></span>
       is a simple utility for performing DNS lookups.
       It is normally used to convert names to IP addresses and vice versa.
@@ -184,7 +184,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543800"></a><h2>IDN SUPPORT</h2>
+<a name=3D"id2543802"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class=3D"command">host</strong></span> has been bui=
lt with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain nam=
es.=20
@@ -198,12 +198,12 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543822"></a><h2>FILES</h2>
+<a name=3D"id2543825"></a><h2>FILES</h2>
 <p><code class=3D"filename">/etc/resolv.conf</code>
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543834"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543836"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dig</span>(1=
)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>.
     </p>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/include/dig=
/dig.h
--- a/head/contrib/bind9/bin/dig/include/dig/dig.h	Tue Apr 17 11:36:47 2012=
 +0300
+++ b/head/contrib/bind9/bin/dig/include/dig/dig.h	Tue Apr 17 11:51:51 2012=
 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dig.h,v 1.111.306.2 2011-02-28 01:19:58 tbox Exp $ */
+/* $Id: dig.h,v 1.111.306.3 2011/12/07 17:23:55 each Exp $ */
=20
 #ifndef DIG_H
 #define DIG_H
@@ -289,7 +289,7 @@
 get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr);
=20
 int
-getaddresses(dig_lookup_t *lookup, const char *host);
+getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp=
);
=20
 isc_result_t
 get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/nslookup.1
--- a/head/contrib/bind9/bin/dig/nslookup.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/nslookup.1	Tue Apr 17 11:51:51 2012 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nslookup.1,v 1.16 2010-02-23 01:14:31 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/nslookup.c
--- a/head/contrib/bind9/bin/dig/nslookup.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dig/nslookup.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: nslookup.c,v 1.127.38.2 2011-02-28 01:19:58 tbox Exp $ */
+/* $Id: nslookup.c,v 1.127.38.2 2011/02/28 01:19:58 tbox Exp $ */
=20
 #include <config.h>
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/nslookup.do=
cbook
--- a/head/contrib/bind9/bin/dig/nslookup.docbook	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/dig/nslookup.docbook	Tue Apr 17 11:51:51 2012 =
+0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: nslookup.docbook,v 1.18 2010-02-22 23:49:11 tbox Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.18 2010/02/22 23:49:11 tbox Exp $ -->
 <!--
  - Copyright (c) 1985, 1989
  -    The Regents of the University of California.  All rights reserved.
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dig/nslookup.ht=
ml
--- a/head/contrib/bind9/bin/dig/nslookup.html	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/dig/nslookup.html	Tue Apr 17 11:51:51 2012 +03=
00
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: nslookup.html,v 1.23 2010-02-23 01:14:31 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -21,7 +21,7 @@
 <meta name=3D"generator" content=3D"DocBook XSL Stylesheets V1.71.1">
 </head>
 <body bgcolor=3D"white" text=3D"black" link=3D"#0000FF" vlink=3D"#840084" =
alink=3D"#0000FF"><div class=3D"refentry" lang=3D"en">
-<a name=3D"id2476276"></a><div class=3D"titlepage"></div>
+<a name=3D"id2476277"></a><div class=3D"titlepage"></div>
 <div class=3D"refnamediv">
 <h2>Name</h2>
 <p>nslookup — query Internet name servers interactively</p>
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">nslookup</code>  [<c=
ode class=3D"option">-option</code>] [name | -] [server]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543358"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543361"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">Nslookup</strong></span>
       is a program to query Internet domain name servers.  <span><strong c=
lass=3D"command">Nslookup</strong></span>
       has two modes: interactive and non-interactive.  Interactive mode al=
lows
@@ -43,7 +43,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543374"></a><h2>ARGUMENTS</h2>
+<a name=3D"id2543377"></a><h2>ARGUMENTS</h2>
 <p>
       Interactive mode is entered in the following cases:
       </p>
@@ -78,7 +78,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543418"></a><h2>INTERACTIVE COMMANDS</h2>
+<a name=3D"id2543420"></a><h2>INTERACTIVE COMMANDS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term"><code class=3D"constant">host</code> [<span class=
=3D"optional">server</span>]</span></dt>
 <dd>
@@ -288,19 +288,19 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2546284"></a><h2>FILES</h2>
+<a name=3D"id2546286"></a><h2>FILES</h2>
 <p><code class=3D"filename">/etc/resolv.conf</code>
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2546296"></a><h2>SEE ALSO</h2>
+<a name=3D"id2546298"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dig</span>(1=
)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">host</spa=
n>(1)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2546330"></a><h2>Author</h2>
+<a name=3D"id2546332"></a><h2>Author</h2>
 <p>
       Andrew Cherenson
     </p>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/Makefile=
.in
--- a/head/contrib/bind9/bin/dnssec/Makefile.in	Tue Apr 17 11:36:47 2012 +0=
300
+++ b/head/contrib/bind9/bin/dnssec/Makefile.in	Tue Apr 17 11:51:51 2012 +0=
300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.42 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.42 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-d=
sfromkey.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8	Tue Apr 17 11:51:51 =
2012 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-dsfromkey.8,v 1.13 2010-12-24 01:14:20 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-d=
sfromkey.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c	Tue Apr 17 11:51:51 =
2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008-2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-dsfromkey.c,v 1.19 2010-12-23 04:07:59 marka Exp $ */
+/* $Id: dnssec-dsfromkey.c,v 1.19.14.2 2011/09/05 23:45:53 tbox Exp $ */
=20
 /*! \file */
=20
@@ -265,12 +265,10 @@
 		fatal("can't print class");
=20
 	isc_buffer_usedregion(&nameb, &r);
-	isc_util_fwrite(r.base, 1, r.length, stdout);
-
-	putchar(' ');
+	printf("%.*s ", (int)r.length, r.base);
=20
 	isc_buffer_usedregion(&classb, &r);
-	isc_util_fwrite(r.base, 1, r.length, stdout);
+	printf("%.*s", (int)r.length, r.base);
=20
 	if (lookaside =3D=3D NULL)
 		printf(" DS ");
@@ -278,8 +276,7 @@
 		printf(" DLV ");
=20
 	isc_buffer_usedregion(&textb, &r);
-	isc_util_fwrite(r.base, 1, r.length, stdout);
-	putchar('\n');
+	printf("%.*s\n", (int)r.length, r.base);
 }
=20
 ISC_PLATFORM_NORETURN_PRE static void
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-d=
sfromkey.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook	Tue Apr 17 11:=
36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook	Tue Apr 17 11:=
51:51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-dsfromkey.docbook,v 1.12 2010-12-23 23:47:08 tbox Exp $ -=
->
+<!-- $Id: dnssec-dsfromkey.docbook,v 1.12 2010/12/23 23:47:08 tbox Exp $ -=
->
 <refentry id=3D"man.dnssec-dsfromkey">
   <refentryinfo>
     <date>August 26, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-d=
sfromkey.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html	Tue Apr 17 11:51:=
51 2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-dsfromkey.html,v 1.13 2010-12-24 01:14:19 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,14 +32,14 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-dsfromkey</co=
de>  {-s} [<code class=3D"option">-1</code>] [<code class=3D"option">-2</co=
de>] [<code class=3D"option">-a <em class=3D"replaceable"><code>alg</code><=
/em></code>] [<code class=3D"option">-K <em class=3D"replaceable"><code>dir=
ectory</code></em></code>] [<code class=3D"option">-l <em class=3D"replacea=
ble"><code>domain</code></em></code>] [<code class=3D"option">-s</code>] [<=
code class=3D"option">-c <em class=3D"replaceable"><code>class</code></em><=
/code>] [<code class=3D"option">-f <em class=3D"replaceable"><code>file</co=
de></em></code>] [<code class=3D"option">-A</code>] [<code class=3D"option"=
>-v <em class=3D"replaceable"><code>level</code></em></code>] {dnsname}</p>=
</div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543464"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543465"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-dsfromkey</strong></span>
       outputs the Delegation Signer (DS) resource record (RR), as defined =
in
       RFC 3658 and RFC 4509, for the given key(s).
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543476"></a><h2>OPTIONS</h2>
+<a name=3D"id2543477"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-1</span></dt>
 <dd><p>
@@ -100,7 +100,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543662"></a><h2>EXAMPLE</h2>
+<a name=3D"id2543664"></a><h2>EXAMPLE</h2>
 <p>
       To build the SHA-256 DS RR from the
       <strong class=3D"userinput"><code>Kexample.com.+003+26160</code></st=
rong>
@@ -115,7 +115,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543692"></a><h2>FILES</h2>
+<a name=3D"id2543693"></a><h2>FILES</h2>
 <p>
       The keyfile can be designed by the key identification
       <code class=3D"filename">Knnnn.+aaa+iiiii</code> or the full file na=
me
@@ -129,13 +129,13 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543728"></a><h2>CAVEAT</h2>
+<a name=3D"id2543729"></a><h2>CAVEAT</h2>
 <p>
       A keyfile error can give a "file not found" even if the file exists.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543737"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543738"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-keyge=
n</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-si=
gnzone</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -145,7 +145,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543777"></a><h2>AUTHOR</h2>
+<a name=3D"id2543778"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eyfromlabel.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8	Tue Apr 17 11:51:=
51 2012 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-keyfromlabel.8,v 1.18.14.2 2011-02-28 02:37:42 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eyfromlabel.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c	Tue Apr 17 11:51:=
51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-keyfromlabel.c,v 1.32.14.2 2011-03-12 04:59:14 tbox Exp $ */
+/* $Id: dnssec-keyfromlabel.c,v 1.32.14.4 2011/11/30 00:51:38 marka Exp $ =
*/
=20
 /*! \file */
=20
@@ -110,7 +110,8 @@
=20
 int
 main(int argc, char **argv) {
-	char		*algname =3D NULL, *nametype =3D NULL, *type =3D NULL;
+	char		*algname =3D NULL, *freeit =3D NULL;
+	char		*nametype =3D NULL, *type =3D NULL;
 	const char	*directory =3D NULL;
 #ifdef USE_PKCS11
 	const char	*engine =3D "pkcs11";
@@ -342,6 +343,9 @@
 			algname =3D strdup(DEFAULT_NSEC3_ALGORITHM);
 		else
 			algname =3D strdup(DEFAULT_ALGORITHM);
+		if (algname =3D=3D NULL)
+			fatal("strdup failed");
+		freeit =3D algname;
 		if (verbose > 0)
 			fprintf(stderr, "no algorithm specified; "
 				"defaulting to %s\n", algname);
@@ -514,8 +518,7 @@
 	 * is a risk of ID collision due to this key or another key
 	 * being revoked.
 	 */
-	if (key_collision(dst_key_id(key), name, directory, alg, mctx, &exact))
-	{
+	if (key_collision(key, name, directory, mctx, &exact)) {
 		isc_buffer_clear(&buf);
 		ret =3D dst_key_buildfilename(key, 0, directory, &buf);
 		if (ret !=3D ISC_R_SUCCESS)
@@ -560,5 +563,8 @@
 	isc_mem_free(mctx, label);
 	isc_mem_destroy(&mctx);
=20
+	if (freeit !=3D NULL)
+		free(freeit);
+
 	return (0);
 }
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eyfromlabel.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook	Tue Apr 17 =
11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook	Tue Apr 17 =
11:51:51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.2 2011-02-28 01:19:58 tbox=
 Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.2 2011/02/28 01:19:58 tbox=
 Exp $ -->
 <refentry id=3D"man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eyfromlabel.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html	Tue Apr 17 11:=
36:47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html	Tue Apr 17 11:=
51:51 2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-keyfromlabel.html,v 1.17.14.2 2011-02-28 02:37:42 tbox Ex=
p $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-keyfromlabel<=
/code>  {-l <em class=3D"replaceable"><code>label</code></em>} [<code class=
=3D"option">-3</code>] [<code class=3D"option">-a <em class=3D"replaceable"=
><code>algorithm</code></em></code>] [<code class=3D"option">-A <em class=
=3D"replaceable"><code>date/offset</code></em></code>] [<code class=3D"opti=
on">-c <em class=3D"replaceable"><code>class</code></em></code>] [<code cla=
ss=3D"option">-D <em class=3D"replaceable"><code>date/offset</code></em></c=
ode>] [<code class=3D"option">-E <em class=3D"replaceable"><code>engine</co=
de></em></code>] [<code class=3D"option">-f <em class=3D"replaceable"><code=
>flag</code></em></code>] [<code class=3D"option">-G</code>] [<code class=
=3D"option">-I <em class=3D"replaceable"><code>date/offset</code></em></cod=
e>] [<code class=3D"option">-k</code>] [<code class=3D"option">-K <em class=
=3D"replaceable"><code>directory</code></em></code>] [<code class=3D"option=
">-n <em class=3D"replaceable"><code>nametype</code></em></code>] [<code cl=
ass=3D"option">-P <em class=3D"replaceable"><code>date/offset</code></em></=
code>] [<code class=3D"option">-p <em class=3D"replaceable"><code>protocol<=
/code></em></code>] [<code class=3D"option">-R <em class=3D"replaceable"><c=
ode>date/offset</code></em></code>] [<code class=3D"option">-t <em class=3D=
"replaceable"><code>type</code></em></code>] [<code class=3D"option">-v <em=
 class=3D"replaceable"><code>level</code></em></code>] [<code class=3D"opti=
on">-y</code>] {name}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543494"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543495"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-keyfromlabel</strong></span>
       gets keys with the given label from a crypto hardware and builds
       key files for DNSSEC (Secure DNS), as defined in RFC 2535
@@ -44,7 +44,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543512"></a><h2>OPTIONS</h2>
+<a name=3D"id2543513"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-a <em class=3D"replaceable"><code>algorithm</cod=
e></em></span></dt>
 <dd>
@@ -163,7 +163,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543876"></a><h2>TIMING OPTIONS</h2>
+<a name=3D"id2543877"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -210,7 +210,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544042"></a><h2>GENERATED KEY FILES</h2>
+<a name=3D"id2544043"></a><h2>GENERATED KEY FILES</h2>
 <p>
       When <span><strong class=3D"command">dnssec-keyfromlabel</strong></s=
pan> completes
       successfully,
@@ -249,7 +249,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544115"></a><h2>SEE ALSO</h2>
+<a name=3D"id2544116"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-keyge=
n</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-si=
gnzone</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -257,7 +257,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544148"></a><h2>AUTHOR</h2>
+<a name=3D"id2544149"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eygen.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-keygen.8	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keygen.8	Tue Apr 17 11:51:51 201=
2 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-keygen.8,v 1.55 2010-12-24 01:14:19 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eygen.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-keygen.c	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keygen.c	Tue Apr 17 11:51:51 201=
2 +0300
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-keygen.c,v 1.115.14.2 2011-03-12 04:59:14 tbox Exp $ */
+/* $Id: dnssec-keygen.c,v 1.115.14.4 2011/11/30 00:51:38 marka Exp $ */
=20
 /*! \file */
=20
@@ -197,7 +197,8 @@
=20
 int
 main(int argc, char **argv) {
-	char		*algname =3D NULL, *nametype =3D NULL, *type =3D NULL;
+	char		*algname =3D NULL, *freeit =3D NULL;
+	char		*nametype =3D NULL, *type =3D NULL;
 	char		*classname =3D NULL;
 	char		*endp;
 	dst_key_t	*key =3D NULL;
@@ -509,6 +510,9 @@
 				algname =3D strdup(DEFAULT_NSEC3_ALGORITHM);
 			else
 				algname =3D strdup(DEFAULT_ALGORITHM);
+			if (algname =3D=3D NULL)
+				fatal("strdup failed");
+			freeit =3D algname;
 			if (verbose > 0)
 				fprintf(stderr, "no algorithm specified; "
 						"defaulting to %s\n", algname);
@@ -965,8 +969,7 @@
 		 * if there is a risk of ID collision due to this key
 		 * or another key being revoked.
 		 */
-		if (key_collision(dst_key_id(key), name, directory,
-				  alg, mctx, NULL)) {
+		if (key_collision(key, name, directory, mctx, NULL)) {
 			conflict =3D ISC_TRUE;
 			if (null_key) {
 				dst_key_free(&key);
@@ -1020,5 +1023,8 @@
 		isc_mem_stats(mctx, stdout);
 	isc_mem_destroy(&mctx);
=20
+	if (freeit !=3D NULL)
+		free(freeit);
+
 	return (0);
 }
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eygen.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-keygen.docbook	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keygen.docbook	Tue Apr 17 11:51:=
51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-keygen.docbook,v 1.36 2010-12-23 04:07:59 marka Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.36 2010/12/23 04:07:59 marka Exp $ -->
 <refentry id=3D"man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-k=
eygen.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-keygen.html	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-keygen.html	Tue Apr 17 11:51:51 =
2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-keygen.html,v 1.47 2010-12-24 01:14:20 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-keygen</code>=
  [<code class=3D"option">-a <em class=3D"replaceable"><code>algorithm</cod=
e></em></code>] [<code class=3D"option">-b <em class=3D"replaceable"><code>=
keysize</code></em></code>] [<code class=3D"option">-n <em class=3D"replace=
able"><code>nametype</code></em></code>] [<code class=3D"option">-3</code>]=
 [<code class=3D"option">-A <em class=3D"replaceable"><code>date/offset</co=
de></em></code>] [<code class=3D"option">-C</code>] [<code class=3D"option"=
>-c <em class=3D"replaceable"><code>class</code></em></code>] [<code class=
=3D"option">-D <em class=3D"replaceable"><code>date/offset</code></em></cod=
e>] [<code class=3D"option">-E <em class=3D"replaceable"><code>engine</code=
></em></code>] [<code class=3D"option">-e</code>] [<code class=3D"option">-=
f <em class=3D"replaceable"><code>flag</code></em></code>] [<code class=3D"=
option">-G</code>] [<code class=3D"option">-g <em class=3D"replaceable"><co=
de>generator</code></em></code>] [<code class=3D"option">-h</code>] [<code =
class=3D"option">-I <em class=3D"replaceable"><code>date/offset</code></em>=
</code>] [<code class=3D"option">-i <em class=3D"replaceable"><code>interva=
l</code></em></code>] [<code class=3D"option">-K <em class=3D"replaceable">=
<code>directory</code></em></code>] [<code class=3D"option">-k</code>] [<co=
de class=3D"option">-P <em class=3D"replaceable"><code>date/offset</code></=
em></code>] [<code class=3D"option">-p <em class=3D"replaceable"><code>prot=
ocol</code></em></code>] [<code class=3D"option">-q</code>] [<code class=3D=
"option">-R <em class=3D"replaceable"><code>date/offset</code></em></code>]=
 [<code class=3D"option">-r <em class=3D"replaceable"><code>randomdev</code=
></em></code>] [<code class=3D"option">-S <em class=3D"replaceable"><code>k=
ey</code></em></code>] [<code class=3D"option">-s <em class=3D"replaceable"=
><code>strength</code></em></code>] [<code class=3D"option">-t <em class=3D=
"replaceable"><code>type</code></em></code>] [<code class=3D"option">-v <em=
 class=3D"replaceable"><code>level</code></em></code>] [<code class=3D"opti=
on">-z</code>] {name}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543578"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543579"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-keygen</strong></span>
       generates keys for DNSSEC (Secure DNS), as defined in RFC 2535
       and RFC 4034.  It can also generate keys for use with
@@ -46,7 +46,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543596"></a><h2>OPTIONS</h2>
+<a name=3D"id2543597"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-a <em class=3D"replaceable"><code>algorithm</cod=
e></em></span></dt>
 <dd>
@@ -248,7 +248,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544301"></a><h2>TIMING OPTIONS</h2>
+<a name=3D"id2544166"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -319,7 +319,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544491"></a><h2>GENERATED KEYS</h2>
+<a name=3D"id2544356"></a><h2>GENERATED KEYS</h2>
 <p>
       When <span><strong class=3D"command">dnssec-keygen</strong></span> c=
ompletes
       successfully,
@@ -365,7 +365,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544642"></a><h2>EXAMPLE</h2>
+<a name=3D"id2544506"></a><h2>EXAMPLE</h2>
 <p>
       To generate a 768-bit DSA key for the domain
       <strong class=3D"userinput"><code>example.com</code></strong>, the f=
ollowing command would be
@@ -386,7 +386,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544685"></a><h2>SEE ALSO</h2>
+<a name=3D"id2544550"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-signz=
one</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class=3D"citetitle">RFC 2539</em>,
@@ -395,7 +395,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544716"></a><h2>AUTHOR</h2>
+<a name=3D"id2544581"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-r=
evoke.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-revoke.8	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-revoke.8	Tue Apr 17 11:51:51 201=
2 +0300
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
 .\"=20
 .\" Permission to use, copy, modify, and/or distribute this software for a=
ny
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-revoke.8,v 1.9 2010-05-19 01:14:14 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
@@ -32,7 +32,7 @@
 dnssec\-revoke \- Set the REVOKED bit on a DNSSEC key
 .SH "SYNOPSIS"
 .HP 14
-\fBdnssec\-revoke\fR [\fB\-hr\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fB\-K\ =
\fR\fB\fIdirectory\fR\fR] [\fB\-E\ \fR\fB\fIengine\fR\fR] [\fB\-f\fR] {keyf=
ile}
+\fBdnssec\-revoke\fR [\fB\-hr\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fB\-K\ =
\fR\fB\fIdirectory\fR\fR] [\fB\-E\ \fR\fB\fIengine\fR\fR] [\fB\-f\fR] [\fB\=
-R\fR] {keyfile}
 .SH "DESCRIPTION"
 .PP
 \fBdnssec\-revoke\fR
@@ -70,6 +70,11 @@
 \fBdnssec\-revoke\fR
 to write the new key pair even if a file already exists matching the algor=
ithm and key ID of the revoked key.
 .RE
+.PP
+\-R
+.RS 4
+Print the key tag of the key with the REVOKE bit set but do not revoke the=
 key.
+.RE
 .SH "SEE ALSO"
 .PP
 \fBdnssec\-keygen\fR(8),
@@ -79,5 +84,5 @@
 .PP
 Internet Systems Consortium
 .SH "COPYRIGHT"
-Copyright \(co 2009 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
 .br
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-r=
evoke.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-revoke.c	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-revoke.c	Tue Apr 17 11:51:51 201=
2 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-revoke.c,v 1.22 2010-05-06 23:50:56 tbox Exp $ */
+/* $Id: dnssec-revoke.c,v 1.22.124.2 2011/10/20 23:46:27 tbox Exp $ */
=20
 /*! \file */
=20
@@ -92,6 +92,7 @@
 	isc_buffer_t buf;
 	isc_boolean_t force =3D ISC_FALSE;
 	isc_boolean_t remove =3D ISC_FALSE;
+	isc_boolean_t id =3D ISC_FALSE;
=20
 	if (argc =3D=3D 1)
 		usage();
@@ -104,7 +105,7 @@
=20
 	isc_commandline_errprint =3D ISC_FALSE;
=20
-	while ((ch =3D isc_commandline_parse(argc, argv, "E:fK:rhv:")) !=3D -1) {
+	while ((ch =3D isc_commandline_parse(argc, argv, "E:fK:rRhv:")) !=3D -1) {
 		switch (ch) {
 		    case 'E':
 			engine =3D isc_commandline_argument;
@@ -126,6 +127,9 @@
 		    case 'r':
 			remove =3D ISC_TRUE;
 			break;
+		    case 'R':
+			id =3D ISC_TRUE;
+			break;
 		    case 'v':
 			verbose =3D strtol(isc_commandline_argument, &endp, 0);
 			if (*endp !=3D '\0')
@@ -186,6 +190,10 @@
 		fatal("Invalid keyfile name %s: %s",
 		      filename, isc_result_totext(result));
=20
+	if (id) {
+		fprintf(stdout, "%u\n", dst_key_rid(key));
+		goto cleanup;
+	}
 	dst_key_format(key, keystr, sizeof(keystr));
=20
 	if (verbose > 2)
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-r=
evoke.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-revoke.docbook	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-revoke.docbook	Tue Apr 17 11:51:=
51 2012 +0300
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
                [<!ENTITY mdash "—">]>
 <!--
- - Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009, 2011  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-revoke.docbook,v 1.7 2009-11-03 21:44:46 each Exp $ -->
+<!-- $Id: dnssec-revoke.docbook,v 1.7.266.2 2011/10/20 23:46:27 tbox Exp $=
 -->
 <refentry id=3D"man.dnssec-revoke">
   <refentryinfo>
     <date>June 1, 2009</date>
@@ -37,6 +37,7 @@
   <docinfo>
     <copyright>
       <year>2009</year>
+      <year>2011</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -49,6 +50,7 @@
       <arg><option>-K <replaceable class=3D"parameter">directory</replacea=
ble></option></arg>
       <arg><option>-E <replaceable class=3D"parameter">engine</replaceable=
></option></arg>
       <arg><option>-f</option></arg>
+      <arg><option>-R</option></arg>
       <arg choice=3D"req">keyfile</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -123,6 +125,16 @@
           </para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term>-R</term>
+        <listitem>
+          <para>
+	    Print the key tag of the key with the REVOKE bit set but do
+	    not revoke the key.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-r=
evoke.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-revoke.html	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-revoke.html	Tue Apr 17 11:51:51 =
2012 +0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-revoke.html,v 1.9 2010-05-19 01:14:14 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -28,10 +28,10 @@
 </div>
 <div class=3D"refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-revoke</code>=
  [<code class=3D"option">-hr</code>] [<code class=3D"option">-v <em class=
=3D"replaceable"><code>level</code></em></code>] [<code class=3D"option">-K=
 <em class=3D"replaceable"><code>directory</code></em></code>] [<code class=
=3D"option">-E <em class=3D"replaceable"><code>engine</code></em></code>] [=
<code class=3D"option">-f</code>] {keyfile}</p></div>
+<div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-revoke</code>=
  [<code class=3D"option">-hr</code>] [<code class=3D"option">-v <em class=
=3D"replaceable"><code>level</code></em></code>] [<code class=3D"option">-K=
 <em class=3D"replaceable"><code>directory</code></em></code>] [<code class=
=3D"option">-E <em class=3D"replaceable"><code>engine</code></em></code>] [=
<code class=3D"option">-f</code>] [<code class=3D"option">-R</code>] {keyfi=
le}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543373"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543382"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-revoke</strong></span>
       reads a DNSSEC key file, sets the REVOKED bit on the key as defined
       in RFC 5011, and creates a new pair of key files containing the
@@ -39,7 +39,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543385"></a><h2>OPTIONS</h2>
+<a name=3D"id2543394"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-h</span></dt>
 <dd><p>
@@ -69,17 +69,22 @@
             write the new key pair even if a file already exists matching
             the algorithm and key ID of the revoked key.
           </p></dd>
+<dt><span class=3D"term">-R</span></dt>
+<dd><p>
+	    Print the key tag of the key with the REVOKE bit set but do
+	    not revoke the key.
+          </p></dd>
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543491"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543512"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-keyge=
n</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class=3D"citetitle">RFC 5011</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543515"></a><h2>AUTHOR</h2>
+<a name=3D"id2543537"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ettime.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-settime.8	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-settime.8	Tue Apr 17 11:51:51 20=
12 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-settime.8,v 1.14.70.1 2011-03-22 02:37:44 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
@@ -52,7 +52,7 @@
 .PP
 When key metadata fields are changed, both files of a key pair (\fIKnnnn.+=
aaa+iiiii.key\fR
 and
-\fIKnnnn.+aaa+iiiii.private\fR) are regenerated. Metadata fields are store=
d in the private file. A human\-readable description of the metadata is als=
o placed in comments in the key file.
+\fIKnnnn.+aaa+iiiii.private\fR) are regenerated. Metadata fields are store=
d in the private file. A human\-readable description of the metadata is als=
o placed in comments in the key file. The private file's permissions are al=
ways set to be inaccessible to anyone other than the owner (mode 0600).
 .SH "OPTIONS"
 .PP
 \-f
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ettime.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-settime.c	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-settime.c	Tue Apr 17 11:51:51 20=
12 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-settime.c,v 1.28.16.3 2011-06-02 20:24:11 each Exp $ */
+/* $Id: dnssec-settime.c,v 1.28.16.3 2011/06/02 20:24:11 each Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ettime.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-settime.docbook	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-settime.docbook	Tue Apr 17 11:51=
:51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-settime.docbook,v 1.11.70.2 2011-03-21 23:46:58 tbox Exp =
$ -->
+<!-- $Id: dnssec-settime.docbook,v 1.11.70.3 2011/11/03 20:21:30 each Exp =
$ -->
 <refentry id=3D"man.dnssec-settime">
   <refentryinfo>
     <date>July 15, 2009</date>
@@ -82,7 +82,8 @@
       <filename>Knnnn.+aaa+iiiii.private</filename>) are regenerated.
       Metadata fields are stored in the private file.  A human-readable
       description of the metadata is also placed in comments in the key
-      file.
+      file.  The private file's permissions are always set to be
+      inaccessible to anyone other than the owner (mode 0600).
     </para>
   </refsect1>
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ettime.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-settime.html	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-settime.html	Tue Apr 17 11:51:51=
 2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-settime.html,v 1.14.70.1 2011-03-22 02:37:44 tbox Exp $ -=
->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-settime</code=
>  [<code class=3D"option">-f</code>] [<code class=3D"option">-K <em class=
=3D"replaceable"><code>directory</code></em></code>] [<code class=3D"option=
">-P <em class=3D"replaceable"><code>date/offset</code></em></code>] [<code=
 class=3D"option">-A <em class=3D"replaceable"><code>date/offset</code></em=
></code>] [<code class=3D"option">-R <em class=3D"replaceable"><code>date/o=
ffset</code></em></code>] [<code class=3D"option">-I <em class=3D"replaceab=
le"><code>date/offset</code></em></code>] [<code class=3D"option">-D <em cl=
ass=3D"replaceable"><code>date/offset</code></em></code>] [<code class=3D"o=
ption">-h</code>] [<code class=3D"option">-v <em class=3D"replaceable"><cod=
e>level</code></em></code>] [<code class=3D"option">-E <em class=3D"replace=
able"><code>engine</code></em></code>] {keyfile}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543422"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543424"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-settime</strong></span>
       reads a DNSSEC private key file and sets the key timing metadata
       as specified by the <code class=3D"option">-P</code>, <code class=3D=
"option">-A</code>,
@@ -52,11 +52,12 @@
       <code class=3D"filename">Knnnn.+aaa+iiiii.private</code>) are regene=
rated.
       Metadata fields are stored in the private file.  A human-readable
       description of the metadata is also placed in comments in the key
-      file.
+      file.  The private file's permissions are always set to be
+      inaccessible to anyone other than the owner (mode 0600).
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543470"></a><h2>OPTIONS</h2>
+<a name=3D"id2543472"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-f</span></dt>
 <dd><p>
@@ -89,7 +90,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543562"></a><h2>TIMING OPTIONS</h2>
+<a name=3D"id2543563"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -168,7 +169,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543701"></a><h2>PRINTING OPTIONS</h2>
+<a name=3D"id2543770"></a><h2>PRINTING OPTIONS</h2>
 <p>
       <span><strong class=3D"command">dnssec-settime</strong></span> can a=
lso be used to print the
       timing metadata associated with a key.
@@ -194,7 +195,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543915"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543848"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-keyge=
n</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-si=
gnzone</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -202,7 +203,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543948"></a><h2>AUTHOR</h2>
+<a name=3D"id2543881"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ignzone.8
--- a/head/contrib/bind9/bin/dnssec/dnssec-signzone.8	Tue Apr 17 11:36:47 2=
012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-signzone.8	Tue Apr 17 11:51:51 2=
012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-signzone.8,v 1.59 2009-12-04 01:13:44 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ignzone.c
--- a/head/contrib/bind9/bin/dnssec/dnssec-signzone.c	Tue Apr 17 11:36:47 2=
012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-signzone.c	Tue Apr 17 11:51:51 2=
012 +0300
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssec-signzone.c,v 1.262.110.9 2011-07-19 23:47:12 tbox Exp $ */
+/* $Id: dnssec-signzone.c,v 1.262.110.9 2011/07/19 23:47:12 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ignzone.docbook
--- a/head/contrib/bind9/bin/dnssec/dnssec-signzone.docbook	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-signzone.docbook	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: dnssec-signzone.docbook,v 1.44 2009-12-03 23:18:16 each Exp $ -->
+<!-- $Id: dnssec-signzone.docbook,v 1.44 2009/12/03 23:18:16 each Exp $ -->
 <refentry id=3D"man.dnssec-signzone">
   <refentryinfo>
     <date>June 05, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssec-s=
ignzone.html
--- a/head/contrib/bind9/bin/dnssec/dnssec-signzone.html	Tue Apr 17 11:36:4=
7 2012 +0300
+++ b/head/contrib/bind9/bin/dnssec/dnssec-signzone.html	Tue Apr 17 11:51:5=
1 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-signzone.html,v 1.45 2009-12-04 01:13:44 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">dnssec-signzone</cod=
e>  [<code class=3D"option">-a</code>] [<code class=3D"option">-c <em class=
=3D"replaceable"><code>class</code></em></code>] [<code class=3D"option">-d=
 <em class=3D"replaceable"><code>directory</code></em></code>] [<code class=
=3D"option">-E <em class=3D"replaceable"><code>engine</code></em></code>] [=
<code class=3D"option">-e <em class=3D"replaceable"><code>end-time</code></=
em></code>] [<code class=3D"option">-f <em class=3D"replaceable"><code>outp=
ut-file</code></em></code>] [<code class=3D"option">-g</code>] [<code class=
=3D"option">-h</code>] [<code class=3D"option">-K <em class=3D"replaceable"=
><code>directory</code></em></code>] [<code class=3D"option">-k <em class=
=3D"replaceable"><code>key</code></em></code>] [<code class=3D"option">-l <=
em class=3D"replaceable"><code>domain</code></em></code>] [<code class=3D"o=
ption">-i <em class=3D"replaceable"><code>interval</code></em></code>] [<co=
de class=3D"option">-I <em class=3D"replaceable"><code>input-format</code><=
/em></code>] [<code class=3D"option">-j <em class=3D"replaceable"><code>jit=
ter</code></em></code>] [<code class=3D"option">-N <em class=3D"replaceable=
"><code>soa-serial-format</code></em></code>] [<code class=3D"option">-o <e=
m class=3D"replaceable"><code>origin</code></em></code>] [<code class=3D"op=
tion">-O <em class=3D"replaceable"><code>output-format</code></em></code>] =
[<code class=3D"option">-p</code>] [<code class=3D"option">-P</code>] [<cod=
e class=3D"option">-r <em class=3D"replaceable"><code>randomdev</code></em>=
</code>] [<code class=3D"option">-S</code>] [<code class=3D"option">-s <em =
class=3D"replaceable"><code>start-time</code></em></code>] [<code class=3D"=
option">-T <em class=3D"replaceable"><code>ttl</code></em></code>] [<code c=
lass=3D"option">-t</code>] [<code class=3D"option">-u</code>] [<code class=
=3D"option">-v <em class=3D"replaceable"><code>level</code></em></code>] [<=
code class=3D"option">-x</code>] [<code class=3D"option">-z</code>] [<code =
class=3D"option">-3 <em class=3D"replaceable"><code>salt</code></em></code>=
] [<code class=3D"option">-H <em class=3D"replaceable"><code>iterations</co=
de></em></code>] [<code class=3D"option">-A</code>] {zonefile} [key...]</p>=
</div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543596"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543597"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">dnssec-signzone</strong></span>
       signs a zone.  It generates
       NSEC and RRSIG records and produces a signed version of the
@@ -43,7 +43,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543611"></a><h2>OPTIONS</h2>
+<a name=3D"id2543612"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-a</span></dt>
 <dd><p>
@@ -379,7 +379,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544896"></a><h2>EXAMPLE</h2>
+<a name=3D"id2544965"></a><h2>EXAMPLE</h2>
 <p>
       The following command signs the <strong class=3D"userinput"><code>ex=
ample.com</code></strong>
       zone with the DSA key generated by <span><strong class=3D"command">d=
nssec-keygen</strong></span>
@@ -409,14 +409,14 @@
 %</pre>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545019"></a><h2>SEE ALSO</h2>
+<a name=3D"id2545020"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">dnssec-keyge=
n</span>(8)</span>,
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class=3D"citetitle">RFC 4033</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545044"></a><h2>AUTHOR</h2>
+<a name=3D"id2545045"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssecto=
ol.c
--- a/head/contrib/bind9/bin/dnssec/dnssectool.c	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/dnssec/dnssectool.c	Tue Apr 17 11:51:51 2012 +=
0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium=
, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-2011  Internet Systems Consortium,=
 Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssectool.c,v 1.60 2010-01-19 23:48:56 tbox Exp $ */
+/* $Id: dnssectool.c,v 1.60.162.3 2011/10/21 03:56:32 marka Exp $ */
=20
 /*! \file */
=20
@@ -406,19 +406,24 @@
 }
=20
 isc_boolean_t
-key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
-	      dns_secalg_t alg, isc_mem_t *mctx, isc_boolean_t *exact)
+key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir,
+	      isc_mem_t *mctx, isc_boolean_t *exact)
 {
 	isc_result_t result;
 	isc_boolean_t conflict =3D ISC_FALSE;
 	dns_dnsseckeylist_t matchkeys;
 	dns_dnsseckey_t *key =3D NULL;
-	isc_uint16_t oldid, diff;
-	isc_uint16_t bits =3D DNS_KEYFLAG_REVOKE;   /* flag bits to look for */
+	isc_uint16_t id, oldid;
+	isc_uint32_t rid, roldid;
+	dns_secalg_t alg;
=20
 	if (exact !=3D NULL)
 		*exact =3D ISC_FALSE;
=20
+	id =3D dst_key_id(dstkey);
+	rid =3D dst_key_rid(dstkey);
+	alg =3D dst_key_alg(dstkey);
+
 	ISC_LIST_INIT(matchkeys);
 	result =3D dns_dnssec_findmatchingkeys(name, dir, mctx, &matchkeys);
 	if (result =3D=3D ISC_R_NOTFOUND)
@@ -430,10 +435,11 @@
 			goto next;
=20
 		oldid =3D dst_key_id(key->key);
-		diff =3D (oldid > id) ? (oldid - id) : (id - oldid);
-		if ((diff & ~bits) =3D=3D 0) {
+		roldid =3D dst_key_rid(key->key);
+
+		if (oldid =3D=3D rid || roldid =3D=3D id || id =3D=3D oldid) {
 			conflict =3D ISC_TRUE;
-			if (diff !=3D 0) {
+			if (id !=3D oldid) {
 				if (verbose > 1)
 					fprintf(stderr, "Key ID %d could "
 						"collide with %d\n",
@@ -461,4 +467,3 @@
=20
 	return (conflict);
 }
-
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/dnssec/dnssecto=
ol.h
--- a/head/contrib/bind9/bin/dnssec/dnssectool.h	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/dnssec/dnssectool.h	Tue Apr 17 11:51:51 2012 +=
0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dnssectool.h,v 1.31 2010-01-19 23:48:56 tbox Exp $ */
+/* $Id: dnssectool.h,v 1.31.162.2 2011/10/20 23:46:27 tbox Exp $ */
=20
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1
@@ -78,6 +78,7 @@
 set_keyversion(dst_key_t *key);
=20
 isc_boolean_t
-key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
-	      dns_secalg_t alg, isc_mem_t *mctx, isc_boolean_t *exact);
+key_collision(dst_key_t *key, dns_name_t *name, const char *dir,
+	      isc_mem_t *mctx, isc_boolean_t *exact);
+
 #endif /* DNSSEC_DNSSECTOOL_H */
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/Makefile.=
in
--- a/head/contrib/bind9/bin/named/Makefile.in	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/named/Makefile.in	Tue Apr 17 11:51:51 2012 +03=
00
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.114.14.2 2011-03-10 23:47:25 tbox Exp $
+# $Id: Makefile.in,v 1.114.14.2 2011/03/10 23:47:25 tbox Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/bind.keys=
.h
--- a/head/contrib/bind9/bin/named/bind.keys.h	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/named/bind.keys.h	Tue Apr 17 11:51:51 2012 +03=
00
@@ -1,6 +1,6 @@
 /*
- * Generated by bindkeys.pl 1.7 2011-01-04 23:47:13 tbox Exp =20
- * From bind.keys 1.7 2011-01-03 23:45:07 each Exp =20
+ * Generated by bindkeys.pl 1.7 2011/01/04 23:47:13 tbox Exp =20
+ * From bind.keys 1.7 2011/01/03 23:45:07 each Exp =20
  */
 #define TRUSTED_KEYS "\
 # The bind.keys file is used to override the built-in DNSSEC trust anchors=
\n\
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/bind9.xsl
--- a/head/contrib/bind9/bin/named/bind9.xsl	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/bind9.xsl	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: bind9.xsl,v 1.21 2009-01-27 23:47:54 tbox Exp $ -->
+<!-- $Id: bind9.xsl,v 1.21 2009/01/27 23:47:54 tbox Exp $ -->
=20
 <xsl:stylesheet version=3D"1.0"
    xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/bind9.xsl=
.h
--- a/head/contrib/bind9/bin/named/bind9.xsl.h	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/named/bind9.xsl.h	Tue Apr 17 11:51:51 2012 +03=
00
@@ -1,6 +1,6 @@
 /*
- * Generated by convertxsl.pl 1.14 2008-07-17 23:43:26 jinmei Exp =20
- * From bind9.xsl 1.21 2009-01-27 23:47:54 tbox Exp=20
+ * Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp =20
+ * From bind9.xsl 1.21 2009/01/27 23:47:54 tbox Exp=20
  */
 static char xslmsg[] =3D
 	"<?xml version=3D\"1.0\" encoding=3D\"UTF-8\"?>\n"
@@ -20,7 +20,7 @@
 	" - PERFORMANCE OF THIS SOFTWARE.\n"
 	"-->\n"
 	"\n"
-	"<!-- \045Id: bind9.xsl,v 1.21 2009-01-27 23:47:54 tbox Exp \045 -->\n"
+	"<!-- \045Id: bind9.xsl,v 1.21 2009/01/27 23:47:54 tbox Exp \045 -->\n"
 	"\n"
 	"<xsl:stylesheet version=3D\"1.0\"\n"
 	" xmlns:xsl=3D\"http://www.w3.org/1999/XSL/Transform\"\n"
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/builtin.c
--- a/head/contrib/bind9/bin/named/builtin.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/builtin.c	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009-2011  Internet Systems Consortium,=
 Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-2012  Internet Systems Consortium,=
 Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: builtin.c,v 1.20 2011-01-07 23:47:07 tbox Exp $ */
+/* $Id: builtin.c,v 1.20.14.3 2012/01/11 20:19:40 ckb Exp $ */
=20
 /*! \file
  * \brief
@@ -300,6 +300,7 @@
 	const char **p;
 	static const char *authors[] =3D {
 		"Mark Andrews",
+		"Curtis Blackburn",
 		"James Brister",
 		"Ben Cottrell",
 		"Michael Graff",
@@ -308,6 +309,7 @@
 		"Evan Hunt",
 		"JINMEI Tatuya",
 		"David Lawrence",
+		"Scott Mann",
 		"Danny Mayer",
 		"Damien Neil",
 		"Matt Nelson",
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/client.c
--- a/head/contrib/bind9/bin/named/client.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/client.c	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: client.c,v 1.271.10.2 2011-07-28 04:30:54 marka Exp $ */
+/* $Id: client.c,v 1.271.10.4 2012/01/31 23:46:39 tbox Exp $ */
=20
 #include <config.h>
=20
@@ -934,6 +934,15 @@
 		render_opts =3D 0;
 	else
 		render_opts =3D DNS_MESSAGERENDER_OMITDNSSEC;
+
+	preferred_glue =3D 0;
+	if (client->view !=3D NULL) {
+		if (client->view->preferred_glue =3D=3D dns_rdatatype_a)
+			preferred_glue =3D DNS_MESSAGERENDER_PREFER_A;
+		else if (client->view->preferred_glue =3D=3D dns_rdatatype_aaaa)
+			preferred_glue =3D DNS_MESSAGERENDER_PREFER_AAAA;
+	}
+
 #ifdef ALLOW_FILTER_AAAA_ON_V4
 	/*
 	 * filter-aaaa-on-v4 yes or break-dnssec option to suppress
@@ -942,17 +951,15 @@
 	 * that we have both AAAA and A records,
 	 * and that we either have no signatures that the client wants
 	 * or we are supposed to break DNSSEC.
+	 *
+	 * Override preferred glue if necessary.
 	 */
-	if ((client->attributes & NS_CLIENTATTR_FILTER_AAAA) !=3D 0)
+	if ((client->attributes & NS_CLIENTATTR_FILTER_AAAA) !=3D 0) {
 		render_opts |=3D DNS_MESSAGERENDER_FILTER_AAAA;
+		if (preferred_glue =3D=3D DNS_MESSAGERENDER_PREFER_AAAA)
+			preferred_glue =3D DNS_MESSAGERENDER_PREFER_A;
+	}
 #endif
-	preferred_glue =3D 0;
-	if (client->view !=3D NULL) {
-		if (client->view->preferred_glue =3D=3D dns_rdatatype_a)
-			preferred_glue =3D DNS_MESSAGERENDER_PREFER_A;
-		else if (client->view->preferred_glue =3D=3D dns_rdatatype_aaaa)
-			preferred_glue =3D DNS_MESSAGERENDER_PREFER_AAAA;
-	}
=20
 	/*
 	 * XXXRTH  The following doesn't deal with TCP buffer resizing.
@@ -2109,6 +2116,9 @@
 	client->recursionquota =3D NULL;
 	client->interface =3D NULL;
 	client->peeraddr_valid =3D ISC_FALSE;
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+	client->filter_aaaa =3D dns_v4_aaaa_ok;
+#endif
 	ISC_EVENT_INIT(&client->ctlevent, sizeof(client->ctlevent), 0, NULL,
 		       NS_EVENT_CLIENTCONTROL, client_start, client, client,
 		       NULL, NULL);
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/config.c
--- a/head/contrib/bind9/bin/named/config.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/config.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: config.c,v 1.113.16.2 2011-02-28 01:19:58 tbox Exp $ */
+/* $Id: config.c,v 1.113.16.2 2011/02/28 01:19:58 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/control.c
--- a/head/contrib/bind9/bin/named/control.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/control.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: control.c,v 1.41 2010-12-03 22:05:19 each Exp $ */
+/* $Id: control.c,v 1.41 2010/12/03 22:05:19 each Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/controlco=
nf.c
--- a/head/contrib/bind9/bin/named/controlconf.c	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/named/controlconf.c	Tue Apr 17 11:51:51 2012 +=
0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011, 2012  Internet Systems Consortium, Inc. =
("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: controlconf.c,v 1.60.544.2 2011-03-12 04:59:14 tbox Exp $ */
+/* $Id: controlconf.c,v 1.60.544.3 2011/12/22 08:10:09 marka Exp $ */
=20
 /*! \file */
=20
@@ -373,17 +373,8 @@
 		if (result =3D=3D ISC_R_SUCCESS)
 			break;
 		isc_mem_put(listener->mctx, secret.rstart, REGION_SIZE(secret));
-		if (result =3D=3D ISCCC_R_BADAUTH) {
-			/*
-			 * For some reason, request is non-NULL when
-			 * isccc_cc_fromwire returns ISCCC_R_BADAUTH.
-			 */
-			if (request !=3D NULL)
-				isccc_sexpr_free(&request);
-		} else {
-			log_invalid(&conn->ccmsg, result);
-			goto cleanup;
-		}
+		log_invalid(&conn->ccmsg, result);
+		goto cleanup;
 	}
=20
 	if (key =3D=3D NULL) {
@@ -1148,6 +1139,11 @@
 	if (result =3D=3D ISC_R_SUCCESS)
 		isc_socket_setname(listener->sock, "control", NULL);
=20
+#ifndef ISC_ALLOW_MAPPED
+	if (result =3D=3D ISC_R_SUCCESS)
+		isc_socket_ipv6only(listener->sock, ISC_TRUE);
+#endif
+
 	if (result =3D=3D ISC_R_SUCCESS)
 		result =3D isc_socket_bind(listener->sock, &listener->address,
 					 ISC_SOCKET_REUSEADDRESS);
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/convertxs=
l.pl
--- a/head/contrib/bind9/bin/named/convertxsl.pl	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/named/convertxsl.pl	Tue Apr 17 11:51:51 2012 +=
0300
@@ -14,12 +14,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: convertxsl.pl,v 1.14 2008-07-17 23:43:26 jinmei Exp $
+# $Id: convertxsl.pl,v 1.14 2008/07/17 23:43:26 jinmei Exp $
=20
 use strict;
 use warnings;
=20
-my $rev =3D '$Id: convertxsl.pl,v 1.14 2008-07-17 23:43:26 jinmei Exp $';
+my $rev =3D '$Id: convertxsl.pl,v 1.14 2008/07/17 23:43:26 jinmei Exp $';
 $rev =3D~ s/\$//g;
 $rev =3D~ s/,v//g;
 $rev =3D~ s/Id: //;
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/d=
lz/dlz_dlopen_driver.h
--- a/head/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h	Tue Apr =
17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h	Tue Apr =
17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dlz_dlopen_driver.h,v 1.1.4.4 2011-03-17 09:41:06 fdupont Exp $ */
+/* $Id: dlz_dlopen_driver.h,v 1.1.4.4 2011/03/17 09:41:06 fdupont Exp $ */
=20
 #ifndef DLZ_DLOPEN_DRIVER_H
 #define DLZ_DLOPEN_DRIVER_H
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/builtin.h
--- a/head/contrib/bind9/bin/named/include/named/builtin.h	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/builtin.h	Tue Apr 17 11:51=
:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: builtin.h,v 1.6 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: builtin.h,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_BUILTIN_H
 #define NAMED_BUILTIN_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/client.h
--- a/head/contrib/bind9/bin/named/include/named/client.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/client.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: client.h,v 1.91 2009-10-26 23:14:53 each Exp $ */
+/* $Id: client.h,v 1.91.278.2 2012/01/31 23:46:39 tbox Exp $ */
=20
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1
@@ -141,6 +141,9 @@
 	isc_netaddr_t		destaddr;
 	struct in6_pktinfo	pktinfo;
 	isc_event_t		ctlevent;
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+	dns_v4_aaaa_t		filter_aaaa;
+#endif
 	/*%
 	 * Information about recent FORMERR response(s), for
 	 * FORMERR loop avoidance.  This is separate for each
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/config.h
--- a/head/contrib/bind9/bin/named/include/named/config.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/config.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: config.h,v 1.16 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: config.h,v 1.16 2009/06/11 23:47:55 tbox Exp $ */
=20
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/control.h
--- a/head/contrib/bind9/bin/named/include/named/control.h	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/control.h	Tue Apr 17 11:51=
:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: control.h,v 1.31 2010-08-16 22:21:06 marka Exp $ */
+/* $Id: control.h,v 1.31 2010/08/16 22:21:06 marka Exp $ */
=20
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/globals.h
--- a/head/contrib/bind9/bin/named/include/named/globals.h	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/globals.h	Tue Apr 17 11:51=
:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: globals.h,v 1.89.54.2 2011-06-17 23:47:10 tbox Exp $ */
+/* $Id: globals.h,v 1.89.54.2 2011/06/17 23:47:10 tbox Exp $ */
=20
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/interfacemgr.h
--- a/head/contrib/bind9/bin/named/include/named/interfacemgr.h	Tue Apr 17 =
11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/interfacemgr.h	Tue Apr 17 =
11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: interfacemgr.h,v 1.33 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: interfacemgr.h,v 1.33 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_INTERFACEMGR_H
 #define NAMED_INTERFACEMGR_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/listenlist.h
--- a/head/contrib/bind9/bin/named/include/named/listenlist.h	Tue Apr 17 11=
:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/listenlist.h	Tue Apr 17 11=
:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: listenlist.h,v 1.15 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: listenlist.h,v 1.15 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_LISTENLIST_H
 #define NAMED_LISTENLIST_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/log.h
--- a/head/contrib/bind9/bin/named/include/named/log.h	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/log.h	Tue Apr 17 11:51:51 =
2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: log.h,v 1.27 2009-01-07 23:47:46 tbox Exp $ */
+/* $Id: log.h,v 1.27 2009/01/07 23:47:46 tbox Exp $ */
=20
 #ifndef NAMED_LOG_H
 #define NAMED_LOG_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/logconf.h
--- a/head/contrib/bind9/bin/named/include/named/logconf.h	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/logconf.h	Tue Apr 17 11:51=
:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: logconf.h,v 1.17 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: logconf.h,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_LOGCONF_H
 #define NAMED_LOGCONF_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/lwaddr.h
--- a/head/contrib/bind9/bin/named/include/named/lwaddr.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/lwaddr.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwaddr.h,v 1.8 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: lwaddr.h,v 1.8 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/lwdclient.h
--- a/head/contrib/bind9/bin/named/include/named/lwdclient.h	Tue Apr 17 11:=
36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/lwdclient.h	Tue Apr 17 11:=
51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdclient.h,v 1.20 2009-01-17 23:47:42 tbox Exp $ */
+/* $Id: lwdclient.h,v 1.20 2009/01/17 23:47:42 tbox Exp $ */
=20
 #ifndef NAMED_LWDCLIENT_H
 #define NAMED_LWDCLIENT_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/lwresd.h
--- a/head/contrib/bind9/bin/named/include/named/lwresd.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/lwresd.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwresd.h,v 1.19 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: lwresd.h,v 1.19 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_LWRESD_H
 #define NAMED_LWRESD_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/lwsearch.h
--- a/head/contrib/bind9/bin/named/include/named/lwsearch.h	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/lwsearch.h	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwsearch.h,v 1.9 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: lwsearch.h,v 1.9 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_LWSEARCH_H
 #define NAMED_LWSEARCH_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/main.h
--- a/head/contrib/bind9/bin/named/include/named/main.h	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/main.h	Tue Apr 17 11:51:51=
 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: main.h,v 1.17 2009-09-29 23:48:03 tbox Exp $ */
+/* $Id: main.h,v 1.17 2009/09/29 23:48:03 tbox Exp $ */
=20
 #ifndef NAMED_MAIN_H
 #define NAMED_MAIN_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/notify.h
--- a/head/contrib/bind9/bin/named/include/named/notify.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/notify.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: notify.h,v 1.16 2009-01-17 23:47:42 tbox Exp $ */
+/* $Id: notify.h,v 1.16 2009/01/17 23:47:42 tbox Exp $ */
=20
 #ifndef NAMED_NOTIFY_H
 #define NAMED_NOTIFY_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/ns_smf_globals.h
--- a/head/contrib/bind9/bin/named/include/named/ns_smf_globals.h	Tue Apr 1=
7 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/ns_smf_globals.h	Tue Apr 1=
7 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: ns_smf_globals.h,v 1.7 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: ns_smf_globals.h,v 1.7 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NS_SMF_GLOBALS_H
 #define NS_SMF_GLOBALS_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/query.h
--- a/head/contrib/bind9/bin/named/include/named/query.h	Tue Apr 17 11:36:4=
7 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/query.h	Tue Apr 17 11:51:5=
1 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: query.h,v 1.45 2011-01-13 04:59:24 tbox Exp $ */
+/* $Id: query.h,v 1.45 2011/01/13 04:59:24 tbox Exp $ */
=20
 #ifndef NAMED_QUERY_H
 #define NAMED_QUERY_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/server.h
--- a/head/contrib/bind9/bin/named/include/named/server.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/server.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: server.h,v 1.110 2010-08-16 23:46:52 tbox Exp $ */
+/* $Id: server.h,v 1.110 2010/08/16 23:46:52 tbox Exp $ */
=20
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/sortlist.h
--- a/head/contrib/bind9/bin/named/include/named/sortlist.h	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/sortlist.h	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: sortlist.h,v 1.11 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: sortlist.h,v 1.11 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_SORTLIST_H
 #define NAMED_SORTLIST_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/statschannel.h
--- a/head/contrib/bind9/bin/named/include/named/statschannel.h	Tue Apr 17 =
11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/statschannel.h	Tue Apr 17 =
11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: statschannel.h,v 1.3 2008-04-03 05:55:51 marka Exp $ */
+/* $Id: statschannel.h,v 1.3 2008/04/03 05:55:51 marka Exp $ */
=20
 #ifndef NAMED_STATSCHANNEL_H
 #define NAMED_STATSCHANNEL_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/tkeyconf.h
--- a/head/contrib/bind9/bin/named/include/named/tkeyconf.h	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/tkeyconf.h	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: tkeyconf.h,v 1.16 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: tkeyconf.h,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NS_TKEYCONF_H
 #define NS_TKEYCONF_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/tsigconf.h
--- a/head/contrib/bind9/bin/named/include/named/tsigconf.h	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/tsigconf.h	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: tsigconf.h,v 1.18 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: tsigconf.h,v 1.18 2009/06/11 23:47:55 tbox Exp $ */
=20
 #ifndef NS_TSIGCONF_H
 #define NS_TSIGCONF_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/types.h
--- a/head/contrib/bind9/bin/named/include/named/types.h	Tue Apr 17 11:36:4=
7 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/types.h	Tue Apr 17 11:51:5=
1 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: types.h,v 1.31 2009-01-09 23:47:45 tbox Exp $ */
+/* $Id: types.h,v 1.31 2009/01/09 23:47:45 tbox Exp $ */
=20
 #ifndef NAMED_TYPES_H
 #define NAMED_TYPES_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/update.h
--- a/head/contrib/bind9/bin/named/include/named/update.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/update.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: update.h,v 1.13 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: update.h,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_UPDATE_H
 #define NAMED_UPDATE_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/xfrout.h
--- a/head/contrib/bind9/bin/named/include/named/xfrout.h	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/xfrout.h	Tue Apr 17 11:51:=
51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: xfrout.h,v 1.12 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: xfrout.h,v 1.12 2007/06/19 23:46:59 tbox Exp $ */
=20
 #ifndef NAMED_XFROUT_H
 #define NAMED_XFROUT_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/include/n=
amed/zoneconf.h
--- a/head/contrib/bind9/bin/named/include/named/zoneconf.h	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/include/named/zoneconf.h	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: zoneconf.h,v 1.28 2010-12-20 23:47:20 tbox Exp $ */
+/* $Id: zoneconf.h,v 1.28 2010/12/20 23:47:20 tbox Exp $ */
=20
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/interface=
mgr.c
--- a/head/contrib/bind9/bin/named/interfacemgr.c	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/named/interfacemgr.c	Tue Apr 17 11:51:51 2012 =
+0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: interfacemgr.c,v 1.95.426.2 2011-03-12 04:59:14 tbox Exp $ */
+/* $Id: interfacemgr.c,v 1.95.426.2 2011/03/12 04:59:14 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/listenlis=
t.c
--- a/head/contrib/bind9/bin/named/listenlist.c	Tue Apr 17 11:36:47 2012 +0=
300
+++ b/head/contrib/bind9/bin/named/listenlist.c	Tue Apr 17 11:51:51 2012 +0=
300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: listenlist.c,v 1.14 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: listenlist.c,v 1.14 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/log.c
--- a/head/contrib/bind9/bin/named/log.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/log.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: log.c,v 1.49 2009-01-07 01:46:40 jinmei Exp $ */
+/* $Id: log.c,v 1.49 2009/01/07 01:46:40 jinmei Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/logconf.c
--- a/head/contrib/bind9/bin/named/logconf.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/logconf.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: logconf.c,v 1.42.816.3 2011-03-05 23:52:06 tbox Exp $ */
+/* $Id: logconf.c,v 1.42.816.3 2011/03/05 23:52:06 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwaddr.c
--- a/head/contrib/bind9/bin/named/lwaddr.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwaddr.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwaddr.c,v 1.10 2008-01-11 23:46:56 tbox Exp $ */
+/* $Id: lwaddr.c,v 1.10 2008/01/11 23:46:56 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwdclient=
.c
--- a/head/contrib/bind9/bin/named/lwdclient.c	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/named/lwdclient.c	Tue Apr 17 11:51:51 2012 +03=
00
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdclient.c,v 1.22 2007-06-18 23:47:18 tbox Exp $ */
+/* $Id: lwdclient.c,v 1.22 2007/06/18 23:47:18 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwderror.c
--- a/head/contrib/bind9/bin/named/lwderror.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwderror.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwderror.c,v 1.12 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: lwderror.c,v 1.12 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwdgabn.c
--- a/head/contrib/bind9/bin/named/lwdgabn.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwdgabn.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdgabn.c,v 1.24 2009-09-02 23:48:01 tbox Exp $ */
+/* $Id: lwdgabn.c,v 1.24 2009/09/02 23:48:01 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwdgnba.c
--- a/head/contrib/bind9/bin/named/lwdgnba.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwdgnba.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdgnba.c,v 1.22 2008-01-14 23:46:56 tbox Exp $ */
+/* $Id: lwdgnba.c,v 1.22 2008/01/14 23:46:56 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwdgrbn.c
--- a/head/contrib/bind9/bin/named/lwdgrbn.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwdgrbn.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdgrbn.c,v 1.22 2009-09-02 23:48:01 tbox Exp $ */
+/* $Id: lwdgrbn.c,v 1.22 2009/09/02 23:48:01 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwdnoop.c
--- a/head/contrib/bind9/bin/named/lwdnoop.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwdnoop.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwdnoop.c,v 1.13 2008-01-22 23:28:04 tbox Exp $ */
+/* $Id: lwdnoop.c,v 1.13 2008/01/22 23:28:04 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwresd.8
--- a/head/contrib/bind9/bin/named/lwresd.8	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwresd.8	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: lwresd.8,v 1.31 2009-07-11 01:12:45 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwresd.c
--- a/head/contrib/bind9/bin/named/lwresd.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwresd.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwresd.c,v 1.60 2009-09-02 23:48:01 tbox Exp $ */
+/* $Id: lwresd.c,v 1.60 2009/09/02 23:48:01 tbox Exp $ */
=20
 /*! \file
  * \brief
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwresd.do=
cbook
--- a/head/contrib/bind9/bin/named/lwresd.docbook	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/named/lwresd.docbook	Tue Apr 17 11:51:51 2012 =
+0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: lwresd.docbook,v 1.20 2009-01-20 23:47:56 tbox Exp $ -->
+<!-- $Id: lwresd.docbook,v 1.20 2009/01/20 23:47:56 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>June 30, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwresd.ht=
ml
--- a/head/contrib/bind9/bin/named/lwresd.html	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/named/lwresd.html	Tue Apr 17 11:51:51 2012 +03=
00
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwresd.html,v 1.27 2009-07-11 01:12:45 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -22,7 +22,7 @@
 <meta name=3D"generator" content=3D"DocBook XSL Stylesheets V1.71.1">
 </head>
 <body bgcolor=3D"white" text=3D"black" link=3D"#0000FF" vlink=3D"#840084" =
alink=3D"#0000FF"><div class=3D"refentry" lang=3D"en">
-<a name=3D"id2476275"></a><div class=3D"titlepage"></div>
+<a name=3D"id2476274"></a><div class=3D"titlepage"></div>
 <div class=3D"refnamediv">
 <h2>Name</h2>
 <p><span class=3D"application">lwresd</span> — lightweight resolver =
daemon</p>
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">lwresd</code>  [<cod=
e class=3D"option">-c <em class=3D"replaceable"><code>config-file</code></e=
m></code>] [<code class=3D"option">-C <em class=3D"replaceable"><code>confi=
g-file</code></em></code>] [<code class=3D"option">-d <em class=3D"replacea=
ble"><code>debug-level</code></em></code>] [<code class=3D"option">-f</code=
>] [<code class=3D"option">-g</code>] [<code class=3D"option">-i <em class=
=3D"replaceable"><code>pid-file</code></em></code>] [<code class=3D"option"=
>-m <em class=3D"replaceable"><code>flag</code></em></code>] [<code class=
=3D"option">-n <em class=3D"replaceable"><code>#cpus</code></em></code>] [<=
code class=3D"option">-P <em class=3D"replaceable"><code>port</code></em></=
code>] [<code class=3D"option">-p <em class=3D"replaceable"><code>port</cod=
e></em></code>] [<code class=3D"option">-s</code>] [<code class=3D"option">=
-t <em class=3D"replaceable"><code>directory</code></em></code>] [<code cla=
ss=3D"option">-u <em class=3D"replaceable"><code>user</code></em></code>] [=
<code class=3D"option">-v</code>] [<code class=3D"option">-4</code>] [<code=
 class=3D"option">-6</code>]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543467"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543469"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">lwresd</strong></span>
       is the daemon providing name lookup
       services to clients that use the BIND 9 lightweight resolver
@@ -67,7 +67,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543514"></a><h2>OPTIONS</h2>
+<a name=3D"id2543516"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-4</span></dt>
 <dd><p>
@@ -197,7 +197,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543931"></a><h2>FILES</h2>
+<a name=3D"id2543933"></a><h2>FILES</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term"><code class=3D"filename">/etc/resolv.conf</code><=
/span></dt>
 <dd><p>
@@ -210,14 +210,14 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543971"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543973"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">named</span>=
(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">lwres</sp=
an>(3)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">resolver<=
/span>(5)</span>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544005"></a><h2>AUTHOR</h2>
+<a name=3D"id2544007"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/lwsearch.c
--- a/head/contrib/bind9/bin/named/lwsearch.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/lwsearch.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: lwsearch.c,v 1.13 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: lwsearch.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/main.c
--- a/head/contrib/bind9/bin/named/main.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/main.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: main.c,v 1.180.14.3 2011-03-11 06:47:00 marka Exp $ */
+/* $Id: main.c,v 1.180.14.4 2011/11/05 00:45:52 each Exp $ */
=20
 /*! \file */
=20
@@ -793,6 +793,25 @@
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 		      ISC_LOG_NOTICE, "built with %s", ns_g_configargs);
=20
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "----------------------------------------------------");
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "BIND 9 is maintained by Internet Systems Consortium,");
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "Inc. (ISC), a non-profit 501(c)(3) public-benefit ");
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "corporation.  Support and training for BIND 9 are ");
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "available at https://www.isc.org/support");
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_NOTICE,
+		      "----------------------------------------------------");
+
 	dump_symboltable();
=20
 	/*
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.8
--- a/head/contrib/bind9/bin/named/named.8	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/named.8	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named.8,v 1.41 2009-10-06 01:14:41 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.con=
f.5
--- a/head/contrib/bind9/bin/named/named.conf.5	Tue Apr 17 11:36:47 2012 +0=
300
+++ b/head/contrib/bind9/bin/named/named.conf.5	Tue Apr 17 11:51:51 2012 +0=
300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named.conf.5,v 1.44.12.1 2011-02-03 12:29:12 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
@@ -254,8 +254,7 @@
 	disable\-algorithms \fIstring\fR { \fIstring\fR; ... };
 	dnssec\-enable \fIboolean\fR;
 	dnssec\-validation \fIboolean\fR;
-	dnssec\-lookaside \fIstring\fR trust\-anchor \fIstring\fR;
-	dnssec\-lookaside ( \fIauto\fR | \fIdomain\fR trust\-anchor \fIdomain\fR =
);
+	dnssec\-lookaside ( \fIauto\fR | \fIno\fR | \fIdomain\fR trust\-anchor \f=
Idomain\fR );
 	dnssec\-must\-be\-secure \fIstring\fR \fIboolean\fR;
 	dnssec\-accept\-expired \fIboolean\fR;
 	dns64\-server \fIstring\fR;
@@ -424,7 +423,7 @@
 	disable\-algorithms \fIstring\fR { \fIstring\fR; ... };
 	dnssec\-enable \fIboolean\fR;
 	dnssec\-validation \fIboolean\fR;
-	dnssec\-lookaside \fIstring\fR trust\-anchor \fIstring\fR;
+	dnssec\-lookaside ( \fIauto\fR | \fIno\fR | \fIdomain\fR trust\-anchor \f=
Idomain\fR );
 	dnssec\-must\-be\-secure \fIstring\fR \fIboolean\fR;
 	dnssec\-accept\-expired \fIboolean\fR;
 	dns64\-server \fIstring\fR;
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.con=
f.docbook
--- a/head/contrib/bind9/bin/named/named.conf.docbook	Tue Apr 17 11:36:47 2=
012 +0300
+++ b/head/contrib/bind9/bin/named/named.conf.docbook	Tue Apr 17 11:51:51 2=
012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: named.conf.docbook,v 1.49.14.1 2011-02-03 05:50:05 marka Exp $ -=
->
+<!-- $Id: named.conf.docbook,v 1.49.14.2 2011/11/07 00:31:47 marka Exp $ -=
->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -285,8 +285,7 @@
 	disable-algorithms <replaceable>string</replaceable> { <replaceable>strin=
g</replaceable>; ... };
 	dnssec-enable <replaceable>boolean</replaceable>;
 	dnssec-validation <replaceable>boolean</replaceable>;
-	dnssec-lookaside <replaceable>string</replaceable> trust-anchor <replacea=
ble>string</replaceable>;
-	dnssec-lookaside ( <replaceable>auto</replaceable> | <replaceable>domain<=
/replaceable> trust-anchor <replaceable>domain</replaceable> );
+	dnssec-lookaside ( <replaceable>auto</replaceable> | <replaceable>no</rep=
laceable> | <replaceable>domain</replaceable> trust-anchor <replaceable>dom=
ain</replaceable> );
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>bool=
ean</replaceable>;
 	dnssec-accept-expired <replaceable>boolean</replaceable>;
=20
@@ -473,7 +472,7 @@
 	disable-algorithms <replaceable>string</replaceable> { <replaceable>strin=
g</replaceable>; ... };
 	dnssec-enable <replaceable>boolean</replaceable>;
 	dnssec-validation <replaceable>boolean</replaceable>;
-	dnssec-lookaside <replaceable>string</replaceable> trust-anchor <replacea=
ble>string</replaceable>;
+	dnssec-lookaside ( <replaceable>auto</replaceable> | <replaceable>no</rep=
laceable> | <replaceable>domain</replaceable> trust-anchor <replaceable>dom=
ain</replaceable> );
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>bool=
ean</replaceable>;
 	dnssec-accept-expired <replaceable>boolean</replaceable>;
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.con=
f.html
--- a/head/contrib/bind9/bin/named/named.conf.html	Tue Apr 17 11:36:47 2012=
 +0300
+++ b/head/contrib/bind9/bin/named/named.conf.html	Tue Apr 17 11:51:51 2012=
 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named.conf.html,v 1.53.12.1 2011-02-03 12:29:12 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">named.conf</code> </=
p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543352"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543353"></a><h2>DESCRIPTION</h2>
 <p><code class=3D"filename">named.conf</code> is the configuration file
       for
       <span><strong class=3D"command">named</strong></span>.  Statements a=
re enclosed
@@ -50,14 +50,14 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543380"></a><h2>ACL</h2>
+<a name=3D"id2543381"></a><h2>ACL</h2>
 <div class=3D"literallayout"><p><br>
 acl=A0<em class=3D"replaceable"><code>string</code></em>=A0{=A0<em class=
=3D"replaceable"><code>address_match_element</code></em>;=A0...=A0};<br>
 <br>
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543396"></a><h2>KEY</h2>
+<a name=3D"id2543397"></a><h2>KEY</h2>
 <div class=3D"literallayout"><p><br>
 key=A0<em class=3D"replaceable"><code>domain_name</code></em>=A0{<br>
 	algorithm=A0<em class=3D"replaceable"><code>string</code></em>;<br>
@@ -66,7 +66,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543415"></a><h2>MASTERS</h2>
+<a name=3D"id2543416"></a><h2>MASTERS</h2>
 <div class=3D"literallayout"><p><br>
 masters=A0<em class=3D"replaceable"><code>string</code></em>=A0[<span clas=
s=3D"optional">=A0port=A0<em class=3D"replaceable"><code>integer</code></em=
>=A0</span>]=A0{<br>
 	(=A0<em class=3D"replaceable"><code>masters</code></em>=A0|=A0<em class=
=3D"replaceable"><code>ipv4_address</code></em>=A0[<span class=3D"optional"=
>port=A0<em class=3D"replaceable"><code>integer</code></em></span>]=A0|<br>
@@ -75,7 +75,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543461"></a><h2>SERVER</h2>
+<a name=3D"id2543462"></a><h2>SERVER</h2>
 <div class=3D"literallayout"><p><br>
 server=A0(=A0<em class=3D"replaceable"><code>ipv4_address[<span class=3D"o=
ptional">/prefixlen</span>]</code></em>=A0|=A0<em class=3D"replaceable"><co=
de>ipv6_address[<span class=3D"optional">/prefixlen</span>]</code></em>=A0)=
=A0{<br>
 	bogus=A0<em class=3D"replaceable"><code>boolean</code></em>;<br>
@@ -97,7 +97,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543529"></a><h2>TRUSTED-KEYS</h2>
+<a name=3D"id2543530"></a><h2>TRUSTED-KEYS</h2>
 <div class=3D"literallayout"><p><br>
 trusted-keys=A0{<br>
 	<em class=3D"replaceable"><code>domain_name</code></em>=A0<em class=3D"re=
placeable"><code>flags</code></em>=A0<em class=3D"replaceable"><code>protoc=
ol</code></em>=A0<em class=3D"replaceable"><code>algorithm</code></em>=A0<e=
m class=3D"replaceable"><code>key</code></em>;=A0...=A0<br>
@@ -105,7 +105,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543555"></a><h2>MANAGED-KEYS</h2>
+<a name=3D"id2543556"></a><h2>MANAGED-KEYS</h2>
 <div class=3D"literallayout"><p><br>
 managed-keys=A0{<br>
 	<em class=3D"replaceable"><code>domain_name</code></em>=A0<code class=3D"=
constant">initial-key</code>=A0<em class=3D"replaceable"><code>flags</code>=
</em>=A0<em class=3D"replaceable"><code>protocol</code></em>=A0<em class=3D=
"replaceable"><code>algorithm</code></em>=A0<em class=3D"replaceable"><code=
>key</code></em>;=A0...=A0<br>
@@ -113,7 +113,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543584"></a><h2>CONTROLS</h2>
+<a name=3D"id2543585"></a><h2>CONTROLS</h2>
 <div class=3D"literallayout"><p><br>
 controls=A0{<br>
 	inet=A0(=A0<em class=3D"replaceable"><code>ipv4_address</code></em>=A0|=
=A0<em class=3D"replaceable"><code>ipv6_address</code></em>=A0|=A0*=A0)<br>
@@ -125,7 +125,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543619"></a><h2>LOGGING</h2>
+<a name=3D"id2543620"></a><h2>LOGGING</h2>
 <div class=3D"literallayout"><p><br>
 logging=A0{<br>
 	channel=A0<em class=3D"replaceable"><code>string</code></em>=A0{<br>
@@ -143,7 +143,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543657"></a><h2>LWRES</h2>
+<a name=3D"id2543658"></a><h2>LWRES</h2>
 <div class=3D"literallayout"><p><br>
 lwres=A0{<br>
 	listen-on=A0[<span class=3D"optional">=A0port=A0<em class=3D"replaceable"=
><code>integer</code></em>=A0</span>]=A0{<br>
@@ -156,7 +156,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543699"></a><h2>OPTIONS</h2>
+<a name=3D"id2543700"></a><h2>OPTIONS</h2>
 <div class=3D"literallayout"><p><br>
 options=A0{<br>
 	avoid-v4-udp-ports=A0{=A0<em class=3D"replaceable"><code>port</code></em>=
;=A0...=A0};<br>
@@ -251,8 +251,7 @@
 	disable-algorithms=A0<em class=3D"replaceable"><code>string</code></em>=
=A0{=A0<em class=3D"replaceable"><code>string</code></em>;=A0...=A0};<br>
 	dnssec-enable=A0<em class=3D"replaceable"><code>boolean</code></em>;<br>
 	dnssec-validation=A0<em class=3D"replaceable"><code>boolean</code></em>;<=
br>
-	dnssec-lookaside=A0<em class=3D"replaceable"><code>string</code></em>=A0t=
rust-anchor=A0<em class=3D"replaceable"><code>string</code></em>;<br>
-	dnssec-lookaside=A0(=A0<em class=3D"replaceable"><code>auto</code></em>=
=A0|=A0<em class=3D"replaceable"><code>domain</code></em>=A0trust-anchor=A0=
<em class=3D"replaceable"><code>domain</code></em>=A0);<br>
+	dnssec-lookaside=A0(=A0<em class=3D"replaceable"><code>auto</code></em>=
=A0|=A0<em class=3D"replaceable"><code>no</code></em>=A0|=A0<em class=3D"re=
placeable"><code>domain</code></em>=A0trust-anchor=A0<em class=3D"replaceab=
le"><code>domain</code></em>=A0);<br>
 	dnssec-must-be-secure=A0<em class=3D"replaceable"><code>string</code></em=
>=A0<em class=3D"replaceable"><code>boolean</code></em>;<br>
 	dnssec-accept-expired=A0<em class=3D"replaceable"><code>boolean</code></e=
m>;<br>
 <br>
@@ -361,7 +360,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544577"></a><h2>VIEW</h2>
+<a name=3D"id2544574"></a><h2>VIEW</h2>
 <div class=3D"literallayout"><p><br>
 view=A0<em class=3D"replaceable"><code>string</code></em>=A0<em class=3D"r=
eplaceable"><code>optional_class</code></em>=A0{<br>
 	match-clients=A0{=A0<em class=3D"replaceable"><code>address_match_element=
</code></em>;=A0...=A0};<br>
@@ -438,7 +437,7 @@
 	disable-algorithms=A0<em class=3D"replaceable"><code>string</code></em>=
=A0{=A0<em class=3D"replaceable"><code>string</code></em>;=A0...=A0};<br>
 	dnssec-enable=A0<em class=3D"replaceable"><code>boolean</code></em>;<br>
 	dnssec-validation=A0<em class=3D"replaceable"><code>boolean</code></em>;<=
br>
-	dnssec-lookaside=A0<em class=3D"replaceable"><code>string</code></em>=A0t=
rust-anchor=A0<em class=3D"replaceable"><code>string</code></em>;<br>
+	dnssec-lookaside=A0(=A0<em class=3D"replaceable"><code>auto</code></em>=
=A0|=A0<em class=3D"replaceable"><code>no</code></em>=A0|=A0<em class=3D"re=
placeable"><code>domain</code></em>=A0trust-anchor=A0<em class=3D"replaceab=
le"><code>domain</code></em>=A0);<br>
 	dnssec-must-be-secure=A0<em class=3D"replaceable"><code>string</code></em=
>=A0<em class=3D"replaceable"><code>boolean</code></em>;<br>
 	dnssec-accept-expired=A0<em class=3D"replaceable"><code>boolean</code></e=
m>;<br>
 <br>
@@ -524,7 +523,7 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545280"></a><h2>ZONE</h2>
+<a name=3D"id2545284"></a><h2>ZONE</h2>
 <div class=3D"literallayout"><p><br>
 zone=A0<em class=3D"replaceable"><code>string</code></em>=A0<em class=3D"r=
eplaceable"><code>optional_class</code></em>=A0{<br>
 	type=A0(=A0master=A0|=A0slave=A0|=A0stub=A0|=A0hint=A0|<br>
@@ -619,12 +618,12 @@
 </p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545659"></a><h2>FILES</h2>
+<a name=3D"id2545664"></a><h2>FILES</h2>
 <p><code class=3D"filename">/etc/named.conf</code>
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2545671"></a><h2>SEE ALSO</h2>
+<a name=3D"id2545675"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">named</span>=
(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named-che=
ckconf</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">rndc</spa=
n>(8)</span>,
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.doc=
book
--- a/head/contrib/bind9/bin/named/named.docbook	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/named/named.docbook	Tue Apr 17 11:51:51 2012 +=
0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: named.docbook,v 1.26 2009-10-05 17:30:49 fdupont Exp $ -->
+<!-- $Id: named.docbook,v 1.26 2009/10/05 17:30:49 fdupont Exp $ -->
 <refentry id=3D"man.named">
   <refentryinfo>
     <date>May 21, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/named.html
--- a/head/contrib/bind9/bin/named/named.html	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/named.html	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named.html,v 1.33 2009-10-06 01:14:41 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">named</code>  [<code=
 class=3D"option">-4</code>] [<code class=3D"option">-6</code>] [<code clas=
s=3D"option">-c <em class=3D"replaceable"><code>config-file</code></em></co=
de>] [<code class=3D"option">-d <em class=3D"replaceable"><code>debug-level=
</code></em></code>] [<code class=3D"option">-E <em class=3D"replaceable"><=
code>engine-name</code></em></code>] [<code class=3D"option">-f</code>] [<c=
ode class=3D"option">-g</code>] [<code class=3D"option">-m <em class=3D"rep=
laceable"><code>flag</code></em></code>] [<code class=3D"option">-n <em cla=
ss=3D"replaceable"><code>#cpus</code></em></code>] [<code class=3D"option">=
-p <em class=3D"replaceable"><code>port</code></em></code>] [<code class=3D=
"option">-s</code>] [<code class=3D"option">-S <em class=3D"replaceable"><c=
ode>#max-socks</code></em></code>] [<code class=3D"option">-t <em class=3D"=
replaceable"><code>directory</code></em></code>] [<code class=3D"option">-u=
 <em class=3D"replaceable"><code>user</code></em></code>] [<code class=3D"o=
ption">-v</code>] [<code class=3D"option">-V</code>] [<code class=3D"option=
">-x <em class=3D"replaceable"><code>cache-file</code></em></code>]</p></di=
v>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543480"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543482"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">named</strong></span>
       is a Domain Name System (DNS) server,
       part of the BIND 9 distribution from ISC.  For more
@@ -47,7 +47,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543505"></a><h2>OPTIONS</h2>
+<a name=3D"id2543507"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-4</span></dt>
 <dd><p>
@@ -228,7 +228,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543962"></a><h2>SIGNALS</h2>
+<a name=3D"id2543964"></a><h2>SIGNALS</h2>
 <p>
       In routine operation, signals should not be used to control
       the nameserver; <span><strong class=3D"command">rndc</strong></span>=
 should be used
@@ -249,7 +249,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544010"></a><h2>CONFIGURATION</h2>
+<a name=3D"id2544012"></a><h2>CONFIGURATION</h2>
 <p>
       The <span><strong class=3D"command">named</strong></span> configurat=
ion file is too complex
       to describe in detail here.  A complete description is provided
@@ -266,7 +266,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544046"></a><h2>FILES</h2>
+<a name=3D"id2544049"></a><h2>FILES</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term"><code class=3D"filename">/etc/named.conf</code></=
span></dt>
 <dd><p>
@@ -279,7 +279,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544086"></a><h2>SEE ALSO</h2>
+<a name=3D"id2544088"></a><h2>SEE ALSO</h2>
 <p><em class=3D"citetitle">RFC 1033</em>,
       <em class=3D"citetitle">RFC 1034</em>,
       <em class=3D"citetitle">RFC 1035</em>,
@@ -292,7 +292,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544293"></a><h2>AUTHOR</h2>
+<a name=3D"id2544295"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/notify.c
--- a/head/contrib/bind9/bin/named/notify.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/notify.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: notify.c,v 1.37 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: notify.c,v 1.37 2007/06/19 23:46:59 tbox Exp $ */
=20
 #include <config.h>
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/query.c
--- a/head/contrib/bind9/bin/named/query.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/query.c	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: query.c,v 1.353.8.11.4.1 2011-11-16 09:32:08 marka Exp $ */
+/* $Id: query.c,v 1.353.8.24 2012/02/07 01:14:39 marka Exp $ */
=20
 /*! \file */
=20
@@ -830,57 +830,41 @@
 }
=20
 static void
-rpz_log(ns_client_t *client) {
-	char namebuf1[DNS_NAME_FORMATSIZE];
-	char namebuf2[DNS_NAME_FORMATSIZE];
-	dns_rpz_st_t *st;
-	const char *pat;
-
-	if (!ns_g_server->log_queries ||
-	    !isc_log_wouldlog(ns_g_lctx, DNS_RPZ_INFO_LEVEL))
+rpz_log_rewrite(ns_client_t *client, const char *disabled,
+		dns_rpz_policy_t policy, dns_rpz_type_t type,
+		dns_name_t *rpz_qname) {
+	char qname_buf[DNS_NAME_FORMATSIZE];
+	char rpz_qname_buf[DNS_NAME_FORMATSIZE];
+
+	if (!isc_log_wouldlog(ns_g_lctx, DNS_RPZ_INFO_LEVEL))
 		return;
=20
-	st =3D client->query.rpz_st;
-	dns_name_format(client->query.qname, namebuf1, sizeof(namebuf1));
-	dns_name_format(st->qname, namebuf2, sizeof(namebuf2));
-
-	switch (st->m.policy) {
-	case DNS_RPZ_POLICY_NO_OP:
-		pat =3D"response policy %s rewrite %s NO-OP using %s";
-		break;
-	case DNS_RPZ_POLICY_NXDOMAIN:
-		pat =3D "response policy %s rewrite %s to NXDOMAIN using %s";
-		break;
-	case DNS_RPZ_POLICY_NODATA:
-		pat =3D "response policy %s rewrite %s to NODATA using %s";
-		break;
-	case DNS_RPZ_POLICY_RECORD:
-	case DNS_RPZ_POLICY_CNAME:
-		pat =3D "response policy %s rewrite %s using %s";
-		break;
-	default:
-		INSIST(0);
-	}
-	ns_client_log(client, NS_LOGCATEGORY_QUERIES, NS_LOGMODULE_QUERY,
-		      DNS_RPZ_INFO_LEVEL, pat, dns_rpz_type2str(st->m.type),
-		      namebuf1, namebuf2);
+	dns_name_format(client->query.qname, qname_buf, sizeof(qname_buf));
+	dns_name_format(rpz_qname, rpz_qname_buf, sizeof(rpz_qname_buf));
+
+	ns_client_log(client, DNS_LOGCATEGORY_RPZ, NS_LOGMODULE_QUERY,
+		      DNS_RPZ_INFO_LEVEL, "%srpz %s %s rewrite %s via %s",
+		      disabled,
+		      dns_rpz_type2str(type), dns_rpz_policy2str(policy),
+		      qname_buf, rpz_qname_buf);
 }
=20
 static void
-rpz_fail_log(ns_client_t *client, int level, dns_rpz_type_t rpz_type,
-	     dns_name_t *name, const char *str, isc_result_t result)
+rpz_log_fail(ns_client_t *client, int level,
+	     dns_rpz_type_t rpz_type, dns_name_t *name,
+	     const char *str, isc_result_t result)
 {
 	char namebuf1[DNS_NAME_FORMATSIZE];
 	char namebuf2[DNS_NAME_FORMATSIZE];
=20
-	if (!ns_g_server->log_queries || !isc_log_wouldlog(ns_g_lctx, level))
+	if (!isc_log_wouldlog(ns_g_lctx, level))
 		return;
=20
 	dns_name_format(client->query.qname, namebuf1, sizeof(namebuf1));
 	dns_name_format(name, namebuf2, sizeof(namebuf2));
 	ns_client_log(client, NS_LOGCATEGORY_QUERY_EERRORS,
 		      NS_LOGMODULE_QUERY, level,
-		      "response policy %s rewrite %s via %s %sfailed: %s",
+		      "rpz %s rewrite %s via %s %sfailed: %s",
 		      dns_rpz_type2str(rpz_type),
 		      namebuf1, namebuf2, str, isc_result_totext(result));
 }
@@ -889,9 +873,8 @@
  * Get a policy rewrite zone database.
  */
 static isc_result_t
-rpz_getdb(ns_client_t *client, dns_rpz_type_t rpz_type,
-	  dns_name_t *rpz_qname, dns_zone_t **zonep,
-	  dns_db_t **dbp, dns_dbversion_t **versionp)
+rpz_getdb(ns_client_t *client, dns_rpz_type_t rpz_type, dns_name_t *rpz_qn=
ame,
+	  dns_zone_t **zonep, dns_db_t **dbp, dns_dbversion_t **versionp)
 {
 	char namebuf1[DNS_NAME_FORMATSIZE];
 	char namebuf2[DNS_NAME_FORMATSIZE];
@@ -901,12 +884,11 @@
 	result =3D query_getzonedb(client, rpz_qname, dns_rdatatype_any,
 				 DNS_GETDB_IGNOREACL, zonep, dbp, &rpz_version);
 	if (result =3D=3D ISC_R_SUCCESS) {
-		if (ns_g_server->log_queries &&
-		    isc_log_wouldlog(ns_g_lctx, DNS_RPZ_DEBUG_LEVEL2)) {
+		if (isc_log_wouldlog(ns_g_lctx, DNS_RPZ_DEBUG_LEVEL2)) {
 			dns_name_format(client->query.qname, namebuf1,
 					sizeof(namebuf1));
 			dns_name_format(rpz_qname, namebuf2, sizeof(namebuf2));
-			ns_client_log(client, NS_LOGCATEGORY_QUERIES,
+			ns_client_log(client, DNS_LOGCATEGORY_RPZ,
 				      NS_LOGMODULE_QUERY, DNS_RPZ_DEBUG_LEVEL2,
 				      "try rpz %s rewrite %s via %s",
 				      dns_rpz_type2str(rpz_type),
@@ -915,7 +897,7 @@
 		*versionp =3D rpz_version;
 		return (ISC_R_SUCCESS);
 	}
-	rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL, rpz_type, rpz_qname,
+	rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, rpz_type, rpz_qname,
 		     "query_getzonedb() ", result);
 	return (result);
 }
@@ -1144,7 +1126,8 @@
 	if (name =3D=3D mname)
 		mname =3D NULL;
=20
-	*mnamep =3D mname;
+	if (mnamep !=3D NULL)
+		*mnamep =3D mname;
=20
 	CTRACE("query_isduplicate: false: done");
 	return (ISC_FALSE);
@@ -1363,6 +1346,10 @@
 	}
=20
 	if (qtype =3D=3D dns_rdatatype_a) {
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+		isc_boolean_t have_a =3D ISC_FALSE;
+#endif
+
 		/*
 		 * We now go looking for A and AAAA records, along with
 		 * their signatures.
@@ -1385,6 +1372,8 @@
 			if (sigrdataset =3D=3D NULL)
 				goto addname;
 		}
+		if (query_isduplicate(client, fname, dns_rdatatype_a, NULL))
+			goto aaaa_lookup;
 		result =3D dns_db_findrdataset(db, node, version,
 					     dns_rdatatype_a, 0,
 					     client->now, rdataset,
@@ -1399,6 +1388,9 @@
 		}
 		if (result =3D=3D ISC_R_SUCCESS) {
 			mname =3D NULL;
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+			have_a =3D ISC_TRUE;
+#endif
 			if (!query_isduplicate(client, fname,
 					       dns_rdatatype_a, &mname)) {
 				if (mname !=3D NULL) {
@@ -1428,6 +1420,9 @@
 					dns_rdataset_disassociate(sigrdataset);
 			}
 		}
+  aaaa_lookup:
+		if (query_isduplicate(client, fname, dns_rdatatype_aaaa, NULL))
+			goto addname;
 		result =3D dns_db_findrdataset(db, node, version,
 					     dns_rdatatype_aaaa, 0,
 					     client->now, rdataset,
@@ -1442,6 +1437,17 @@
 		}
 		if (result =3D=3D ISC_R_SUCCESS) {
 			mname =3D NULL;
+			/*
+			 * There's an A; check whether we're filtering AAAA
+			 */
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+			if (have_a &&
+			    (client->filter_aaaa =3D=3D dns_v4_aaaa_break_dnssec ||
+			    (client->filter_aaaa =3D=3D dns_v4_aaaa_filter &&
+			     (!WANTDNSSEC(client) || sigrdataset =3D=3D NULL ||
+			      !dns_rdataset_isassociated(sigrdataset)))))
+				goto addname;
+#endif
 			if (!query_isduplicate(client, fname,
 					       dns_rdatatype_aaaa, &mname)) {
 				if (mname !=3D NULL) {
@@ -1593,7 +1599,13 @@
 	dns_rdatatype_t type;
 	dns_rdatasetadditional_t additionaltype;
=20
-	if (qtype !=3D dns_rdatatype_a) {
+	/*
+	 * If we don't have an additional cache call query_addadditional.
+	 */
+	client =3D additionalctx->client;
+	REQUIRE(NS_CLIENT_VALID(client));
+
+	if (qtype !=3D dns_rdatatype_a || client->view->acache =3D=3D NULL) {
 		/*
 		 * This function is optimized for "address" types.  For other
 		 * types, use a generic routine.
@@ -1607,8 +1619,6 @@
 	 * Initialization.
 	 */
 	rdataset_base =3D additionalctx->rdataset;
-	client =3D additionalctx->client;
-	REQUIRE(NS_CLIENT_VALID(client));
 	eresult =3D ISC_R_SUCCESS;
 	fname =3D NULL;
 	rdataset =3D NULL;
@@ -1861,6 +1871,9 @@
 	if (sigrdataset =3D=3D NULL)
 		goto cleanup;
=20
+	if (additionaltype =3D=3D dns_rdatasetadditional_fromcache &&
+	    query_isduplicate(client, fname, dns_rdatatype_a, NULL))
+		goto aaaa_lookup;
 	/*
 	 * Find A RRset with sig RRset.  Even if we don't find a sig RRset
 	 * for a client using DNSSEC, we'll continue the process to make a
@@ -1905,6 +1918,10 @@
 		}
 	}
=20
+ aaaa_lookup:
+	if (additionaltype =3D=3D dns_rdatasetadditional_fromcache &&
+	    query_isduplicate(client, fname, dns_rdatatype_aaaa, NULL))
+		goto foundcache;
 	/* Find AAAA RRset with sig RRset */
 	result =3D dns_db_findrdataset(db, node, version, dns_rdatatype_aaaa,
 				     0, client->now, rdataset, sigrdataset);
@@ -3350,8 +3367,9 @@
 				       sigrdataset, fname, ISC_TRUE, cname);
 		if (!dns_rdataset_isassociated(rdataset))
 			goto cleanup;
-		query_addrrset(client, &fname, &rdataset, &sigrdataset,
-			       dbuf, DNS_SECTION_AUTHORITY);
+		if (!ispositive)
+			query_addrrset(client, &fname, &rdataset, &sigrdataset,
+				       dbuf, DNS_SECTION_AUTHORITY);
=20
 		/*
 		 * Replace resources which were consumed by query_addrrset.
@@ -3799,14 +3817,15 @@
 	dns_rpz_st_t *st =3D client->query.rpz_st;
=20
 	rpz_clean(&st->m.zone, &st->m.db, &st->m.node, NULL);
+	st->m.version =3D NULL;
 	if (st->m.rdataset !=3D NULL)
 		query_putrdataset(client, &st->m.rdataset);
=20
-	rpz_clean(NULL, &st->ns.db, NULL, NULL);
-	if (st->ns.ns_rdataset !=3D NULL)
-		query_putrdataset(client, &st->ns.ns_rdataset);
-	if (st->ns.r_rdataset !=3D NULL)
-		query_putrdataset(client, &st->ns.r_rdataset);
+	rpz_clean(NULL, &st->r.db, NULL, NULL);
+	if (st->r.ns_rdataset !=3D NULL)
+		query_putrdataset(client, &st->r.ns_rdataset);
+	if (st->r.r_rdataset !=3D NULL)
+		query_putrdataset(client, &st->r.r_rdataset);
=20
 	rpz_clean(&st->q.zone, &st->q.db, &st->q.node, NULL);
 	if (st->q.rdataset !=3D NULL)
@@ -3814,15 +3833,18 @@
 	if (st->q.sigrdataset !=3D NULL)
 		query_putrdataset(client, &st->q.sigrdataset);
 	st->state =3D 0;
+	st->m.type =3D DNS_RPZ_TYPE_BAD;
+	st->m.policy =3D DNS_RPZ_POLICY_MISS;
 }
=20
 /*
- * Get NS, A, or AAAA rrset for rpz nsdname or nsip checking.
+ * Get NS, A, or AAAA rrset for response policy zone checks.
  */
 static isc_result_t
-rpz_ns_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type,
-	    dns_db_t **dbp, dns_dbversion_t *version,
-	    dns_rdataset_t **rdatasetp, isc_boolean_t resuming)
+rpz_rrset_find(ns_client_t *client, dns_rpz_type_t rpz_type,
+	       dns_name_t *name, dns_rdatatype_t type,
+	       dns_db_t **dbp, dns_dbversion_t *version,
+	       dns_rdataset_t **rdatasetp, isc_boolean_t resuming)
 {
 	dns_rpz_st_t *st;
 	isc_boolean_t is_zone;
@@ -3833,22 +3855,22 @@
=20
 	st =3D client->query.rpz_st;
 	if ((st->state & DNS_RPZ_RECURSING) !=3D 0) {
-		INSIST(st->ns.r_type =3D=3D type);
+		INSIST(st->r.r_type =3D=3D type);
 		INSIST(dns_name_equal(name, st->r_name));
 		INSIST(*rdatasetp =3D=3D NULL ||
 		       !dns_rdataset_isassociated(*rdatasetp));
 		st->state &=3D ~DNS_RPZ_RECURSING;
-		*dbp =3D st->ns.db;
-		st->ns.db =3D NULL;
+		*dbp =3D st->r.db;
+		st->r.db =3D NULL;
 		if (*rdatasetp !=3D NULL)
 			query_putrdataset(client, rdatasetp);
-		*rdatasetp =3D st->ns.r_rdataset;
-		st->ns.r_rdataset =3D NULL;
-		result =3D st->ns.r_result;
+		*rdatasetp =3D st->r.r_rdataset;
+		st->r.r_rdataset =3D NULL;
+		result =3D st->r.r_result;
 		if (result =3D=3D DNS_R_DELEGATION) {
-			rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL,
-				     DNS_RPZ_TYPE_NSIP, name,
-				     "rpz_ns_find() ", result);
+			rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL,
+				     rpz_type, name,
+				     "rpz_rrset_find(1) ", result);
 			st->m.policy =3D DNS_RPZ_POLICY_ERROR;
 			result =3D DNS_R_SERVFAIL;
 		}
@@ -3870,9 +3892,9 @@
 		result =3D query_getdb(client, name, type, 0, &zone, dbp,
 				     &version, &is_zone);
 		if (result !=3D ISC_R_SUCCESS) {
-			rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL,
-				     DNS_RPZ_TYPE_NSIP, name, "NS getdb() ",
-				     result);
+			rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL,
+				     rpz_type, name,
+				     "rpz_rrset_find(2) ", result);
 			st->m.policy =3D DNS_RPZ_POLICY_ERROR;
 			if (zone !=3D NULL)
 				dns_zone_detach(&zone);
@@ -3885,8 +3907,8 @@
 	node =3D NULL;
 	dns_fixedname_init(&fixed);
 	found =3D dns_fixedname_name(&fixed);
-	result =3D dns_db_find(*dbp, name, version, type, 0, client->now, &node,
-			     found, *rdatasetp, NULL);
+	result =3D dns_db_find(*dbp, name, version, type, DNS_DBFIND_GLUEOK,
+			     client->now, &node, found, *rdatasetp, NULL);
 	if (result =3D=3D DNS_R_DELEGATION && is_zone && USECACHE(client)) {
 		/*
 		 * Try the cache if we're authoritative for an
@@ -3901,16 +3923,21 @@
 	}
 	rpz_clean(NULL, dbp, &node, NULL);
 	if (result =3D=3D DNS_R_DELEGATION) {
+		rpz_clean(NULL, NULL, NULL, rdatasetp);
 		/*
-		 * Recurse to get NS rrset or A or AAAA rrset for an NS name.
+		 * Recurse for NS rrset or A or AAAA rrset for an NS.
+		 * Do not recurse for addresses for the query name.
 		 */
-		rpz_clean(NULL, NULL, NULL, rdatasetp);
-		dns_name_copy(name, st->r_name, NULL);
-		result =3D query_recurse(client, type, st->r_name, NULL, NULL,
-				       resuming);
-		if (result =3D=3D ISC_R_SUCCESS) {
-			st->state |=3D DNS_RPZ_RECURSING;
-			result =3D DNS_R_DELEGATION;
+		if (rpz_type =3D=3D DNS_RPZ_TYPE_IP) {
+			result =3D DNS_R_NXRRSET;
+		} else {
+			dns_name_copy(name, st->r_name, NULL);
+			result =3D query_recurse(client, type, st->r_name,
+					       NULL, NULL, resuming);
+			if (result =3D=3D ISC_R_SUCCESS) {
+				st->state |=3D DNS_RPZ_RECURSING;
+				result =3D DNS_R_DELEGATION;
+			}
 		}
 	}
 	return (result);
@@ -3928,7 +3955,7 @@
 	dns_dbversion_t *version;
 	dns_zone_t *zone;
 	dns_db_t *db;
-	dns_rpz_zone_t *new_rpz;
+	dns_rpz_zone_t *rpz;
 	isc_result_t result;
=20
 	st =3D client->query.rpz_st;
@@ -3939,16 +3966,26 @@
 	}
 	zone =3D NULL;
 	db =3D NULL;
-	for (new_rpz =3D ISC_LIST_HEAD(client->view->rpz_zones);
-	     new_rpz !=3D NULL;
-	     new_rpz =3D ISC_LIST_NEXT(new_rpz, link)) {
+	for (rpz =3D ISC_LIST_HEAD(client->view->rpz_zones);
+	     rpz !=3D NULL;
+	     rpz =3D ISC_LIST_NEXT(rpz, link)) {
+		/*
+		 * Do not check policy zones that cannot replace a policy
+		 * already known to match.
+		 */
+		if (st->m.policy !=3D DNS_RPZ_POLICY_MISS) {
+			if (st->m.rpz->num < rpz->num)
+				break;
+			if (st->m.rpz->num =3D=3D rpz->num &&
+			    st->m.type < rpz_type)
+				continue;
+		}
+
+		/*
+		 * Find the database for this policy zone to get its radix tree.
+		 */
 		version =3D NULL;
-
-		/*
-		 * Find the database for this policy zone to get its
-		 * radix tree.
-		 */
-		result =3D rpz_getdb(client, rpz_type, &new_rpz->origin,
+		result =3D rpz_getdb(client, rpz_type, &rpz->origin,
 				   &zone, &db, &version);
 		if (result !=3D ISC_R_SUCCESS) {
 			rpz_clean(&zone, &db, NULL, NULL);
@@ -3960,26 +3997,31 @@
 		 * hit, if any.  Note the domain name and quality of the
 		 * best hit.
 		 */
-		result =3D dns_db_rpz_findips(new_rpz, rpz_type, zone, db,
-					    version, rdataset, st);
-		RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
+		(void)dns_db_rpz_findips(rpz, rpz_type, zone, db, version,
+					 rdataset, st,
+					 client->query.rpz_st->qname);
 		rpz_clean(&zone, &db, NULL, NULL);
 	}
 	return (ISC_R_SUCCESS);
 }
=20
+/*
+ * Look for an A or AAAA rdataset
+ * and check for IP or NSIP rewrite policy rules.
+ */
 static isc_result_t
-rpz_rewrite_nsip(ns_client_t *client, dns_rdatatype_t type, dns_name_t *na=
me,
-		 dns_db_t **dbp, dns_dbversion_t *version,
-		 dns_rdataset_t **rdatasetp, isc_boolean_t resuming)
+rpz_rewrite_rrset(ns_client_t *client, dns_rpz_type_t rpz_type,
+		  dns_rdatatype_t type, dns_name_t *name,
+		  dns_db_t **dbp, dns_dbversion_t *version,
+		  dns_rdataset_t **rdatasetp, isc_boolean_t resuming)
 {
 	isc_result_t result;
=20
-	result =3D rpz_ns_find(client, name, type, dbp, version, rdatasetp,
-			     resuming);
+	result =3D rpz_rrset_find(client, rpz_type, name, type, dbp, version,
+				rdatasetp, resuming);
 	switch (result) {
 	case ISC_R_SUCCESS:
-		result =3D rpz_rewrite_ip(client, *rdatasetp, DNS_RPZ_TYPE_NSIP);
+		result =3D rpz_rewrite_ip(client, *rdatasetp, rpz_type);
 		break;
 	case DNS_R_EMPTYNAME:
 	case DNS_R_EMPTYWILD:
@@ -3987,17 +4029,24 @@
 	case DNS_R_NCACHENXDOMAIN:
 	case DNS_R_NXRRSET:
 	case DNS_R_NCACHENXRRSET:
+	case ISC_R_NOTFOUND:
 		result =3D ISC_R_SUCCESS;
 		break;
 	case DNS_R_DELEGATION:
 	case DNS_R_DUPLICATE:
 	case DNS_R_DROP:
 		break;
+	case DNS_R_CNAME:
+	case DNS_R_DNAME:
+		rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, rpz_type,
+			     name, "NS address rewrite rrset ", result);
+		result =3D ISC_R_SUCCESS;
+		break;
 	default:
 		if (client->query.rpz_st->m.policy !=3D DNS_RPZ_POLICY_ERROR) {
 			client->query.rpz_st->m.policy =3D DNS_RPZ_POLICY_ERROR;
-			rpz_fail_log(client, ISC_LOG_WARNING, DNS_RPZ_TYPE_NSIP,
-				     name, "NS address rewrite nsip ", result);
+			rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, rpz_type,
+				     name, "NS address rewrite rrset ", result);
 		}
 		break;
 	}
@@ -4005,15 +4054,61 @@
 }
=20
 /*
+ * Look for both A and AAAA rdatasets
+ * and check for IP or NSIP rewrite policy rules.
+ * Look only for addresses that will be in the ANSWER section
+ * when checking for IP rules.
+ */
+static isc_result_t
+rpz_rewrite_rrsets(ns_client_t *client, dns_rpz_type_t rpz_type,
+		   dns_name_t *name, dns_rdatatype_t type,
+		   dns_rdataset_t **rdatasetp, isc_boolean_t resuming)
+{
+	dns_rpz_st_t *st;
+	dns_dbversion_t *version;
+	dns_db_t *ipdb;
+	isc_result_t result;
+
+	st =3D client->query.rpz_st;
+	version =3D NULL;
+	ipdb =3D NULL;
+	if ((st->state & DNS_RPZ_DONE_IPv4) =3D=3D 0 &&
+	    ((rpz_type =3D=3D DNS_RPZ_TYPE_NSIP) ?
+	     (st->state & DNS_RPZ_HAVE_NSIPv4) :
+	     (st->state & DNS_RPZ_HAVE_IP)) !=3D 0 &&
+	    (type =3D=3D dns_rdatatype_any || type =3D=3D dns_rdatatype_a)) {
+		result =3D rpz_rewrite_rrset(client, rpz_type, dns_rdatatype_a,
+					   name, &ipdb, version, rdatasetp,
+					   resuming);
+		if (result =3D=3D ISC_R_SUCCESS)
+			st->state |=3D DNS_RPZ_DONE_IPv4;
+	} else {
+		result =3D ISC_R_SUCCESS;
+	}
+	if (result =3D=3D ISC_R_SUCCESS &&
+	    ((rpz_type =3D=3D DNS_RPZ_TYPE_NSIP) ?
+	     (st->state & DNS_RPZ_HAVE_NSIPv6) :
+	     (st->state & DNS_RPZ_HAVE_IP)) !=3D 0 &&
+	    (type =3D=3D dns_rdatatype_any || type =3D=3D dns_rdatatype_aaaa)) {
+		result =3D rpz_rewrite_rrset(client, rpz_type, dns_rdatatype_aaaa,
+					   name, &ipdb, version, rdatasetp,
+					   resuming);
+	}
+	if (ipdb !=3D NULL)
+		dns_db_detach(&ipdb);
+	return (result);
+}
+
+/*
  * Get the rrset from a response policy zone.
  */
 static isc_result_t
 rpz_find(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qnamef,
 	 dns_name_t *sname, dns_rpz_type_t rpz_type, dns_zone_t **zonep,
-	 dns_db_t **dbp, dns_dbnode_t **nodep, dns_rdataset_t **rdatasetp,
+	 dns_db_t **dbp, dns_dbversion_t **versionp,
+	 dns_dbnode_t **nodep, dns_rdataset_t **rdatasetp,
 	 dns_rpz_policy_t *policyp)
 {
-	dns_dbversion_t *version;
 	dns_rpz_policy_t policy;
 	dns_fixedname_t fixed;
 	dns_name_t *found;
@@ -4029,8 +4124,8 @@
 	 * Try to get either a CNAME or the type of record demanded by the
 	 * request from the policy zone.
 	 */
-	version =3D NULL;
-	result =3D rpz_getdb(client, rpz_type, qnamef, zonep, dbp, &version);
+	*versionp =3D NULL;
+	result =3D rpz_getdb(client, rpz_type, qnamef, zonep, dbp, versionp);
 	if (result !=3D ISC_R_SUCCESS) {
 		*policyp =3D DNS_RPZ_POLICY_MISS;
 		return (DNS_R_NXDOMAIN);
@@ -4038,17 +4133,17 @@
=20
 	dns_fixedname_init(&fixed);
 	found =3D dns_fixedname_name(&fixed);
-	result =3D dns_db_find(*dbp, qnamef, version, dns_rdatatype_any, 0,
+	result =3D dns_db_find(*dbp, qnamef, *versionp, dns_rdatatype_any, 0,
 			     client->now, nodep, found, *rdatasetp, NULL);
 	if (result =3D=3D ISC_R_SUCCESS) {
 		dns_rdatasetiter_t *rdsiter;
=20
 		rdsiter =3D NULL;
-		result =3D dns_db_allrdatasets(*dbp, *nodep, version, 0,
+		result =3D dns_db_allrdatasets(*dbp, *nodep, *versionp, 0,
 					     &rdsiter);
 		if (result !=3D ISC_R_SUCCESS) {
 			dns_db_detachnode(*dbp, nodep);
-			rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL, rpz_type,
+			rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, rpz_type,
 				     qnamef, "allrdatasets()", result);
 			*policyp =3D DNS_RPZ_POLICY_ERROR;
 			return (DNS_R_SERVFAIL);
@@ -4065,7 +4160,7 @@
 		dns_rdatasetiter_destroy(&rdsiter);
 		if (result !=3D ISC_R_SUCCESS) {
 			if (result !=3D ISC_R_NOMORE) {
-				rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL,
+				rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL,
 					     rpz_type, qnamef, "rdatasetiter",
 					     result);
 				*policyp =3D DNS_RPZ_POLICY_ERROR;
@@ -4083,7 +4178,7 @@
 			    qtype =3D=3D dns_rdatatype_sig)
 				result =3D DNS_R_NXRRSET;
 			else
-				result =3D dns_db_find(*dbp, qnamef, version,
+				result =3D dns_db_find(*dbp, qnamef, *versionp,
 						     qtype, 0, client->now,
 						     nodep, found, *rdatasetp,
 						     NULL);
@@ -4095,7 +4190,8 @@
 			policy =3D DNS_RPZ_POLICY_RECORD;
 		} else {
 			policy =3D dns_rpz_decode_cname(*rdatasetp, sname);
-			if (policy =3D=3D DNS_RPZ_POLICY_RECORD &&
+			if ((policy =3D=3D DNS_RPZ_POLICY_RECORD ||
+			     policy =3D=3D DNS_RPZ_POLICY_WILDCNAME) &&
 			    qtype !=3D dns_rdatatype_cname &&
 			    qtype !=3D dns_rdatatype_any)
 				result =3D DNS_R_CNAME;
@@ -4106,8 +4202,8 @@
 		 * DNAME policy RRs have very few if any uses that are not
 		 * better served with simple wildcards.  Making the work would
 		 * require complications to get the number of labels matched
-		 * in the name or the found name itself to the main DNS_R_DNAME
-		 * case in query_find(). So fall through to treat them as NODATA.
+		 * in the name or the found name to the main DNS_R_DNAME case
+		 * in query_find(). So fall through to treat them as NODATA.
 		 */
 	case DNS_R_NXRRSET:
 		policy =3D DNS_RPZ_POLICY_NODATA;
@@ -4126,7 +4222,7 @@
 	default:
 		dns_db_detach(dbp);
 		dns_zone_detach(zonep);
-		rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL, rpz_type, qnamef,
+		rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, rpz_type, qnamef,
 			     "", result);
 		policy =3D DNS_RPZ_POLICY_ERROR;
 		result =3D DNS_R_SERVFAIL;
@@ -4150,6 +4246,7 @@
 	dns_name_t *prefix, *suffix, *rpz_qname;
 	dns_zone_t *zone;
 	dns_db_t *db;
+	dns_dbversion_t *version;
 	dns_dbnode_t *node;
 	dns_rpz_policy_t policy;
 	unsigned int labels;
@@ -4164,7 +4261,18 @@
 	     rpz !=3D NULL;
 	     rpz =3D ISC_LIST_NEXT(rpz, link)) {
 		/*
-		 * Construct the rule's owner name.
+		 * Do not check policy zones that cannot replace a policy
+		 * already known to match.
+		 */
+		if (st->m.policy !=3D DNS_RPZ_POLICY_MISS) {
+			if (st->m.rpz->num < rpz->num)
+				break;
+			if (st->m.rpz->num =3D=3D rpz->num &&
+			    st->m.type < rpz_type)
+				continue;
+		}
+		/*
+		 * Construct the policy's owner name.
 		 */
 		dns_fixedname_init(&prefixf);
 		prefix =3D dns_fixedname_name(&prefixf);
@@ -4183,13 +4291,13 @@
 			INSIST(result =3D=3D DNS_R_NAMETOOLONG);
 			labels =3D dns_name_countlabels(prefix);
 			if (labels < 2) {
-				rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL,
+				rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL,
 					     rpz_type, suffix,
 					     "concatentate() ", result);
 				return (ISC_R_SUCCESS);
 			}
 			if (labels+1 =3D=3D dns_name_countlabels(qname)) {
-				rpz_fail_log(client, DNS_RPZ_DEBUG_LEVEL1,
+				rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1,
 					     rpz_type, suffix,
 					     "concatentate() ", result);
 			}
@@ -4197,10 +4305,11 @@
 		}
=20
 		/*
-		 * See if the qname rule (or RR) exists.
+		 * See if the policy record exists.
 		 */
 		result =3D rpz_find(client, qtype, rpz_qname, qname, rpz_type,
-				  &zone, &db, &node, rdatasetp, &policy);
+				  &zone, &db, &version, &node, rdatasetp,
+				  &policy);
 		switch (result) {
 		case DNS_R_NXDOMAIN:
 		case DNS_R_EMPTYNAME:
@@ -4211,14 +4320,31 @@
 			return (DNS_R_SERVFAIL);
 		default:
 			/*
-			 * when more than one name or address hits a rule,
-			 * prefer the first set of names (qname or NS),
-			 * the first policy zone, and the smallest name
+			 * We are dealing with names here.
+			 * With more than one applicable policy, prefer
+			 * the earliest configured policy,
+			 * QNAME over IP over NSDNAME over NSIP,
+			 * and the smallest name.
+			 * Because of the testing above,
+			 * we known st->m.rpz->num >=3D rpz->num  and either
+			 * st->m.rpz->num > rpz->num or st->m.type >=3D rpz_type
 			 */
-			if (st->m.type =3D=3D rpz_type &&
-			    rpz->num > st->m.rpz->num &&
-			    0 <=3D dns_name_compare(rpz_qname, st->qname))
+			if (st->m.policy !=3D DNS_RPZ_POLICY_MISS &&
+			    rpz->num =3D=3D st->m.rpz->num &&
+			    (st->m.type < rpz_type ||
+			     (st->m.type =3D=3D rpz_type &&
+			      0 >=3D dns_name_compare(rpz_qname, st->qname))))
 				continue;
+
+			/*
+			 * Merely log DNS_RPZ_POLICY_DISABLED hits.
+			 */
+			if (rpz->policy =3D=3D DNS_RPZ_POLICY_DISABLED) {
+				rpz_log_rewrite(client, "disabled ",
+						policy, rpz_type, rpz_qname);
+				continue;
+			}
+
 			rpz_clean(&st->m.zone, &st->m.db, &st->m.node,
 				  &st->m.rdataset);
 			st->m.rpz =3D rpz;
@@ -4227,7 +4353,8 @@
 			st->m.policy =3D policy;
 			st->m.result =3D result;
 			dns_name_copy(rpz_qname, st->qname, NULL);
-			if (dns_rdataset_isassociated(*rdatasetp)) {
+			if (*rdatasetp !=3D NULL &&
+			    dns_rdataset_isassociated(*rdatasetp)) {
 				dns_rdataset_t *trdataset;
=20
 				trdataset =3D st->m.rdataset;
@@ -4241,6 +4368,7 @@
 			node =3D NULL;
 			st->m.db =3D db;
 			db =3D NULL;
+			st->m.version =3D version;
 			st->m.zone =3D zone;
 			zone =3D NULL;
 		}
@@ -4250,24 +4378,38 @@
 	return (ISC_R_SUCCESS);
 }
=20
+static void
+rpz_rewrite_ns_skip(ns_client_t *client, dns_name_t *nsname,
+		    isc_result_t result, int level, const char *str)
+{
+	dns_rpz_st_t *st;
+
+	st =3D client->query.rpz_st;
+
+	if (str !=3D NULL)
+		rpz_log_fail(client, level, DNS_RPZ_TYPE_NSIP, nsname,
+			     str, result);
+	if (st->r.ns_rdataset !=3D NULL &&
+	    dns_rdataset_isassociated(st->r.ns_rdataset))
+		dns_rdataset_disassociate(st->r.ns_rdataset);
+
+	st->r.label--;
+}
+
 /*
- * Look for response policy zone NSIP and NSDNAME rewriting.
+ * Look for response policy zone QNAME, NSIP, and NSDNAME rewriting.
  */
 static isc_result_t
-rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
+rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresu=
lt,
 	    isc_boolean_t resuming)
 {
 	dns_rpz_st_t *st;
-	dns_db_t *ipdb;
 	dns_rdataset_t *rdataset;
 	dns_fixedname_t nsnamef;
 	dns_name_t *nsname;
-	dns_dbversion_t *version;
+	isc_boolean_t ck_ip;
 	isc_result_t result;
=20
-	ipdb =3D NULL;
-	rdataset =3D NULL;
-
 	st =3D client->query.rpz_st;
 	if (st =3D=3D NULL) {
 		st =3D isc_mem_get(client->mctx, sizeof(*st));
@@ -4275,7 +4417,9 @@
 			return (ISC_R_NOMEMORY);
 		st->state =3D 0;
 		memset(&st->m, 0, sizeof(st->m));
-		memset(&st->ns, 0, sizeof(st->ns));
+		st->m.type =3D DNS_RPZ_TYPE_BAD;
+		st->m.policy =3D DNS_RPZ_POLICY_MISS;
+		memset(&st->r, 0, sizeof(st->r));
 		memset(&st->q, 0, sizeof(st->q));
 		dns_fixedname_init(&st->_qnamef);
 		dns_fixedname_init(&st->_r_namef);
@@ -4285,78 +4429,147 @@
 		st->fname =3D dns_fixedname_name(&st->_fnamef);
 		client->query.rpz_st =3D st;
 	}
+
+	/*
+	 * There is nothing to rewrite if the main query failed.
+	 */
+	switch (qresult) {
+	case ISC_R_SUCCESS:
+	case DNS_R_GLUE:
+	case DNS_R_ZONECUT:
+		ck_ip =3D ISC_TRUE;
+		break;
+	case DNS_R_EMPTYNAME:
+	case DNS_R_NXRRSET:
+	case DNS_R_NXDOMAIN:
+	case DNS_R_EMPTYWILD:
+	case DNS_R_NCACHENXDOMAIN:
+	case DNS_R_NCACHENXRRSET:
+	case DNS_R_CNAME:
+	case DNS_R_DNAME:
+		ck_ip =3D ISC_FALSE;
+		break;
+	case DNS_R_DELEGATION:
+	case ISC_R_NOTFOUND:
+		return (ISC_R_SUCCESS);
+	case ISC_R_FAILURE:
+	case ISC_R_TIMEDOUT:
+	case DNS_R_BROKENCHAIN:
+		rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL3, DNS_RPZ_TYPE_QNAME,
+			     client->query.qname,
+			     "stop on qresult in rpz_rewrite()",
+			     qresult);
+		return (ISC_R_SUCCESS);
+	default:
+		rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, DNS_RPZ_TYPE_QNAME,
+			     client->query.qname,
+			     "stop on unrecognized qresult in rpz_rewrite()",
+			     qresult);
+		return (ISC_R_SUCCESS);
+	}
+
+	rdataset =3D NULL;
 	if ((st->state & DNS_RPZ_DONE_QNAME) =3D=3D 0) {
-		st->state =3D DNS_RPZ_DONE_QNAME;
-		st->m.type =3D DNS_RPZ_TYPE_BAD;
-		st->m.policy =3D DNS_RPZ_POLICY_MISS;
-
 		/*
-		 * Check rules for the name if this it the first time,
-		 * i.e. we've not been recursing.
+		 * Check rules for the query name if this it the first time
+		 * for the current qname, i.e. we've not been recursing.
+		 * There is a first time for each name in a CNAME chain.
 		 */
-		st->state &=3D ~(DNS_RPZ_HAVE_IP | DNS_RPZ_HAVE_NSIPv4 |
-			       DNS_RPZ_HAVE_NSIPv6 | DNS_RPZ_HAD_NSDNAME);
 		result =3D rpz_rewrite_name(client, qtype, client->query.qname,
 					  DNS_RPZ_TYPE_QNAME, &rdataset);
 		if (result !=3D ISC_R_SUCCESS)
 			goto cleanup;
-		if (st->m.policy !=3D DNS_RPZ_POLICY_MISS)
+
+		st->r.label =3D dns_name_countlabels(client->query.qname);
+
+		st->state &=3D ~(DNS_RPZ_DONE_QNAME_IP | DNS_RPZ_DONE_IPv4);
+		st->state |=3D DNS_RPZ_DONE_QNAME;
+	}
+
+	/*
+	 * Check known IP addresses for the query name.
+	 * Any recursion required for the query has already happened.
+	 * Do not check addresses that will not be in the ANSWER section.
+	 */
+	if ((st->state & DNS_RPZ_DONE_QNAME_IP) =3D=3D 0 &&
+	    (st->state & DNS_RPZ_HAVE_IP) !=3D 0 && ck_ip) {
+		result =3D rpz_rewrite_rrsets(client, DNS_RPZ_TYPE_IP,
+					    client->query.qname, qtype,
+					    &rdataset, resuming);
+		if (result !=3D ISC_R_SUCCESS)
 			goto cleanup;
-		if ((st->state & (DNS_RPZ_HAVE_NSIPv4 | DNS_RPZ_HAVE_NSIPv6 |
-				  DNS_RPZ_HAD_NSDNAME)) =3D=3D 0)
-			goto cleanup;
-		st->ns.label =3D dns_name_countlabels(client->query.qname);
+		st->state &=3D ~DNS_RPZ_DONE_IPv4;
+		st->state |=3D DNS_RPZ_DONE_QNAME_IP;
+	}
+
+	/*
+	 * Stop looking for rules if there are none of the other kinds.
+	 */
+	if ((st->state & (DNS_RPZ_HAVE_NSIPv4 | DNS_RPZ_HAVE_NSIPv6 |
+			  DNS_RPZ_HAVE_NSDNAME)) =3D=3D 0) {
+		result =3D ISC_R_SUCCESS;
+		goto cleanup;
 	}
=20
 	dns_fixedname_init(&nsnamef);
 	dns_name_clone(client->query.qname, dns_fixedname_name(&nsnamef));
-	while (st->ns.label > 1 && st->m.policy =3D=3D DNS_RPZ_POLICY_MISS) {
-		if (st->ns.label =3D=3D dns_name_countlabels(client->query.qname)) {
+	while (st->r.label > 1) {
+		/*
+		 * Get NS rrset for each domain in the current qname.
+		 */
+		if (st->r.label =3D=3D dns_name_countlabels(client->query.qname)) {
 			nsname =3D client->query.qname;
 		} else {
 			nsname =3D dns_fixedname_name(&nsnamef);
-			dns_name_split(client->query.qname, st->ns.label,
+			dns_name_split(client->query.qname, st->r.label,
 				       NULL, nsname);
 		}
-		if (st->ns.ns_rdataset =3D=3D NULL ||
-		    !dns_rdataset_isassociated(st->ns.ns_rdataset)) {
+		if (st->r.ns_rdataset =3D=3D NULL ||
+		    !dns_rdataset_isassociated(st->r.ns_rdataset)) {
 			dns_db_t *db =3D NULL;
-			result =3D rpz_ns_find(client, nsname, dns_rdatatype_ns,
-					     &db, NULL, &st->ns.ns_rdataset,
-					     resuming);
+			result =3D rpz_rrset_find(client, DNS_RPZ_TYPE_NSDNAME,
+						nsname, dns_rdatatype_ns,
+						&db, NULL, &st->r.ns_rdataset,
+						resuming);
 			if (db !=3D NULL)
 				dns_db_detach(&db);
-			if (result !=3D ISC_R_SUCCESS) {
-				if (result =3D=3D DNS_R_DELEGATION)
+			if (st->m.policy =3D=3D DNS_RPZ_POLICY_ERROR)
+				goto cleanup;
+			switch (result) {
+			case ISC_R_SUCCESS:
+				result =3D dns_rdataset_first(st->r.ns_rdataset);
+				if (result !=3D ISC_R_SUCCESS)
 					goto cleanup;
-				if (result =3D=3D DNS_R_EMPTYNAME ||
-				    result =3D=3D DNS_R_NXRRSET ||
-				    result =3D=3D DNS_R_EMPTYWILD ||
-				    result =3D=3D DNS_R_NXDOMAIN ||
-				    result =3D=3D DNS_R_NCACHENXDOMAIN ||
-				    result =3D=3D DNS_R_NCACHENXRRSET ||
-				    result =3D=3D DNS_R_CNAME ||
-				    result =3D=3D DNS_R_DNAME) {
-					rpz_fail_log(client,
-						     DNS_RPZ_DEBUG_LEVEL2,
-						     DNS_RPZ_TYPE_NSIP, nsname,
-						     "NS db_find() ", result);
-					dns_rdataset_disassociate(st->ns.
-							ns_rdataset);
-					st->ns.label--;
-					continue;
-				}
-				if (st->m.policy !=3D DNS_RPZ_POLICY_ERROR) {
-					rpz_fail_log(client, DNS_RPZ_INFO_LEVEL,
-						     DNS_RPZ_TYPE_NSIP, nsname,
-						     "NS db_find() ", result);
-					st->m.policy =3D DNS_RPZ_POLICY_ERROR;
-				}
+				st->state &=3D ~(DNS_RPZ_DONE_NSDNAME |
+					       DNS_RPZ_DONE_IPv4);
+				break;
+			case DNS_R_DELEGATION:
 				goto cleanup;
+			case DNS_R_EMPTYNAME:
+			case DNS_R_NXRRSET:
+			case DNS_R_EMPTYWILD:
+			case DNS_R_NXDOMAIN:
+			case DNS_R_NCACHENXDOMAIN:
+			case DNS_R_NCACHENXRRSET:
+			case ISC_R_NOTFOUND:
+			case DNS_R_CNAME:
+			case DNS_R_DNAME:
+				rpz_rewrite_ns_skip(client, nsname, result,
+						    0, NULL);
+				continue;
+			case ISC_R_TIMEDOUT:
+			case DNS_R_BROKENCHAIN:
+			case ISC_R_FAILURE:
+				rpz_rewrite_ns_skip(client, nsname, result,
+						DNS_RPZ_DEBUG_LEVEL3,
+						"NS db_find() ");
+				continue;
+			default:
+				rpz_rewrite_ns_skip(client, nsname, result,
+						DNS_RPZ_INFO_LEVEL,
+						"unrecognized NS db_find() ");
+				continue;
 			}
-			result =3D dns_rdataset_first(st->ns.ns_rdataset);
-			if (result !=3D ISC_R_SUCCESS)
-				goto cleanup;
 		}
 		/*
 		 * Check all NS names.
@@ -4365,17 +4578,30 @@
 			dns_rdata_ns_t ns;
 			dns_rdata_t nsrdata =3D DNS_RDATA_INIT;
=20
-			dns_rdataset_current(st->ns.ns_rdataset, &nsrdata);
+			dns_rdataset_current(st->r.ns_rdataset, &nsrdata);
 			result =3D dns_rdata_tostruct(&nsrdata, &ns, NULL);
 			dns_rdata_reset(&nsrdata);
 			if (result !=3D ISC_R_SUCCESS) {
-				rpz_fail_log(client, DNS_RPZ_ERROR_LEVEL,
+				rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL,
 					     DNS_RPZ_TYPE_NSIP, nsname,
 					     "rdata_tostruct() ", result);
 				st->m.policy =3D DNS_RPZ_POLICY_ERROR;
 				goto cleanup;
 			}
-			if ((st->state & DNS_RPZ_HAD_NSDNAME) !=3D 0) {
+			/*
+			 * Do nothing about "NS ."
+			 */
+			if (dns_name_equal(&ns.name, dns_rootname)) {
+				dns_rdata_freestruct(&ns);
+				result =3D dns_rdataset_next(st->r.ns_rdataset);
+				continue;
+			}
+			/*
+			 * Check this NS name if we did not handle it
+			 * during a previous recursion.
+			 */
+			if ((st->state & DNS_RPZ_DONE_NSDNAME) =3D=3D 0 &&
+			    (st->state & DNS_RPZ_HAVE_NSDNAME) !=3D 0) {
 				result =3D rpz_rewrite_name(client, qtype,
 							&ns.name,
 							DNS_RPZ_TYPE_NSDNAME,
@@ -4384,42 +4610,23 @@
 					dns_rdata_freestruct(&ns);
 					goto cleanup;
 				}
+				st->state |=3D DNS_RPZ_DONE_NSDNAME;
 			}
 			/*
-			 * Check all IP addresses for this NS name, but don't
-			 * bother without NSIP rules or with a NSDNAME hit.
+			 * Check all IP addresses for this NS name.
 			 */
-			version =3D NULL;
-			if ((st->state & DNS_RPZ_HAVE_NSIPv4) !=3D 0 &&
-			    st->m.type !=3D DNS_RPZ_TYPE_NSDNAME &&
-			    (st->state & DNS_RPZ_DONE_A) =3D=3D 0) {
-				result =3D rpz_rewrite_nsip(client,
-							  dns_rdatatype_a,
-							  &ns.name, &ipdb,
-							  version, &rdataset,
-							  resuming);
-				if (result =3D=3D ISC_R_SUCCESS)
-					st->state |=3D DNS_RPZ_DONE_A;
-			}
-			if (result =3D=3D ISC_R_SUCCESS &&
-			    (st->state & DNS_RPZ_HAVE_NSIPv6) !=3D 0 &&
-			    st->m.type !=3D DNS_RPZ_TYPE_NSDNAME) {
-				result =3D rpz_rewrite_nsip(client,
-							  dns_rdatatype_aaaa,
-							  &ns.name, &ipdb,
-							  version, &rdataset,
-							  resuming);
-			}
+			result =3D rpz_rewrite_rrsets(client, DNS_RPZ_TYPE_NSIP,
+						    &ns.name, dns_rdatatype_any,
+						    &rdataset, resuming);
 			dns_rdata_freestruct(&ns);
-			if (ipdb !=3D NULL)
-				dns_db_detach(&ipdb);
 			if (result !=3D ISC_R_SUCCESS)
 				goto cleanup;
-			st->state &=3D ~DNS_RPZ_DONE_A;
-			result =3D dns_rdataset_next(st->ns.ns_rdataset);
+			st->state &=3D ~(DNS_RPZ_DONE_NSDNAME |
+				       DNS_RPZ_DONE_IPv4);
+			result =3D dns_rdataset_next(st->r.ns_rdataset);
 		} while (result =3D=3D ISC_R_SUCCESS);
-		dns_rdataset_disassociate(st->ns.ns_rdataset);
-		st->ns.label--;
+		dns_rdataset_disassociate(st->r.ns_rdataset);
+		st->r.label--;
 	}
=20
 	/*
@@ -4429,31 +4636,76 @@
=20
 cleanup:
 	if (st->m.policy !=3D DNS_RPZ_POLICY_MISS &&
-	    st->m.policy !=3D DNS_RPZ_POLICY_NO_OP &&
 	    st->m.policy !=3D DNS_RPZ_POLICY_ERROR &&
 	    st->m.rpz->policy !=3D DNS_RPZ_POLICY_GIVEN)
 		st->m.policy =3D st->m.rpz->policy;
-	if (st->m.policy =3D=3D DNS_RPZ_POLICY_NO_OP)
-		rpz_log(client);
 	if (st->m.policy =3D=3D DNS_RPZ_POLICY_MISS ||
-	    st->m.policy =3D=3D DNS_RPZ_POLICY_NO_OP ||
-	    st->m.policy =3D=3D DNS_RPZ_POLICY_ERROR)
+	    st->m.policy =3D=3D DNS_RPZ_POLICY_PASSTHRU ||
+	    st->m.policy =3D=3D DNS_RPZ_POLICY_ERROR) {
+		if (st->m.policy =3D=3D DNS_RPZ_POLICY_PASSTHRU)
+			rpz_log_rewrite(client, "", st->m.policy, st->m.type,
+					st->qname);
 		rpz_clean(&st->m.zone, &st->m.db, &st->m.node, &st->m.rdataset);
-	if (st->m.policy !=3D DNS_RPZ_POLICY_MISS)
-		st->state |=3D DNS_RPZ_REWRITTEN;
+	}
 	if (st->m.policy =3D=3D DNS_RPZ_POLICY_ERROR) {
 		st->m.type =3D DNS_RPZ_TYPE_BAD;
 		result =3D DNS_R_SERVFAIL;
 	}
-	if (rdataset !=3D NULL)
-		query_putrdataset(client, &rdataset);
-	if ((st->state & DNS_RPZ_RECURSING) =3D=3D 0) {
-		rpz_clean(NULL, &st->ns.db, NULL, &st->ns.ns_rdataset);
-	}
+	query_putrdataset(client, &rdataset);
+	if ((st->state & DNS_RPZ_RECURSING) =3D=3D 0)
+		rpz_clean(NULL, &st->r.db, NULL, &st->r.ns_rdataset);
=20
 	return (result);
 }
=20
+/*
+ * Add a CNAME to the query response, including translating foo.evil.com a=
nd
+ *	*.evil.com CNAME *.example.com
+ * to
+ *	foo.evil.com CNAME foo.evil.com.example.com
+ */
+static isc_result_t
+rpz_add_cname(ns_client_t *client, dns_rpz_st_t *st,
+	      dns_name_t *cname, dns_name_t *fname, isc_buffer_t *dbuf)
+{
+	dns_fixedname_t prefix, suffix;
+	unsigned int labels;
+	isc_result_t result;
+
+	labels =3D dns_name_countlabels(cname);
+	if (labels > 2 && dns_name_iswildcard(cname)) {
+		dns_fixedname_init(&prefix);
+		dns_name_split(client->query.qname, 1,
+			       dns_fixedname_name(&prefix), NULL);
+		dns_fixedname_init(&suffix);
+		dns_name_split(cname, labels-1,
+			       NULL, dns_fixedname_name(&suffix));
+		result =3D dns_name_concatenate(dns_fixedname_name(&prefix),
+					      dns_fixedname_name(&suffix),
+					      fname, NULL);
+		if (result =3D=3D DNS_R_NAMETOOLONG)
+			client->message->rcode =3D dns_rcode_yxdomain;
+	} else {
+		result =3D dns_name_copy(cname, fname, NULL);
+		RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
+	}
+	if (result !=3D ISC_R_SUCCESS)
+		return (result);
+	query_keepname(client, fname, dbuf);
+	result =3D query_add_cname(client, client->query.qname,
+				 fname, dns_trust_authanswer, st->m.ttl);
+	if (result !=3D ISC_R_SUCCESS)
+		return (result);
+	rpz_log_rewrite(client, "", st->m.policy, st->m.type, st->qname);
+	ns_client_qnamereplace(client, fname);
+	/*
+	 * Turn off DNSSEC because the results of a
+	 * response policy zone cannot verify.
+	 */
+	client->attributes &=3D ~NS_CLIENTATTR_WANTDNSSEC;
+	return (ISC_R_SUCCESS);
+}
+
 #define MAX_RESTARTS 16
=20
 #define QUERY_ERROR(r) \
@@ -5027,14 +5279,12 @@
 			rpz_st->q.sigrdataset =3D NULL;
 			qtype =3D rpz_st->q.qtype;
=20
+			rpz_st->r.db =3D event->db;
 			if (event->node !=3D NULL)
-				dns_db_detachnode(db, &event->node);
-			rpz_st->ns.db =3D event->db;
-			rpz_st->ns.r_type =3D event->qtype;
-			rpz_st->ns.r_rdataset =3D event->rdataset;
-			if (event->sigrdataset !=3D NULL &&
-			    dns_rdataset_isassociated(event->sigrdataset))
-				dns_rdataset_disassociate(event->sigrdataset);
+				dns_db_detachnode(event->db, &event->node);
+			rpz_st->r.r_type =3D event->qtype;
+			rpz_st->r.r_rdataset =3D event->rdataset;
+			query_putrdataset(client, &event->sigrdataset);
 		} else {
 			authoritative =3D ISC_FALSE;
=20
@@ -5085,7 +5335,7 @@
 		}
 		if (rpz_st !=3D NULL &&
 		    (rpz_st->state & DNS_RPZ_RECURSING) !=3D 0) {
-			rpz_st->ns.r_result =3D event->result;
+			rpz_st->r.r_result =3D event->result;
 			result =3D rpz_st->q.result;
 			isc_event_free(ISC_EVENT_PTR(&event));
 		} else {
@@ -5248,13 +5498,14 @@
=20
 	if (!ISC_LIST_EMPTY(client->view->rpz_zones) &&
 	    RECURSIONOK(client) && !RECURSING(client) &&
-	    result !=3D DNS_R_DELEGATION && result !=3D ISC_R_NOTFOUND &&
+	    (!WANTDNSSEC(client) || sigrdataset =3D=3D NULL ||
+	     !dns_rdataset_isassociated(sigrdataset)) &&
 	    (client->query.rpz_st =3D=3D NULL ||
 	     (client->query.rpz_st->state & DNS_RPZ_REWRITTEN) =3D=3D 0) &&
 	    !dns_name_equal(client->query.qname, dns_rootname)) {
 		isc_result_t rresult;
=20
-		rresult =3D rpz_rewrite(client, qtype, resuming);
+		rresult =3D rpz_rewrite(client, qtype, result, resuming);
 		rpz_st =3D client->query.rpz_st;
 		switch (rresult) {
 		case ISC_R_SUCCESS:
@@ -5285,16 +5536,19 @@
 			RECURSE_ERROR(rresult);
 			goto cleanup;
 		}
+		if (rpz_st->m.policy !=3D DNS_RPZ_POLICY_MISS)
+			rpz_st->state |=3D DNS_RPZ_REWRITTEN;
 		if (rpz_st->m.policy !=3D DNS_RPZ_POLICY_MISS &&
-		    rpz_st->m.policy !=3D DNS_RPZ_POLICY_NO_OP) {
-			result =3D dns_name_copy(client->query.qname, fname,
-					       NULL);
-			RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
- finish_rewrite:
+		    rpz_st->m.policy !=3D DNS_RPZ_POLICY_PASSTHRU &&
+		    rpz_st->m.policy !=3D DNS_RPZ_POLICY_ERROR) {
+			if (rpz_st->m.type =3D=3D DNS_RPZ_TYPE_QNAME) {
+				result =3D dns_name_copy(client->query.qname,
+						       fname, NULL);
+				RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
+			}
 			rpz_clean(&zone, &db, &node, NULL);
 			if (rpz_st->m.rdataset !=3D NULL) {
-				if (rdataset !=3D NULL)
-					query_putrdataset(client, &rdataset);
+				query_putrdataset(client, &rdataset);
 				rdataset =3D rpz_st->m.rdataset;
 				rpz_st->m.rdataset =3D NULL;
 			} else if (rdataset !=3D NULL &&
@@ -5305,10 +5559,11 @@
 			rpz_st->m.node =3D NULL;
 			db =3D rpz_st->m.db;
 			rpz_st->m.db =3D NULL;
+			version =3D rpz_st->m.version;
+			rpz_st->m.version =3D NULL;
 			zone =3D rpz_st->m.zone;
 			rpz_st->m.zone =3D NULL;
=20
-			result =3D rpz_st->m.result;
 			switch (rpz_st->m.policy) {
 			case DNS_RPZ_POLICY_NXDOMAIN:
 				result =3D DNS_R_NXDOMAIN;
@@ -5317,27 +5572,39 @@
 				result =3D DNS_R_NXRRSET;
 				break;
 			case DNS_RPZ_POLICY_RECORD:
+				result =3D rpz_st->m.result;
 				if (type =3D=3D dns_rdatatype_any &&
 				    result !=3D DNS_R_CNAME &&
 				    dns_rdataset_isassociated(rdataset))
 					dns_rdataset_disassociate(rdataset);
 				break;
-			case DNS_RPZ_POLICY_CNAME:
-				result =3D dns_name_copy(&rpz_st->m.rpz->cname,
-						       fname, NULL);
+			case DNS_RPZ_POLICY_WILDCNAME:
+				result =3D dns_rdataset_first(rdataset);
 				RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
-				query_keepname(client, fname, dbuf);
-				result =3D query_add_cname(client,
-							client->query.qname,
-							fname,
-							dns_trust_authanswer,
-							rpz_st->m.ttl);
+				dns_rdataset_current(rdataset, &rdata);
+				result =3D dns_rdata_tostruct(&rdata, &cname,
+							    NULL);
+				RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
+				dns_rdata_reset(&rdata);
+				result =3D rpz_add_cname(client, rpz_st,
+						       &cname.cname,
+						       fname, dbuf);
 				if (result !=3D ISC_R_SUCCESS)
 					goto cleanup;
-				ns_client_qnamereplace(client, fname);
 				fname =3D NULL;
-				client->attributes &=3D ~NS_CLIENTATTR_WANTDNSSEC;
-				rpz_log(client);
+				want_restart =3D ISC_TRUE;
+				goto cleanup;
+			case DNS_RPZ_POLICY_CNAME:
+				/*
+				 * Add overridding CNAME from a named.conf
+				 * response-policy statement
+				 */
+				result =3D rpz_add_cname(client, rpz_st,
+						       &rpz_st->m.rpz->cname,
+						       fname, dbuf);
+				if (result !=3D ISC_R_SUCCESS)
+					goto cleanup;
+				fname =3D NULL;
 				want_restart =3D ISC_TRUE;
 				goto cleanup;
 			default:
@@ -5349,11 +5616,10 @@
 			 * response policy zone cannot verify.
 			 */
 			client->attributes &=3D ~NS_CLIENTATTR_WANTDNSSEC;
-			if (sigrdataset !=3D NULL &&
-			    dns_rdataset_isassociated(sigrdataset))
-				dns_rdataset_disassociate(sigrdataset);
+			query_putrdataset(client, &sigrdataset);
 			is_zone =3D ISC_TRUE;
-			rpz_log(client);
+			rpz_log_rewrite(client, "", rpz_st->m.policy,
+					rpz_st->m.type, rpz_st->qname);
 		}
 	}
=20
@@ -5668,7 +5934,7 @@
=20
 	case DNS_R_EMPTYNAME:
 	case DNS_R_NXRRSET:
-	nxrrset:
+	iszone_nxrrset:
 		INSIST(is_zone);
=20
 #ifdef dns64_bis_return_excluded_addresses
@@ -5686,6 +5952,8 @@
 				query_putrdataset(client, &sigrdataset);
 			rdataset =3D client->query.dns64_aaaa;
 			sigrdataset =3D client->query.dns64_sigaaaa;
+			client->query.dns64_aaaa =3D NULL;
+			client->query.dns64_sigaaaa =3D NULL;
 			if (fname =3D=3D NULL) {
 				dbuf =3D query_getnamebuf(client);
 				if (dbuf =3D=3D NULL) {
@@ -5699,8 +5967,6 @@
 				}
 			}
 			dns_name_copy(client->query.qname, fname, NULL);
-			client->query.dns64_aaaa =3D NULL;
-			client->query.dns64_sigaaaa =3D NULL;
 			dns64 =3D ISC_FALSE;
 #ifdef dns64_bis_return_excluded_addresses
 			/*
@@ -5735,6 +6001,7 @@
 		/*
 		 * Look for a NSEC3 record if we don't have a NSEC record.
 		 */
+ nxrrset_rrsig:
 		if (!dns_rdataset_isassociated(rdataset) &&
 		     WANTDNSSEC(client)) {
 			if ((fname->attributes & DNS_NAMEATTR_WILDCARD) =3D=3D 0) {
@@ -5860,6 +6127,7 @@
 			 */
 			query_releasename(client, &fname);
 		}
+
 		/*
 		 * Add SOA.  If the query was for a SOA record force the
 		 * ttl to zero so that it is possible for clients to find
@@ -5936,6 +6204,8 @@
 				query_putrdataset(client, &sigrdataset);
 			rdataset =3D client->query.dns64_aaaa;
 			sigrdataset =3D client->query.dns64_sigaaaa;
+			client->query.dns64_aaaa =3D NULL;
+			client->query.dns64_sigaaaa =3D NULL;
 			if (fname =3D=3D NULL) {
 				dbuf =3D query_getnamebuf(client);
 				if (dbuf =3D=3D NULL) {
@@ -5949,8 +6219,6 @@
 				}
 			}
 			dns_name_copy(client->query.qname, fname, NULL);
-			client->query.dns64_aaaa =3D NULL;
-			client->query.dns64_sigaaaa =3D NULL;
 			dns64 =3D ISC_FALSE;
 #ifdef dns64_bis_return_excluded_addresses
 			if (dns64_excluded)
@@ -6201,9 +6469,21 @@
 		need_wildcardproof =3D ISC_TRUE;
 	}
=20
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+	if (client->view->v4_aaaa !=3D dns_v4_aaaa_ok &&
+	    is_v4_client(client) &&
+	    ns_client_checkaclsilent(client, NULL,
+				     client->view->v4_aaaa_acl,
+				     ISC_TRUE) =3D=3D ISC_R_SUCCESS)
+		client->filter_aaaa =3D client->view->v4_aaaa;
+	else
+		client->filter_aaaa =3D dns_v4_aaaa_ok;
+
+#endif
+
 	if (type =3D=3D dns_rdatatype_any) {
 #ifdef ALLOW_FILTER_AAAA_ON_V4
-		isc_boolean_t have_aaaa, have_a, have_sig, filter_aaaa;
+		isc_boolean_t have_aaaa, have_a, have_sig;
=20
 		/*
 		 * The filter-aaaa-on-v4 option should
@@ -6215,14 +6495,6 @@
 		have_aaaa =3D ISC_FALSE;
 		have_a =3D !authoritative;
 		have_sig =3D ISC_FALSE;
-		if (client->view->v4_aaaa !=3D dns_v4_aaaa_ok &&
-		    is_v4_client(client) &&
-		    ns_client_checkaclsilent(client, NULL,
-					     client->view->v4_aaaa_acl,
-					     ISC_TRUE) =3D=3D ISC_R_SUCCESS)
-			filter_aaaa =3D ISC_TRUE;
-		else
-			filter_aaaa =3D ISC_FALSE;
 #endif
 		/*
 		 * XXXRTH  Need to handle zonecuts with special case
@@ -6237,53 +6509,6 @@
 		}
=20
 		/*
-		 * Check all A and AAAA records in all response policy
-		 * IP address zones
-		 */
-		rpz_st =3D client->query.rpz_st;
-		if (rpz_st !=3D NULL &&
-		    (rpz_st->state & DNS_RPZ_DONE_QNAME) !=3D 0 &&
-		    (rpz_st->state & DNS_RPZ_REWRITTEN) =3D=3D 0 &&
-		    RECURSIONOK(client) && !RECURSING(client) &&
-		    (rpz_st->state & DNS_RPZ_HAVE_IP) !=3D 0) {
-			for (result =3D dns_rdatasetiter_first(rdsiter);
-			     result =3D=3D ISC_R_SUCCESS;
-			     result =3D dns_rdatasetiter_next(rdsiter)) {
-				dns_rdatasetiter_current(rdsiter, rdataset);
-				if (rdataset->type =3D=3D dns_rdatatype_a ||
-				    rdataset->type =3D=3D dns_rdatatype_aaaa)
-					result =3D rpz_rewrite_ip(client,
-							      rdataset,
-							      DNS_RPZ_TYPE_IP);
-				dns_rdataset_disassociate(rdataset);
-				if (result !=3D ISC_R_SUCCESS)
-					break;
-			}
-			if (result !=3D ISC_R_NOMORE) {
-				dns_rdatasetiter_destroy(&rdsiter);
-				QUERY_ERROR(DNS_R_SERVFAIL);
-				goto cleanup;
-			}
-			switch (rpz_st->m.policy) {
-			case DNS_RPZ_POLICY_MISS:
-				break;
-			case DNS_RPZ_POLICY_NO_OP:
-				rpz_log(client);
-				rpz_st->state |=3D DNS_RPZ_REWRITTEN;
-				break;
-			case DNS_RPZ_POLICY_NXDOMAIN:
-			case DNS_RPZ_POLICY_NODATA:
-			case DNS_RPZ_POLICY_RECORD:
-			case DNS_RPZ_POLICY_CNAME:
-				dns_rdatasetiter_destroy(&rdsiter);
-				rpz_st->state |=3D DNS_RPZ_REWRITTEN;
-				goto finish_rewrite;
-			default:
-				INSIST(0);
-			}
-		}
-
-		/*
 		 * Calling query_addrrset() with a non-NULL dbuf is going
 		 * to either keep or release the name.  We don't want it to
 		 * release fname, since we may have to call query_addrrset()
@@ -6304,7 +6529,7 @@
 			 * Notice the presence of A and AAAAs so
 			 * that AAAAs can be hidden from IPv4 clients.
 			 */
-			if (filter_aaaa) {
+			if (client->filter_aaaa !=3D dns_v4_aaaa_ok) {
 				if (rdataset->type =3D=3D dns_rdatatype_aaaa)
 					have_aaaa =3D ISC_TRUE;
 				else if (rdataset->type =3D=3D dns_rdatatype_a)
@@ -6361,76 +6586,52 @@
 		 * Filter AAAAs if there is an A and there is no signature
 		 * or we are supposed to break DNSSEC.
 		 */
-		if (filter_aaaa && have_aaaa && have_a &&
-		    (!have_sig || !WANTDNSSEC(client) ||
-		     client->view->v4_aaaa =3D=3D dns_v4_aaaa_break_dnssec))
+		if (client->filter_aaaa =3D=3D dns_v4_aaaa_break_dnssec)
 			client->attributes |=3D NS_CLIENTATTR_FILTER_AAAA;
+		else if (client->filter_aaaa !=3D dns_v4_aaaa_ok &&
+			 have_aaaa && have_a &&
+			 (!have_sig || !WANTDNSSEC(client)))
+			  client->attributes |=3D NS_CLIENTATTR_FILTER_AAAA;
 #endif
 		if (fname !=3D NULL)
 			dns_message_puttempname(client->message, &fname);
=20
-		if (n =3D=3D 0 && is_zone) {
+		if (n =3D=3D 0) {
 			/*
-			 * We didn't match any rdatasets.
+			 * No matching rdatasets found in cache. If we were
+			 * searching for RRSIG/SIG, that's probably okay;
+			 * otherwise this is an error condition.
 			 */
 			if ((qtype =3D=3D dns_rdatatype_rrsig ||
 			     qtype =3D=3D dns_rdatatype_sig) &&
 			    result =3D=3D ISC_R_NOMORE) {
-				/*
-				 * XXXRTH  If this is a secure zone and we
-				 * didn't find any SIGs, we should generate
-				 * an error unless we were searching for
-				 * glue.  Ugh.
-				 */
 				if (!is_zone) {
-					/*
-					 * Note: this is dead code because
-					 * is_zone is always true due to the
-					 * condition above.  But naive
-					 * recursion would cause infinite
-					 * attempts of recursion because
-					 * the answer to (RR)SIG queries
-					 * won't be cached.  Until we figure
-					 * out what we should do and implement
-					 * it we intentionally keep this code
-					 * dead.
-					 */
 					authoritative =3D ISC_FALSE;
 					dns_rdatasetiter_destroy(&rdsiter);
-					if (RECURSIONOK(client)) {
-						result =3D query_recurse(client,
-							    qtype,
-							    client->query.qname,
-							    NULL, NULL,
-							    resuming);
-						if (result =3D=3D ISC_R_SUCCESS)
-						    client->query.attributes |=3D
-							NS_QUERYATTR_RECURSING;
-						else
-						    RECURSE_ERROR(result);
-					}
+					client->attributes &=3D ~NS_CLIENTATTR_RA;
 					goto addauth;
 				}
-				/*
-				 * We were searching for SIG records in
-				 * a nonsecure zone.  Send a "no error,
-				 * no data" response.
-				 */
-				/*
-				 * Add SOA.
-				 */
-				result =3D query_addsoa(client, db, version,
-						      ISC_UINT32_MAX,
-						      ISC_FALSE);
-				if (result =3D=3D ISC_R_SUCCESS)
-					result =3D ISC_R_NOMORE;
-			} else {
-				/*
-				 * Something went wrong.
-				 */
+
+				if (dns_db_issecure(db)) {
+					char namebuf[DNS_NAME_FORMATSIZE];
+					dns_name_format(client->query.qname,
+							namebuf,
+							sizeof(namebuf));
+					ns_client_log(client,
+						      DNS_LOGCATEGORY_DNSSEC,
+						      NS_LOGMODULE_QUERY,
+						      ISC_LOG_WARNING,
+						      "missing signature "
+						      "for %s", namebuf);
+				}
+
+				dns_rdatasetiter_destroy(&rdsiter);
+				fname =3D query_newname(client, dbuf, &b);
+				goto nxrrset_rrsig;
+			} else
 				result =3D DNS_R_SERVFAIL;
-			}
 		}
+
 		dns_rdatasetiter_destroy(&rdsiter);
 		if (result !=3D ISC_R_NOMORE) {
 			QUERY_ERROR(DNS_R_SERVFAIL);
@@ -6442,48 +6643,6 @@
 		 * we know the answer.
 		 */
=20
-		/*
-		 * Check all A and AAAA records in all response policy
-		 * IP address zones
-		 */
-		rpz_st =3D client->query.rpz_st;
-		if (rpz_st !=3D NULL &&
-		    (rpz_st->state & DNS_RPZ_DONE_QNAME) !=3D 0 &&
-		    (rpz_st->state & DNS_RPZ_REWRITTEN) =3D=3D 0 &&
-		    RECURSIONOK(client) && !RECURSING(client) &&
-		    (rpz_st->state & DNS_RPZ_HAVE_IP) !=3D 0 &&
-		    (qtype =3D=3D dns_rdatatype_aaaa || qtype =3D=3D dns_rdatatype_a)) {
-			result =3D rpz_rewrite_ip(client, rdataset,
-						DNS_RPZ_TYPE_IP);
-			if (result !=3D ISC_R_SUCCESS) {
-				QUERY_ERROR(DNS_R_SERVFAIL);
-				goto cleanup;
-			}
-			/*
-			 * After a hit in the radix tree for the policy domain,
-			 * either stop trying to rewrite (DNS_RPZ_POLICY_NO_OP)
-			 * or restart to ask the ordinary database of the
-			 * policy zone for the DNS record corresponding to the
-			 * record in the radix tree.
-			 */
-			switch (rpz_st->m.policy) {
-			case DNS_RPZ_POLICY_MISS:
-				break;
-			case DNS_RPZ_POLICY_NO_OP:
-				rpz_log(client);
-				rpz_st->state |=3D DNS_RPZ_REWRITTEN;
-				break;
-			case DNS_RPZ_POLICY_NXDOMAIN:
-			case DNS_RPZ_POLICY_NODATA:
-			case DNS_RPZ_POLICY_RECORD:
-			case DNS_RPZ_POLICY_CNAME:
-				rpz_st->state |=3D DNS_RPZ_REWRITTEN;
-				goto finish_rewrite;
-			default:
-				INSIST(0);
-			}
-		}
-
 #ifdef ALLOW_FILTER_AAAA_ON_V4
 		/*
 		 * Optionally hide AAAAs from IPv4 clients if there is an A.
@@ -6493,15 +6652,11 @@
 		 * so fundamentally wrong, unavoidably inaccurate, and
 		 * unneeded that it is best to keep it as short as possible.
 		 */
-		if (client->view->v4_aaaa !=3D dns_v4_aaaa_ok &&
-		    is_v4_client(client) &&
-		    ns_client_checkaclsilent(client, NULL,
-					     client->view->v4_aaaa_acl,
-					     ISC_TRUE) =3D=3D ISC_R_SUCCESS &&
-		    (!WANTDNSSEC(client) ||
-		     sigrdataset =3D=3D NULL ||
-		     !dns_rdataset_isassociated(sigrdataset) ||
-		     client->view->v4_aaaa =3D=3D dns_v4_aaaa_break_dnssec)) {
+		if (client->filter_aaaa =3D=3D dns_v4_aaaa_break_dnssec ||
+		    (client->filter_aaaa =3D=3D dns_v4_aaaa_filter &&
+		     (!WANTDNSSEC(client) || sigrdataset =3D=3D NULL ||
+		     !dns_rdataset_isassociated(sigrdataset))))
+		{
 			if (qtype =3D=3D dns_rdatatype_aaaa) {
 				trdataset =3D query_newrdataset(client);
 				result =3D dns_db_findrdataset(db, node, version,
@@ -6633,7 +6788,7 @@
 				}
 #endif
 				if (is_zone)
-					goto nxrrset;
+					goto iszone_nxrrset;
 				else
 					goto ncache_nxrrset;
 			} else if (result !=3D ISC_R_SUCCESS) {
@@ -6691,9 +6846,11 @@
 	 * General cleanup.
 	 */
 	rpz_st =3D client->query.rpz_st;
-	if (rpz_st !=3D NULL && (rpz_st->state & DNS_RPZ_RECURSING) =3D=3D 0)
+	if (rpz_st !=3D NULL && (rpz_st->state & DNS_RPZ_RECURSING) =3D=3D 0) {
 		rpz_clean(&rpz_st->m.zone, &rpz_st->m.db, &rpz_st->m.node,
 			  &rpz_st->m.rdataset);
+		rpz_st->state &=3D ~DNS_RPZ_DONE_QNAME;
+	}
 	if (rdataset !=3D NULL)
 		query_putrdataset(client, &rdataset);
 	if (sigrdataset !=3D NULL)
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/server.c
--- a/head/contrib/bind9/bin/named/server.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/server.c	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: server.c,v 1.599.8.12 2011-08-02 04:58:45 each Exp $ */
+/* $Id: server.c,v 1.599.8.19 2012/02/22 00:33:32 each Exp $ */
=20
 /*! \file */
=20
@@ -2596,14 +2596,19 @@
 	if (result =3D=3D ISC_R_SUCCESS) {
 		/* If set to "auto", use the version from the defaults */
 		const cfg_obj_t *dlvobj;
+		const char *dom;
 		dlvobj =3D cfg_listelt_value(cfg_list_first(obj));
-		if (!strcmp(cfg_obj_asstring(cfg_tuple_get(dlvobj, "domain")),
-			    "auto") &&
-		    cfg_obj_isvoid(cfg_tuple_get(dlvobj, "trust-anchor"))) {
-			auto_dlv =3D ISC_TRUE;
-			obj =3D NULL;
-			result =3D cfg_map_get(ns_g_defaults,
-					     "dnssec-lookaside", &obj);
+		dom =3D cfg_obj_asstring(cfg_tuple_get(dlvobj, "domain"));
+		if (cfg_obj_isvoid(cfg_tuple_get(dlvobj, "trust-anchor"))) {
+			/* If "no", skip; if "auto", use global default */
+			if (!strcasecmp(dom, "no"))
+				result =3D ISC_R_NOTFOUND;
+			else if (!strcasecmp(dom, "auto")) {
+				auto_dlv =3D ISC_TRUE;
+				obj =3D NULL;
+				result =3D cfg_map_get(ns_g_defaults,
+						     "dnssec-lookaside", &obj);
+			}
 		}
 	}
=20
@@ -2704,7 +2709,7 @@
 		rfc1918 =3D ISC_FALSE;
 		empty_zones_enable =3D ISC_FALSE;
 	}
-	if (empty_zones_enable) {
+	if (empty_zones_enable && !lwresd_g_useresolvconf) {
 		const char *empty;
 		int empty_zone =3D 0;
 		dns_fixedname_t fixed;
@@ -2842,7 +2847,8 @@
 			CHECK(dns_zone_create(&zone, mctx));
 			CHECK(dns_zone_setorigin(zone, name));
 			dns_zone_setview(zone, view);
-			CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, zone));
+			CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr,
+						     zone));
 			dns_zone_setclass(zone, view->rdclass);
 			dns_zone_settype(zone, dns_zone_master);
 			dns_zone_setstats(zone, ns_g_server->zonestats);
@@ -3449,6 +3455,12 @@
 	 */
 	CHECK(dns_view_addzone(view, zone));
=20
+	/*
+	 * Ensure that zone keys are reloaded on reconfig
+	 */
+	if ((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_MAINTAIN) !=3D 0)
+		dns_zone_rekey(zone, ISC_FALSE);
+
  cleanup:
 	if (zone !=3D NULL)
 		dns_zone_detach(&zone);
@@ -3489,6 +3501,7 @@
 		dns_zone_attach(pview->managed_keys, &view->managed_keys);
 		dns_zone_setview(pview->managed_keys, view);
 		dns_view_detach(&pview);
+		dns_zone_synckeyzone(view->managed_keys);
 		return (ISC_R_SUCCESS);
 	}
=20
@@ -4278,15 +4291,12 @@
 	ns_cache_t *nsc;
 	struct cfg_context *nzctx;
 	int num_zones =3D 0;
+	isc_boolean_t exclusive =3D ISC_FALSE;
=20
 	ISC_LIST_INIT(viewlist);
 	ISC_LIST_INIT(builtin_viewlist);
 	ISC_LIST_INIT(cachelist);
=20
-	/* Ensure exclusive access to configuration data. */
-	result =3D isc_task_beginexclusive(server->task);
-	RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
-
 	/* Create the ACL configuration context */
 	if (ns_g_aclconfctx !=3D NULL)
 		cfg_aclconfctx_detach(&ns_g_aclconfctx);
@@ -4382,6 +4392,13 @@
 		CHECK(result);
 	}
=20
+	/* Ensure exclusive access to configuration data. */
+	if (!exclusive) {
+		result =3D isc_task_beginexclusive(server->task);
+		RUNTIME_CHECK(result =3D=3D ISC_R_SUCCESS);
+		exclusive =3D ISC_TRUE;
+	}
+
 	/*
 	 * Set process limits, which (usually) needs to be done as root.
 	 */
@@ -5149,7 +5166,8 @@
 		adjust_interfaces(server, ns_g_mctx);
=20
 	/* Relinquish exclusive access to configuration data. */
-	isc_task_endexclusive(server->task);
+	if (exclusive)
+		isc_task_endexclusive(server->task);
=20
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,
 		      ISC_LOG_DEBUG(1), "load_configuration: %s",
@@ -7352,13 +7370,14 @@
 	CHECK(isc_stdio_open(view->new_zone_file, "a", &fp));
=20
 	/* Mark view unfrozen so that zone can be added */
+	isc_task_beginexclusive(server->task);
 	dns_view_thaw(view);
 	result =3D configure_zone(cfg->config, parms, vconfig,
 				server->mctx, view, cfg->actx, ISC_FALSE);
 	dns_view_freeze(view);
-	if (result !=3D ISC_R_SUCCESS) {
+	isc_task_endexclusive(server->task);
+	if (result !=3D ISC_R_SUCCESS)
 		goto cleanup;
-	}
=20
 	/* Is it there yet? */
 	CHECK(dns_zt_find(view->zonetable, &dnsname, 0, NULL, &zone));
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/sortlist.c
--- a/head/contrib/bind9/bin/named/sortlist.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/sortlist.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: sortlist.c,v 1.17 2007-09-14 01:46:05 marka Exp $ */
+/* $Id: sortlist.c,v 1.17 2007/09/14 01:46:05 marka Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/statschan=
nel.c
--- a/head/contrib/bind9/bin/named/statschannel.c	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/named/statschannel.c	Tue Apr 17 11:51:51 2012 =
+0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: statschannel.c,v 1.26.150.2 2011-03-12 04:59:14 tbox Exp $ */
+/* $Id: statschannel.c,v 1.26.150.2 2011/03/12 04:59:14 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/tkeyconf.c
--- a/head/contrib/bind9/bin/named/tkeyconf.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/tkeyconf.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: tkeyconf.c,v 1.33 2010-12-20 23:47:20 tbox Exp $ */
+/* $Id: tkeyconf.c,v 1.33 2010/12/20 23:47:20 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/tsigconf.c
--- a/head/contrib/bind9/bin/named/tsigconf.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/tsigconf.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: tsigconf.c,v 1.35 2011-01-11 23:47:12 tbox Exp $ */
+/* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/unix/Make=
file.in
--- a/head/contrib/bind9/bin/named/unix/Makefile.in	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/named/unix/Makefile.in	Tue Apr 17 11:51:51 201=
2 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.13.244.2 2011-03-10 23:47:26 tbox Exp $
+# $Id: Makefile.in,v 1.13.244.2 2011/03/10 23:47:26 tbox Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/unix/dlz_=
dlopen_driver.c
--- a/head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c	Tue Apr 17 11:3=
6:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c	Tue Apr 17 11:5=
1:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: dlz_dlopen_driver.c,v 1.1.4.4 2011-03-17 09:41:06 fdupont Exp $ */
+/* $Id: dlz_dlopen_driver.c,v 1.1.4.6 2012/02/22 23:46:35 tbox Exp $ */
=20
 #include <config.h>
=20
@@ -313,6 +313,8 @@
 		dl_load_symbol(cd, "dlz_subrdataset", ISC_FALSE);
 	cd->dlz_delrdataset =3D (dlz_dlopen_delrdataset_t *)
 		dl_load_symbol(cd, "dlz_delrdataset", ISC_FALSE);
+	cd->dlz_destroy =3D (dlz_dlopen_destroy_t *)
+		dl_load_symbol(cd, "dlz_destroy", ISC_FALSE);
=20
 	/* Check the version of the API is the same */
 	cd->version =3D cd->dlz_version(&cd->flags);
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/unix/incl=
ude/named/os.h
--- a/head/contrib/bind9/bin/named/unix/include/named/os.h	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/unix/include/named/os.h	Tue Apr 17 11:51=
:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: os.h,v 1.31 2009-08-05 23:47:43 tbox Exp $ */
+/* $Id: os.h,v 1.31 2009/08/05 23:47:43 tbox Exp $ */
=20
 #ifndef NS_OS_H
 #define NS_OS_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/unix/os.c
--- a/head/contrib/bind9/bin/named/unix/os.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/unix/os.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: os.c,v 1.104.38.3 2011-03-02 00:04:01 marka Exp $ */
+/* $Id: os.c,v 1.104.38.3 2011/03/02 00:04:01 marka Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/update.c
--- a/head/contrib/bind9/bin/named/update.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/update.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: update.c,v 1.186.16.5 2011-03-25 23:53:52 each Exp $ */
+/* $Id: update.c,v 1.186.16.7 2011/11/03 02:55:34 each Exp $ */
=20
 #include <config.h>
=20
@@ -1506,8 +1506,6 @@
  * Incremental updating of NSECs and RRSIGs.
  */
=20
-#define MAXZONEKEYS 32	/*%< Maximum number of zone keys supported. */
-
 /*%
  * We abuse the dns_diff_t type to represent a set of domain names
  * affected by the update.
@@ -2131,7 +2129,7 @@
 	dns_diff_t nsec_diff;
 	dns_diff_t nsec_mindiff;
 	isc_boolean_t flag, build_nsec, build_nsec3;
-	dst_key_t *zone_keys[MAXZONEKEYS];
+	dst_key_t *zone_keys[DNS_MAXZONEKEYS];
 	unsigned int nkeys =3D 0;
 	unsigned int i;
 	isc_stdtime_t now, inception, expire;
@@ -2154,7 +2152,7 @@
 	dns_diff_init(client->mctx, &nsec_mindiff);
=20
 	result =3D find_zone_keys(zone, db, newver, client->mctx,
-				MAXZONEKEYS, zone_keys, &nkeys);
+				DNS_MAXZONEKEYS, zone_keys, &nkeys);
 	if (result !=3D ISC_R_SUCCESS) {
 		update_log(client, zone, ISC_LOG_ERROR,
 			   "could not get zone keys for secure dynamic update");
@@ -4473,6 +4471,12 @@
 	isc_task_t *zonetask =3D NULL;
 	ns_client_t *evclient;
=20
+	/*
+	 * This may take some time so replace this client.
+	 */
+	if (!client->mortal && (client->attributes & NS_CLIENTATTR_TCP) =3D=3D 0)
+		CHECK(ns_client_replace(client));
+
 	event =3D (update_event_t *)
 		isc_event_allocate(client->mctx, client, DNS_EVENT_UPDATE,
 				   forward_action, NULL, sizeof(*event));
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/xfrout.c
--- a/head/contrib/bind9/bin/named/xfrout.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/xfrout.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: xfrout.c,v 1.139.16.3 2011-07-28 04:30:54 marka Exp $ */
+/* $Id: xfrout.c,v 1.139.16.4 2011/12/01 01:00:50 marka Exp $ */
=20
 #include <config.h>
=20
@@ -1287,6 +1287,13 @@
 			isc_buffer_free(&xfr->lasttsig);
=20
 		/*
+		 * Account for reserved space.
+		 */
+		if (xfr->tsigkey !=3D NULL)
+			INSIST(msg->reserved !=3D 0U);
+		isc_buffer_add(&xfr->buf, msg->reserved);
+
+		/*
 		 * Include a question section in the first message only.
 		 * BIND 8.2.1 will not recognize an IXFR if it does not
 		 * have a question section.
@@ -1324,9 +1331,13 @@
 			ISC_LIST_APPEND(qname->list, qrdataset, link);
=20
 			dns_message_addname(msg, qname, DNS_SECTION_QUESTION);
+		} else {
+			/*
+			 * Reserve space for the 12-byte message header
+			 */
+			isc_buffer_add(&xfr->buf, 12);
+			msg->tcp_continuation =3D 1;
 		}
-		else
-			msg->tcp_continuation =3D 1;
 	}
=20
 	/*
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/named/zoneconf.c
--- a/head/contrib/bind9/bin/named/zoneconf.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/named/zoneconf.c	Tue Apr 17 11:51:51 2012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: zoneconf.c,v 1.170.14.4 2011-05-23 20:56:10 each Exp $ */
+/* $Id: zoneconf.c,v 1.170.14.7 2012/01/31 23:46:39 tbox Exp $ */
=20
 /*% */
=20
@@ -1329,8 +1329,11 @@
 							 &count));
 			result =3D dns_zone_setmasterswithkeys(zone, addrs,
 							     keynames, count);
-			ns_config_putipandkeylist(mctx, &addrs, &keynames,
-						  count);
+			if (count !=3D 0)
+				ns_config_putipandkeylist(mctx, &addrs,
+							  &keynames, count);
+			else
+				INSIST(addrs =3D=3D NULL && keynames =3D=3D NULL);
 		} else
 			result =3D dns_zone_setmasters(zone, NULL, 0);
 		RETERR(result);
@@ -1462,15 +1465,21 @@
=20
 	zoptions =3D cfg_tuple_get(zconfig, "options");
=20
-	if (zonetype_fromconfig(zoptions) !=3D dns_zone_gettype(zone))
+	if (zonetype_fromconfig(zoptions) !=3D dns_zone_gettype(zone)) {
+		dns_zone_log(zone, ISC_LOG_DEBUG(1),
+			     "not reusable: type mismatch");
 		return (ISC_FALSE);
+	}
=20
 	/*
 	 * We always reconfigure a static-stub zone for simplicity, assuming
 	 * the amount of data to be loaded is small.
 	 */
-	if (zonetype_fromconfig(zoptions) =3D=3D dns_zone_staticstub)
+	if (zonetype_fromconfig(zoptions) =3D=3D dns_zone_staticstub) {
+		dns_zone_log(zone, ISC_LOG_DEBUG(1),
+			     "not reusable: staticstub");
 		return (ISC_FALSE);
+	}
=20
 	obj =3D NULL;
 	(void)cfg_map_get(zoptions, "file", &obj);
@@ -1481,8 +1490,11 @@
 	zfilename =3D dns_zone_getfile(zone);
 	if (!((cfilename =3D=3D NULL && zfilename =3D=3D NULL) ||
 	      (cfilename !=3D NULL && zfilename !=3D NULL &&
-	       strcmp(cfilename, zfilename) =3D=3D 0)))
-	    return (ISC_FALSE);
+	       strcmp(cfilename, zfilename) =3D=3D 0))) {
+		dns_zone_log(zone, ISC_LOG_DEBUG(1),
+			"not reusable: filename mismatch");
+		return (ISC_FALSE);
+	}
=20
 	return (ISC_TRUE);
 }
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/nsupdate/Makefi=
le.in
--- a/head/contrib/bind9/bin/nsupdate/Makefile.in	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/nsupdate/Makefile.in	Tue Apr 17 11:51:51 2012 =
+0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.36 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/nsupdate/nsupda=
te.1
--- a/head/contrib/bind9/bin/nsupdate/nsupdate.1	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/nsupdate/nsupdate.1	Tue Apr 17 11:51:51 2012 +=
0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nsupdate.1,v 1.13 2010-07-10 01:14:19 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/nsupdate/nsupda=
te.c
--- a/head/contrib/bind9/bin/nsupdate/nsupdate.c	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/nsupdate/nsupdate.c	Tue Apr 17 11:51:51 2012 +=
0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: nsupdate.c,v 1.193.12.3 2011-05-23 22:12:14 each Exp $ */
+/* $Id: nsupdate.c,v 1.193.12.4 2011/11/03 04:30:09 each Exp $ */
=20
 /*! \file */
=20
@@ -2280,6 +2280,7 @@
 		dns_message_destroy(&soaquery);
 		ddebug("Out of recvsoa");
 		done_update();
+		seenerror =3D ISC_TRUE;
 		return;
 	}
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/nsupdate/nsupda=
te.docbook
--- a/head/contrib/bind9/bin/nsupdate/nsupdate.docbook	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/nsupdate/nsupdate.docbook	Tue Apr 17 11:51:51 =
2012 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: nsupdate.docbook,v 1.44 2010-07-09 23:46:51 tbox Exp $ -->
+<!-- $Id: nsupdate.docbook,v 1.44 2010/07/09 23:46:51 tbox Exp $ -->
 <refentry id=3D"man.nsupdate">
   <refentryinfo>
     <date>Aug 25, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/nsupdate/nsupda=
te.html
--- a/head/contrib/bind9/bin/nsupdate/nsupdate.html	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/nsupdate/nsupdate.html	Tue Apr 17 11:51:51 201=
2 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: nsupdate.html,v 1.50 2010-07-10 01:14:19 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">nsupdate</code>  [<c=
ode class=3D"option">-d</code>] [<code class=3D"option">-D</code>] [[<code =
class=3D"option">-g</code>] |  [<code class=3D"option">-o</code>] |  [<code=
 class=3D"option">-l</code>] |  [<code class=3D"option">-y <em class=3D"rep=
laceable"><code>[<span class=3D"optional">hmac:</span>]keyname:secret</code=
></em></code>] |  [<code class=3D"option">-k <em class=3D"replaceable"><cod=
e>keyfile</code></em></code>]] [<code class=3D"option">-t <em class=3D"repl=
aceable"><code>timeout</code></em></code>] [<code class=3D"option">-u <em c=
lass=3D"replaceable"><code>udptimeout</code></em></code>] [<code class=3D"o=
ption">-r <em class=3D"replaceable"><code>udpretries</code></em></code>] [<=
code class=3D"option">-R <em class=3D"replaceable"><code>randomdev</code></=
em></code>] [<code class=3D"option">-v</code>] [filename]</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543457"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543459"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">nsupdate</strong></span>
       is used to submit Dynamic DNS Update requests as defined in RFC 2136
       to a name server.
@@ -192,7 +192,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543788"></a><h2>INPUT FORMAT</h2>
+<a name=3D"id2543790"></a><h2>INPUT FORMAT</h2>
 <p><span><strong class=3D"command">nsupdate</strong></span>
       reads input from
       <em class=3D"parameter"><code>filename</code></em>
@@ -480,7 +480,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544700"></a><h2>EXAMPLES</h2>
+<a name=3D"id2544702"></a><h2>EXAMPLES</h2>
 <p>
       The examples below show how
       <span><strong class=3D"command">nsupdate</strong></span>
@@ -534,7 +534,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544744"></a><h2>FILES</h2>
+<a name=3D"id2544746"></a><h2>FILES</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term"><code class=3D"constant">/etc/resolv.conf</code><=
/span></dt>
 <dd><p>
@@ -557,7 +557,7 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2544827"></a><h2>SEE ALSO</h2>
+<a name=3D"id2544829"></a><h2>SEE ALSO</h2>
 <p>
       <em class=3D"citetitle">RFC 2136</em>,
       <em class=3D"citetitle">RFC 3007</em>,
@@ -572,7 +572,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2542154"></a><h2>BUGS</h2>
+<a name=3D"id2542156"></a><h2>BUGS</h2>
 <p>
       The TSIG key is redundantly stored in two separate files.
       This is a consequence of nsupdate using the DST library
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/Makefile.in
--- a/head/contrib/bind9/bin/rndc/Makefile.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/Makefile.in	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.49 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.49 2009/12/05 23:31:40 each Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/include/rn=
dc/os.h
--- a/head/contrib/bind9/bin/rndc/include/rndc/os.h	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/rndc/include/rndc/os.h	Tue Apr 17 11:51:51 201=
2 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: os.h,v 1.12 2009-06-10 00:27:21 each Exp $ */
+/* $Id: os.h,v 1.12 2009/06/10 00:27:21 each Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.8
--- a/head/contrib/bind9/bin/rndc/rndc.8	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.8	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: rndc.8,v 1.43 2009-07-11 01:12:46 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.c
--- a/head/contrib/bind9/bin/rndc/rndc.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: rndc.c,v 1.131.20.2 2011-02-28 01:19:59 tbox Exp $ */
+/* $Id: rndc.c,v 1.131.20.3 2011/11/03 22:06:31 each Exp $ */
=20
 /*! \file */
=20
@@ -142,13 +142,17 @@
 		Flush the given name from the server's cache(s)\n\
   status	Display status of the server.\n\
   recursing	Dump the queries that are currently recursing (named.recursing=
)\n\
+  tsig-list	List all currently active TSIG keys, including both statically=
\n\
+		configured and TKEY-negotiated keys.\n\
+  tsig-delete keyname [view]	\n\
+		Delete a TKEY-negotiated TSIG key.\n\
   validation newstate [view]\n\
 		Enable / disable DNSSEC validation.\n\
-  *restart	Restart the server.\n\
   addzone [\"file\"] zone [class [view]] { zone-options }\n\
 		Add zone to given view. Requires new-zone-file option.\n\
   delzone [\"file\"] zone [class [view]]\n\
 		Removes zone from given view. Requires new-zone-file option.\n\
+  *restart	Restart the server.\n\
 \n\
 * =3D=3D not yet implemented\n\
 Version: %s\n",
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.conf
--- a/head/contrib/bind9/bin/rndc/rndc.conf	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.conf	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: rndc.conf,v 1.11 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: rndc.conf,v 1.11 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*
  * Sample rndc configuration file.
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.conf.5
--- a/head/contrib/bind9/bin/rndc/rndc.conf.5	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.conf.5	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: rndc.conf.5,v 1.41 2009-07-11 01:12:46 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.conf.=
docbook
--- a/head/contrib/bind9/bin/rndc/rndc.conf.docbook	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.conf.docbook	Tue Apr 17 11:51:51 201=
2 +0300
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: rndc.conf.docbook,v 1.17 2007-06-18 23:47:25 tbox Exp $ -->
+<!-- $Id: rndc.conf.docbook,v 1.17 2007/06/18 23:47:25 tbox Exp $ -->
 <refentry id=3D"man.rndc.conf">
   <refentryinfo>
     <date>June 30, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.conf.=
html
--- a/head/contrib/bind9/bin/rndc/rndc.conf.html	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/rndc/rndc.conf.html	Tue Apr 17 11:51:51 2012 +=
0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc.conf.html,v 1.32 2009-07-11 01:12:46 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">rndc.conf</code> </p=
></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543352"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543354"></a><h2>DESCRIPTION</h2>
 <p><code class=3D"filename">rndc.conf</code> is the configuration file
       for <span><strong class=3D"command">rndc</strong></span>, the BIND 9=
 name server control
       utility.  This file has a similar structure and syntax to
@@ -117,7 +117,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543500"></a><h2>EXAMPLE</h2>
+<a name=3D"id2543502"></a><h2>EXAMPLE</h2>
 <pre class=3D"programlisting">
       options {
         default-server  localhost;
@@ -191,7 +191,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543592"></a><h2>NAME SERVER CONFIGURATION</h2>
+<a name=3D"id2543594"></a><h2>NAME SERVER CONFIGURATION</h2>
 <p>
       The name server must be configured to accept rndc connections and
       to recognize the key specified in the <code class=3D"filename">rndc.=
conf</code>
@@ -201,7 +201,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543613"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543616"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">rndc</span>(=
8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">rndc-conf=
gen</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">mmencode<=
/span>(1)</span>,
@@ -209,7 +209,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543652"></a><h2>AUTHOR</h2>
+<a name=3D"id2543654"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.docbo=
ok
--- a/head/contrib/bind9/bin/rndc/rndc.docbook	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/rndc/rndc.docbook	Tue Apr 17 11:51:51 2012 +03=
00
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: rndc.docbook,v 1.21 2007-12-14 20:39:14 marka Exp $ -->
+<!-- $Id: rndc.docbook,v 1.21 2007/12/14 20:39:14 marka Exp $ -->
 <refentry id=3D"man.rndc">
   <refentryinfo>
     <date>June 30, 2000</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/rndc.html
--- a/head/contrib/bind9/bin/rndc/rndc.html	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/rndc.html	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc.html,v 1.32 2009-07-11 01:12:46 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -32,7 +32,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">rndc</code>  [<code =
class=3D"option">-b <em class=3D"replaceable"><code>source-address</code></=
em></code>] [<code class=3D"option">-c <em class=3D"replaceable"><code>conf=
ig-file</code></em></code>] [<code class=3D"option">-k <em class=3D"replace=
able"><code>key-file</code></em></code>] [<code class=3D"option">-s <em cla=
ss=3D"replaceable"><code>server</code></em></code>] [<code class=3D"option"=
>-p <em class=3D"replaceable"><code>port</code></em></code>] [<code class=
=3D"option">-V</code>] [<code class=3D"option">-y <em class=3D"replaceable"=
><code>key_id</code></em></code>] {command}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543413"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543415"></a><h2>DESCRIPTION</h2>
 <p><span><strong class=3D"command">rndc</strong></span>
       controls the operation of a name
       server.  It supersedes the <span><strong class=3D"command">ndc</stro=
ng></span> utility
@@ -61,7 +61,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543448"></a><h2>OPTIONS</h2>
+<a name=3D"id2543450"></a><h2>OPTIONS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-b <em class=3D"replaceable"><code>source-address=
</code></em></span></dt>
 <dd><p>
@@ -133,7 +133,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543656"></a><h2>LIMITATIONS</h2>
+<a name=3D"id2543658"></a><h2>LIMITATIONS</h2>
 <p><span><strong class=3D"command">rndc</strong></span>
       does not yet support all the commands of
       the BIND 8 <span><strong class=3D"command">ndc</strong></span> utili=
ty.
@@ -147,7 +147,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543683"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543685"></a><h2>SEE ALSO</h2>
 <p><span class=3D"citerefentry"><span class=3D"refentrytitle">rndc.conf</s=
pan>(5)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">rndc-conf=
gen</span>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>,
@@ -157,7 +157,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543738"></a><h2>AUTHOR</h2>
+<a name=3D"id2543740"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/util.c
--- a/head/contrib/bind9/bin/rndc/util.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/util.c	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: util.c,v 1.7 2007-06-19 23:46:59 tbox Exp $ */
+/* $Id: util.c,v 1.7 2007/06/19 23:46:59 tbox Exp $ */
=20
 /*! \file */
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/rndc/util.h
--- a/head/contrib/bind9/bin/rndc/util.h	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/rndc/util.h	Tue Apr 17 11:51:51 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: util.h,v 1.12 2009-09-29 23:48:03 tbox Exp $ */
+/* $Id: util.h,v 1.12 2009/09/29 23:48:03 tbox Exp $ */
=20
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/Makefile.=
in
--- a/head/contrib/bind9/bin/tools/Makefile.in	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/tools/Makefile.in	Tue Apr 17 11:51:51 2012 +03=
00
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.13 2010-01-07 23:48:53 tbox Exp $
+# $Id: Makefile.in,v 1.13 2010/01/07 23:48:53 tbox Exp $
=20
 srcdir =3D	@srcdir@
 VPATH =3D		@srcdir@
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/arpaname.1
--- a/head/contrib/bind9/bin/tools/arpaname.1	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/tools/arpaname.1	Tue Apr 17 11:51:51 2012 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: arpaname.1,v 1.4 2010-05-19 01:14:14 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/arpaname.c
--- a/head/contrib/bind9/bin/tools/arpaname.c	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/tools/arpaname.c	Tue Apr 17 11:51:51 2012 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: arpaname.c,v 1.4 2009-10-27 03:05:33 marka Exp $ */
+/* $Id: arpaname.c,v 1.4 2009/10/27 03:05:33 marka Exp $ */
=20
 #include "config.h"
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/arpaname.=
docbook
--- a/head/contrib/bind9/bin/tools/arpaname.docbook	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/tools/arpaname.docbook	Tue Apr 17 11:51:51 201=
2 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: arpaname.docbook,v 1.1 2009-03-04 01:30:27 marka Exp $ -->
+<!-- $Id: arpaname.docbook,v 1.1 2009/03/04 01:30:27 marka Exp $ -->
 <refentry id=3D"man.arpaname">
   <refentryinfo>
     <date>March 4, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/arpaname.=
html
--- a/head/contrib/bind9/bin/tools/arpaname.html	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/bin/tools/arpaname.html	Tue Apr 17 11:51:51 2012 +=
0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: arpaname.html,v 1.4 2010-05-19 01:14:14 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,20 +31,20 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">arpaname</code>  {<e=
m class=3D"replaceable"><code>ipaddress </code></em>...}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543345"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543347"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class=3D"command">arpaname</strong></span> translates =
IP addresses (IPv4 and
       IPv6) to the corresponding IN-ADDR.ARPA or IP6.ARPA names.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543357"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543360"></a><h2>SEE ALSO</h2>
 <p>
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543371"></a><h2>AUTHOR</h2>
+<a name=3D"id2543373"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/genrandom=
.8
--- a/head/contrib/bind9/bin/tools/genrandom.8	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/tools/genrandom.8	Tue Apr 17 11:51:51 2012 +03=
00
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2009-2011 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009-2012 Internet Systems Consortium, Inc. ("ISC")
 .\"=20
 .\" Permission to use, copy, modify, and/or distribute this software for a=
ny
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: genrandom.8,v 1.8.124.1 2011-08-09 01:52:58 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
@@ -65,5 +65,5 @@
 .PP
 Internet Systems Consortium
 .SH "COPYRIGHT"
-Copyright \(co 2009\-2011 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2009\-2012 Internet Systems Consortium, Inc. ("ISC")
 .br
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/genrandom=
.c
--- a/head/contrib/bind9/bin/tools/genrandom.c	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/tools/genrandom.c	Tue Apr 17 11:51:51 2012 +03=
00
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: genrandom.c,v 1.7 2010-05-17 23:51:04 tbox Exp $ */
+/* $Id: genrandom.c,v 1.7 2010/05/17 23:51:04 tbox Exp $ */
=20
 /*! \file */
 #include <config.h>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/genrandom=
.docbook
--- a/head/contrib/bind9/bin/tools/genrandom.docbook	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/tools/genrandom.docbook	Tue Apr 17 11:51:51 20=
12 +0300
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "—">]>
 <!--
- - Copyright (C) 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009-2012  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: genrandom.docbook,v 1.6.124.2 2011-08-08 23:45:44 tbox Exp $ -->
+<!-- $Id$ -->
 <refentry id=3D"man.genrandom">
   <refentryinfo>
     <date>Feb 19, 2009</date>
@@ -39,6 +39,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2012</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/genrandom=
.html
--- a/head/contrib/bind9/bin/tools/genrandom.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/tools/genrandom.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2009-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009-2012 Internet Systems Consortium, Inc. ("ISC")
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: genrandom.html,v 1.8.124.1 2011-08-09 01:52:58 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">genrandom</code>  [<=
code class=3D"option">-n <em class=3D"replaceable"><code>number</code></em>=
</code>] {<em class=3D"replaceable"><code>size</code></em>} {<em class=3D"r=
eplaceable"><code>filename</code></em>}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543366"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543370"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class=3D"command">genrandom</strong></span>
       generates a file or a set of files containing a specified quantity
@@ -40,7 +40,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543379"></a><h2>ARGUMENTS</h2>
+<a name=3D"id2543383"></a><h2>ARGUMENTS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">-n <em class=3D"replaceable"><code>number</code><=
/em></span></dt>
 <dd><p>
@@ -58,14 +58,14 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543440"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543444"></a><h2>SEE ALSO</h2>
 <p>
       <span class=3D"citerefentry"><span class=3D"refentrytitle">rand</spa=
n>(3)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">arc4rando=
m</span>(3)</span>
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543466"></a><h2>AUTHOR</h2>
+<a name=3D"id2543470"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/isc-hmac-=
fixup.8
--- a/head/contrib/bind9/bin/tools/isc-hmac-fixup.8	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/tools/isc-hmac-fixup.8	Tue Apr 17 11:51:51 201=
2 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: isc-hmac-fixup.8,v 1.4 2010-05-19 01:14:14 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/isc-hmac-=
fixup.c
--- a/head/contrib/bind9/bin/tools/isc-hmac-fixup.c	Tue Apr 17 11:36:47 201=
2 +0300
+++ b/head/contrib/bind9/bin/tools/isc-hmac-fixup.c	Tue Apr 17 11:51:51 201=
2 +0300
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: isc-hmac-fixup.c,v 1.4 2010-03-10 02:17:52 marka Exp $ */
+/* $Id: isc-hmac-fixup.c,v 1.4 2010/03/10 02:17:52 marka Exp $ */
=20
 #include <config.h>
=20
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/isc-hmac-=
fixup.docbook
--- a/head/contrib/bind9/bin/tools/isc-hmac-fixup.docbook	Tue Apr 17 11:36:=
47 2012 +0300
+++ b/head/contrib/bind9/bin/tools/isc-hmac-fixup.docbook	Tue Apr 17 11:51:=
51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: isc-hmac-fixup.docbook,v 1.2 2010-01-07 21:52:11 each Exp $ -->
+<!-- $Id: isc-hmac-fixup.docbook,v 1.2 2010/01/07 21:52:11 each Exp $ -->
 <refentry id=3D"man.isc-hmac-fixup">
   <refentryinfo>
     <date>January 5, 2010</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/isc-hmac-=
fixup.html
--- a/head/contrib/bind9/bin/tools/isc-hmac-fixup.html	Tue Apr 17 11:36:47 =
2012 +0300
+++ b/head/contrib/bind9/bin/tools/isc-hmac-fixup.html	Tue Apr 17 11:51:51 =
2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: isc-hmac-fixup.html,v 1.4 2010-05-19 01:14:14 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">isc-hmac-fixup</code=
>  {<em class=3D"replaceable"><code>algorithm</code></em>} {<em class=3D"re=
placeable"><code>secret</code></em>}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543351"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543352"></a><h2>DESCRIPTION</h2>
 <p>
       Versions of BIND 9 up to and including BIND 9.6 had a bug causing
       HMAC-SHA* TSIG keys which were longer than the digest length of the
@@ -57,7 +57,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543374"></a><h2>SECURITY CONSIDERATIONS</h2>
+<a name=3D"id2543376"></a><h2>SECURITY CONSIDERATIONS</h2>
 <p>
       Secrets that have been converted by <span><strong class=3D"command">=
isc-hmac-fixup</strong></span>
       are shortened, but as this is how the HMAC protocol works in
@@ -68,14 +68,14 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543388"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543389"></a><h2>SEE ALSO</h2>
 <p>
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class=3D"citetitle">RFC 2104</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543405"></a><h2>AUTHOR</h2>
+<a name=3D"id2543406"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/named-jou=
rnalprint.8
--- a/head/contrib/bind9/bin/tools/named-journalprint.8	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/tools/named-journalprint.8	Tue Apr 17 11:51:51=
 2012 +0300
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-journalprint.8,v 1.4 2010-05-19 01:14:14 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/named-jou=
rnalprint.c
--- a/head/contrib/bind9/bin/tools/named-journalprint.c	Tue Apr 17 11:36:47=
 2012 +0300
+++ b/head/contrib/bind9/bin/tools/named-journalprint.c	Tue Apr 17 11:51:51=
 2012 +0300
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: named-journalprint.c,v 1.2 2009-12-04 21:59:23 marka Exp $ */
+/* $Id: named-journalprint.c,v 1.2 2009/12/04 21:59:23 marka Exp $ */
=20
 /*! \file */
 #include <config.h>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/named-jou=
rnalprint.docbook
--- a/head/contrib/bind9/bin/tools/named-journalprint.docbook	Tue Apr 17 11=
:36:47 2012 +0300
+++ b/head/contrib/bind9/bin/tools/named-journalprint.docbook	Tue Apr 17 11=
:51:51 2012 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: named-journalprint.docbook,v 1.2 2009-12-04 21:59:23 marka Exp $=
 -->
+<!-- $Id: named-journalprint.docbook,v 1.2 2009/12/04 21:59:23 marka Exp $=
 -->
 <refentry id=3D"man.named-journalprint">
   <refentryinfo>
     <date>Feb 18, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/named-jou=
rnalprint.html
--- a/head/contrib/bind9/bin/tools/named-journalprint.html	Tue Apr 17 11:36=
:47 2012 +0300
+++ b/head/contrib/bind9/bin/tools/named-journalprint.html	Tue Apr 17 11:51=
:51 2012 +0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-journalprint.html,v 1.4 2010-05-19 01:14:14 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">named-journalprint</=
code>  {<em class=3D"replaceable"><code>journal</code></em>}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543342"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543344"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class=3D"command">named-journalprint</strong></span>
       prints the contents of a zone journal file in a human-readable
@@ -57,7 +57,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543378"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543379"></a><h2>SEE ALSO</h2>
 <p>
       <span class=3D"citerefentry"><span class=3D"refentrytitle">named</sp=
an>(8)</span>,
       <span class=3D"citerefentry"><span class=3D"refentrytitle">nsupdate<=
/span>(8)</span>,
@@ -65,7 +65,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543409"></a><h2>AUTHOR</h2>
+<a name=3D"id2543410"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/nsec3hash=
.8
--- a/head/contrib/bind9/bin/tools/nsec3hash.8	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/tools/nsec3hash.8	Tue Apr 17 11:51:51 2012 +03=
00
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE=
 OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nsec3hash.8,v 1.5 2010-05-19 01:14:14 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/nsec3hash=
.c
--- a/head/contrib/bind9/bin/tools/nsec3hash.c	Tue Apr 17 11:36:47 2012 +03=
00
+++ b/head/contrib/bind9/bin/tools/nsec3hash.c	Tue Apr 17 11:51:51 2012 +03=
00
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008, 2009  Internet Systems Consortium, Inc. ("ISC=
")
+ * Copyright (C) 2006, 2008, 2009, 2011, 2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: nsec3hash.c,v 1.6 2009-10-06 21:20:44 each Exp $ */
+/* $Id$ */
=20
 #include <config.h>
=20
@@ -60,7 +60,8 @@
=20
 static void
 usage() {
-	fatal("salt hash iterations domain");
+	printf("Usage: %s salt algorithm iterations domain\n", program);
+	exit(1);
 }
=20
 int
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/nsec3hash=
.docbook
--- a/head/contrib/bind9/bin/tools/nsec3hash.docbook	Tue Apr 17 11:36:47 20=
12 +0300
+++ b/head/contrib/bind9/bin/tools/nsec3hash.docbook	Tue Apr 17 11:51:51 20=
12 +0300
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- $Id: nsec3hash.docbook,v 1.3 2009-03-02 23:47:43 tbox Exp $ -->
+<!-- $Id: nsec3hash.docbook,v 1.3 2009/03/02 23:47:43 tbox Exp $ -->
 <refentry id=3D"man.nsec3hash">
   <refentryinfo>
     <date>Feb 18, 2009</date>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/bin/tools/nsec3hash=
.html
--- a/head/contrib/bind9/bin/tools/nsec3hash.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/bin/tools/nsec3hash.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: nsec3hash.html,v 1.5 2010-05-19 01:14:14 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -31,7 +31,7 @@
 <div class=3D"cmdsynopsis"><p><code class=3D"command">nsec3hash</code>  {<=
em class=3D"replaceable"><code>salt</code></em>} {<em class=3D"replaceable"=
><code>algorithm</code></em>} {<em class=3D"replaceable"><code>iterations</=
code></em>} {<em class=3D"replaceable"><code>domain</code></em>}</p></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543367"></a><h2>DESCRIPTION</h2>
+<a name=3D"id2543369"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class=3D"command">nsec3hash</strong></span> generates =
an NSEC3 hash based on
       a set of NSEC3 parameters.  This can be used to check the validity
@@ -39,7 +39,7 @@
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543380"></a><h2>ARGUMENTS</h2>
+<a name=3D"id2543382"></a><h2>ARGUMENTS</h2>
 <div class=3D"variablelist"><dl>
 <dt><span class=3D"term">salt</span></dt>
 <dd><p>
@@ -63,14 +63,14 @@
 </dl></div>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543442"></a><h2>SEE ALSO</h2>
+<a name=3D"id2543444"></a><h2>SEE ALSO</h2>
 <p>
       <em class=3D"citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class=3D"citetitle">RFC 5155</em>.
     </p>
 </div>
 <div class=3D"refsect1" lang=3D"en">
-<a name=3D"id2543459"></a><h2>AUTHOR</h2>
+<a name=3D"id2543461"></a><h2>AUTHOR</h2>
 <p><span class=3D"corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/config.h.in
--- a/head/contrib/bind9/config.h.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/config.h.in	Tue Apr 17 11:51:51 2012 +0300
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
=20
-/* $Id: config.h.in,v 1.143.8.4 2011-03-10 04:29:14 each Exp $ */
+/* $Id$ */
=20
 /*! \file */
=20
@@ -144,6 +144,9 @@
 /* Define if threads need PTHREAD_SCOPE_SYSTEM */
 #undef NEED_PTHREAD_SCOPE_SYSTEM
=20
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to enable the "filter-aaaa-on-v4" option. */
 #undef ALLOW_FILTER_AAAA_ON_V4
=20
@@ -380,6 +383,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
=20
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
=20
@@ -387,6 +393,9 @@
    (O_NDELAY/O_NONBLOCK). */
 #undef PORT_NONBLOCK
=20
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
=20
@@ -400,9 +409,17 @@
 /* define if idnkit support is to be included. */
 #undef WITH_IDN
=20
-/* Define to 1 if your processor stores words with the most significant by=
te
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
=20
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/config.threads.in
--- a/head/contrib/bind9/config.threads.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/config.threads.in	Tue Apr 17 11:51:51 2012 +0300
@@ -33,8 +33,9 @@
 *-*-sysv*OpenUNIX*)
         # UnixWare
 	use_threads=3Dtrue ;;
-*-netbsd[1234].*)
-	# NetBSD earlier than NetBSD 5.0 has poor pthreads.  Don't use it by defa=
ult.
+[*-netbsd[1234].*])
+	# NetBSD earlier than NetBSD 5.0 has poor pthreads.
+	#  Don't use it by default.
 	use_threads=3Dfalse ;;
 *-netbsd*)
 	use_threads=3Dtrue ;;
@@ -44,7 +45,7 @@
 	use_threads=3Dfalse ;;
 *-freebsd*)
 	use_threads=3Dfalse ;;
-*-bsdi[234]*)
+[*-bsdi[234]*])
 	# Thread signals do not work reliably on some versions of BSD/OS.
 	use_threads=3Dfalse ;;
 *-bsdi5*)
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/configure.in
--- a/head/contrib/bind9/configure.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/configure.in	Tue Apr 17 11:51:51 2012 +0300
@@ -18,7 +18,7 @@
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
=20
-AC_REVISION($Revision: 1.512.8.12 $)
+AC_REVISION($Revision: 1.512.8.15 $)
=20
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -62,6 +62,25 @@
 		;;
 esac
=20
+AC_ARG_ENABLE(developer, [  --enable-developer     enable developer build =
settings])
+case "$enable_developer" in
+yes)
+	test "${enable_fixed_rrset+set}" =3D set || enable_fixed_rrset=3Dyes
+	test "${with_atf+set}" =3D set || with_atf=3Dyes
+	test "${enable_filter_aaaa+set}" =3D set || enable_filter_aaaa=3Dyes
+	test "${enable_rpz_nsip+set}" =3D set || enable_rpz_nsip=3Dyes
+	test "${enable_rpz_nsdname+set}" =3D set || enable_rpz_nsdname=3Dyes
+	test "${with_dlz_filesystem+set}" =3D set || with_dlz_filesystem=3Dyes
+	case "$host" in
+	*-darwin*)
+		test "${enable_exportlib+set}" =3D set || enable_exportlib=3Dyes
+		;;
+	*-linux*)
+		test "${enable_exportlib+set}" =3D set || enable_exportlib=3Dyes
+		;;
+	esac
+	;;
+esac
 #
 # Make very sure that these are the first files processed by
 # config.status, since we use the processed output as the input for
@@ -263,7 +282,7 @@
 	# as it breaks how the two halves (Basic and Advanced) of the IPv6
 	# Socket API were designed to be used but we have to live with it.
 	# Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
-	*-linux*)
+	*-linux* | *-kfreebsd*-gnu)
 		STD_CDEFINES=3D"$STD_CDEFINES -D_GNU_SOURCE"
 		CPPFLAGS=3D"$CPPFLAGS -D_GNU_SOURCE"
 		;;
@@ -502,7 +521,6 @@
 #
 AC_C_BIGENDIAN
=20
-
 #
 # was --with-openssl specified?
 #
@@ -1437,9 +1455,9 @@
 		O=3Dlo
 		A=3Dla
 		LIBTOOL_MKDEP_SED=3D's;\.o;\.lo;'
-		LIBTOOL_MODE_COMPILE=3D'--mode=3Dcompile'
-		LIBTOOL_MODE_INSTALL=3D'--mode=3Dinstall'
-		LIBTOOL_MODE_LINK=3D'--mode=3Dlink'
+		LIBTOOL_MODE_COMPILE=3D'--mode=3Dcompile --tag=3DCC'
+		LIBTOOL_MODE_INSTALL=3D'--mode=3Dinstall --tag=3DCC'
+		LIBTOOL_MODE_LINK=3D'--mode=3Dlink --tag=3DCC'
 		case "$host" in
 		*) LIBTOOL_ALLOW_UNDEFINED=3D ;;
 		esac
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/Makefile.in
--- a/head/contrib/bind9/doc/Makefile.in	Tue Apr 17 11:36:47 2012 +0300
+++ b/head/contrib/bind9/doc/Makefile.in	Tue Apr 17 11:51:51 2012 +0300
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
=20
-# $Id: Makefile.in,v 1.11 2007-06-19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.11 2007/06/19 23:47:13 tbox Exp $
=20
 # This Makefile is a placeholder.  It exists merely to make
 # sure that its directory gets created in the object directory
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/arm/Bv9ARM-book=
.xml
--- a/head/contrib/bind9/doc/arm/Bv9ARM-book.xml	Tue Apr 17 11:36:47 2012 +=
0300
+++ b/head/contrib/bind9/doc/arm/Bv9ARM-book.xml	Tue Apr 17 11:51:51 2012 +=
0300
@@ -2,7 +2,7 @@
               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "—">]>
 <!--
- - Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
=20
-<!-- File: $Id: Bv9ARM-book.xml,v 1.478.8.11 2011-08-02 04:58:46 each Exp =
$ -->
+<!-- File: $Id$ -->
 <book xmlns:xi=3D"http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
=20
@@ -32,6 +32,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2012</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -1462,6 +1463,31 @@
                   </varlistentry>
=20
                   <varlistentry>
+                    <term><userinput>tsig-list</userinput></term>
+                    <listitem>
+                      <para>
+                        List the names of all TSIG keys currently configur=
ed
+                        for use by <command>named</command> in each view. =
 The
+                        list both statically configured keys and dynamic
+                        TKEY-negotiated keys.
+                      </para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><userinput>tsig-delete</userinput>
+                     <replaceable>keyname</replaceable>
+                     <optional><replaceable>view</replaceable></optional><=
/term>
+                    <listitem>
+                      <para>
+                        Delete a given TKEY-negotated key from the server.
+                        (This does not apply to statically configured TSIG
+                        keys.)
+                      </para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
                     <term><userinput>addzone
                         <replaceable>zone</replaceable>
                         <optional><replaceable>class</replaceable>
@@ -1898,11 +1924,13 @@
       </para>
=20
       <para>
-        When acting as a slave, <acronym>BIND</acronym> 9 will
-        attempt to use IXFR unless
-        it is explicitly disabled. For more information about disabling
-        IXFR, see the description of the <command>request-ixfr</command> c=
lause
-        of the <command>server</command> statement.
+        When acting as a slave, <acronym>BIND</acronym> 9 will attempt
+        to use IXFR unless it is explicitly disabled via the
+        <command>request-ixfr</command> option or the use of
+        <command>ixfr-from-differences</command>.  For
+        more information about disabling IXFR, see the description
+        of the <command>request-ixfr</command> clause of the
+        <command>server</command> statement.
       </para>
     </sect1>
=20
@@ -4645,6 +4673,19 @@
 		    </para>
 		  </entry>
 		</row>
+                <row rowsep=3D"0">
+                  <entry colname=3D"1">
+                    <para><command>RPZ</command></para>
+                  </entry>
+		  <entry colname=3D"2">
+		    <para>
+		      Information about errors in response policy zone files,
+		      rewritten responses, and at the highest
+		      <command>debug</command> levels, mere rewriting
+		      attempts.
+		    </para>
+		  </entry>
+		</row>
 	      </tbody>
 	    </tgroup>
 	  </informaltable>
@@ -4993,6 +5034,10 @@
     <optional> cache-file <replaceable>path_name</replaceable>; </optional>
     <optional> dump-file <replaceable>path_name</replaceable>; </optional>
     <optional> bindkeys-file <replaceable>path_name</replaceable>; </optio=
nal>
+    <optional> secroots-file <replaceable>path_name</replaceable>; </optio=
nal>
+    <optional> session-keyfile <replaceable>path_name</replaceable>; </opt=
ional>
+    <optional> session-keyname <replaceable>key_name</replaceable>; </opti=
onal>
+    <optional> session-keyalg <replaceable>algorithm_id</replaceable>; </o=
ptional>
     <optional> memstatistics <replaceable>yes_or_no</replaceable>; </optio=
nal>
     <optional> memstatistics-file <replaceable>path_name</replaceable>; </=
optional>
     <optional> pid-file <replaceable>path_name</replaceable>; </optional>
@@ -5018,7 +5063,8 @@
     <optional> ixfr-from-differences (<replaceable>yes_or_no</replaceable>=
 | <constant>master</constant> | <constant>slave</constant>); </optional>
     <optional> dnssec-enable <replaceable>yes_or_no</replaceable>; </optio=
nal>
     <optional> dnssec-validation (<replaceable>yes_or_no</replaceable> | <=
constant>auto</constant>); </optional>
-    <optional> dnssec-lookaside ( <replaceable>auto</replaceable> |=20
+    <optional> dnssec-lookaside ( <replaceable>auto</replaceable> |
+			<replaceable>no</replaceable> |
                         <replaceable>domain</replaceable> trust-anchor <re=
placeable>domain</replaceable> ); </optional>
     <optional> dnssec-must-be-secure <replaceable>domain yes_or_no</replac=
eable>; </optional>
     <optional> dnssec-accept-expired <replaceable>yes_or_no</replaceable>;=
 </optional>
@@ -5166,7 +5212,7 @@
     <optional> resolver-query-timeout <replaceable>number</replaceable> ; =
</optional>
     <optional> deny-answer-addresses { <replaceable>address_match_list</re=
placeable> } <optional> except-from { <replaceable>namelist</replaceable> }=
 </optional>;</optional>
     <optional> deny-answer-aliases { <replaceable>namelist</replaceable> }=
 <optional> except-from { <replaceable>namelist</replaceable> } </optional>=
;</optional>
-    <optional> response-policy { <replaceable>zone_name</replaceable> <opt=
ional> policy <replaceable>given</replaceable> | <replaceable>no-op</replac=
eable> | <replaceable>nxdomain</replaceable> | <replaceable>nodata</replace=
able> | <replaceable>cname domain</replaceable> </optional> ; } ; </optiona=
l>
+    <optional> response-policy { <replaceable>zone_name</replaceable> <opt=
ional> policy given | disabled | passthru | nxdomain | nodata | cname <repl=
aceable>domain</replaceable> </optional> ; } ; </optional>
 };
 </programlisting>
=20
@@ -5516,7 +5562,8 @@
                 The pathname of the file the server dumps
                 security roots to when instructed to do so with
                 <command>rndc secroots</command>.
-                If not specified, the default is <filename>named.secroots<=
/filename>.
+                If not specified, the default is
+		<filename>named.secroots</filename>.
               </para>
             </listitem>
           </varlistentry>
@@ -5561,19 +5608,6 @@
           </varlistentry>
=20
           <varlistentry>
-            <term><command>session-keyfile</command></term>
-            <listitem>
-              <para>
-                The pathname of the file into which to write a session TSIG
-                key for use by <command>nsupdate -l</command>.  (See the
-                discussion of the <command>update-policy</command>
-                statement's <userinput>local</userinput> option for more
-                details on this feature.)
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
             <term><command>port</command></term>
             <listitem>
               <para>
@@ -5708,6 +5742,11 @@
 		values for the DLV domain and trust anchor will be
 		used, along with a built-in key for validation.
 	      </para>
+	      <para>
+		If <command>dnssec-lookaside</command> is set to
+		<userinput>no</userinput>, then dnssec-lookaside
+		is not used.
+	      </para>
               <para>
                 The default DLV key is stored in the file
                 <filename>bind.keys</filename>;
@@ -8590,7 +8629,7 @@
 		<para>
 		  Specify a private RDATA type to be used when generating
 		  key signing records.  The default is
-		  <literal>65535</literal>.
+		  <literal>65534</literal>.
 		</para>
 		<para>
 		  It is expected that this parameter may be removed
@@ -8853,10 +8892,11 @@
 	    and which queries should not be sent to the Internet's root
 	    servers.  The official servers which cover these namespaces
 	    return NXDOMAIN responses to these queries.  In particular,
-	    these cover the reverse namespace for addresses from RFC 1918 and
-	    RFC 3330.  They also include the reverse namespace for IPv6 local
-	    address (locally assigned), IPv6 link local addresses, the IPv6
-	    loopback address and the IPv6 unknown address.
+            these cover the reverse namespaces for addresses from
+            RFC 1918, RFC 4193, and RFC 5737.  They also include the
+            reverse namespace for IPv6 local address (locally assigned),
+            IPv6 link local addresses, the IPv6 loopback address and the
+            IPv6 unknown address.
 	  </para>
 	  <para>
 	    Named will attempt to determine if a built-in zone already exists
@@ -9227,141 +9267,228 @@
 	  <title>Response Policy Zone (RPZ) Rewriting</title>
 	  <para>
 	    <acronym>BIND</acronym> 9 includes an intentionally limited
-            mechanism to modify DNS responses for recursive requests
-            similar to email anti-spam DNS blacklists.
-            All response policy zones are named in the
-            <command>response-policy</command> option for the view or amon=
g the
-            global options if there is no response-policy option for the v=
iew.
-          </para>
-
-          <para>
-            The rules encoded in a response policy zone (RPZ) are applied
-            only to responses to queries that ask for recursion (RD=3D1).
-            RPZs are normal DNS zones containing RRsets
-            that can be queried normally if allowed.
-            It is usually best to restrict those queries with something li=
ke
-            <command>allow-query {none; };</command> or
-            <command>allow-query { 127.0.0.1; };</command>.
-          </para>
-
-          <para>
-            There are four kinds of RPZ rewrite rules.  QNAME rules are
-            applied to query names in requests and to targets of CNAME
-            records resolved in the process of generating the response.
-            The owner name of a QNAME rule is the query name relativized
-            to the RPZ.
-	    The records in a rewrite rule are usually A, AAAA, or special
-	    CNAMEs, but can be any type except DNAME.
-          </para>
-
-          <para>
-            IP rules are triggered by addresses in A and AAAA records.
-            All IP addresses in A or AAAA RRsets are tested and the rule
-            longest prefix is applied.  Ties between rules with equal pref=
ixes
-            are broken in favor of the first RPZ mentioned in the
-            response-policy option.
-            The rule matching the smallest IP address is chosen among equal
-            prefix rules from a single RPZ.
-            IP rules are expressed in RRsets with owner names that are
-            subdomains of rpz-ip and encoding an IP address block, reversed
-            as in IN-ARPA.
-            prefix.B.B.B.B with prefix between 1 and 32 and B between 1 an=
d 255
-            encodes an IPv4 address.
-            IPv6 addresses are encoded by with prefix.W.W.W.W.W.W.W.W or
-            prefix.WORDS.zz.WORDS.  The words in the standard IPv6 text
-            representation are reversed, "::" is replaced with ".zz.",
-            and ":" becomes ".".
-          </para>
-
-          <para>
-            NSDNAME rules match names in NS RRsets for the response or a
-            parent.  They are encoded as subdomains of rpz-nsdomain relati=
vized
-            to the RPZ origin name.
-          </para>
-
-          <para>
-            NSIP rules match IP addresses in A and AAAA RRsets for names of
-            responsible servers or the names that can be matched by NSDNAME
-            rules.  The are encoded like IP rules except as subdomains of
-            rpz-nsip.
-	  </para>
-
-	  <para>
-            Authority verification issues and variations in authority data=
 in
-	    the current version of <acronym>BIND</acronym> 9 can cause
-	    inconsistent results from NSIP and NSDNAME.  So they are available
+	    mechanism to modify DNS responses for recursive requests
+	    somewhat similar to email anti-spam DNS blacklists.
+	    Responses can be changed to deny the existence of domains(NXDOMAIN),
+	    deny the existence of IP addresses for domains (NODATA),
+	    or contain other IP addresses or data.
+	  </para>
+
+	  <para>
+	    The actions encoded in a response policy zone (RPZ) are applied
+	    only to queries that ask for recursion (RD=3D1).
+	    Response policy zones are named in the
+	    <command>response-policy</command> option for the view or among the
+	    global options if there is no response-policy option for the view.
+	    RPZs are ordinary DNS zones containing RRsets
+	    that can be queried normally if allowed.
+	    It is usually best to restrict those queries with something like
+	    <command>allow-query { localhost; };</command>.
+	  </para>
+
+	  <para>
+	    There are four kinds of RPZ records, QNAME, IP, NSIP,
+	    and NSDNAME.
+	    QNAME records are applied to query names of requests and targets
+	    of CNAME records resolved to generate the response.
+	    The owner name of a QNAME RPZ record is the query name relativized
+	    to the RPZ.
+	  </para>
+
+	  <para>
+	    The second kind of RPZ record, an IP policy record,
+	    is triggered by addresses in A and AAAA records
+	    for the ANSWER sections of responses.
+	    IP policy records have owner names that are
+	    subdomains of <userinput>rpz-ip</userinput> relativized to the
+	    RPZ origin name and encode an IP address or address block.
+	    IPv4 addresses are encoded as
+	    <userinput>prefixlength.B4.B3.B2.B1.rpz-ip</userinput>.
+	    The prefix length must be between 1 and 32.
+	    All four bytes, B4, B3, B2, and B1, must be present.
+	    B4 is the decimal value of the least significant byte of the
+	    IPv4 address as in IN-ADDR.ARPA.
+	    IPv6 addresses are encoded in a format similar to the standard
+	    IPv6 text representation,
+	    <userinput>prefixlength.W8.W7.W6.W5.W4.W3.W2.W1.rpz-ip</userinput>.
+	    Each of W8,...,W1 is a one to four digit hexadecimal number
+	    representing 16 bits of the IPv6 address as in the standard text
+	    representation of IPv6 addresses, but reversed as in IN-ADDR.ARPA.
+	    All 8 words must be present except when consecutive
+	    zero words are replaced with <userinput>.zz.</userinput>
+	    analogous to double colons (::) in standard IPv6 text encodings.
+	    The prefix length must be between 1 and 128.
+	  </para>
+
+	  <para>
+	    NSDNAME policy records match names of authoritative servers
+	    for the query name, a parent of the query name, a CNAME,
+	    or a parent of a CNAME.
+	    They are encoded as subdomains of
+	    <userinput>rpz-nsdomain</userinput> relativized
+	    to the RPZ origin name.
+	  </para>
+
+	  <para>
+	    NSIP policy records match IP addresses in A and AAAA RRsets
+	    for domains that can be checked against NSDNAME policy records.
+	    The are encoded like IP policies except as subdomains of
+	    <userinput>rpz-nsip</userinput>.
+	  </para>
+
+	  <para>
+	    The query response is checked against all RPZs, so
+	    two or more policy records can apply to a single response.
+	    Because DNS responses can be rewritten according by at most a
+	    single policy record, a single policy (other than
+	    <command>DISABLED</command> policies) must be chosen.
+	    Policies are chosen in the following order:
+	    <itemizedlist>
+	      <listitem>Among applicable zones, use the RPZ that appears first
+		in the response-policy option.
+	      </listitem>
+	      <listitem>Prefer QNAME to IP to NSDNAME to NSIP policy records
+		in a single RPZ
+	      </listitem>
+	      <listitem>Among applicable NSDNAME policy records, prefer the
+		policy record that matches the lexically smallest name
+	      </listitem>
+	      <listitem>Among IP or NSIP policy records, prefer the record
+		with the longest prefix.
+	      </listitem>
+	      <listitem>Among records with the same prefex length,
+		prefer the IP or NSIP policy record that matches
+		the smallest IP address.
+	      </listitem>
+	    </itemizedlist>
+	  </para>
+
+	  <para>
+	    When the processing of a response is restarted to resolve
+	    DNAME or CNAME records and an applicable policy record set has
+	    not been found,
+	    all RPZs are again consulted for the DNAME or CNAME names
+	    and addresses.
+	  </para>
+
+	  <para>
+	    Authority verification issues and variations in authority data
+	    can cause inconsistent results for NSIP and NSDNAME policy records.
+	    Glue NS records often differ from authoritative NS records.
+	    So they are available
 	    only when <acronym>BIND</acronym> is built with the
 	    <userinput>--enable-rpz-nsip</userinput> or
 	    <userinput>--enable-rpz-nsdname</userinput> options
-            on the "configure" command line.
-          </para>
-
-          <para>
-            Four policies can be expressed.
-            The <command>NXDOMAIN</command> policy causes a NXDOMAIN respo=
nse
-            and is expressed with an RRset consisting of a single CNAME
-            whose target is the root domain (.).
-            <command>NODATA</command> generates NODATA or ANCOUNT=3D1 rega=
rdless
-            of query type.
-            It is expressed with a CNAME whose target is the wildcard
-            top-level domain (*.).
-            The <command>NO-OP</command> policy does not change the respon=
se
-            and is used to "poke holes" in policies for larger CIDR blocks=
 or in
-            zones named later in the <command>response-policy</command> op=
tion.
-            The NO-OP policy is expressed by a CNAME with a target consist=
ing
-            of the variable part of the owner name, such as "example.com."=
 for
-            a QNAME rule or "128.1.0.0.127." for an IP rule.
-            The <command>CNAME</command> policy is used to replace the RRs=
ets
-            of response.
-            A and AAAA RRsets are most common and useful to capture
-            an evil domain in a walled garden, but any valid set of RRsets
-            is possible.
-          </para>
-
-          <para>
-            All of the policies in an RPZ can be overridden with a
-            <command>policy</command> clause.
-            <command>given</command> says "do not override."
-            <command>no-op</command> says "do nothing" regardless of the p=
olicy
-            in RPZ records.
-            <command>nxdomain</command> causes all RPZ rules to generate
-            NXDOMAIN results.
-            <command>nodata</command> gives nodata.
-            <command>cname domain</command> causes all RPZ rules to act as=
 if
-            the consisted of a "cname domain" record.
-          </para>
-
-          <para>
-            For example, you might use this option statement
-          </para>
-<programlisting>response-policy { zone "bl"; };</programlisting>
+	    on the "configure" command line.
+	  </para>
+
+	  <para>
+	    RPZ record sets are special CNAME records or one or more
+	    of any types of DNS record except DNAME or DNSSEC.
+	    Except when a policy record is a CNAME, there can be more
+	    more than one record and more than one type
+	    in a set of policy records.
+	    Except for three kinds of CNAME records that are illegal except
+	    in policy zones, the records in a set are used in the response as if
+	    their owner name were the query name.  They are copied to the
+	    response as dictated by their types.
+	    <itemizedlist>
+	      <listitem>A CNAME whose target is the root domain (.)
+		specifies the <command>NXDOMAIN</command> policy,
+		which generates an NXDOMAIN response.
+	      </listitem>
+	      <listitem>A CNAME whose target is the wildcard top-level
+		domain (*.) specifies the <command>NODATA</command> policy,
+		which rewrites the response to NODATA or ANCOUNT=3D1.
+	      </listitem>
+	      <listitem>A CNAME whose target is a wildcard hostname such
+		as *.example.com is used normally after the astrisk (*)
+		has been replaced with the query name.
+		These records are usually resolved with ordinary CNAMEs
+		outside the policy zones.  They can be useful for logging.
+	      </listitem>
+	      <listitem>The <command>PASSTHRU</command> policy is specified
+		by a CNAME whose target is the variable part of its own
+		owner name.  It causes the response to not be rewritten
+		and is most often used to "poke holes" in policies for
+		CIDR blocks.
+	      </listitem>
+	    </itemizedlist>
+	  </para>
+
+	  <para>
+	    The policies specified in individual records
+	    in an RPZ can be overridden with a <command>policy</command> clause
+	    in the <command>response-policy</command> option.
+	    An organization using an RPZ provided by another organization might
+	    use this mechanism to redirect domains to its own walled garden.
+	    <itemizedlist>
+	      <listitem><command>GIVEN</command> says "do not override."
+	      </listitem>
+	      <listitem><command>DISABLED</command> causes policy records to do
+		nothing but log what they might have done.
+		The response to the DNS query will be written according to
+		any matching policy records that are not disabled.
+		Policy zones overridden with <command>DISABLED</command> should
+		appear first, because they will often not be logged
+		if a higher precedence policy is found first.
+	      </listitem>
+	      <listitem><command>PASSTHRU</command> causes all policy records
+		to act as if they were CNAME records with targets the variable
+		part of their owner name.  They protect the response from
+		being changed.
+	      </listitem>
+	      <listitem><command>NXDOMAIN</command> causes all RPZ records
+		to specify NXDOMAIN policies.
+	      </listitem>
+	      <listitem><command>NODATA</command> overrides with the
+		NODATA policy
+	      </listitem>
+	      <listitem><command>CNAME domain</command> causes all RPZ
+		policy records to act as if they were "cname domain" records.
+	      </listitem>
+	    </itemizedlist>
+	  </para>
+
+	  <para>
+	    For example, you might use this option statement
+          </para>
+<programlisting>    response-policy { zone "badlist"; };</programlisting>
           <para>
             and this zone statement
           </para>
-<programlisting>zone "bl" {type master; file "example/bl"; allow-query {no=
ne;}; };</programlisting>
+<programlisting>    zone "badlist" {type master; file "master/badlist"; al=
low-query {none;}; };</programlisting>
           <para>
             with this zone file
           </para>
 <programlisting>$TTL 1H
-@                   SOA LOCALHOST. named-mgr.example.com (1 1h 15m 30d 2h)
-
-; QNAME rules
-nxdomain.domain.com         CNAME   .
-nodata.domain.com           CNAME   *.
-bad.domain.com              A       10.0.0.1
-                            AAAA    2001:2::1
-ok.domain.com               CNAME   ok.domain.com.
-*.badzone.domain.com	    CNAME   garden.example.com.
-
-; IP rules rewriting all answers for 127/8 except 127.0.0.1
-8.0.0.0.127.ip              CNAME   .
-32.1.0.0.127.ip             CNAME   32.1.0.0.127.
-
-; NSDNAME and NSIP rules
+@                       SOA LOCALHOST. named-mgr.example.com (1 1h 15m 30d=
 2h)
+                        NS  LOCALHOST.
+
+; QNAME policy records.  There are no periods (.) after the owner names.
+nxdomain.domain.com     CNAME   .               ; NXDOMAIN policy
+nodata.domain.com       CNAME   *.              ; NODATA policy
+bad.domain.com          A       10.0.0.1        ; redirect to a walled gar=
den
+                        AAAA    2001:2::1
+
+; do not rewrite (PASSTHRU) OK.DOMAIN.COM
+ok.domain.com           CNAME   ok.domain.com.
+
+bzone.domain.com        CNAME   garden.example.com.
+
+; redirect x.bzone.domain.com to x.bzone.domain.com.garden.example.com
+*.bzone.domain.com      CNAME   *.garden.example.com.
+
+
+; IP policy records that rewrite all answers for 127/8 except 127.0.0.1
+8.0.0.0.127.rpz-ip      CNAME   .
+32.1.0.0.127.rpz-ip     CNAME   32.1.0.0.127.   ; PASSTHRU for 127.0.0.1
+
+; NSDNAME and NSIP policy records
 ns.domain.com.rpz-nsdname   CNAME   .
 48.zz.2.2001.rpz-nsip       CNAME   .
 </programlisting>
-	</sect3>
+        </sect3>
       </sect2>
=20
       <sect2 id=3D"server_statement_grammar">
@@ -14725,9 +14852,8 @@
 // RFC1918 space and some reserved space, which is
 // commonly used in spoofing attacks.
 acl bogusnets {
-        0.0.0.0/8; 1.0.0.0/8; 2.0.0.0/8; 192.0.2.0/24;
-        224.0.0.0/3; 10.0.0.0/8; 172.16.0.0/12;
-        192.168.0.0/16;
+        0.0.0.0/8;  192.0.2.0/24; 224.0.0.0/3;
+        10.0.0.0/8; 172.16.0.0/12; 192.168.0.0/16;
 };
=20
 // Set up an ACL called our-nets. Replace this with the
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/arm/Bv9ARM.ch01=
.html
--- a/head/contrib/bind9/doc/arm/Bv9ARM.ch01.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/doc/arm/Bv9ARM.ch01.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch01.html,v 1.49.14.1 2011-06-22 02:37:19 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -45,17 +45,17 @@
 <div class=3D"toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564371">Scope of =
Document</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564394">Organizat=
ion of This Document</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564534">Conventio=
ns Used in This Document</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564715">The Domai=
n Name System (<acronym class=3D"acronym">DNS</acronym>)</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564375">Scope of =
Document</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564398">Organizat=
ion of This Document</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564538">Conventio=
ns Used in This Document</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch01.html#id2564720">The Domai=
n Name System (<acronym class=3D"acronym">DNS</acronym>)</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2564737">DNS Funda=
mentals</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2564771">Domains a=
nd Domain Names</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567176">Zones</a>=
</span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567253">Authorita=
tive Name Servers</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567426">Caching N=
ame Servers</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567556">Name Serv=
ers in Multiple Roles</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2564741">DNS Funda=
mentals</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2564775">Domains a=
nd Domain Names</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567180">Zones</a>=
</span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567257">Authorita=
tive Name Servers</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567430">Caching N=
ame Servers</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch01.html#id2567560">Name Serv=
ers in Multiple Roles</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -71,7 +71,7 @@
     </p>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2564371"></a>Scope of Document</h2></div></div></div>
+<a name=3D"id2564375"></a>Scope of Document</h2></div></div></div>
 <p>
         The Berkeley Internet Name Domain
         (<acronym class=3D"acronym">BIND</acronym>) implements a
@@ -87,7 +87,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2564394"></a>Organization of This Document</h2></div></div></=
div>
+<a name=3D"id2564398"></a>Organization of This Document</h2></div></div></=
div>
 <p>
         In this document, <span class=3D"emphasis"><em>Chapter 1</em></spa=
n> introduces
         the basic <acronym class=3D"acronym">DNS</acronym> and <acronym cl=
ass=3D"acronym">BIND</acronym> concepts. <span class=3D"emphasis"><em>Chapt=
er 2</em></span>
@@ -116,7 +116,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2564534"></a>Conventions Used in This Document</h2></div></di=
v></div>
+<a name=3D"id2564538"></a>Conventions Used in This Document</h2></div></di=
v></div>
 <p>
         In this document, we use the following general typographic
         conventions:
@@ -243,7 +243,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2564715"></a>The Domain Name System (<acronym class=3D"acrony=
m">DNS</acronym>)</h2></div></div></div>
+<a name=3D"id2564720"></a>The Domain Name System (<acronym class=3D"acrony=
m">DNS</acronym>)</h2></div></div></div>
 <p>
         The purpose of this document is to explain the installation
         and upkeep of the <acronym class=3D"acronym">BIND</acronym> (Berke=
ley Internet
@@ -253,7 +253,7 @@
       </p>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2564737"></a>DNS Fundamentals</h3></div></div></div>
+<a name=3D"id2564741"></a>DNS Fundamentals</h3></div></div></div>
 <p>
           The Domain Name System (DNS) is a hierarchical, distributed
           database.  It stores information for mapping Internet host names=
 to
@@ -275,7 +275,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2564771"></a>Domains and Domain Names</h3></div></div></div>
+<a name=3D"id2564775"></a>Domains and Domain Names</h3></div></div></div>
 <p>
           The data stored in the DNS is identified by <span class=3D"empha=
sis"><em>domain names</em></span> that are organized as a tree according to
           organizational or administrative boundaries. Each node of the tr=
ee,
@@ -321,7 +321,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567176"></a>Zones</h3></div></div></div>
+<a name=3D"id2567180"></a>Zones</h3></div></div></div>
 <p>
           To properly operate a name server, it is important to understand
           the difference between a <span class=3D"emphasis"><em>zone</em><=
/span>
@@ -374,7 +374,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567253"></a>Authoritative Name Servers</h3></div></div></div>
+<a name=3D"id2567257"></a>Authoritative Name Servers</h3></div></div></div>
 <p>
           Each zone is served by at least
           one <span class=3D"emphasis"><em>authoritative name server</em><=
/span>,
@@ -391,7 +391,7 @@
         </p>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2567276"></a>The Primary Master</h4></div></div></div>
+<a name=3D"id2567281"></a>The Primary Master</h4></div></div></div>
 <p>
             The authoritative server where the master copy of the zone
             data is maintained is called the
@@ -411,7 +411,7 @@
 </div>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2567374"></a>Slave Servers</h4></div></div></div>
+<a name=3D"id2567379"></a>Slave Servers</h4></div></div></div>
 <p>
             The other authoritative servers, the <span class=3D"emphasis">=
<em>slave</em></span>
             servers (also known as <span class=3D"emphasis"><em>secondary<=
/em></span> servers)
@@ -427,7 +427,7 @@
 </div>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2567396"></a>Stealth Servers</h4></div></div></div>
+<a name=3D"id2567400"></a>Stealth Servers</h4></div></div></div>
 <p>
             Usually all of the zone's authoritative servers are listed in
             NS records in the parent zone.  These NS records constitute
@@ -462,7 +462,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567426"></a>Caching Name Servers</h3></div></div></div>
+<a name=3D"id2567430"></a>Caching Name Servers</h3></div></div></div>
 <p>
           The resolver libraries provided by most operating systems are
           <span class=3D"emphasis"><em>stub resolvers</em></span>, meaning=
 that they are not
@@ -489,7 +489,7 @@
         </p>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2567529"></a>Forwarding</h4></div></div></div>
+<a name=3D"id2567533"></a>Forwarding</h4></div></div></div>
 <p>
             Even a caching name server does not necessarily perform
             the complete recursive lookup itself.  Instead, it can
@@ -516,7 +516,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567556"></a>Name Servers in Multiple Roles</h3></div></div><=
/div>
+<a name=3D"id2567560"></a>Name Servers in Multiple Roles</h3></div></div><=
/div>
 <p>
           The <acronym class=3D"acronym">BIND</acronym> name server can
           simultaneously act as
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/arm/Bv9ARM.ch02=
.html
--- a/head/contrib/bind9/doc/arm/Bv9ARM.ch02.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/doc/arm/Bv9ARM.ch02.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch02.html,v 1.43 2011-01-05 01:14:07 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -45,16 +45,16 @@
 <div class=3D"toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567590">Hardware =
requirements</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567617">CPU Requi=
rements</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567629">Memory Re=
quirements</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567724">Name Serv=
er Intensive Environment Issues</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567735">Supported=
 Operating Systems</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567594">Hardware =
requirements</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567621">CPU Requi=
rements</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567634">Memory Re=
quirements</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567729">Name Serv=
er Intensive Environment Issues</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch02.html#id2567739">Supported=
 Operating Systems</a></span></dt>
 </dl>
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2567590"></a>Hardware requirements</h2></div></div></div>
+<a name=3D"id2567594"></a>Hardware requirements</h2></div></div></div>
 <p>
         <acronym class=3D"acronym">DNS</acronym> hardware requirements have
         traditionally been quite modest.
@@ -73,7 +73,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2567617"></a>CPU Requirements</h2></div></div></div>
+<a name=3D"id2567621"></a>CPU Requirements</h2></div></div></div>
 <p>
         CPU requirements for <acronym class=3D"acronym">BIND</acronym> 9 r=
ange from
         i486-class machines
@@ -84,7 +84,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2567629"></a>Memory Requirements</h2></div></div></div>
+<a name=3D"id2567634"></a>Memory Requirements</h2></div></div></div>
 <p>
         The memory of the server has to be large enough to fit the
         cache and zones loaded off disk.  The <span><strong class=3D"comma=
nd">max-cache-size</strong></span>
@@ -107,7 +107,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2567724"></a>Name Server Intensive Environment Issues</h2></d=
iv></div></div>
+<a name=3D"id2567729"></a>Name Server Intensive Environment Issues</h2></d=
iv></div></div>
 <p>
         For name server intensive environments, there are two alternative
         configurations that may be used. The first is where clients and
@@ -124,7 +124,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2567735"></a>Supported Operating Systems</h2></div></div></di=
v>
+<a name=3D"id2567739"></a>Supported Operating Systems</h2></div></div></di=
v>
 <p>
         ISC <acronym class=3D"acronym">BIND</acronym> 9 compiles and runs =
on a large
         number
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/arm/Bv9ARM.ch03=
.html
--- a/head/contrib/bind9/doc/arm/Bv9ARM.ch03.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/doc/arm/Bv9ARM.ch03.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch03.html,v 1.83.8.1 2011-05-24 02:37:17 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -47,14 +47,14 @@
 <dl>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch03.html#sample_configuration=
">Sample Configurations</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2567767">A Caching=
-only Name Server</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2567988">An Author=
itative-only Name Server</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2567771">A Caching=
-only Name Server</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2567992">An Author=
itative-only Name Server</a></span></dt>
 </dl></dd>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch03.html#id2568010">Load Bala=
ncing</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch03.html#id2568364">Name Serv=
er Operations</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch03.html#id2568014">Load Bala=
ncing</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch03.html#id2568369">Name Serv=
er Operations</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2568370">Tools for=
 Use With the Name Server Daemon</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2570378">Signals</=
a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2568374">Tools for=
 Use With the Name Server Daemon</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch03.html#id2570421">Signals</=
a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -68,7 +68,7 @@
 <a name=3D"sample_configuration"></a>Sample Configurations</h2></div></div=
></div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567767"></a>A Caching-only Name Server</h3></div></div></div>
+<a name=3D"id2567771"></a>A Caching-only Name Server</h3></div></div></div>
 <p>
           The following sample configuration is appropriate for a caching-=
only
           name server for use by clients internal to a corporation.  All
@@ -98,7 +98,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2567988"></a>An Authoritative-only Name Server</h3></div></di=
v></div>
+<a name=3D"id2567992"></a>An Authoritative-only Name Server</h3></div></di=
v></div>
 <p>
           This sample configuration is for an authoritative-only server
           that is the master server for "<code class=3D"filename">example.=
com</code>"
@@ -146,7 +146,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2568010"></a>Load Balancing</h2></div></div></div>
+<a name=3D"id2568014"></a>Load Balancing</h2></div></div></div>
 <p>
         A primitive form of load balancing can be achieved in
         the <acronym class=3D"acronym">DNS</acronym> by using multiple rec=
ords
@@ -289,10 +289,10 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2568364"></a>Name Server Operations</h2></div></div></div>
+<a name=3D"id2568369"></a>Name Server Operations</h2></div></div></div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2568370"></a>Tools for Use With the Name Server Daemon</h3></=
div></div></div>
+<a name=3D"id2568374"></a>Tools for Use With the Name Server Daemon</h3></=
div></div></div>
 <p>
           This section describes several indispensable diagnostic,
           administrative and monitoring tools available to the system
@@ -670,6 +670,21 @@
                         set to <strong class=3D"userinput"><code>yes</code=
></strong> to be effective.
                         It defaults to enabled.
                       </p></dd>
+<dt><span class=3D"term"><strong class=3D"userinput"><code>tsig-list</code=
></strong></span></dt>
+<dd><p>
+                        List the names of all TSIG keys currently configur=
ed
+                        for use by <span><strong class=3D"command">named</=
strong></span> in each view.  The
+                        list both statically configured keys and dynamic
+                        TKEY-negotiated keys.
+                      </p></dd>
+<dt><span class=3D"term"><strong class=3D"userinput"><code>tsig-delete</co=
de></strong>
+                     <em class=3D"replaceable"><code>keyname</code></em>
+                     [<span class=3D"optional"><em class=3D"replaceable"><=
code>view</code></em></span>]</span></dt>
+<dd><p>
+                        Delete a given TKEY-negotated key from the server.
+                        (This does not apply to statically configured TSIG
+                        keys.)
+                      </p></dd>
 <dt><span class=3D"term"><strong class=3D"userinput"><code>addzone
                         <em class=3D"replaceable"><code>zone</code></em>
                         [<span class=3D"optional"><em class=3D"replaceable=
"><code>class</code></em>
@@ -873,7 +888,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2570378"></a>Signals</h3></div></div></div>
+<a name=3D"id2570421"></a>Signals</h3></div></div></div>
 <p>
           Certain UNIX signals cause the name server to take specific
           actions, as described in the following table.  These signals can
diff -r 428842767fa6 -r f2935497fa04 head/contrib/bind9/doc/arm/Bv9ARM.ch04=
.html
--- a/head/contrib/bind9/doc/arm/Bv9ARM.ch04.html	Tue Apr 17 11:36:47 2012 =
+0300
+++ b/head/contrib/bind9/doc/arm/Bv9ARM.ch04.html	Tue Apr 17 11:51:51 2012 =
+0300
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  -=20
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE =
OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch04.html,v 1.125.8.9 2011-08-03 02:35:12 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-8859=
-1">
@@ -49,59 +49,59 @@
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#dynamic_update">Dyna=
mic Update</a></span></dt>
 <dd><dl><dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#journal">The=
 journal file</a></span></dt></dl></dd>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#incremental_zone_tra=
nsfers">Incremental Zone Transfers (IXFR)</a></span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2570885">Split DNS=
</a></span></dt>
-<dd><dl><dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2570903">E=
xample split DNS setup</a></span></dt></dl></dd>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2570934">Split DNS=
</a></span></dt>
+<dd><dl><dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2570952">E=
xample split DNS setup</a></span></dt></dl></dd>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#tsig">TSIG</a></span=
></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571336">Generate =
Shared Keys for Each Pair of Hosts</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571478">Copying t=
he Shared Secret to Both Machines</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571489">Informing=
 the Servers of the Key's Existence</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571525">Instructi=
ng the Server to Use the Key</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571651">TSIG Key =
Based Access Control</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571700">Errors</a=
></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2564012">Generate =
Shared Keys for Each Pair of Hosts</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2564086">Copying t=
he Shared Secret to Both Machines</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571811">Informing=
 the Servers of the Key's Existence</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571847">Instructi=
ng the Server to Use the Key</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571905">TSIG Key =
Based Access Control</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571954">Errors</a=
></span></dt>
 </dl></dd>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2571714">TKEY</a><=
/span></dt>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2563980">SIG(0)</a=
></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2571968">TKEY</a><=
/span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2572153">SIG(0)</a=
></span></dt>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#DNSSEC">DNSSEC</a></=
span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2564117">Generatin=
g Keys</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572183">Signing t=
he Zone</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572264">Configuri=
ng Servers</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572221">Generatin=
g Keys</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572300">Signing t=
he Zone</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572381">Configuri=
ng Servers</a></span></dt>
 </dl></dd>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#dnssec.dynamic.zones=
">DNSSEC, Dynamic Zones, and Automatic Signing</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563484">Convertin=
g from insecure to secure</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563522">Dynamic D=
NS update method</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563626">Fully aut=
omatic zone signing</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563777">Private-t=
ype records</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563814">DNSKEY ro=
llovers</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563827">Dynamic D=
NS update method</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563860">Automatic=
 key rollovers</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563886">NSEC3PARA=
M rollovers via UPDATE</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563896">Convertin=
g from NSEC to NSEC3</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563906">Convertin=
g from NSEC3 to NSEC</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563918">Convertin=
g from secure to insecure</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563956">Periodic =
re-signing</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571816">NSEC3 and=
 OPTOUT</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571421">Convertin=
g from insecure to secure</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571459">Dynamic D=
NS update method</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563508">Fully aut=
omatic zone signing</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563590">Private-t=
ype records</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563696">DNSKEY ro=
llovers</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563708">Dynamic D=
NS update method</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563741">Automatic=
 key rollovers</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563836">NSEC3PARA=
M rollovers via UPDATE</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563846">Convertin=
g from NSEC to NSEC3</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563856">Convertin=
g from NSEC3 to NSEC</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563868">Convertin=
g from secure to insecure</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563906">Periodic =
re-signing</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2563915">NSEC3 and=
 OPTOUT</a></span></dt>
 </dl></dd>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#rfc5011.support">Dyn=
amic Trust Anchor Management</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571869">Validatin=
g Resolver</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571892">Authorita=
tive Server</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571685">Validatin=
g Resolver</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2571707">Authorita=
tive Server</a></span></dt>
 </dl></dd>
 <dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#pkcs11">PKCS #11 (Cr=
yptoki) support</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2609757">Prerequis=
ites</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2607912">Building =
BIND 9 with PKCS#11</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2608144">PKCS #11 =
Tools</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2608174">Using the=
 HSM</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2610353">Specifyin=
g the engine on the command line</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2610467">Running n=
amed with automatic zone re-signing</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2609970">Prerequis=
ites</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2608219">Building =
BIND 9 with PKCS#11</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2610529">PKCS #11 =
Tools</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2610560">Using the=
 HSM</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2635129">Specifyin=
g the engine on the command line</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2635243">Running n=
amed with automatic zone re-signing</a></span></dt>
 </dl></dd>
-<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2572484">IPv6 Supp=
ort in <acronym class=3D"acronym">BIND</acronym> 9</a></span></dt>
+<dt><span class=3D"sect1"><a href=3D"Bv9ARM.ch04.html#id2572669">IPv6 Supp=
ort in <acronym class=3D"acronym">BIND</acronym> 9</a></span></dt>
 <dd><dl>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572819">Address L=
ookups Using AAAA Records</a></span></dt>
-<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572840">Address t=
o Name Lookups Using Nibble Format</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572868">Address L=
ookups Using AAAA Records</a></span></dt>
+<dt><span class=3D"sect2"><a href=3D"Bv9ARM.ch04.html#id2572889">Address t=
o Name Lookups Using Nibble Format</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -247,16 +247,18 @@
         to <strong class=3D"userinput"><code>yes</code></strong>.
       </p>
 <p>
-        When acting as a slave, <acronym class=3D"acronym">BIND</acronym> =
9 will
-        attempt to use IXFR unless
-        it is explicitly disabled. For more information about disabling
-        IXFR, see the description of the <span><strong class=3D"command">r=
equest-ixfr</strong></span> clause
-        of the <span><strong class=3D"command">server</strong></span> stat=
ement.
+        When acting as a slave, <acronym class=3D"acronym">BIND</acronym> =
9 will attempt
+        to use IXFR unless it is explicitly disabled via the
+        <span><strong class=3D"command">request-ixfr</strong></span> optio=
n or the use of
+        <span><strong class=3D"command">ixfr-from-differences</strong></sp=
an>.  For
+        more information about disabling IXFR, see the description
+        of the <span><strong class=3D"command">request-ixfr</strong></span=
> clause of the
+        <span><strong class=3D"command">server</strong></span> statement.
       </p>
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2570885"></a>Split DNS</h2></div></div></div>
+<a name=3D"id2570934"></a>Split DNS</h2></div></div></div>
 <p>
         Setting up different views, or visibility, of the DNS space to
         internal and external resolvers is usually referred to as a
@@ -286,7 +288,7 @@
       </p>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2570903"></a>Example split DNS setup</h3></div></div></div>
+<a name=3D"id2570952"></a>Example split DNS setup</h3></div></div></div>
 <p>
         Let's say a company named <span class=3D"emphasis"><em>Example, In=
c.</em></span>
         (<code class=3D"literal">example.com</code>)
@@ -543,7 +545,7 @@
       </p>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571336"></a>Generate Shared Keys for Each Pair of Hosts</h3>=
</div></div></div>
+<a name=3D"id2564012"></a>Generate Shared Keys for Each Pair of Hosts</h3>=
</div></div></div>
 <p>
           A shared secret is generated to be shared between <span class=3D=
"emphasis"><em>host1</em></span> and <span class=3D"emphasis"><em>host2</em=
></span>.
           An arbitrary key name is chosen: "host1-host2.". The key name mu=
st
@@ -551,7 +553,7 @@
         </p>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2571353"></a>Automatic Generation</h4></div></div></div>
+<a name=3D"id2564029"></a>Automatic Generation</h4></div></div></div>
 <p>
             The following command will generate a 128-bit (16 byte) HMAC-S=
HA256
             key as described above. Longer keys are better, but shorter ke=
ys
@@ -575,7 +577,7 @@
 </div>
 <div class=3D"sect3" lang=3D"en">
 <div class=3D"titlepage"><div><div><h4 class=3D"title">
-<a name=3D"id2571392"></a>Manual Generation</h4></div></div></div>
+<a name=3D"id2564068"></a>Manual Generation</h4></div></div></div>
 <p>
             The shared secret is simply a random sequence of bits, encoded
             in base-64. Most ASCII strings are valid base-64 strings (assu=
ming
@@ -590,7 +592,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571478"></a>Copying the Shared Secret to Both Machines</h3><=
/div></div></div>
+<a name=3D"id2564086"></a>Copying the Shared Secret to Both Machines</h3><=
/div></div></div>
 <p>
           This is beyond the scope of DNS. A secure transport mechanism
           should be used. This could be secure FTP, ssh, telephone, etc.
@@ -598,7 +600,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571489"></a>Informing the Servers of the Key's Existence</h3=
></div></div></div>
+<a name=3D"id2571811"></a>Informing the Servers of the Key's Existence</h3=
></div></div></div>
 <p>
           Imagine <span class=3D"emphasis"><em>host1</em></span> and <span=
 class=3D"emphasis"><em>host 2</em></span>
           are
@@ -625,7 +627,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571525"></a>Instructing the Server to Use the Key</h3></div>=
</div></div>
+<a name=3D"id2571847"></a>Instructing the Server to Use the Key</h3></div>=
</div></div>
 <p>
           Since keys are shared between two hosts only, the server must
           be told when keys are to be used. The following is added to the =
<code class=3D"filename">named.conf</code> file
@@ -657,7 +659,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571651"></a>TSIG Key Based Access Control</h3></div></div></=
div>
+<a name=3D"id2571905"></a>TSIG Key Based Access Control</h3></div></div></=
div>
 <p>
           <acronym class=3D"acronym">BIND</acronym> allows IP addresses an=
d ranges
           to be specified in ACL
@@ -684,7 +686,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2571700"></a>Errors</h3></div></div></div>
+<a name=3D"id2571954"></a>Errors</h3></div></div></div>
 <p>
           The processing of TSIG signed messages can result in
           several errors. If a signed message is sent to a non-TSIG aware
@@ -710,7 +712,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2571714"></a>TKEY</h2></div></div></div>
+<a name=3D"id2571968"></a>TKEY</h2></div></div></div>
 <p><span><strong class=3D"command">TKEY</strong></span>
         is a mechanism for automatically generating a shared secret
         between two hosts.  There are several "modes" of
@@ -746,7 +748,7 @@
 </div>
 <div class=3D"sect1" lang=3D"en">
 <div class=3D"titlepage"><div><div><h2 class=3D"title" style=3D"clear: bot=
h">
-<a name=3D"id2563980"></a>SIG(0)</h2></div></div></div>
+<a name=3D"id2572153"></a>SIG(0)</h2></div></div></div>
 <p>
         <acronym class=3D"acronym">BIND</acronym> 9 partially supports DNS=
SEC SIG(0)
             transaction signatures as specified in RFC 2535 and RFC 2931.
@@ -807,7 +809,7 @@
       </p>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2564117"></a>Generating Keys</h3></div></div></div>
+<a name=3D"id2572221"></a>Generating Keys</h3></div></div></div>
 <p>
           The <span><strong class=3D"command">dnssec-keygen</strong></span=
> program is used to
           generate keys.
@@ -863,7 +865,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2572183"></a>Signing the Zone</h3></div></div></div>
+<a name=3D"id2572300"></a>Signing the Zone</h3></div></div></div>
 <p>
           The <span><strong class=3D"command">dnssec-signzone</strong></sp=
an> program is used
           to sign a zone.
@@ -905,7 +907,7 @@
 </div>
 <div class=3D"sect2" lang=3D"en">
 <div class=3D"titlepage"><div><div><h3 class=3D"title">
-<a name=3D"id2572264"></a>Configuring Servers</h3></div></div></div>
+<a name=3D"id2572381"></a>Configuring Servers</h3></div></div></div>
 <p>
           To enable <span><strong class=3D"command">named</strong></span> =
to respond appropriately
           to DNS requests from DNSSEC aware clients,
@@ -1065,7 +1067,7 @@
   from insecure to signed and back again. A secure zone can use
   either NSEC or NSEC3 chains.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563484"></a>Converting from insecure to secure</h3></div></d=
iv></div></div>
+<a name=3D"id2571421"></a>Converting from insecure to secure</h3></div></d=
iv></div></div>
 <p>Changing a zone from insecure to secure can be done in two
   ways: using a dynamic DNS update, or the=20
   <span><strong class=3D"command">auto-dnssec</strong></span> zone option.=
</p>
@@ -1091,7 +1093,7 @@
   well. An NSEC chain will be generated as part of the initial
   signing process.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563522"></a>Dynamic DNS update method</h3></div></div></div>=
</div>
+<a name=3D"id2571459"></a>Dynamic DNS update method</h3></div></div></div>=
</div>
 <p>To insert the keys via dynamic update:</p>
 <pre class=3D"screen">
         % nsupdate
@@ -1127,7 +1129,7 @@
 <p>While the initial signing and NSEC/NSEC3 chain generation
   is happening, other updates are possible as well.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563626"></a>Fully automatic zone signing</h3></div></div></d=
iv></div>
+<a name=3D"id2563508"></a>Fully automatic zone signing</h3></div></div></d=
iv></div>
 <p>To enable automatic signing, add the=20
   <span><strong class=3D"command">auto-dnssec</strong></span> option to th=
e zone statement in=20
   <code class=3D"filename">named.conf</code>.=20
@@ -1162,7 +1164,7 @@
   configuration. If this has not been done, the configuration will
   fail.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563777"></a>Private-type records</h3></div></div></div></div>
+<a name=3D"id2563590"></a>Private-type records</h3></div></div></div></div>
 <p>The state of the signing process is signaled by
   private-type records (with a default type value of 65534). When
   signing is complete, these records will have a nonzero value for
@@ -1203,12 +1205,12 @@
 <p>
   </p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563814"></a>DNSKEY rollovers</h3></div></div></div></div>
+<a name=3D"id2563696"></a>DNSKEY rollovers</h3></div></div></div></div>
 <p>As with insecure-to-secure conversions, rolling DNSSEC
   keys can be done in two ways: using a dynamic DNS update, or the=20
   <span><strong class=3D"command">auto-dnssec</strong></span> zone option.=
</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563827"></a>Dynamic DNS update method</h3></div></div></div>=
</div>
+<a name=3D"id2563708"></a>Dynamic DNS update method</h3></div></div></div>=
</div>
 <p> To perform key rollovers via dynamic update, you need to add
   the <code class=3D"filename">K*</code> files for the new keys so that=20
   <span><strong class=3D"command">named</strong></span> can find them. You=
 can then add the new
@@ -1230,7 +1232,7 @@
   <span><strong class=3D"command">named</strong></span> will clean out any=
 signatures generated
   by the old key after the update completes.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563860"></a>Automatic key rollovers</h3></div></div></div></=
div>
+<a name=3D"id2563741"></a>Automatic key rollovers</h3></div></div></div></=
div>
 <p>When a new key reaches its activation date (as set by
   <span><strong class=3D"command">dnssec-keygen</strong></span> or <span><=
strong class=3D"command">dnssec-settime</strong></span>),
   if the <span><strong class=3D"command">auto-dnssec</strong></span> zone =
option is set to=20
@@ -1245,27 +1247,27 @@
   completes in 30 days, after which it will be safe to remove the
   old key from the DNSKEY RRset.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563886"></a>NSEC3PARAM rollovers via UPDATE</h3></div></div>=
</div></div>
+<a name=3D"id2563836"></a>NSEC3PARAM rollovers via UPDATE</h3></div></div>=
</div></div>
 <p>Add the new NSEC3PARAM record via dynamic update. When the
   new NSEC3 chain has been generated, the NSEC3PARAM flag field
   will be zero. At this point you can remove the old NSEC3PARAM
   record. The old chain will be removed after the update request
   completes.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563896"></a>Converting from NSEC to NSEC3</h3></div></div></=
div></div>
+<a name=3D"id2563846"></a>Converting from NSEC to NSEC3</h3></div></div></=
div></div>
 <p>To do this, you just need to add an NSEC3PARAM record. When
   the conversion is complete, the NSEC chain will have been removed
   and the NSEC3PARAM record will have a zero flag field. The NSEC3
   chain will be generated before the NSEC chain is
   destroyed.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563906"></a>Converting from NSEC3 to NSEC</h3></div></div></=
div></div>
+<a name=3D"id2563856"></a>Converting from NSEC3 to NSEC</h3></div></div></=
div></div>
 <p>To do this, use <span><strong class=3D"command">nsupdate</strong></span=
> to
   remove all NSEC3PARAM records with a zero flag
   field. The NSEC chain will be generated before the NSEC3 chain is
   removed.</p>
 <div class=3D"sect2" lang=3D"en"><div class=3D"titlepage"><div><div><h3 cl=
ass=3D"title">
-<a name=3D"id2563918"></a>Converting from secure to insecure</h3></div>