[email protected]
[Top] [All Lists]

PERFORCE change 114034 for review

Subject: PERFORCE change 114034 for review
From: Matt Jacob
Date: Mon, 5 Feb 2007 05:26:07 GMT
http://perforce.freebsd.org/chv.cgi?CH=114034

Change 114034 by [email protected] on 2007/02/05 05:25:18

        IFC

Affected files ...

.. //depot/projects/mjexp/ObsoleteFiles.inc#7 integrate
.. //depot/projects/mjexp/contrib/bind9/CHANGES#4 integrate
.. //depot/projects/mjexp/contrib/bind9/FAQ#3 integrate
.. //depot/projects/mjexp/contrib/bind9/FAQ.xml#3 integrate
.. //depot/projects/mjexp/contrib/bind9/README#3 integrate
.. //depot/projects/mjexp/contrib/bind9/lib/dns/api#3 integrate
.. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#3 
integrate
.. //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#4 integrate
.. //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#3 integrate
.. //depot/projects/mjexp/contrib/bind9/version#4 integrate
.. //depot/projects/mjexp/etc/etc.powerpc/ttys#2 integrate
.. //depot/projects/mjexp/gnu/usr.bin/Makefile#3 integrate
.. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate
.. //depot/projects/mjexp/gnu/usr.bin/gzip/COPYING#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/ChangeLog#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/Makefile#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/NEWS#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/README#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/THANKS#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/TODO#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/algorithm.doc#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/bits.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/crypt.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/crypt.h#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/deflate.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/gzexe#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/gzexe.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.h#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/inflate.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/lzw.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/lzw.h#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/match.S#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/revision.h#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/tailor.h#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/trees.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/unlzh.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/unlzw.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/unpack.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/unzip.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/util.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zdiff#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zdiff.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zforce#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zforce.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.getopt#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.libz#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zip.c#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zmore#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/zmore.1#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/znew#2 delete
.. //depot/projects/mjexp/gnu/usr.bin/gzip/znew.1#2 delete
.. //depot/projects/mjexp/include/Makefile#5 integrate
.. //depot/projects/mjexp/include/objformat.h#2 delete
.. //depot/projects/mjexp/include/rpc/auth_kerb.h#2 integrate
.. //depot/projects/mjexp/include/tgmath.h#2 integrate
.. //depot/projects/mjexp/lib/bind/bind/config.h#3 integrate
.. //depot/projects/mjexp/lib/bind/config.h#3 integrate
.. //depot/projects/mjexp/lib/bind/dns/code.h#3 integrate
.. //depot/projects/mjexp/lib/bind/dns/dns/enumclass.h#3 integrate
.. //depot/projects/mjexp/lib/bind/dns/dns/enumtype.h#3 integrate
.. //depot/projects/mjexp/lib/bind/dns/dns/rdatastruct.h#3 integrate
.. //depot/projects/mjexp/lib/libarchive/Makefile#3 integrate
.. //depot/projects/mjexp/lib/libarchive/archive.h.in#6 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read.3#5 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read.c#6 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_all.c#3 
integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_empty.c#1 
branch
.. //depot/projects/mjexp/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/gen/getobjformat.3#3 delete
.. //depot/projects/mjexp/lib/libc/gen/getobjformat.c#2 delete
.. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/quotactl.2#3 integrate
.. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#3 integrate
.. //depot/projects/mjexp/release/Makefile#5 integrate
.. //depot/projects/mjexp/rescue/rescue/Makefile#3 integrate
.. //depot/projects/mjexp/sbin/camcontrol/camcontrol.c#4 integrate
.. //depot/projects/mjexp/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#2 integrate
.. //depot/projects/mjexp/sbin/geom/class/journal/gjournal.8#1 branch
.. //depot/projects/mjexp/sbin/geom/misc/subr.c#2 integrate
.. //depot/projects/mjexp/sbin/geom/misc/subr.h#2 integrate
.. //depot/projects/mjexp/sbin/ifconfig/af_inet6.c#2 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/mjexp/sbin/init/init.c#2 integrate
.. //depot/projects/mjexp/sbin/ldconfig/ldconfig.c#2 integrate
.. //depot/projects/mjexp/sbin/mount/Makefile#2 integrate
.. //depot/projects/mjexp/sbin/mount/mount.c#4 integrate
.. //depot/projects/mjexp/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate
.. //depot/projects/mjexp/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate
.. //depot/projects/mjexp/sbin/mount_nfs4/Makefile#2 delete
.. //depot/projects/mjexp/sbin/mount_nfs4/mount_nfs4.8#2 delete
.. //depot/projects/mjexp/sbin/mount_nfs4/mount_nfs4.c#2 delete
.. //depot/projects/mjexp/sbin/quotacheck/quotacheck.8#3 integrate
.. //depot/projects/mjexp/sbin/quotacheck/quotacheck.c#4 integrate
.. //depot/projects/mjexp/share/examples/cvsup/ports-supfile#2 integrate
.. //depot/projects/mjexp/share/man/man4/altq.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/an.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ath.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/aue.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/awi.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/bce.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/bfe.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/bge.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/dc.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/de.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ed.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/em.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/fxp.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/hme.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ipw.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/iwi.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/le.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/man4.arm/npe.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/man4.i386/ep.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/msk.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/mxge.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/my.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ng_deflate.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/nve.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ral.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/re.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/rl.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/sf.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/sis.4#5 integrate
.. //depot/projects/mjexp/share/man/man4/sk.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ste.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/stge.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/tap.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/tun.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/udav.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ural.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/vr.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/wi.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/xl.4#2 integrate
.. //depot/projects/mjexp/share/man/man5/linsysfs.5#3 integrate
.. //depot/projects/mjexp/share/man/man5/quota.user.5#2 integrate
.. //depot/projects/mjexp/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/mjexp/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/mjexp/share/man/man9/Makefile#6 integrate
.. //depot/projects/mjexp/share/man/man9/disk.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/hashinit.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/pmap_extract.9#2 integrate
.. //depot/projects/mjexp/share/man/man9/sf_buf.9#1 branch
.. //depot/projects/mjexp/share/man/man9/style.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/vm_map.9#2 integrate
.. //depot/projects/mjexp/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/mjexp/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/mjexp/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/mjexp/share/zoneinfo/leapseconds#2 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate
.. //depot/projects/mjexp/sys/boot/common/loader.8#4 integrate
.. //depot/projects/mjexp/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/mjexp/sys/coda/coda_vfsops.h#2 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#8 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/mjexp/sys/conf/NOTES#10 integrate
.. //depot/projects/mjexp/sys/conf/files#10 integrate
.. //depot/projects/mjexp/sys/conf/kmod.mk#4 integrate
.. //depot/projects/mjexp/sys/conf/options#9 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bce.c#9 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#6 integrate
.. //depot/projects/mjexp/sys/dev/mii/brgphy.c#5 integrate
.. //depot/projects/mjexp/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#11 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/mjexp/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pci/pcireg.h#6 integrate
.. //depot/projects/mjexp/sys/dev/re/if_re.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/driver.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/mss.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/midi.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/midi.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/midiq.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/mpu_if.m#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/mpufoi_if.m#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/midi/synth_if.m#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/maestro.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.h#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_aue.c#6 integrate
.. //depot/projects/mjexp/sys/dev/usb/ubsa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/uhub.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/uipaq.c#1 branch
.. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/uvisor.c#2 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/mjexp/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/mjexp/sys/geom/geom_io.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/mjexp/sys/kern/sched_4bsd.c#8 integrate
.. //depot/projects/mjexp/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/mjexp/sys/kern/subr_firmware.c#3 integrate
.. //depot/projects/mjexp/sys/kern/subr_witness.c#4 integrate
.. //depot/projects/mjexp/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/mjexp/sys/modules/Makefile#5 integrate
.. //depot/projects/mjexp/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/msdosfs/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/uipaq/Makefile#1 branch
.. //depot/projects/mjexp/sys/net/bpf.c#4 integrate
.. //depot/projects/mjexp/sys/net/bpf_compat.h#2 delete
.. //depot/projects/mjexp/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/mjexp/sys/net/if_tap.c#3 integrate
.. //depot/projects/mjexp/sys/net/if_tun.c#4 integrate
.. //depot/projects/mjexp/sys/net80211/_ieee80211.h#4 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/in.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/in.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_carp.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_fw2.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/tcp.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/mjexp/sys/nfs4client/nfs4_vfs_subs.c#2 integrate
.. //depot/projects/mjexp/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/mjexp/sys/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs.h#4 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/mjexp/sys/powerpc/include/ipl.h#2 delete
.. //depot/projects/mjexp/sys/sun4v/conf/.cvsignore#1 branch
.. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#3 integrate
.. //depot/projects/mjexp/sys/sun4v/include/smp.h#4 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/tte.c#4 integrate
.. //depot/projects/mjexp/sys/sys/ata.h#2 integrate
.. //depot/projects/mjexp/sys/sys/conf.h#3 integrate
.. //depot/projects/mjexp/sys/sys/lock.h#3 integrate
.. //depot/projects/mjexp/sys/sys/mbuf.h#3 integrate
.. //depot/projects/mjexp/sys/sys/param.h#7 integrate
.. //depot/projects/mjexp/sys/sys/socketvar.h#2 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#4 integrate
.. //depot/projects/mjexp/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/mjexp/sys/vm/uma.h#3 integrate
.. //depot/projects/mjexp/sys/vm/uma_core.c#5 integrate
.. //depot/projects/mjexp/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate
.. //depot/projects/mjexp/tools/build/options/WITHOUT_BZIP2#1 branch
.. //depot/projects/mjexp/tools/build/options/WITHOUT_BZIP2_SUPPORT#1 branch
.. //depot/projects/mjexp/tools/regression/fstest/README#1 branch
.. //depot/projects/mjexp/tools/regression/fstest/tests/chmod/00.t#2 integrate
.. //depot/projects/mjexp/tools/regression/fstest/tests/mkdir/00.t#2 integrate
.. //depot/projects/mjexp/tools/regression/fstest/tests/mkfifo/00.t#2 integrate
.. //depot/projects/mjexp/tools/regression/fstest/tests/open/00.t#2 integrate
.. //depot/projects/mjexp/tools/regression/netinet/ipsockopt/ipsockopt.c#2 
integrate
.. //depot/projects/mjexp/tools/sched/schedgraph.py#4 integrate
.. //depot/projects/mjexp/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/Makefile#3 integrate
.. //depot/projects/mjexp/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 
integrate
.. //depot/projects/mjexp/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 
integrate
.. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.music#3 integrate
.. //depot/projects/mjexp/usr.bin/gzip/Makefile#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/gzexe#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/gzexe.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/gzip.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/gzip.c#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/unbzip2.c#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zdiff#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zdiff.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zforce#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zforce.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zgrep#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zgrep.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zmore#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zmore.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/znew#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/znew.1#1 branch
.. //depot/projects/mjexp/usr.bin/gzip/zuncompress.c#1 branch
.. //depot/projects/mjexp/usr.bin/objformat/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/objformat/objformat.1#2 delete
.. //depot/projects/mjexp/usr.bin/objformat/objformat.c#2 delete
.. //depot/projects/mjexp/usr.bin/objformat/objformat.sh#1 branch
.. //depot/projects/mjexp/usr.bin/quota/quota.c#3 integrate
.. //depot/projects/mjexp/usr.sbin/Makefile#4 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#5 
integrate
.. //depot/projects/mjexp/usr.sbin/edquota/edquota.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/edquota/edquota.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/gstat/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/mountd/mountd.c#5 integrate
.. //depot/projects/mjexp/usr.sbin/pciconf/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/pciconf/cap.c#1 branch
.. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.h#1 branch
.. //depot/projects/mjexp/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/pkg_install/sign/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/pkg_install/sign/stand.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/quotaon/quotaon.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#4 integrate
.. //depot/projects/mjexp/usr.sbin/vnconfig/Makefile#2 delete
.. //depot/projects/mjexp/usr.sbin/vnconfig/vnconfig.c#2 delete

