PERFORCE change 62190 for review

Marcel Moolenaar marcel at FreeBSD.org
Fri Sep 24 21:54:11 PDT 2004


http://perforce.freebsd.org/chv.cgi?CH=62190

Change 62190 by marcel at marcel_nfs on 2004/09/25 04:53:48

	IFC @62189

Affected files ...

.. //depot/projects/ia64/UPDATING#69 integrate
.. //depot/projects/ia64/bin/mkdir/mkdir.c#6 integrate
.. //depot/projects/ia64/contrib/bind/CHANGES#9 delete
.. //depot/projects/ia64/contrib/bind/DNSSEC#2 delete
.. //depot/projects/ia64/contrib/bind/FREEBSD-Upgrade#3 delete
.. //depot/projects/ia64/contrib/bind/FREEBSD-Xlist#3 delete
.. //depot/projects/ia64/contrib/bind/INSTALL#3 delete
.. //depot/projects/ia64/contrib/bind/LICENSE#2 delete
.. //depot/projects/ia64/contrib/bind/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/README#8 delete
.. //depot/projects/ia64/contrib/bind/SUPPORT#2 delete
.. //depot/projects/ia64/contrib/bind/TODO#2 delete
.. //depot/projects/ia64/contrib/bind/Version#8 delete
.. //depot/projects/ia64/contrib/bind/bin/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/bin/addr/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/addr/addr.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/dig/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/dig/dig.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/dnskeygen/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/dnskeygen/dnskeygen.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/dnsquery/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/dnsquery/dnsquery.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/host/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/host/host.c#7 delete
.. //depot/projects/ia64/contrib/bind/bin/irpd/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/irpd/irpd.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/irpd/irs-irpd.conf#2 delete
.. //depot/projects/ia64/contrib/bind/bin/irpd/version.c#2 delete
.. //depot/projects/ia64/contrib/bind/bin/mkservdb/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/mkservdb/mkservdb.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named-bootconf/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named-bootconf/named-bootconf.sh#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named-bootconf/test.boot#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named-xfer/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named-xfer/named-xfer.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_defs.h#7 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_dump.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_func.h#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_glob.h#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_glue.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_ixfr.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_load.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_lookup.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_save.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_sec.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_tsig.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/db_update.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/named.conf#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/named.h#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_config.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_ctl.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_defs.h#8 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_forw.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_func.h#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_glob.h#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_glue.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_init.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_ixfr.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_lexer.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_lexer.h#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_main.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_maint.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_ncache.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_notify.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_parser.y#6 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_parseutil.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_parseutil.h#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_req.c#8 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_resp.c#9 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_signal.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_sort.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_stats.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_udp.c#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_update.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/ns_xfr.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/named/pathtemplate.h#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/test/127.0.0.zone#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/test/localhost.zone#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/test/named.conf#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/test/root.hint#2 delete
.. //depot/projects/ia64/contrib/bind/bin/named/version.c#2 delete
.. //depot/projects/ia64/contrib/bind/bin/ndc/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/ndc/ndc.c#5 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/commands.l#5 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/debug.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/getinfo.c#7 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/list.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/main.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/nslookup.help#2 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/pathnames.h#2 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/res.h#4 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/send.c#6 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/skip.c#3 delete
.. //depot/projects/ia64/contrib/bind/bin/nslookup/subr.c#4 delete
.. //depot/projects/ia64/contrib/bind/bin/nsupdate/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/bin/nsupdate/nsupdate.c#4 delete
.. //depot/projects/ia64/contrib/bind/doc/html/acl.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/address_list.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/comments.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/config.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/controls.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/docdef.html#3 delete
.. //depot/projects/ia64/contrib/bind/doc/html/example.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/include.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/index.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/key.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/logging.html#4 delete
.. //depot/projects/ia64/contrib/bind/doc/html/master.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/options.html#5 delete
.. //depot/projects/ia64/contrib/bind/doc/html/server.html#4 delete
.. //depot/projects/ia64/contrib/bind/doc/html/trusted-keys.html#2 delete
.. //depot/projects/ia64/contrib/bind/doc/html/zone.html#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/doc/man/dig.1#5 delete
.. //depot/projects/ia64/contrib/bind/doc/man/dnskeygen.1#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/dnsquery.1#4 delete
.. //depot/projects/ia64/contrib/bind/doc/man/getaddrinfo.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/gethostbyname.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/getipnodebyname.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/getnameinfo.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/getnetent.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/hesiod.3#2 delete
.. //depot/projects/ia64/contrib/bind/doc/man/host.1#4 delete
.. //depot/projects/ia64/contrib/bind/doc/man/hostname.7#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/inet_cidr.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/irs.conf.5#2 delete
.. //depot/projects/ia64/contrib/bind/doc/man/mailaddr.7#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/mkdep.1#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/named-bootconf.8#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/named-xfer.8#4 delete
.. //depot/projects/ia64/contrib/bind/doc/man/named.8#4 delete
.. //depot/projects/ia64/contrib/bind/doc/man/named.conf.5#6 delete
.. //depot/projects/ia64/contrib/bind/doc/man/ndc.8#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/nslookup.8#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/nsupdate.8#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/resolver.3#5 delete
.. //depot/projects/ia64/contrib/bind/doc/man/resolver.5#3 delete
.. //depot/projects/ia64/contrib/bind/doc/man/tsig.3#3 delete
.. //depot/projects/ia64/contrib/bind/doc/misc/DynamicUpdate#2 delete
.. //depot/projects/ia64/contrib/bind/doc/misc/FAQ.1of2#2 delete
.. //depot/projects/ia64/contrib/bind/doc/misc/FAQ.2of2#2 delete
.. //depot/projects/ia64/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete
.. //depot/projects/ia64/contrib/bind/doc/misc/style.txt#2 delete
.. //depot/projects/ia64/contrib/bind/include/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/include/arpa/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/include/arpa/inet.h#2 delete
.. //depot/projects/ia64/contrib/bind/include/arpa/nameser.h#5 delete
.. //depot/projects/ia64/contrib/bind/include/arpa/nameser_compat.h#5 delete
.. //depot/projects/ia64/contrib/bind/include/fd_setsize.h#2 delete
.. //depot/projects/ia64/contrib/bind/include/hesiod.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/irp.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/irs.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/include/isc/assertions.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/isc/ctl.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/dst.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/isc/eventlib.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/heap.h#2 delete
.. //depot/projects/ia64/contrib/bind/include/isc/irpmarshall.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/list.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/isc/logging.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/memcluster.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/isc/misc.h#4 delete
.. //depot/projects/ia64/contrib/bind/include/isc/tree.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/netdb.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/netgroup.h#3 delete
.. //depot/projects/ia64/contrib/bind/include/res_update.h#2 delete
.. //depot/projects/ia64/contrib/bind/include/resolv.h#6 delete
.. //depot/projects/ia64/contrib/bind/lib/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/README#2 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/bsafe_link.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/cylink_link.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/dst_api.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/dst_internal.h#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/eay_dss_link.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/hmac_link.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/md5.h#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/md5_dgst.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/md5_locl.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/prandom.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/rsaref_link.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/dst/support.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_addr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_cidr_ntop.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_cidr_pton.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_data.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_lnaof.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_makeaddr.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_net_ntop.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_net_pton.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_neta.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_netof.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_network.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_ntoa.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_ntop.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/inet_pton.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/inet/nsap_addr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/Makefile.BSD#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/README#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_gr.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_ho.c#6 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_nw.c#6 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_pr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_pw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/dns_sv.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gai_strerror.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_gr.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_ho.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_ng.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_nw.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_p.h#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_pr.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_pw.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gen_sv.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getaddrinfo.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getgrent.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getgrent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gethostent.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/gethostent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getnameinfo.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getnetent.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getnetent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getnetgrent.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getnetgrent_r.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getprotoent.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getprotoent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getpwent.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getpwent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getservent.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/getservent_r.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/hesiod.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/hesiod_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_gr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_ho.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_ng.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_nw.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_p.h#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_pr.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_pw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irp_sv.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irpmarshall.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irs_data.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irs_data.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/irs_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_gr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_ho.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_ng.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_nw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_pr.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_pw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/lcl_sv.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_gr.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_ho.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_ng.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_nw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_pr.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_pw.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nis_sv.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/nul_ng.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/pathnames.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/irs/util.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/assertions.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/assertions.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/base64.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/bitncmp.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/bitncmp.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ctl_clnt.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ctl_p.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ctl_p.h#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ctl_srvr.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ev_connects.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ev_files.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ev_streams.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ev_timers.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/ev_waits.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/eventlib.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/eventlib.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/eventlib_p.h#4 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/heap.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/heap.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/hex.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/logging.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/logging.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/logging_p.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/memcluster.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/memcluster.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/movefile.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/tree.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/isc/tree.mdoc#3 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_date.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_name.c#7 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_netint.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_parse.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_print.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_samedomain.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_sign.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_ttl.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/nameser/ns_verify.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/Makefile#3 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/herror.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_comp.c#3 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_data.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_debug.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_debug.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_findzonecut.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_init.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_mkquery.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_mkupdate.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_mkupdate.h#2 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_private.h#4 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_query.c#4 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_send.c#5 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_sendsigned.c#2 delete
.. //depot/projects/ia64/contrib/bind/lib/resolv/res_update.c#5 delete
.. //depot/projects/ia64/contrib/bind/port/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/port/README#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/Makefile.set#5 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/bin/probe_ipv6#3 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/port_after.h#6 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/port_before.h#4 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/prand_conf.h#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/sys/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/noop.c#2 delete
.. //depot/projects/ia64/contrib/bind/port/freebsd/probe#2 delete
.. //depot/projects/ia64/contrib/bind/port/prand_conf/Makefile#2 delete
.. //depot/projects/ia64/contrib/bind/port/prand_conf/README#2 delete
.. //depot/projects/ia64/contrib/bind/port/prand_conf/prand_conf.c#2 delete
.. //depot/projects/ia64/contrib/bind/port/settings#2 delete
.. //depot/projects/ia64/contrib/bind/port/systype#2 delete
.. //depot/projects/ia64/contrib/bind/tests/irs_testclient.c#2 delete
.. //depot/projects/ia64/contrib/bind/tests/irs_testirpd.c#2 delete
.. //depot/projects/ia64/contrib/bind/tests/irs_testserver.c#2 delete
.. //depot/projects/ia64/contrib/bind/tests/test_cidr.c#2 delete
.. //depot/projects/ia64/contrib/bind/tests/test_getaddr.c#2 delete
.. //depot/projects/ia64/contrib/libbegemot/rpoll.c#1 branch
.. //depot/projects/ia64/contrib/libbegemot/rpoll.h#1 branch
.. //depot/projects/ia64/contrib/libbegemot/rpoll.man#1 branch
.. //depot/projects/ia64/contrib/ngatm/sscop/common.c#3 integrate
.. //depot/projects/ia64/contrib/ngatm/sscop/common.h#3 integrate
.. //depot/projects/ia64/contrib/ngatm/sscop/sscop_main.c#3 integrate
.. //depot/projects/ia64/etc/Makefile#43 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#53 integrate
.. //depot/projects/ia64/etc/etc.arm/ttys#2 integrate
.. //depot/projects/ia64/etc/mtree/BSD.usr.dist#35 integrate
.. //depot/projects/ia64/etc/rc.d/named#9 integrate
.. //depot/projects/ia64/lib/Makefile#48 integrate
.. //depot/projects/ia64/lib/bind/bind/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/bind9/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/config.mk#3 integrate
.. //depot/projects/ia64/lib/bind/dns/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/isc/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/isccc/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/isccfg/Makefile#2 integrate
.. //depot/projects/ia64/lib/bind/lwres/Makefile#2 integrate
.. //depot/projects/ia64/lib/libbegemot/Makefile#1 branch
.. //depot/projects/ia64/lib/libc/gen/isnan.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#46 integrate
.. //depot/projects/ia64/libexec/ftpd/ftpd.c#28 integrate
.. //depot/projects/ia64/share/doc/Makefile#3 integrate
.. //depot/projects/ia64/share/doc/bind9/Makefile#1 branch
.. //depot/projects/ia64/share/examples/etc/make.conf#40 integrate
.. //depot/projects/ia64/share/man/man4/gif.4#9 integrate
.. //depot/projects/ia64/share/man/man5/make.conf.5#46 integrate
.. //depot/projects/ia64/share/man/man9/kthread.9#5 integrate
.. //depot/projects/ia64/share/mk/bsd.libnames.mk#26 integrate
.. //depot/projects/ia64/share/monetdef/es_ES.ISO8859-1.src#3 integrate
.. //depot/projects/ia64/sys/boot/common/help.common#11 integrate
.. //depot/projects/ia64/sys/boot/forth/loader.conf#22 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_stats.c#18 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#27 integrate
.. //depot/projects/ia64/sys/conf/files.ia64#56 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bge.c#52 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#26 integrate
.. //depot/projects/ia64/sys/dev/dcons/dcons.c#5 integrate
.. //depot/projects/ia64/sys/dev/fdc/fdc.c#7 integrate
.. //depot/projects/ia64/sys/dev/mii/brgphy.c#21 integrate
.. //depot/projects/ia64/sys/dev/mii/miidevs#13 integrate
.. //depot/projects/ia64/sys/dev/snp/snp.c#20 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#11 integrate
.. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#34 integrate
.. //depot/projects/ia64/sys/geom/geom_dev.c#48 integrate
.. //depot/projects/ia64/sys/i386/i386/mptable.c#6 integrate
.. //depot/projects/ia64/sys/ia64/ia32/ia32_trap.c#1 branch
.. //depot/projects/ia64/sys/ia64/ia64/exception.S#10 integrate
.. //depot/projects/ia64/sys/ia64/ia64/genassym.c#18 integrate
.. //depot/projects/ia64/sys/ia64/ia64/trap.c#75 integrate
.. //depot/projects/ia64/sys/ia64/include/md_var.h#11 integrate
.. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#26 integrate
.. //depot/projects/ia64/sys/kern/kern_conf.c#31 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#56 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#81 integrate
.. //depot/projects/ia64/sys/kern/tty.c#37 integrate
.. //depot/projects/ia64/sys/kern/tty_cons.c#21 integrate
.. //depot/projects/ia64/sys/kern/vfs_bio.c#72 integrate
.. //depot/projects/ia64/sys/kern/vfs_default.c#31 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#68 integrate
.. //depot/projects/ia64/sys/kern/vfs_vnops.c#42 integrate
.. //depot/projects/ia64/sys/netinet/ip_input.c#46 integrate
.. //depot/projects/ia64/sys/sys/conf.h#34 integrate
.. //depot/projects/ia64/sys/sys/syscallsubr.h#10 integrate
.. //depot/projects/ia64/sys/vm/device_pager.c#19 integrate
.. //depot/projects/ia64/sys/vm/swap_pager.c#48 integrate
.. //depot/projects/ia64/sys/vm/vm_mmap.c#37 integrate
.. //depot/projects/ia64/tools/tools/README#15 integrate
.. //depot/projects/ia64/tools/tools/mfc/Makefile#1 branch
.. //depot/projects/ia64/tools/tools/mfc/mfc.awk#1 branch
.. //depot/projects/ia64/tools/tools/mfc/mfc.sh#1 branch
.. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#3 integrate
.. //depot/projects/ia64/usr.bin/atm/sscop/Makefile#3 integrate
.. //depot/projects/ia64/usr.bin/dig/Makefile#3 integrate
.. //depot/projects/ia64/usr.bin/host/Makefile#3 integrate
.. //depot/projects/ia64/usr.bin/nslookup/Makefile#2 integrate
.. //depot/projects/ia64/usr.bin/nsupdate/Makefile#2 integrate
.. //depot/projects/ia64/usr.bin/printf/printf.c#9 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#65 integrate
.. //depot/projects/ia64/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/dnssec-keygen/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/dnssec-signzone/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/named-checkconf/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/named-checkzone/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/named/Makefile#8 integrate
.. //depot/projects/ia64/usr.sbin/nslookup/Makefile#4 delete
.. //depot/projects/ia64/usr.sbin/nsupdate/Makefile#2 delete
.. //depot/projects/ia64/usr.sbin/rndc-confgen/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/rndc/Makefile#2 integrate

