Date: Sat, 23 Jun 2007 00:00:54 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 122170 for review Message-ID: <200706230000.l5N00sqT052527@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122170 Change 122170 by sam@sam_aku on 2007/06/23 00:00:23 IFC @ 122169 Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#18 integrate .. //depot/projects/wifi/contrib/less/NEWS#4 integrate .. //depot/projects/wifi/contrib/less/README#4 integrate .. //depot/projects/wifi/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/wifi/contrib/less/command.c#4 integrate .. //depot/projects/wifi/contrib/less/forwback.c#4 integrate .. //depot/projects/wifi/contrib/less/less.man#4 integrate .. //depot/projects/wifi/contrib/less/less.nro#4 integrate .. //depot/projects/wifi/contrib/less/lessecho.man#3 integrate .. //depot/projects/wifi/contrib/less/lessecho.nro#3 integrate .. //depot/projects/wifi/contrib/less/lesskey.man#4 integrate .. //depot/projects/wifi/contrib/less/lesskey.nro#4 integrate .. //depot/projects/wifi/contrib/less/main.c#5 integrate .. //depot/projects/wifi/contrib/less/optfunc.c#4 integrate .. //depot/projects/wifi/contrib/less/screen.c#4 integrate .. //depot/projects/wifi/contrib/less/search.c#4 integrate .. //depot/projects/wifi/contrib/less/version.c#4 integrate .. //depot/projects/wifi/etc/Makefile#14 integrate .. //depot/projects/wifi/etc/devd.conf#17 integrate .. //depot/projects/wifi/etc/namedb/Makefile#4 integrate .. //depot/projects/wifi/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/wifi/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/wifi/etc/namedb/make-localhost#2 delete .. //depot/projects/wifi/etc/namedb/master/Makefile#1 branch .. //depot/projects/wifi/etc/namedb/master/empty.db#1 branch .. //depot/projects/wifi/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/wifi/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/wifi/etc/namedb/named.conf#5 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#6 integrate .. //depot/projects/wifi/etc/pam.d/cron#1 branch .. //depot/projects/wifi/etc/rc.resume#2 integrate .. //depot/projects/wifi/etc/rc.suspend#2 integrate .. //depot/projects/wifi/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/wifi/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/wifi/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/wifi/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#26 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#18 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/wifi/lib/libbsnmp/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#6 integrate .. //depot/projects/wifi/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/wifi/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/timer_create.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/timer_delete.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/timer_settime.2#4 integrate .. //depot/projects/wifi/lib/libpam/Makefile.inc#4 integrate .. //depot/projects/wifi/libexec/atrun/atrun.man#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#22 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#20 integrate .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.1#2 integrate .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/wifi/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#7 integrate .. //depot/projects/wifi/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/wifi/share/man/man9/lock.9#6 integrate .. //depot/projects/wifi/share/man/man9/locking.9#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/wifi/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low.c#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#18 integrate .. //depot/projects/wifi/sys/conf/files.sun4v#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_panasonic.c#7 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/wifi/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#20 integrate .. //depot/projects/wifi/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/wifi/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/wifi/sys/dev/aha/aha.c#6 integrate .. //depot/projects/wifi/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/wifi/sys/dev/ahb/ahbreg.h#3 integrate .. //depot/projects/wifi/sys/dev/aic/aic.c#5 integrate .. //depot/projects/wifi/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/wifi/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/aic/aic_pccard.c#6 integrate .. //depot/projects/wifi/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/wifi/sys/dev/amd/amd.c#8 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#11 integrate .. //depot/projects/wifi/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/wifi/sys/dev/asr/asr.c#11 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cam.c#13 integrate .. //depot/projects/wifi/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/wifi/sys/dev/buslogic/bt.c#7 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#20 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9x.c#10 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp_targ.c#8 integrate .. //depot/projects/wifi/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/wifi/sys/dev/hptmv/entry.c#13 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/wifi/sys/dev/iir/iir.c#7 integrate .. //depot/projects/wifi/sys/dev/iir/iir.h#7 integrate .. //depot/projects/wifi/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/mly/mly.c#8 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/wifi/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/wifi/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10kx-pcm.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#17 integrate .. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/solo.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/t4dwave.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/vibes.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/sbus/cs4231.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#19 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#14 integrate .. //depot/projects/wifi/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/wifi/sys/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/wifi/sys/dev/trm/trm.c#9 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/hid.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#22 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#17 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#31 integrate .. //depot/projects/wifi/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/sl811hs.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/slhci_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/uark.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ufm.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uhub.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/umct.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/umodem.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/uplcom.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/urio.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/usb.h#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb_mem.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#12 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.h#6 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi_util.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uvisor.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/wifi/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part.c#6 integrate .. //depot/projects/wifi/sys/geom/part/g_part.h#3 integrate .. //depot/projects/wifi/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/wifi/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#20 integrate .. //depot/projects/wifi/sys/kern/subr_unit.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/wifi/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#24 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#11 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#16 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/wifi/sys/netinet6/ah_output.c#4 integrate .. //depot/projects/wifi/sys/pci/ncr.c#9 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci.c#4 delete .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci_if.m#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcibus.c#9 integrate .. //depot/projects/wifi/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/wifi/sys/sys/priv.h#7 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#21 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_inode.c#9 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#20 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#23 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/wifi/usr.bin/netstat/sctp.c#3 integrate .. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate .. //depot/projects/wifi/usr.sbin/bsnmpd/modules/Makefile.inc#6 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/cron.8#3 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/do_command.c#4 integrate .. //depot/projects/wifi/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/cron/lib/entry.c#5 integrate .. //depot/projects/wifi/usr.sbin/fwcontrol/fwdv.c#3 integrate .. //depot/projects/wifi/usr.sbin/moused/moused.c#10 integrate .. //depot/projects/wifi/usr.sbin/periodic/periodic.8#3 integrate .. //depot/projects/wifi/usr.sbin/periodic/periodic.sh#2 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/lib/deps.c#2 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.94 2007/06/05 01:10:47 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,51 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070618: shared library version bump +OLD_LIBS+=lib/libalias.so.5 +OLD_LIBS+=lib/libbsnmp.so.3 +OLD_LIBS+=lib/libncurses.so.6 +OLD_LIBS+=lib/libncursesw.so.6 +OLD_LIBS+=lib/libreadline.so.6 +OLD_LIBS+=usr/lib/libdialog.so.5 +OLD_LIBS+=usr/lib/libgnuregex.so.3 +OLD_LIBS+=usr/lib/libhistory.so.6 +OLD_LIBS+=usr/lib/libpam.so.3 +OLD_LIBS+=usr/lib/libssh.so.3 +OLD_LIBS+=usr/lib/pam_chroot.so.3 +OLD_LIBS+=usr/lib/pam_deny.so.3 +OLD_LIBS+=usr/lib/pam_echo.so.3 +OLD_LIBS+=usr/lib/pam_exec.so.3 +OLD_LIBS+=usr/lib/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib/pam_group.so.3 +OLD_LIBS+=usr/lib/pam_guest.so.3 +OLD_LIBS+=usr/lib/pam_krb5.so.3 +OLD_LIBS+=usr/lib/pam_ksu.so.3 +OLD_LIBS+=usr/lib/pam_lastlog.so.3 +OLD_LIBS+=usr/lib/pam_login_access.so.3 +OLD_LIBS+=usr/lib/pam_nologin.so.3 +OLD_LIBS+=usr/lib/pam_opie.so.3 +OLD_LIBS+=usr/lib/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib/pam_permit.so.3 +OLD_LIBS+=usr/lib/pam_radius.so.3 +OLD_LIBS+=usr/lib/pam_rhosts.so.3 +OLD_LIBS+=usr/lib/pam_rootok.so.3 +OLD_LIBS+=usr/lib/pam_securetty.so.3 +OLD_LIBS+=usr/lib/pam_self.so.3 +OLD_LIBS+=usr/lib/pam_ssh.so.3 +OLD_LIBS+=usr/lib/pam_tacplus.so.3 +OLD_LIBS+=usr/lib/pam_unix.so.3 +OLD_LIBS+=usr/lib/snmp_atm.so.4 +OLD_LIBS+=usr/lib/snmp_bridge.so.4 +OLD_LIBS+=usr/lib/snmp_hostres.so.4 +OLD_LIBS+=usr/lib/snmp_mibII.so.4 +OLD_LIBS+=usr/lib/snmp_netgraph.so.4 +OLD_LIBS+=usr/lib/snmp_pf.so.4 # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz +# 20070603: BIND 9.4.1 import +OLD_LIBS+=lib/liblwres.so.10 # 20070521: shared library version bump OLD_LIBS+=lib/libatm.so.4 OLD_LIBS+=lib/libbegemot.so.2 @@ -74,6 +117,7 @@ OLD_LIBS+=usr/lib/libthread_db.so.2 OLD_LIBS+=usr/lib/libugidfw.so.2 OLD_LIBS+=usr/lib/libusbhid.so.2 +OLD_LIBS+=usr/lib/libvgl.so.4 OLD_LIBS+=usr/lib/libwrap.so.4 OLD_LIBS+=usr/lib/libypclnt.so.2 OLD_LIBS+=usr/lib/snmp_atm.so.3 ==== //depot/projects/wifi/contrib/less/NEWS#4 (text+ko) ==== @@ -13,7 +13,7 @@ ====================================================================== - Major changes between "less" versions 394 and 403 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/wifi/contrib/less/README#4 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 403 + Less, version 406 - This is the distribution of less, version 403, released 25 May 2007. + This is the distribution of less, version 406, released 19 Jun 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/wifi/contrib/less/cmdbuf.c#4 (text+ko) ==== @@ -1390,11 +1390,14 @@ } if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) ml = &mlist_search; + else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { #if SHELL_ESCAPE || PIPEC - else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) ml = &mlist_shell; +#else + ml = NULL; #endif - else if (*line == '"') + } else if (*line == '"') { if (ml != NULL) cmd_addhist(ml, line+1); @@ -1444,11 +1447,18 @@ #if CMD_HISTORY char *filename; FILE *f; + int modified = 0; filename = histfile_name(); if (filename == NULL) return; - if (!mlist_search.modified && !mlist_shell.modified) + if (mlist_search.modified) + modified = 1; +#if SHELL_ESCAPE || PIPEC + if (mlist_shell.modified) + modified = 1; +#endif + if (!modified) return; f = fopen(filename, "w"); free(filename); ==== //depot/projects/wifi/contrib/less/command.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -87,7 +87,7 @@ cmd_exec() { clear_attn(); - line_left(); + clear_bot(); flush(); } ==== //depot/projects/wifi/contrib/less/forwback.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/forwback.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/forwback.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,9 +142,6 @@ clear(); home(); } - } else - { - clear_bot(); } if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) ==== //depot/projects/wifi/contrib/less/less.man#4 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 403: 25 May 2007 LESS(1) + Version 406: 19 Jun 2007 LESS(1) ==== //depot/projects/wifi/contrib/less/less.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 403: 25 May 2007" +.TH LESS 1 "Version 406: 19 Jun 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/lessecho.man#3 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 403: 25 May 2007 LESSECHO(1) + Version 406: 19 Jun 2007 LESSECHO(1) ==== //depot/projects/wifi/contrib/less/lessecho.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 403: 25 May 2007" +.TH LESSECHO 1 "Version 406: 19 Jun 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/lesskey.man#4 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 403: 25 May 2007 LESSKEY(1) + Version 406: 19 Jun 2007 LESSKEY(1) ==== //depot/projects/wifi/contrib/less/lesskey.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 403: 25 May 2007" +.TH LESSKEY 1 "Version 406: 19 Jun 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/main.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.7 2007/06/16 02:43:44 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,7 +142,8 @@ if (s != NULL) scan_option(save(s)); -#define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') +#define isoptstring(s) less_is_more ? (((s)[0] == '-') && (s)[1] != '\0') : \ + (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') while (argc > 0 && (isoptstring(*argv) || isoptpending())) { s = *argv++; ==== //depot/projects/wifi/contrib/less/optfunc.c#4 (text+ko) ==== @@ -45,6 +45,9 @@ extern char *wproto; extern IFILE curr_ifile; extern char version[]; +extern int jump_sline; +extern int jump_sline_fraction; +extern int less_is_more; #if LOGFILE extern char *namelogfile; extern int force_logfile; @@ -53,9 +56,6 @@ #if TAGS public char *tagoption = NULL; extern char *tags; -extern int jump_sline; -extern int jump_sline_fraction; -extern int less_is_more; #endif #if MSDOS_COMPILER extern int nm_fg_color, nm_bg_color; ==== //depot/projects/wifi/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -626,7 +626,25 @@ char *capname; { char name[16]; + char *s; + s = lgetenv("LESS_TERMCAP_DEBUG"); + if (s != NULL && *s != '\0') + { + struct env { struct env *next; char *name; char *value; }; + static struct env *envs = NULL; + struct env *p; + for (p = envs; p != NULL; p = p->next) + if (strcmp(p->name, capname) == 0) + return p->value; + p = (struct env *) ecalloc(1, sizeof(struct env)); + p->name = save(capname); + p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); + sprintf(p->value, "<%s>", capname); + p->next = envs; + envs = p; + return p->value; + } strcpy(name, "LESS_TERMCAP_"); strcat(name, capname); return (lgetenv(name)); ==== //depot/projects/wifi/contrib/less/search.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/search.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/search.c,v 1.8 2007/06/17 23:20:43 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -294,6 +294,7 @@ POSITION old_end_attnpos; POSITION pos; POSITION epos; + int moved = 0; if (start_attnpos == NULL_POSITION) return; @@ -321,8 +322,11 @@ (void) forw_line(pos); goto_line(slinenum); put_line(); + moved = 1; } } + if (moved) + lower_left(); } #endif ==== //depot/projects/wifi/contrib/less/version.c#4 (text+ko) ==== @@ -690,6 +690,9 @@ v402 3/30/07 Fix autoconf bug when memcpy etc are inline; fix bug in terminating number following -j option. v403 5/25/07 Fix Windows build. +v404 6/5/07 Fix display bug with F command and long lines. +v405 6/17/07 Fix display bug when using -w option. +v406 6/17/07 Fix secure build. */ -char version[] = "403"; +char version[] = "406"; ==== //depot/projects/wifi/etc/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.358 2006/09/26 23:26:48 piso Exp $ +# $FreeBSD: src/etc/Makefile,v 1.359 2007/06/18 05:44:38 dougb Exp $ .include <bsd.own.mk> @@ -64,11 +64,6 @@ .endif .endif -.if ${MK_BIND_ETC} != "no" -NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost -.endif - PPPCNF= ppp.conf .if ${MK_SENDMAIL} == "no" @@ -135,6 +130,15 @@ .if ${MK_I4B} != "no" cd ${.CURDIR}/isdn; ${MAKE} install .endif +.if ${MK_BIND_MTREE} != "no" + @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ + set -x; \ + ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ + fi +.endif +.if ${MK_BIND_ETC} != "no" + cd ${.CURDIR}/namedb; ${MAKE} install +.endif .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif @@ -163,16 +167,6 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/var/named/etc/namedb -.endif -.if ${MK_BIND_MTREE} != "no" - @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ - set -x; \ - ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ - fi -.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/wifi/etc/devd.conf#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -239,6 +239,19 @@ action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; }; +# User requested suspend, so perform preparation steps and then execute +# the actual suspend process. +notify 10 { + match "system" "ACPI"; + match "subsystem" "Suspend"; + action "/etc/rc.suspend acpi $notify"; +}; +notify 10 { + match "system" "ACPI"; + match "subsystem" "Resume"; + action "/etc/rc.resume acpi $notify"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might @@ -277,6 +290,7 @@ # Button: Button pressed (0 for power, 1 for sleep) # CMBAT: ACPI battery events # Lid: Lid state (0 is closed, 1 is open) +# Suspend, Resume: Suspend and resume notification # Thermal: ACPI thermal zone events # # This example calls a script when the AC state changes, passing the ==== //depot/projects/wifi/etc/namedb/Makefile#4 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $ +# $FreeBSD: src/etc/namedb/Makefile,v 1.5 2007/06/18 05:44:38 dougb Exp $ + +SUBDIR= master + +FILES= named.conf named.root -FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost NO_OBJ= -FILESDIR= /etc/namedb -FILESMODE= 644 +FILESDIR= /etc/namedb +FILESMODE= 644 .include <bsd.prog.mk> ==== //depot/projects/wifi/etc/namedb/named.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.22 2005/09/05 13:42:22 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.24 2007/06/18 06:29:45 dougb Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -9,11 +9,16 @@ // or cause huge amounts of useless Internet traffic. options { + // Relative to the chroot directory, if any directory "/etc/namedb"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. @@ -28,7 +33,7 @@ // server to never initiate queries of its own, but always ask its // forwarders only, by enabling the following line: // -// forward only; +// forward only; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you @@ -52,21 +57,178 @@ // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. +/* Slaving the following zones from the root name servers has some + significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots + 3. Greater resilience to any potential root server failure/DDoS + + If you do not wish to slave these zones from the root servers + use the entry below instead. + zone "." { type hint; file "named.root"; }; +*/ zone "." { - type hint; - file "named.root"; + type slave; + file "slave/root.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "arpa" { + type slave; + file "slave/arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "in-addr.arpa" { + type slave; + file "slave/in-addr.arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; }; -zone "0.0.127.IN-ADDR.ARPA" { - type master; - file "master/localhost.rev"; -}; +/* Serving the following zones locally will prevent any queries + for these zones leaving your network and going to the root + name servers. This has two significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots +*/ +// RFC 1912 +zone "localhost" { type master; file "master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; + +// RFC 1912-style zone for IPv6 localhost address +zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; + +// "This" Network (RFCs 1912 and 3330) +zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IANA Reserved - Unlikely to ever be assigned +zone "1.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "2.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "223.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Public Data Networks (RFC 3330) +zone "14.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Private Use Networks (RFC 1918) +zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Link-local/APIPA (RFCs 3330 and 3927) +zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; + +// TEST-NET for Documentation (RFC 3330) +zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Router Benchmark Testing (RFC 2544) +zone "18.192.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IANA Reserved - Old Class E Space +zone "240.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Unassigned Addresses (RFC 4291) +zone "1.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 ULA (RFC 4193) +zone "c.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Link Local (RFC 4291) +zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Deprecated Site-Local Addresses (RFC 3879) +zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; }; -// RFC 3152 -zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA" { - type master; - file "master/localhost-v6.rev"; -}; +// IP6.INT is Deprecated (RFC 4159) +zone "ip6.int" { type master; file "master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! @@ -74,30 +236,23 @@ // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible -// primary. +// master name server. // -// Never forget to include the reverse lookup (IN-ADDR.ARPA) zone! -// (This is named after the first bytes of the IP address, in reverse -// order, with ".IN-ADDR.ARPA" appended.) +// Do not forget to include the reverse lookup zone! +// This is named after the first bytes of the IP address, in reverse +// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // -// Before starting to set up a primary zone, make sure you fully -// understand how DNS and BIND works. There are sometimes -// non-obvious pitfalls. Setting up a slave zone is simpler. +// Before starting to set up a master zone, make sure you fully +// understand how DNS and BIND work. There are sometimes +// non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706230000.l5N00sqT052527>