Differences ...

==== //depot/projects/mjexp/ObsoleteFiles.inc#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.68 2007/01/02 03:42:16 kientzle Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.71 2007/02/01 08:45:26 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,6 +14,16 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070201: remove libmytinfo link
+OLD_FILES+=usr/lib/libmytinfo.a
+OLD_FILES+=usr/lib/libmytinfo.so
+# 20070128: remove vnconfig
+OLD_FILES+=usr/sbin/vnconfig
+# 20070125: objformat bites the dust
+OLD_FILES+=usr/bin/objformat
+OLD_FILES+=usr/share/man/man1/objformat.1.gz
+OLD_FILES+=usr/include/objformat.h
+OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061201: remove symlink to *.so.4 libalias modules
 OLD_FILES+=usr/lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_dummy.so

==== //depot/projects/mjexp/contrib/bind9/CHANGES#4 (text+ko) ====

@@ -1,4 +1,11 @@
 
+       --- 9.3.4 released ---
+
+2126.  [security]      Serialise validation of type ANY responses. [RT #16555]
+
+2124.  [security]      It was possible to dereference a freed fetch
+                       context. [RT #16584]
+
        --- 9.3.3 released ---
 
 2107.  [bug]           dighost.c: more cleanup of buffers. [RT #16499]

==== //depot/projects/mjexp/contrib/bind9/FAQ#3 (text+ko) ====

@@ -1,5 +1,9 @@
 Frequently Asked Questions about BIND 9
 
+Copyright © 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+
+Copyright © 2000-2003 Internet Software Consortium.
+
 -------------------------------------------------------------------------------
 
 Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads?
@@ -630,3 +634,42 @@
    See these man-pages for more information : selinux(8), named_selinux(8), 
chcon
    (1), setsebool(8)
 
+Q: I want to forward all DNS queries from my caching nameserver to another 
server.
+   But there are some domains which have to be served locally, via rbldnsd.
+
+   How do I achieve this ?
+
+A: options {
+           forward only;
+           forwarders { <ip.of.primary.nameserver>; };
+   };
+
+   zone "sbl-xbl.spamhaus.org" {
+           type forward; forward only;
+           forwarders { <ip.of.rbldns.server> port 530; };
+   };
+
+   zone "list.dsbl.org" {
+           type forward; forward only;
+           forwarders { <ip.of.rbldns.server> port 530; };
+   };
+
+
+Q: Will named be affected by the 2007 changes to daylight savings rules in the 
US.
+
+A: No, so long as the machines internal clock (as reported by "date -u") 
remains
+   at UTC. The only visible change if you fail to upgrade your OS, if you are 
in a
+   affected area, will be that log messages will be a hour out during the 
period
+   where the old rules do not match the new rules.
+
+   For most OS's this change just means that you need to update the conversion
+   rules from UTC to local time. Normally this involves updating a file in /etc
+   (which sets the default timezone for the machine) and possibly a directory
+   which has all the conversion rules for the world (e.g. /usr/share/zoneinfo).
+   When updating the OS do not forget to update any chroot areas as well. See 
your
+   OS's documetation for more details.
+
+   The local timezone conversion rules can also be done on a individual basis 
by
+   setting the TZ envirionment variable appropriately. See your OS's 
documentation
+   for more details.
+

==== //depot/projects/mjexp/contrib/bind9/FAQ.xml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; []>
 <!--
- - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
@@ -17,10 +17,26 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: FAQ.xml,v 1.4.6.5 2006/02/27 21:11:40 marka Exp $ -->
+<!-- $Id: FAQ.xml,v 1.4.6.5.6.1 2007/01/12 02:28:00 marka Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>
+  <articleinfo>
+    <copyright>
+      <year>2004</year>
+      <year>2005</year>
+      <year>2006</year>
+      <year>2007</year>
+      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
+    </copyright>
+    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
+      <holder>Internet Software Consortium.</holder>
+    </copyright>
+  </articleinfo>
   <qandaset defaultlabel='qanda'>
     <qandaentry>
       <question>
@@ -1193,5 +1209,68 @@
        </para>
       </answer>
     </qandaentry>
+    <qandaentry>
+      <question>
+       <para>
+         I want to forward all DNS queries from my caching nameserver to
+         another server. But there are some domains which have to be
+         served locally, via rbldnsd.
+       </para>
+       <para>
+         How do I achieve this ?
+       </para>
+      </question>
+      <answer>
+        <programlisting>
+options {
+       forward only;
+       forwarders { &lt;ip.of.primary.nameserver&gt;; };
+};
+
+zone "sbl-xbl.spamhaus.org" {
+       type forward; forward only;
+       forwarders { &lt;ip.of.rbldns.server&gt; port 530; };
+};
+
+zone "list.dsbl.org" {
+       type forward; forward only;
+       forwarders { &lt;ip.of.rbldns.server&gt; port 530; };
+};
+        </programlisting>
+      </answer>
+    </qandaentry>
+    <qandaentry>
+      <question>
+       <para>
+         Will named be affected by the 2007 changes to daylight savings
+         rules in the US.
+       </para>
+      </question>
+      <answer>
+       <para>
+         No, so long as the machines internal clock (as reported
+         by "date -u") remains at UTC.  The only visible change
+         if you fail to upgrade your OS, if you are in a affected
+         area, will be that log messages will be a hour out during
+         the period where the old rules do not match the new rules.
+       </para>
+       <para>
+         For most OS's this change just means that you need to
+         update the conversion rules from UTC to local time.
+         Normally this involves updating a file in /etc (which
+         sets the default timezone for the machine) and possibly
+         a directory which has all the conversion rules for the
+         world (e.g. /usr/share/zoneinfo).  When updating the OS
+         do not forget to update any chroot areas as well.
+         See your OS's documetation for more details.
+       </para>
+       <para>
+         The local timezone conversion rules can also be done on
+         a individual basis by setting the TZ envirionment variable
+         appropriately.  See your OS's documentation for more
+         details.
+       </para>
+      </answer>
+    </qandaentry>
   </qandaset>
 </article>

==== //depot/projects/mjexp/contrib/bind9/README#3 (text+ko) ====

@@ -42,6 +42,14 @@
                Stichting NLnet - NLnet Foundation
                Nominum, Inc.
 
+BIND 9.3.4
+
+       BIND 9.3.4 is a security release.
+
+BIND 9.3.3
+
+        BIND 9.3.3 is a maintenance release, containing fixes for
+        a number of bugs in 9.3.2.
 
 BIND 9.3.2
 

==== //depot/projects/mjexp/contrib/bind9/lib/dns/api#3 (text+ko) ====

@@ -1,3 +1,3 @@
-LIBINTERFACE = 22
-LIBREVISION = 7
-LIBAGE = 0
+LIBINTERFACE = 23
+LIBREVISION = 0
+LIBAGE = 1

==== //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#3 
(text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.18.12.11 2006/01/06 00:01:42 marka Exp $ */
+/* $Id: validator.h,v 1.18.12.11.6.1 2007/01/11 04:51:39 marka Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
@@ -144,6 +144,7 @@
  * dns_validator_create() options.
  */
 #define DNS_VALIDATOR_DLV 1U
+#define DNS_VALIDATOR_DEFER 2U
 
 ISC_LANG_BEGINDECLS
 
@@ -192,6 +193,15 @@
  */
 
 void
+dns_validator_send(dns_validator_t *validator);
+/*%<
+ * Send a deferred validation request
+ *
+ * Requires:
+ *     'validator' to points to a valid DNSSEC validator.
+ */
+
+void
 dns_validator_cancel(dns_validator_t *validator);
 /*%<
  * Cancel a DNSSEC validation in progress.

==== //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#4 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.64 2006/08/31 03:57:11 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.64.4.2 2007/01/11 05:05:10 marka Exp $ */
 
 #include <config.h>
 
@@ -218,6 +218,11 @@
        dns_name_t                      nsname; 
        dns_fetch_t *                   nsfetch;
        dns_rdataset_t                  nsrrset;
+
+       /*%
+        * Number of queries that reference this context.
+        */
+       unsigned int                    nqueries;
 };
 
 #define FCTX_MAGIC                     ISC_MAGIC('F', '!', '!', '!')
@@ -351,6 +356,7 @@
                                      dns_rdataset_t *ardataset,
                                      isc_result_t *eresultp);
 static void validated(isc_task_t *task, isc_event_t *event); 
+static void maybe_destroy(fetchctx_t *fctx);
 
 static isc_result_t
 valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name,
@@ -369,6 +375,9 @@
        valarg->fctx = fctx;
        valarg->addrinfo = addrinfo;
 
+       if (!ISC_LIST_EMPTY(fctx->validators))
+               INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0);
+
        result = dns_validator_create(fctx->res->view, name, type, rdataset,
                                      sigrdataset, fctx->rmessage,
                                      valoptions, task, validated, valarg,
@@ -515,6 +524,9 @@
 
        INSIST(query->tcpsocket == NULL);
 
+       query->fctx->nqueries--;
+       if (SHUTTINGDOWN(query->fctx))
+               maybe_destroy(query->fctx);     /* Locks bucket. */
        query->magic = 0;
        isc_mem_put(query->mctx, query, sizeof(*query));
        *queryp = NULL;
@@ -973,6 +985,8 @@
        if (result != ISC_R_SUCCESS)
                return (result);
 
+       INSIST(ISC_LIST_EMPTY(fctx->validators));
+
        dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE);
 
        query = isc_mem_get(res->mctx, sizeof(*query));
@@ -1088,6 +1102,7 @@
        }
 
        ISC_LIST_APPEND(fctx->queries, query, link);