Differences ...

==== //depot/projects/ia64/UPDATING#69 (text+ko) ====

@@ -23,6 +23,19 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+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.
+
 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 +1872,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.362 2004/09/25 03:41:38 dougb Exp $

==== //depot/projects/ia64/bin/mkdir/mkdir.c#6 (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/ia64/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/ia64/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
+
 /*
  * Writes to a pipe must be in messages (if we don't use framing).
  * It is not clear, what is the maximum message size for this. It seems
@@ -49,7 +57,9 @@
 extern int loose;		/* loose messages */
 extern int user_out_fd;		/* file descriptor for output to user */
 extern u_int verbose;		/* talk to me */
+#ifndef USE_LIBBEGEMOT
 extern evContext evctx;
+#endif
 extern evFileID sscop_h;
 extern evFileID user_h;
 

==== //depot/projects/ia64/contrib/ngatm/sscop/sscop_main.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/sscop_main.c,v 1.2 2004/09/24 22:00:33 trhodes Exp $
  * $Begemot: libunimsg/sscop/sscop_main.c,v 1.4 2004/07/08 08:22:28 brandt Exp $
  */
 
@@ -41,7 +41,6 @@
 #include <signal.h>
 #include <assert.h>
 #include <err.h>
-#include <isc/eventlib.h>
 
 #include <netnatm/unimsg.h>
 #include <netnatm/saal/sscop.h>
