PERFORCE change 62362 for review
Peter Wemm
peter at FreeBSD.org
Tue Sep 28 16:12:53 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=62362
Change 62362 by peter at peter_daintree on 2004/09/28 23:11:52
IFC @62361
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#61 integrate
.. //depot/projects/hammer/UPDATING#57 integrate
.. //depot/projects/hammer/bin/mkdir/mkdir.c#4 integrate
.. //depot/projects/hammer/bin/sh/exec.c#5 integrate
.. //depot/projects/hammer/bin/sh/var.c#6 integrate
.. //depot/projects/hammer/contrib/bind/CHANGES#6 delete
.. //depot/projects/hammer/contrib/bind/DNSSEC#2 delete
.. //depot/projects/hammer/contrib/bind/FREEBSD-Upgrade#3 delete
.. //depot/projects/hammer/contrib/bind/FREEBSD-Xlist#2 delete
.. //depot/projects/hammer/contrib/bind/INSTALL#2 delete
.. //depot/projects/hammer/contrib/bind/LICENSE#2 delete
.. //depot/projects/hammer/contrib/bind/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/README#5 delete
.. //depot/projects/hammer/contrib/bind/SUPPORT#2 delete
.. //depot/projects/hammer/contrib/bind/TODO#2 delete
.. //depot/projects/hammer/contrib/bind/Version#5 delete
.. //depot/projects/hammer/contrib/bind/bin/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/addr/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/addr/addr.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/dig/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/dig/dig.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/dnskeygen/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/dnskeygen/dnskeygen.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/dnsquery/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/dnsquery/dnsquery.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/host/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/host/host.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/irpd/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/irpd/irpd.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/irpd/irs-irpd.conf#2 delete
.. //depot/projects/hammer/contrib/bind/bin/irpd/version.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/mkservdb/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/mkservdb/mkservdb.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-bootconf/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-bootconf/named-bootconf.sh#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-bootconf/test.boot#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-xfer/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named-xfer/named-xfer.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_defs.h#5 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_dump.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_func.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_glob.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_glue.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_ixfr.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_load.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_lookup.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_save.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_sec.c#5 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_tsig.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/db_update.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/named.conf#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/named.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_config.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_ctl.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_defs.h#5 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_forw.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_func.h#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_glob.h#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_glue.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_init.c#4 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_ixfr.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_lexer.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_lexer.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_main.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_maint.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_ncache.c#5 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_notify.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_parser.y#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_parseutil.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_parseutil.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_req.c#5 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#6 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_signal.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_sort.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_stats.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_udp.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_update.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/named/ns_xfr.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/pathtemplate.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/test/127.0.0.zone#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/test/localhost.zone#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/test/named.conf#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/test/root.hint#2 delete
.. //depot/projects/hammer/contrib/bind/bin/named/version.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/ndc/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/ndc/ndc.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/commands.l#3 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/debug.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/getinfo.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/list.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/main.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/nslookup.help#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/pathnames.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/res.h#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/send.c#3 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/skip.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nslookup/subr.c#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nsupdate/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/bin/nsupdate/nsupdate.c#3 delete
.. //depot/projects/hammer/contrib/bind/doc/html/acl.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/address_list.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/comments.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/config.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/controls.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/docdef.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/example.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/include.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/index.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/key.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/logging.html#3 delete
.. //depot/projects/hammer/contrib/bind/doc/html/master.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/options.html#4 delete
.. //depot/projects/hammer/contrib/bind/doc/html/server.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/trusted-keys.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/html/zone.html#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/dig.1#3 delete
.. //depot/projects/hammer/contrib/bind/doc/man/dnskeygen.1#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/dnsquery.1#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/getaddrinfo.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/gethostbyname.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/getipnodebyname.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/getnameinfo.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/getnetent.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/hesiod.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/host.1#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/hostname.7#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/inet_cidr.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/irs.conf.5#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/mailaddr.7#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/mkdep.1#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/named-bootconf.8#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/named-xfer.8#3 delete
.. //depot/projects/hammer/contrib/bind/doc/man/named.8#3 delete
.. //depot/projects/hammer/contrib/bind/doc/man/named.conf.5#4 delete
.. //depot/projects/hammer/contrib/bind/doc/man/ndc.8#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/nslookup.8#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/nsupdate.8#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/resolver.3#4 delete
.. //depot/projects/hammer/contrib/bind/doc/man/resolver.5#2 delete
.. //depot/projects/hammer/contrib/bind/doc/man/tsig.3#2 delete
.. //depot/projects/hammer/contrib/bind/doc/misc/DynamicUpdate#2 delete
.. //depot/projects/hammer/contrib/bind/doc/misc/FAQ.1of2#2 delete
.. //depot/projects/hammer/contrib/bind/doc/misc/FAQ.2of2#2 delete
.. //depot/projects/hammer/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete
.. //depot/projects/hammer/contrib/bind/doc/misc/style.txt#2 delete
.. //depot/projects/hammer/contrib/bind/include/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/include/arpa/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/include/arpa/inet.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/arpa/nameser.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/arpa/nameser_compat.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/fd_setsize.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/hesiod.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/irp.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/irs.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/include/isc/assertions.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/isc/ctl.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/dst.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/eventlib.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/heap.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/isc/irpmarshall.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/list.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/isc/logging.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/memcluster.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/isc/misc.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/isc/tree.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/netdb.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/netgroup.h#3 delete
.. //depot/projects/hammer/contrib/bind/include/res_update.h#2 delete
.. //depot/projects/hammer/contrib/bind/include/resolv.h#3 delete
.. //depot/projects/hammer/contrib/bind/lib/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/README#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/bsafe_link.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/cylink_link.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/dst_api.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/dst_internal.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/eay_dss_link.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/hmac_link.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/md5.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/md5_dgst.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/md5_locl.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/prandom.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/rsaref_link.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/dst/support.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_addr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_cidr_ntop.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_cidr_pton.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_data.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_lnaof.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_makeaddr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_net_ntop.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_net_pton.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_neta.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_netof.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_network.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_ntoa.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_ntop.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/inet_pton.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/inet/nsap_addr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/Makefile.BSD#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/README#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_gr.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_ho.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_nw.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_pr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_pw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/dns_sv.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gai_strerror.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_gr.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_ho.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_ng.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_nw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_pr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_pw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gen_sv.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getaddrinfo.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getgrent.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getgrent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gethostent.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/gethostent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getnameinfo.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getnetent.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getnetent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent_r.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getprotoent.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getprotoent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getpwent.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getpwent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getservent.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/getservent_r.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/hesiod.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/hesiod_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_gr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_ho.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_ng.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_nw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_p.h#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_pr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_pw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irp_sv.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irpmarshall.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irs_data.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irs_data.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/irs_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_gr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_ho.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_ng.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_nw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_pr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_pw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/lcl_sv.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_gr.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_ho.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_ng.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_nw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_pr.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_pw.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nis_sv.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/nul_ng.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/pathnames.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/irs/util.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/assertions.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/assertions.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/base64.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/bitncmp.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/bitncmp.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ctl_clnt.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ctl_p.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ctl_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ctl_srvr.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ev_connects.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ev_files.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ev_streams.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ev_timers.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/ev_waits.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/eventlib.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/eventlib.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/eventlib_p.h#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/heap.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/heap.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/hex.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/logging.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/logging.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/logging_p.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/memcluster.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/memcluster.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/movefile.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/tree.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/isc/tree.mdoc#2 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_date.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_name.c#5 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_netint.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_parse.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_print.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_samedomain.c#5 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_sign.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_ttl.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/nameser/ns_verify.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/herror.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_comp.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_data.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_debug.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_debug.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_findzonecut.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_init.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_mkquery.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_mkupdate.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_mkupdate.h#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_private.h#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_query.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_send.c#3 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_sendsigned.c#2 delete
.. //depot/projects/hammer/contrib/bind/lib/resolv/res_update.c#3 delete
.. //depot/projects/hammer/contrib/bind/port/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/port/README#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/Makefile.set#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/bin/probe_ipv6#3 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/port_after.h#4 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/port_before.h#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/prand_conf.h#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/sys/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/noop.c#2 delete
.. //depot/projects/hammer/contrib/bind/port/freebsd/probe#2 delete
.. //depot/projects/hammer/contrib/bind/port/prand_conf/Makefile#2 delete
.. //depot/projects/hammer/contrib/bind/port/prand_conf/README#2 delete
.. //depot/projects/hammer/contrib/bind/port/prand_conf/prand_conf.c#2 delete
.. //depot/projects/hammer/contrib/bind/port/settings#2 delete
.. //depot/projects/hammer/contrib/bind/port/systype#2 delete
.. //depot/projects/hammer/contrib/bind/tests/irs_testclient.c#2 delete
.. //depot/projects/hammer/contrib/bind/tests/irs_testirpd.c#2 delete
.. //depot/projects/hammer/contrib/bind/tests/irs_testserver.c#2 delete
.. //depot/projects/hammer/contrib/bind/tests/test_cidr.c#2 delete
.. //depot/projects/hammer/contrib/bind/tests/test_getaddr.c#2 delete
.. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#2 integrate
.. //depot/projects/hammer/contrib/libbegemot/rpoll.c#1 branch
.. //depot/projects/hammer/contrib/libbegemot/rpoll.h#1 branch
.. //depot/projects/hammer/contrib/libbegemot/rpoll.man#1 branch
.. //depot/projects/hammer/contrib/ngatm/sscop/common.c#3 integrate
.. //depot/projects/hammer/contrib/ngatm/sscop/common.h#3 integrate
.. //depot/projects/hammer/contrib/ngatm/sscop/sscop_main.c#3 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.4#4 integrate
.. //depot/projects/hammer/etc/Makefile#27 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#35 integrate
.. //depot/projects/hammer/etc/etc.arm/ttys#2 integrate
.. //depot/projects/hammer/etc/mtree/BIND.chroot.dist#1 branch
.. //depot/projects/hammer/etc/mtree/BIND.include.dist#1 branch
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#27 integrate
.. //depot/projects/hammer/etc/mtree/BSD.root.dist#13 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#29 integrate
.. //depot/projects/hammer/etc/mtree/BSD.var.dist#6 integrate
.. //depot/projects/hammer/etc/mtree/Makefile#2 integrate
.. //depot/projects/hammer/etc/namedb/make-localhost#2 integrate
.. //depot/projects/hammer/etc/namedb/named.conf#4 integrate
.. //depot/projects/hammer/etc/rc.d/named#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#5 integrate
.. //depot/projects/hammer/include/Makefile#31 integrate
.. //depot/projects/hammer/lib/Makefile#43 integrate
.. //depot/projects/hammer/lib/bind/bind/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/bind9/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/config.mk#3 integrate
.. //depot/projects/hammer/lib/bind/dns/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/isc/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/isccc/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/isccfg/Makefile#3 integrate
.. //depot/projects/hammer/lib/bind/lwres/Makefile#3 integrate
.. //depot/projects/hammer/lib/libbegemot/Makefile#1 branch
.. //depot/projects/hammer/lib/libc/gen/isnan.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#4 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#11 integrate
.. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_execve.c#1 branch
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#32 integrate
.. //depot/projects/hammer/lib/libutil/humanize_number.3#4 integrate
.. //depot/projects/hammer/lib/libutil/humanize_number.c#2 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#16 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/reloc.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_start.S#3 integrate
.. //depot/projects/hammer/release/Makefile#62 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#63 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#14 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#22 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#8 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#7 integrate
.. //depot/projects/hammer/sbin/init/init.c#7 integrate
.. //depot/projects/hammer/share/doc/Makefile#3 integrate
.. //depot/projects/hammer/share/doc/bind9/Makefile#1 branch
.. //depot/projects/hammer/share/examples/etc/make.conf#24 integrate
.. //depot/projects/hammer/share/examples/isdn/i4brunppp/Makefile#2 integrate
.. //depot/projects/hammer/share/man/man4/gif.4#4 integrate
.. //depot/projects/hammer/share/man/man4/re.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ulpt.4#4 integrate
.. //depot/projects/hammer/share/man/man4/urio.4#4 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#24 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#40 integrate
.. //depot/projects/hammer/share/man/man9/kthread.9#4 integrate
.. //depot/projects/hammer/share/man/man9/vm_map.9#5 integrate
.. //depot/projects/hammer/share/man/man9/vm_map_entry_resize_free.9#1 branch
.. //depot/projects/hammer/share/man/man9/vm_map_findspace.9#3 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#23 integrate
.. //depot/projects/hammer/share/monetdef/es_ES.ISO8859-1.src#2 integrate
.. //depot/projects/hammer/sys/arm/arm/fusu.S#2 integrate
.. //depot/projects/hammer/sys/arm/arm/locore.S#4 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/hammer/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/hammer/sys/boot/common/help.common#8 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#15 integrate
.. //depot/projects/hammer/sys/boot/ia64/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/libski/Makefile#5 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/acpi_stub.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/bootinfo.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/copy.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/delay.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/devicename.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/efi_stub.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#7 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/exit.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/libski.h#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/module.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/pal_stub.S#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/sal_stub.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/skiconsole.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/skifs.c#3 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/ssc.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/libski/time.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/acpi_stub.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/bootinfo.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/conf.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/copy.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/delay.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/devicename.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/efi_stub.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/elf_freebsd.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/exit.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/ldscript.ia64#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/libski.h#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/pal_stub.S#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/sal_stub.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/skiconsole.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/skifs.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/skiload.cmd#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/ssc.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/start.S#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/time.c#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/version#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/skiload/Makefile#6 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/conf.c#4 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/ldscript.ia64#3 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/main.c#5 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/skiload.cmd#2 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/start.S#3 delete
.. //depot/projects/hammer/sys/boot/ia64/skiload/version#2 delete
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#14 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#14 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#57 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#23 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#37 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#21 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#21 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#17 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#35 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#18 integrate
.. //depot/projects/hammer/sys/dev/dcons/dcons.c#9 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#18 integrate
.. //depot/projects/hammer/sys/dev/mii/brgphy.c#15 integrate
.. //depot/projects/hammer/sys/dev/mii/miidevs#9 integrate
.. //depot/projects/hammer/sys/dev/musycc/musycc.c#9 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#20 integrate
.. //depot/projects/hammer/sys/dev/snp/snp.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/ucomvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#19 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#11 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#7 integrate
.. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#26 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#26 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#27 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#8 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#7 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#3 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#4 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_readwrite.c#5 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#19 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#13 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable.c#14 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_trap.c#1 branch
.. //depot/projects/hammer/sys/ia64/ia64/exception.S#7 integrate
.. //depot/projects/hammer/sys/ia64/ia64/genassym.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#29 integrate
.. //depot/projects/hammer/sys/ia64/include/md_var.h#10 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#36 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#66 integrate
.. //depot/projects/hammer/sys/kern/subr_kdb.c#6 integrate
.. //depot/projects/hammer/sys/kern/tty.c#26 integrate
.. //depot/projects/hammer/sys/kern/tty_cons.c#17 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#21 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#40 integrate
.. //depot/projects/hammer/sys/kern/vfs_cluster.c#17 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#23 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#35 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#54 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#22 integrate
.. //depot/projects/hammer/sys/modules/mem/Makefile#2 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#42 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#10 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs.h#13 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#16 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#23 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsnode.h#7 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#14 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#44 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#8 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/uninorthvar.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#13 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/rwindow.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#17 integrate
.. //depot/projects/hammer/sys/sys/buf.h#14 integrate
.. //depot/projects/hammer/sys/sys/conf.h#19 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#31 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#9 integrate
.. //depot/projects/hammer/sys/sys/tty.h#17 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#6 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#28 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#24 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#6 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#20 integrate
.. //depot/projects/hammer/sys/vm/device_pager.c#12 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#29 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#27 integrate
.. //depot/projects/hammer/tools/tools/README#10 integrate
.. //depot/projects/hammer/tools/tools/mfc/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/mfc/mfc.awk#1 branch
.. //depot/projects/hammer/tools/tools/mfc/mfc.sh#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#3 integrate
.. //depot/projects/hammer/tools/tools/recoverdisk/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/recoverdisk/README#1 branch
.. //depot/projects/hammer/tools/tools/recoverdisk/recoverdisk.c#1 branch
.. //depot/projects/hammer/usr.bin/Makefile#36 integrate
.. //depot/projects/hammer/usr.bin/atm/sscop/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/dig/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/host/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#6 integrate
.. //depot/projects/hammer/usr.bin/nslookup/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/nsupdate/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/printf/printf.c#5 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#56 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/dconschat/dconschat.c#6 integrate
.. //depot/projects/hammer/usr.sbin/dnssec-keygen/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/dnssec-signzone/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.c#12 integrate
.. //depot/projects/hammer/usr.sbin/lpr/lptest/lptest.c#3 integrate
.. //depot/projects/hammer/usr.sbin/named-checkconf/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/named-checkzone/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/named/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/nslookup/Makefile#3 delete
.. //depot/projects/hammer/usr.sbin/nsupdate/Makefile#2 delete
.. //depot/projects/hammer/usr.sbin/rndc-confgen/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/rndc/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/smbmsg/Makefile#2 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#61 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.447 2004/09/21 21:47:05 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.448 2004/09/27 08:23:42 dougb Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -270,6 +270,10 @@
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+ mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
+ -p ${WORLDTMP}/usr/include >/dev/null
+.endif
_legacy:
@echo
@echo "--------------------------------------------------------------"
==== //depot/projects/hammer/UPDATING#57 (text+ko) ====
@@ -23,6 +23,57 @@
developers choose to disable these features on build machines
to maximize performance.
+20040928:
+ If enabled, the default is now to run named in a chroot
+ "sandbox." For users with existing configurations in
+ /etc/namedb the migration should be simple. Upgrade your
+ world as usual, then after installworld but before
+ mergemaster do the following:
+
+ /etc/rc.d/syslogd stop
+ If named is running: /etc/rc.d/named stop
+ cd /etc
+ mv namedb namedb.bak
+ mkdir -p /var/named/etc/namedb
+ cp -Rp namedb.bak/* /var/named/etc/namedb/
+ mergemaster (with your usual options)
+ If using the generated localhost* files:
+ cd /var/named/etc/namedb
+ /bin/sh make-localhost
+ rm -f localhost-v6.rev localhost.rev
+ /etc/rc.d/syslogd start
+ /etc/rc.d/named start
+
+ If you are using a custom configuration, or if you have
+ customised the named_* variables in /etc/rc.conf[.local]
+ then you may have to adjust the instructions accordingly.
+ It is suggested that you carefully examine the new named
+ variables in /etc/defaults/rc.conf and the options in
+ /var/named/etc/namedb/named.conf to see if they might
+ now be more suitable.
+
+20040925:
+ BIND 9 has been imported into the base, and is now fully
+ functional. BIND 8 has now been removed. There are numerous
+ differences between BIND 8 and 9, and users with critical
+ named installations should read the migration documentation
+ in /usr/share/doc/bind9/misc/migration. There is also a
+ new instruction manual in /usr/share/doc/bind9/arm.
+
+ The key differences that most users will experience are in
+ how picky BIND 9 is about zone file format. If you are using
+ named as a resolving (caching) name server, you will likely
+ not have trouble.
+
+ The following files are part of the old BIND 8 installation
+ and should be removed:
+ /usr/bin/dnskeygen /usr/bin/dnsquery /usr/libexec/named-xfer
+ /usr/sbin/named.restart /usr/sbin/ndc
+
+ The following files have moved to /usr/bin, and should be
+ removed from their old locations:
+ /usr/sbin/nslookup /usr/sbin/nsupdate
+
20040914:
The format of the pflogd(8) logfile "/var/log/pflog" has changed for
architectures that have a 64 bit long type to make it compatible to
@@ -1859,4 +1910,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.361 2004/09/22 20:42:30 andre Exp $
+$FreeBSD: src/UPDATING,v 1.365 2004/09/28 13:44:41 dougb Exp $
==== //depot/projects/hammer/bin/mkdir/mkdir.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.29 2004/09/24 06:57:26 das Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -147,7 +147,7 @@
else if (p[0] != '/')
continue;
*p = '\0';
- if (p[1] == '\0')
+ if (!last && p[1] == '\0')
last = 1;
if (first) {
/*
==== //depot/projects/hammer/bin/sh/exec.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.24 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.25 2004/09/27 18:43:18 des Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -701,7 +701,7 @@
delete_cmd_entry();
return (0);
}
- return (1);
+ return (0);
}
/*
==== //depot/projects/hammer/bin/sh/var.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.27 2004/09/27 18:43:18 des Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -761,7 +761,7 @@
}
}
- return (1);
+ return (0);
}
==== //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#2 (text+ko) ====
@@ -1,17 +1,99 @@
-# $FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.1 2004/09/21 19:01:41 des Exp $
-#
-# Bug trhodes@ and des@ to actually throw some text in here.
-#
+
+
+ FreeBSD maintainer's guide to updating BIND 9
+ =============================================
+
+1) Obtain the latest source distribution from the ISC's FTP server
+ (ftp://ftp.isc.org/isc/bind9/)
+
+2) Unpack the tarball in a suitable directory.
+
+3) Remove unwanted files and directories:
+
+ $ while read pattern ; do rm -rf $pattern ; done \
+ </usr/src/contrib/bind9/FREEBSD-Xlist
+
+ Make sure that took care of everything, and if it didn't, make sure
+ to update FREEBSD-Xlist so you won't miss it the next time. A good
+ way to do this is to run a test import and see if any new files
+ show up:
+
+ $ cvs -n import src/contrib/bind9 ISC x | grep \^N
+
+4) Import the sources:
+
+ $ cvs import src/contrib/bind9 ISC BIND_9_X_Y
+
+5) Resolve conflicts.
+
+ As of 2004-09-27, we have no local patches against BIND 9; thus
+ there are no conflicts to merge. This may change at a later date.
+
+6) Remove any references to the {bin,lib}/tests and docutil
+ directories from the configure and Makefile templates:
+
+ $ sed -i.orig -e '/\/tests/d; /docutil/d;' \
+ configure.in Makefile.in */Makefile.in
+
+ Please do not commit this change, as it would unnecessarily take
+ files off the vendor branch. You only need this to generate
+ config.h.
+
+7) Generate and run configure:
+
+ $ autoconf253
+ $ autoheader253
+ $ ./configure --prefix=/usr \
+ --infodir=/usr/share/info --mandir=/usr/share/man \
+ --enable-threads --enable-libbind --disable-ipv6 \
+ --enable-getifaddrs --disable-linux-caps \
+ --with-openssl=/usr --with-randomdev=/dev/random
+
+ Note that we intentionally disable IPv6 support on the configure
+ command line; src/lib/bind/config.mk will re-enable it at compile
+ time if NOINET6 is not defined.
+
+8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and
+ commit it. Do not commit any other file that was modified or
+ created in steps 6) or 7).
+
+9) The following directories contain Makefiles for bits and pieces of
+ BIND 9:
+
+ FreeBSD directory ISC directory
+ ========================================================
+ src/lib/bind bind9/lib
+ src/lib/bind/bind bind9/lib/bind
+ src/lib/bind/bind9 bind9/lib/bind9
+ src/lib/bind/dns bind9/lib/dns
+ src/lib/bind/isc bind9/lib/isc
+ src/lib/bind/isccc bind9/lib/isccc
+ src/lib/bind/isccfg bind9/lib/isccfg
+ src/lib/bind/lwres bind9/lib/lwres
+ src/share/doc/bind9 bind9/doc/{arm,misc}
+ src/usr.bin/dig bind9/bin/dig
+ src/usr.bin/host bind9/bin/dig
+ src/usr.bin/nslookup bind9/bin/dig
+ src/usr.bin/nsupdate bind9/bin/nsupdate
+ src/usr.sbin/dnssec-keygen bind9/bin/dnssec
+ src/usr.sbin/dnssec-signzone bind9/bin/dnssec
+ src/usr.sbin/named bind9/bin/named
+ src/usr.sbin/named-checkconf bind9/bin/check
+ src/usr.sbin/named-checkzone bind9/bin/check
+ src/usr.sbin/rndc bind9/bin/rndc
+ src/usr.sbin/rndc-confgen bind9/bin/rndc
+
+ Make sure that the lists of sources, headers and man pages in each
+ FreeBSD Makefile accurately reflects those in the corresponding ISC
+ Makefile. Please strive to keep those lists in the same order and
+ with line breaks in the same places to ease future comparisons.
-while read pattern ; do rm -rf $pattern ; done <FREEBSD-Xlist
+A) Build and test.
-sed -i.orig -e '/\/tests/d; /docutil/d;' configure.in Makefile.in */Makefile.in
+B) Lather, rinse, repeat.
-autoconf253
+C) Commit when everything builds cleanly and works properly.
-autoheader253
+ -- des at FreeBSD.org
-./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man \
- --enable-threads --enable-libbind --disable-ipv6 \
- --enable-getifaddrs --disable-linux-caps \
- --with-openssl=/usr --with-randomdev=/dev/random
+$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.2 2004/09/27 00:25:56 des Exp $
==== //depot/projects/hammer/contrib/ngatm/sscop/common.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ * $FreeBSD: src/contrib/ngatm/sscop/common.c,v 1.2 2004/09/24 22:00:33 trhodes Exp $
* $Begemot: libunimsg/sscop/common.c,v 1.4 2004/07/08 08:22:27 brandt Exp $
*/
@@ -44,7 +44,6 @@
#include <assert.h>
#include <fcntl.h>
#include <err.h>
-#include <isc/eventlib.h>
#include <netnatm/unimsg.h>
#include <netnatm/saal/sscop.h>
@@ -64,7 +63,9 @@
int loose;
int user_out_fd;
u_int verbose;
+#ifndef USE_LIBBEGEMOT
evContext evctx;
+#endif
evFileID sscop_h;
evFileID user_h;
@@ -153,7 +154,11 @@
if (got == 0) {
eof:
+#ifdef USE_LIBBEGEMOT
+ poll_unregister(sscop_h);
+#else
evDeselectFD(evctx, sscop_h);
+#endif
(void)close(sscop_fd);
sscop_fd = -1;
if (m != NULL)
@@ -212,7 +217,11 @@
if (size == 0) {
eof:
+#ifdef USE_LIBBEGEMOT
+ poll_unregister(user_h);
+#else
evDeselectFD(evctx, user_h);
+#endif
if (m != NULL)
uni_msg_destroy(m);
VERBOSE(("EOF on user connection"));
@@ -384,9 +393,14 @@
abort();
}
+#ifdef USE_LIBBEGEMOT
static void
+tfunc(int tid __unused, void *uap)
+#else
+static void
tfunc(evContext ctx __unused, void *uap, struct timespec due __unused,
struct timespec inter __unused)
+#endif
{
struct timer *t = uap;
@@ -402,18 +416,25 @@
void (*func)(void *))
{
struct timer *t;
+#ifndef USE_LIBBEGEMOT
struct timespec due;
+#endif
if ((t = malloc(sizeof(*t))) == NULL)
err(1, NULL);
t->sscop = sscop;
t->func = func;
+#ifdef USE_LIBBEGEMOT
+ if ((t->id = poll_start_timer(msec, 0, tfunc, t)) == -1)
+ err(1, "cannot start timer");
+#else
due = evAddTime(evNowTime(),
evConsTime((time_t)msec/1000, (long)(msec%1000)*1000));
if (evSetTimer(evctx, tfunc, t, due, evConsTime(0, 0), &t->id))
err(1, "cannot start timer");
+#endif
return (t);
}
@@ -426,6 +447,10 @@
{
struct timer *t = tp;
+#ifdef USE_LIBBEGEMOT
+ poll_stop_timer(t->id);
+#else
evClearTimer(evctx, t->id);
+#endif
free(t);
}
==== //depot/projects/hammer/contrib/ngatm/sscop/common.h#3 (text+ko) ====
@@ -25,7 +25,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ * $FreeBSD: src/contrib/ngatm/sscop/common.h,v 1.2 2004/09/24 22:00:33 trhodes Exp $
* $Begemot: libunimsg/sscop/common.h,v 1.4 2004/07/08 08:22:27 brandt Exp $
*
* Common declaration for the SAAL programs.
@@ -33,6 +33,14 @@
#ifndef _SAAL_COMMON_H_
#define _SAAL_COMMON_H_
+#ifdef USE_LIBBEGEMOT
+#include <rpoll.h>
+#define evFileID int
+#define evTimerID int
+#else
+#include <isc/eventlib.h>
+#endif
+
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list