+       query->fctx->nqueries++;
 
        return (ISC_R_SUCCESS);
 
@@ -1540,7 +1555,7 @@
                        want_done = ISC_TRUE;
                }
        } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 &&
-                  ISC_LIST_EMPTY(fctx->validators)) {
+                  fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) {
                bucketnum = fctx->bucketnum;
                LOCK(&res->buckets[bucketnum].lock);
                /*
@@ -2394,8 +2409,8 @@
        REQUIRE(ISC_LIST_EMPTY(fctx->finds));
        REQUIRE(ISC_LIST_EMPTY(fctx->altfinds));
        REQUIRE(fctx->pending == 0);
+       REQUIRE(fctx->references == 0);
        REQUIRE(ISC_LIST_EMPTY(fctx->validators));
-       REQUIRE(fctx->references == 0);
 
        FCTXTRACE("destroy");
 
@@ -2569,7 +2584,7 @@
        }
 
        if (fctx->references == 0 && fctx->pending == 0 &&
-           ISC_LIST_EMPTY(fctx->validators))
+           fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators))
                bucket_empty = fctx_destroy(fctx);
 
        UNLOCK(&res->buckets[bucketnum].lock);
@@ -2610,6 +2625,7 @@
                 * pending ADB finds and no pending validations.
                 */
                INSIST(fctx->pending == 0);
+               INSIST(fctx->nqueries == 0);
                INSIST(ISC_LIST_EMPTY(fctx->validators));
                if (fctx->references == 0) {
                        /*
@@ -2771,6 +2787,7 @@
        fctx->restarts = 0;
        fctx->timeouts = 0;
        fctx->attributes = 0;
+       fctx->nqueries = 0;
 
        dns_name_init(&fctx->nsname, NULL);
        fctx->nsfetch = NULL;
@@ -3093,12 +3110,21 @@
        unsigned int bucketnum;
        isc_boolean_t bucket_empty = ISC_FALSE;
        dns_resolver_t *res = fctx->res;
+       dns_validator_t *validator;
 
        REQUIRE(SHUTTINGDOWN(fctx));
 
-       if (fctx->pending != 0 || !ISC_LIST_EMPTY(fctx->validators))
+       if (fctx->pending != 0 || fctx->nqueries != 0)
                return;
 
+       for (validator = ISC_LIST_HEAD(fctx->validators);
+            validator != NULL;
+            validator = ISC_LIST_HEAD(fctx->validators)) {
+               ISC_LIST_UNLINK(fctx->validators, validator, link);
+               dns_validator_cancel(validator);
+               dns_validator_destroy(&validator);
+       }
+
        bucketnum = fctx->bucketnum;
        LOCK(&res->buckets[bucketnum].lock);
        if (fctx->references == 0)
@@ -3232,7 +3258,9 @@
                add_bad(fctx, &addrinfo->sockaddr, result);
                isc_event_free(&event);
                UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
-               if (sentresponse)
+               if (!ISC_LIST_EMPTY(fctx->validators))
+                       dns_validator_send(ISC_LIST_HEAD(fctx->validators));
+               else if (sentresponse)
                        fctx_done(fctx, result);        /* Locks bucket. */
                else
                        fctx_try(fctx);                 /* Locks bucket. */
@@ -3330,6 +3358,7 @@
                 * be validated.
                 */
                UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+               dns_validator_send(ISC_LIST_HEAD(fctx->validators));
                goto cleanup_event;
        }
 
@@ -3640,6 +3669,13 @@
                                                           rdataset,
                                                           sigrdataset,
                                                           valoptions, task);