@@ -95,8 +94,13 @@
  * SSCOP file descriptor is ready. Allocate and read one message
  * and dispatch a signal.
  */
+#ifdef USE_LIBBEGEMOT
+static void
+proto_infunc(int fd, int mask __unused, void *uap)
+#else
 static void
 proto_infunc(evContext ctx __unused, void *uap, int fd, int mask __unused)
+#endif
 {
 	struct uni_msg *m;
 
@@ -107,8 +111,13 @@
 /*
  * User input. Allocate and read message and dispatch signal.
  */
+#ifdef USE_LIBBEGEMOT
+static void
+user_infunc(int fd, int mask __unused, void *uap)
+#else
 static void
 user_infunc(evContext ctx __unused, void *uap, int fd, int mask __unused)
+#endif
 {
 	struct uni_msg *m;
 
@@ -134,7 +143,9 @@
 	struct sigaction sa;
 	int wait = 0;
 	u_int mask;
+#ifndef USE_LIBBEGEMOT
 	evEvent ev;
+#endif
 
 	/*
 	 * Default is to have the USER on stdin and SSCOP on stdout
@@ -209,8 +220,10 @@
 	if(user_out_fd < 0)
 		user_out_fd = user_fd;
 
+#ifndef USE_LIBBEGEMOT
 	if (evCreate(&evctx))
 		err(1, "evCreate");
+#endif
 
 	/*
 	 * Catch USR1
@@ -233,8 +246,14 @@
 	/*
 	 * Register sscop fd
 	 */
+#ifdef USE_LIBBEGEMOT
+	if ((sscop_h = poll_register(sscop_fd, proto_infunc,
+	    sscop, POLL_IN)) == -1)
+		err(1, "can't select on sscop fd");
+#else
 	if (evSelectFD(evctx, sscop_fd, EV_READ, proto_infunc, sscop, &sscop_h))
 		err(1, "can't select on sscop fd");
+#endif
 
 	/*
 	 * if we are active - send establish request
@@ -246,11 +265,15 @@
 	 * Run protocol until it get's ready
 	 */
 	while (sscop_fd >= 0 && !ready) {
+#ifdef USE_LIBBEGEMOT
+		poll_dispatch(1);
+#else
 		if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
 			if (evDispatch(evctx, ev))
 				err(1, "dispatch event");
 		} else if (errno != EINTR)
 			err(1, "get event");
+#endif
 	}
 
 	/*
@@ -265,15 +288,23 @@
 	VERBOSE(("READY - starting data transfer"));
 
 	if (!unidir &&
+#ifdef USE_LIBBEGEMOT
+	    ((user_h = poll_register(user_fd, user_infunc, sscop, POLL_IN)) == -1))
+#else
 	    evSelectFD(evctx, user_fd, EV_READ, user_infunc, sscop, &user_h))
+#endif
 		err(1, "can't select on sscop fd");
 
 	while (!sigusr1 && sscop_fd >= 0) {
+#ifdef USE_LIBBEGEMOT
+		poll_dispatch(1);
+#else
 		if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
 			if (evDispatch(evctx, ev))
 				err(1, "dispatch event");
 		} else if (errno != EINTR)
 			err(1, "get event");
+#endif
 	}
 
 	if (sigusr1 && sscop_fd >= 0) {
@@ -282,11 +313,15 @@
 		 */
 		sscop_aasig(sscop, SSCOP_RELEASE_request, NULL, 0);
 		while (!finished && sscop_fd >= 0) {
+#ifdef USE_LIBBEGEMOT
+			poll_dispatch(1);
+#else
 			if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
 				if (evDispatch(evctx, ev))
 					err(1, "dispatch event");
 			} else if (errno != EINTR)
 				err(1, "get event");
+#endif
 		}
 	}
 
@@ -333,7 +368,11 @@
 	  case SSCOP_RELEASE_indication:
 		if (end_at_eof) {
 			VERBOSE((" ... exiting"));
+#ifdef USE_LIBBEGEMOT
+			poll_unregister(sscop_h);
+#else
 			evDeselectFD(evctx, sscop_h);
+#endif
 			(void)close(sscop_fd);
 			sscop_fd = -1;
 		}
@@ -345,7 +384,11 @@
 	  case SSCOP_RELEASE_confirm:
 		if (end_at_eof) {
 			VERBOSE((" ... exiting"));
+#ifdef USE_LIBBEGEMOT
+			poll_unregister(sscop_h);
+#else
 			evDeselectFD(evctx, sscop_h);
+#endif
 			(void)close(sscop_fd);
 			sscop_fd = -1;
 		}

==== //depot/projects/ia64/etc/Makefile#43 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.328 2004/09/21 19:01:41 des Exp $
+# $FreeBSD: src/etc/Makefile,v 1.329 2004/09/24 16:13:55 des Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -114,10 +114,8 @@
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if 0
 	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${NAMEDB} ${DESTDIR}/etc/namedb
-.endif
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

==== //depot/projects/ia64/etc/defaults/rc.conf#53 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.214 2004/09/15 01:08:32 seanc Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.217 2004/09/24 22:47:10 dougb Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -163,12 +163,11 @@
 named_enable="NO"		# Run named, the DNS server (or NO).
 named_program="/usr/sbin/named"	# path to named, if you want a different one.
 named_flags="-u bind" 		# Flags for named