+                                       /*
+                                        * Defer any further validations.
+                                        * This prevents multiple validators
+                                        * from manipulating fctx->rmessage
+                                        * simultaniously.
+                                        */
+                                       valoptions |= DNS_VALIDATOR_DEFER;
                                }
                        } else if (CHAINING(rdataset)) {
                                if (rdataset->type == dns_rdatatype_cname)
@@ -6371,7 +6407,8 @@
                /*
                 * No one cares about the result of this fetch anymore.
                 */
-               if (fctx->pending == 0 && ISC_LIST_EMPTY(fctx->validators) &&
+               if (fctx->pending == 0 && fctx->nqueries == 0 &&
+                   ISC_LIST_EMPTY(fctx->validators) &&
                    SHUTTINGDOWN(fctx)) {
                        /*
                         * This fctx is already shutdown; we were just

==== //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#3 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.27.6.1 2007/01/11 04:51:39 marka Exp $ */
 
 #include <config.h>
 
@@ -2825,7 +2825,8 @@
        ISC_LINK_INIT(val, link);
        val->magic = VALIDATOR_MAGIC;
 
-       isc_task_send(task, ISC_EVENT_PTR(&event));
+       if ((options & DNS_VALIDATOR_DEFER) == 0)
+               isc_task_send(task, ISC_EVENT_PTR(&event));
 
        *validatorp = val;
 
@@ -2843,6 +2844,21 @@
 }
 
 void
+dns_validator_send(dns_validator_t *validator) {
+       isc_event_t *event;
+       REQUIRE(VALID_VALIDATOR(validator));
+
+       LOCK(&validator->lock);
+
+       INSIST((validator->options & DNS_VALIDATOR_DEFER) != 0);
+       event = (isc_event_t *)validator->event;
+       validator->options &= ~DNS_VALIDATOR_DEFER;
+       UNLOCK(&validator->lock);
+
+       isc_task_send(validator->task, ISC_EVENT_PTR(&event));
+}
+
+void
 dns_validator_cancel(dns_validator_t *validator) {
        REQUIRE(VALID_VALIDATOR(validator));
 
@@ -2856,6 +2872,12 @@
 
                if (validator->subvalidator != NULL)
                        dns_validator_cancel(validator->subvalidator);
+               if ((validator->options & DNS_VALIDATOR_DEFER) != 0) {
+                       isc_task_t *task = validator->event->ev_sender;
+                       validator->options &= ~DNS_VALIDATOR_DEFER;
+                       isc_event_free((isc_event_t **)&validator->event);
+                       isc_task_detach(&task);
+               }
        }
        UNLOCK(&validator->lock);
 }

==== //depot/projects/mjexp/contrib/bind9/version#4 (text+ko) ====

@@ -1,10 +1,10 @@
-# $Id: version,v 1.26.2.17.2.26 2006/11/28 00:52:38 marka Exp $
+# $Id: version,v 1.26.2.17.2.26.4.1 2007/01/11 05:06:25 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
 MAJORVER=9
 MINORVER=3
-PATCHVER=3
+PATCHVER=4
 RELEASETYPE=
 RELEASEVER=

==== //depot/projects/mjexp/etc/etc.powerpc/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.3 2005/09/10 22:46:03 grehan Exp $
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.4 2007/01/26 06:22:34 marcel Exp $
 #      @(#)ttys        5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -32,12 +32,6 @@
 # when going to single-user mode.
 console        none                            unknown off secure
 #
-# ofw_console(4)
-#screen        "/usr/libexec/getty Pc"         cons25  on  secure
-# zs(4)
-#ttyy0 "/usr/libexec/getty std.9600"   cons25  on  secure
-#ttyy1 "/usr/libexec/getty std.9600"   cons25  off secure
-#
 ttyv0  "/usr/libexec/getty Pc"         cons25  on  secure
 # Virtual terminals
 ttyv1  "/usr/libexec/getty Pc"         cons25  on  secure
@@ -50,10 +44,10 @@
 #ttyv8 "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-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
-ttyd3  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu0  "/usr/libexec/getty std.9600"   vt100   on  secure
+ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
 # Dumb console
 dcons  "/usr/libexec/getty std.9600"   vt100   off secure
 # Pseudo terminals

==== //depot/projects/mjexp/gnu/usr.bin/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.91 2006/10/03 00:03:30 imp Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.92 2007/01/26 10:19:07 delphij Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,6 @@
        ${_gperf} \
        grep \
        ${_groff} \
-       gzip \
        ${_man} \
        patch \
        ${_rcs} \

==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.5 2006/10/16 20:07:23 
jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.6 2007/01/25 06:39:25 
rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -104,12 +104,17 @@
        stoppcbs = lookup("_stoppcbs");
 
        while (paddr != 0) {
-               if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p))
+               if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) {
                        warnx("kvm_read: %s", kvm_geterr(kvm));
+                       break;
+               }
                addr = (uintptr_t)TAILQ_FIRST(&p.p_threads);
                while (addr != 0) {
-                       if (kvm_read(kvm, addr, &td, sizeof(td)) != sizeof(td))
+                       if (kvm_read(kvm, addr, &td, sizeof(td)) !=
+                           sizeof(td)) {
                                warnx("kvm_read: %s", kvm_geterr(kvm));
+                               break;
+                       }
                        kt = malloc(sizeof(*kt));
                        kt->next = first;
                        kt->kaddr = addr;

==== //depot/projects/mjexp/include/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.266 2006/11/11 16:26:54 trhodes Exp $
+# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -15,7 +15,7 @@
        inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
        locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
        ndbm.h netconfig.h \
-       netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
+       netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h \
        printf.h proc_service.h pthread.h \
        pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
        res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \

==== //depot/projects/mjexp/include/rpc/auth_kerb.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*     $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred 
Exp $ */
+/*     $FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 
schweikh Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -6,23 +6,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or

>>> TRUNCATED FOR MAIL (1000 lines) <<<
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/p4-projects
To unsubscribe, send any mail to "[email protected]"

<Prev in Thread] Current Thread [Next in Thread>
  • PERFORCE change 114034 for review, Matt Jacob <=