-named_pidfile="/var/run/named/pid" # Pid file
+named_pidfile="/var/run/named/pid" # Must set this in named.conf as well
 named_chrootdir=""		# Chroot directory (or "" not to auto-chroot it)
 named_chroot_autoupdate="YES"	# Automatically install/update chrooted
 				# components of named. See /etc/rc.d/named.
-named_symlink_enable="YES"	# Symlink ${named_pidfile} and /var/run/ndc
-				# to their chrooted counterparts.
+named_symlink_enable="YES"	# Symlink the chrooted pid file
 
 #
 # kerberos. Do not run the admin daemons on slave servers

==== //depot/projects/ia64/etc/etc.arm/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.arm/ttys,v 1.1 2004/06/11 15:37:49 cognet Exp $
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.2 2004/09/24 12:51:15 cognet Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -44,6 +44,7 @@
 #ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
+ttyu0	"/usr/libexec/getty std.9600"	vt100	on  secure
 ttyd0	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyd1	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyd2	"/usr/libexec/getty std.9600"	dialup	off secure

==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#35 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.307 2004/09/14 01:07:18 mlaier Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.308 2004/09/25 00:42:37 dougb Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -63,8 +63,8 @@
             ..
             atm
             ..
-            bind
-                html
+            bind9
+                arm
                 ..
                 misc
                 ..

==== //depot/projects/ia64/etc/rc.d/named#9 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/named,v 1.9 2004/03/14 19:10:05 dougb Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.12 2004/09/24 23:49:38 dougb Exp $
 #
 
 # PROVIDE: named
@@ -14,6 +14,7 @@
 name="named"
 rcvar=`set_rcvar`
 start_precmd="named_precmd"
+start_postcmd="make_symlinks"
 required_dirs="$named_chrootdir"	# if it is set, it must exist
 extra_commands="reload"
 
@@ -28,24 +29,17 @@
 #
 chroot_autoupdate()
 {
-	# If the named-xfer in the system is newer than the one in the
-	# chroot directory or if it (in the chrootdir) doesn't exist
-	# copy it over
-	#
-	if [ ! -x "${named_chrootdir}/usr/libexec/named-xfer" -o \
-	    "${named_chrootdir}/usr/libexec/named-xfer" -ot \
-	    /usr/libexec/named-xfer ]; then
-		rm -f "${named_chrootdir}/usr/libexec/named-xfer"
-		cp -p /usr/libexec/named-xfer "${named_chrootdir}/usr/libexec"
-	fi
-
-	# Copy /dev/null over, if neccessary. Preserve everything (perms,
+	# Copy devices if necessary. Preserve everything (perms,
 	# ownership, mod times).
 	#
 	if [ ! -c "${named_chrootdir}/dev/null" ]; then
 	rm -f "${named_chrootdir}/dev/null"
 		( cd /dev ; /bin/pax -rw -pe null "${named_chrootdir}/dev" )
 	fi
+	if [ ! -c "${named_chrootdir}/dev/random" ]; then
+	rm -f "${named_chrootdir}/dev/random"
+		( cd /dev ; /bin/pax -rw -pe random "${named_chrootdir}/dev" )
+	fi
 
 	# Copy local timezone information if it's not up-to-date.
 	#
@@ -55,21 +49,30 @@
 	fi
 }
 
-# Make symlinks to the correct pid and ndc socket files
+# Make symlinks to the correct pid file
 #
 make_symlinks()
 {
-	ln -fs "${named_chrootdir}${named_pidfile}" ${named_pidfile}
-	ln -fs "${named_chrootdir}/var/run/ndc" /var/run/ndc
+	checkyesno named_symlink_enable &&
+	ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
 }
 
 named_precmd()
 {
+	local confgen_chroot
+
 	# Is the user using a sandbox?
 	if [ -n "$named_chrootdir" ]; then
 		rc_flags="$rc_flags -t $named_chrootdir"
+		confgen_chroot="-t${named_chrootdir}"
 		checkyesno named_chroot_autoupdate && chroot_autoupdate
-		checkyesno named_symlink_enable && make_symlinks
+	else
+		named_symlink_enable=NO
+	fi
+
+	# Create an rndc.key file for the user if none exists
+	if [ ! -f "${named_chrootdir}/etc/namedb/rndc.key" ]; then
+		rndc-confgen -a -b256 ${confgen_chroot}
 	fi
 }
 

==== //depot/projects/ia64/lib/Makefile#48 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.193 2004/09/21 19:01:42 des Exp $
+# $FreeBSD: src/lib/Makefile,v 1.194 2004/09/24 22:10:34 trhodes Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -25,7 +25,7 @@
 SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
 	libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
 	${_libypclnt} libalias libarchive ${_libatm} \
-	${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
+	libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list