svn commit: r190861 - in projects/tcp_cc_7.x: . bin bin/chio bin/cp bin/dd bin/ln bin/pax bin/sh cddl/contrib/opensolaris cddl/contrib/opensolaris/lib/libdtrace/common contrib contrib/bind9 contrib...

Lawrence Stewart lstewart at FreeBSD.org
Wed Apr 8 22:41:36 PDT 2009


Author: lstewart
Date: Thu Apr  9 05:41:34 2009
New Revision: 190861
URL: http://svn.freebsd.org/changeset/base/190861

Log:
  Merge r188429:r190860 from stable/7.

Added:
  projects/tcp_cc_7.x/contrib/csup/lex.rcs.c
     - copied unchanged from r190860, stable/7/contrib/csup/lex.rcs.c
  projects/tcp_cc_7.x/contrib/csup/rcsfile.c
     - copied unchanged from r190860, stable/7/contrib/csup/rcsfile.c
  projects/tcp_cc_7.x/contrib/csup/rcsfile.h
     - copied unchanged from r190860, stable/7/contrib/csup/rcsfile.h
  projects/tcp_cc_7.x/contrib/csup/rcsparse.c
     - copied unchanged from r190860, stable/7/contrib/csup/rcsparse.c
  projects/tcp_cc_7.x/contrib/csup/rcsparse.h
     - copied unchanged from r190860, stable/7/contrib/csup/rcsparse.h
  projects/tcp_cc_7.x/contrib/csup/rcstokenizer.h
     - copied unchanged from r190860, stable/7/contrib/csup/rcstokenizer.h
  projects/tcp_cc_7.x/contrib/csup/rcstokenizer.l
     - copied unchanged from r190860, stable/7/contrib/csup/rcstokenizer.l
  projects/tcp_cc_7.x/contrib/csup/rsyncfile.c
     - copied unchanged from r190860, stable/7/contrib/csup/rsyncfile.c
  projects/tcp_cc_7.x/contrib/csup/rsyncfile.h
     - copied unchanged from r190860, stable/7/contrib/csup/rsyncfile.h
  projects/tcp_cc_7.x/lib/libbluetooth/dev.c
     - copied unchanged from r190860, stable/7/lib/libbluetooth/dev.c
  projects/tcp_cc_7.x/lib/libbluetooth/hci.c
     - copied unchanged from r190860, stable/7/lib/libbluetooth/hci.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_affinity.c
     - copied unchanged from r190860, stable/7/lib/libthr/thread/thr_affinity.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_getcpuclockid.c
     - copied unchanged from r190860, stable/7/lib/libthr/thread/thr_getcpuclockid.c
  projects/tcp_cc_7.x/sbin/ipfw/altq.c
     - copied unchanged from r190860, stable/7/sbin/ipfw/altq.c
  projects/tcp_cc_7.x/sbin/ipfw/dummynet.c
     - copied unchanged from r190860, stable/7/sbin/ipfw/dummynet.c
  projects/tcp_cc_7.x/sbin/ipfw/ipfw2.h
     - copied unchanged from r190860, stable/7/sbin/ipfw/ipfw2.h
  projects/tcp_cc_7.x/sbin/ipfw/ipv6.c
     - copied unchanged from r190860, stable/7/sbin/ipfw/ipv6.c
  projects/tcp_cc_7.x/sbin/ipfw/main.c
     - copied unchanged from r190860, stable/7/sbin/ipfw/main.c
  projects/tcp_cc_7.x/sbin/ipfw/nat.c
     - copied unchanged from r190860, stable/7/sbin/ipfw/nat.c
  projects/tcp_cc_7.x/share/man/man4/u3g.4
     - copied unchanged from r190860, stable/7/share/man/man4/u3g.4
  projects/tcp_cc_7.x/sys/dev/ata/ata-raid-ddf.h
     - copied unchanged from r190860, stable/7/sys/dev/ata/ata-raid-ddf.h
  projects/tcp_cc_7.x/sys/dev/drm/i915_reg.h
     - copied unchanged from r190860, stable/7/sys/dev/drm/i915_reg.h
  projects/tcp_cc_7.x/sys/dev/drm/r600_cp.c
     - copied unchanged from r190860, stable/7/sys/dev/drm/r600_cp.c
  projects/tcp_cc_7.x/sys/dev/drm/r600_microcode.h
     - copied unchanged from r190860, stable/7/sys/dev/drm/r600_microcode.h
  projects/tcp_cc_7.x/sys/dev/pcn/
     - copied from r190860, stable/7/sys/dev/pcn/
  projects/tcp_cc_7.x/sys/dev/sis/
     - copied from r190860, stable/7/sys/dev/sis/
  projects/tcp_cc_7.x/sys/dev/usb/u3g.c
     - copied unchanged from r190860, stable/7/sys/dev/usb/u3g.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_ebr.c
     - copied unchanged from r190860, stable/7/sys/geom/part/g_part_ebr.c
  projects/tcp_cc_7.x/sys/modules/geom/geom_part/geom_part_ebr/
     - copied from r190860, stable/7/sys/modules/geom/geom_part/geom_part_ebr/
  projects/tcp_cc_7.x/sys/modules/u3g/
     - copied from r190860, stable/7/sys/modules/u3g/
  projects/tcp_cc_7.x/sys/powerpc/include/altivec.h
     - copied unchanged from r190860, stable/7/sys/powerpc/include/altivec.h
  projects/tcp_cc_7.x/sys/powerpc/powerpc/altivec.c
     - copied unchanged from r190860, stable/7/sys/powerpc/powerpc/altivec.c
  projects/tcp_cc_7.x/sys/sparc64/include/dcr.h
     - copied unchanged from r190860, stable/7/sys/sparc64/include/dcr.h
  projects/tcp_cc_7.x/sys/sparc64/pci/schizo.c
     - copied unchanged from r190860, stable/7/sys/sparc64/pci/schizo.c
  projects/tcp_cc_7.x/sys/sparc64/pci/schizoreg.h
     - copied unchanged from r190860, stable/7/sys/sparc64/pci/schizoreg.h
  projects/tcp_cc_7.x/sys/sparc64/pci/schizovar.h
     - copied unchanged from r190860, stable/7/sys/sparc64/pci/schizovar.h
  projects/tcp_cc_7.x/sys/sparc64/sparc64/jbusppm.c
     - copied unchanged from r190860, stable/7/sys/sparc64/sparc64/jbusppm.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/schppm.c
     - copied unchanged from r190860, stable/7/sys/sparc64/sparc64/schppm.c
  projects/tcp_cc_7.x/sys/sun4v/sun4v/clock.c
     - copied unchanged from r190860, stable/7/sys/sun4v/sun4v/clock.c
  projects/tcp_cc_7.x/sys/vm/vm_reserv.c
     - copied unchanged from r190860, stable/7/sys/vm/vm_reserv.c
  projects/tcp_cc_7.x/sys/vm/vm_reserv.h
     - copied unchanged from r190860, stable/7/sys/vm/vm_reserv.h
  projects/tcp_cc_7.x/tools/regression/posixsem/
     - copied from r190860, stable/7/tools/regression/posixsem/
  projects/tcp_cc_7.x/usr.sbin/bluetooth/btpand/
     - copied from r190860, stable/7/usr.sbin/bluetooth/btpand/
  projects/tcp_cc_7.x/usr.sbin/makefs/   (props changed)
     - copied from r190860, stable/7/usr.sbin/makefs/
Deleted:
  projects/tcp_cc_7.x/sys/modules/ath_hal/
  projects/tcp_cc_7.x/sys/modules/ath_rate_amrr/
  projects/tcp_cc_7.x/sys/modules/ath_rate_onoe/
  projects/tcp_cc_7.x/sys/modules/ath_rate_sample/
  projects/tcp_cc_7.x/sys/pci/if_pcn.c
  projects/tcp_cc_7.x/sys/pci/if_pcnreg.h
  projects/tcp_cc_7.x/sys/pci/if_sis.c
  projects/tcp_cc_7.x/sys/pci/if_sisreg.h
  projects/tcp_cc_7.x/sys/vm/vm_pageq.c
Modified:
  projects/tcp_cc_7.x/   (props changed)
  projects/tcp_cc_7.x/COPYRIGHT   (props changed)
  projects/tcp_cc_7.x/Makefile   (contents, props changed)
  projects/tcp_cc_7.x/Makefile.inc1   (contents, props changed)
  projects/tcp_cc_7.x/UPDATING   (contents, props changed)
  projects/tcp_cc_7.x/bin/   (props changed)
  projects/tcp_cc_7.x/bin/chio/   (props changed)
  projects/tcp_cc_7.x/bin/cp/   (props changed)
  projects/tcp_cc_7.x/bin/dd/   (props changed)
  projects/tcp_cc_7.x/bin/ln/   (props changed)
  projects/tcp_cc_7.x/bin/pax/   (props changed)
  projects/tcp_cc_7.x/bin/pax/file_subs.c
  projects/tcp_cc_7.x/bin/sh/   (props changed)
  projects/tcp_cc_7.x/bin/sh/miscbltin.c
  projects/tcp_cc_7.x/cddl/contrib/opensolaris/   (props changed)
  projects/tcp_cc_7.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/tcp_cc_7.x/contrib/   (props changed)
  projects/tcp_cc_7.x/contrib/bind9/   (props changed)
  projects/tcp_cc_7.x/contrib/bind9/CHANGES
  projects/tcp_cc_7.x/contrib/bind9/lib/dns/validator.c
  projects/tcp_cc_7.x/contrib/bind9/version
  projects/tcp_cc_7.x/contrib/csup/   (props changed)
  projects/tcp_cc_7.x/contrib/csup/GNUmakefile
  projects/tcp_cc_7.x/contrib/csup/Makefile
  projects/tcp_cc_7.x/contrib/csup/TODO
  projects/tcp_cc_7.x/contrib/csup/config.c
  projects/tcp_cc_7.x/contrib/csup/csup.1
  projects/tcp_cc_7.x/contrib/csup/detailer.c
  projects/tcp_cc_7.x/contrib/csup/diff.c
  projects/tcp_cc_7.x/contrib/csup/diff.h
  projects/tcp_cc_7.x/contrib/csup/fattr.c
  projects/tcp_cc_7.x/contrib/csup/fattr.h
  projects/tcp_cc_7.x/contrib/csup/keyword.c
  projects/tcp_cc_7.x/contrib/csup/keyword.h
  projects/tcp_cc_7.x/contrib/csup/lister.c
  projects/tcp_cc_7.x/contrib/csup/misc.c
  projects/tcp_cc_7.x/contrib/csup/misc.h
  projects/tcp_cc_7.x/contrib/csup/mux.c
  projects/tcp_cc_7.x/contrib/csup/proto.c
  projects/tcp_cc_7.x/contrib/csup/proto.h
  projects/tcp_cc_7.x/contrib/csup/status.c
  projects/tcp_cc_7.x/contrib/csup/stream.c
  projects/tcp_cc_7.x/contrib/csup/stream.h
  projects/tcp_cc_7.x/contrib/csup/updater.c
  projects/tcp_cc_7.x/contrib/gcc/   (props changed)
  projects/tcp_cc_7.x/contrib/gdb/   (props changed)
  projects/tcp_cc_7.x/contrib/gdtoa/   (props changed)
  projects/tcp_cc_7.x/contrib/libpcap/   (props changed)
  projects/tcp_cc_7.x/contrib/libpcap/savefile.c
  projects/tcp_cc_7.x/contrib/ntp/   (props changed)
  projects/tcp_cc_7.x/contrib/sendmail/   (props changed)
  projects/tcp_cc_7.x/contrib/smbfs/   (props changed)
  projects/tcp_cc_7.x/contrib/tcsh/   (props changed)
  projects/tcp_cc_7.x/contrib/telnet/   (props changed)
  projects/tcp_cc_7.x/contrib/telnet/telnetd/sys_term.c
  projects/tcp_cc_7.x/contrib/top/   (props changed)
  projects/tcp_cc_7.x/contrib/traceroute/   (props changed)
  projects/tcp_cc_7.x/contrib/wpa_supplicant/   (props changed)
  projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_supplicant.conf   (contents, props changed)
  projects/tcp_cc_7.x/crypto/openssh/   (props changed)
  projects/tcp_cc_7.x/etc/   (props changed)
  projects/tcp_cc_7.x/etc/defaults/rc.conf
  projects/tcp_cc_7.x/etc/mail/aliases
  projects/tcp_cc_7.x/etc/periodic/weekly/   (props changed)
  projects/tcp_cc_7.x/etc/rc.d/   (props changed)
  projects/tcp_cc_7.x/etc/rc.d/amd
  projects/tcp_cc_7.x/etc/rc.d/apmd
  projects/tcp_cc_7.x/etc/rc.d/bsnmpd
  projects/tcp_cc_7.x/etc/rc.d/bthidd
  projects/tcp_cc_7.x/etc/rc.d/devd
  projects/tcp_cc_7.x/etc/rc.d/ftp-proxy
  projects/tcp_cc_7.x/etc/rc.d/ftpd
  projects/tcp_cc_7.x/etc/rc.d/hcsecd
  projects/tcp_cc_7.x/etc/rc.d/idmapd
  projects/tcp_cc_7.x/etc/rc.d/ipfw
  projects/tcp_cc_7.x/etc/rc.d/keyserv
  projects/tcp_cc_7.x/etc/rc.d/lockd
  projects/tcp_cc_7.x/etc/rc.d/lpd
  projects/tcp_cc_7.x/etc/rc.d/mountd
  projects/tcp_cc_7.x/etc/rc.d/moused
  projects/tcp_cc_7.x/etc/rc.d/named
  projects/tcp_cc_7.x/etc/rc.d/nfsd
  projects/tcp_cc_7.x/etc/rc.d/nscd
  projects/tcp_cc_7.x/etc/rc.d/ntpd
  projects/tcp_cc_7.x/etc/rc.d/powerd
  projects/tcp_cc_7.x/etc/rc.d/rpcbind
  projects/tcp_cc_7.x/etc/rc.d/rtadvd
  projects/tcp_cc_7.x/etc/rc.d/rwho
  projects/tcp_cc_7.x/etc/rc.d/savecore
  projects/tcp_cc_7.x/etc/rc.d/sdpd
  projects/tcp_cc_7.x/etc/rc.d/sendmail
  projects/tcp_cc_7.x/etc/rc.d/sshd
  projects/tcp_cc_7.x/etc/rc.d/statd
  projects/tcp_cc_7.x/etc/rc.d/timed
  projects/tcp_cc_7.x/etc/rc.d/ugidfw
  projects/tcp_cc_7.x/etc/rc.d/watchdogd
  projects/tcp_cc_7.x/etc/rc.d/ypbind
  projects/tcp_cc_7.x/etc/rc.d/yppasswdd
  projects/tcp_cc_7.x/etc/rc.d/ypserv
  projects/tcp_cc_7.x/etc/rc.d/ypset
  projects/tcp_cc_7.x/etc/rc.d/ypupdated
  projects/tcp_cc_7.x/etc/rc.d/ypxfrd
  projects/tcp_cc_7.x/games/fortune/   (props changed)
  projects/tcp_cc_7.x/games/fortune/fortune/   (props changed)
  projects/tcp_cc_7.x/gnu/   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/cc/   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/cvs/   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/gdb/kgdb/   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/grep/   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/grep/savedir.c
  projects/tcp_cc_7.x/gnu/usr.bin/groff/tmac/mdoc.local   (props changed)
  projects/tcp_cc_7.x/gnu/usr.bin/sort/   (props changed)
  projects/tcp_cc_7.x/include/   (props changed)
  projects/tcp_cc_7.x/include/paths.h
  projects/tcp_cc_7.x/include/pthread.h
  projects/tcp_cc_7.x/include/pthread_np.h
  projects/tcp_cc_7.x/include/uuid.h
  projects/tcp_cc_7.x/kerberos5/   (props changed)
  projects/tcp_cc_7.x/lib/   (props changed)
  projects/tcp_cc_7.x/lib/bind/   (props changed)
  projects/tcp_cc_7.x/lib/csu/   (props changed)
  projects/tcp_cc_7.x/lib/libarchive/   (props changed)
  projects/tcp_cc_7.x/lib/libbluetooth/   (props changed)
  projects/tcp_cc_7.x/lib/libbluetooth/Makefile
  projects/tcp_cc_7.x/lib/libbluetooth/bluetooth.3
  projects/tcp_cc_7.x/lib/libbluetooth/bluetooth.c
  projects/tcp_cc_7.x/lib/libbluetooth/bluetooth.h
  projects/tcp_cc_7.x/lib/libc/   (props changed)
  projects/tcp_cc_7.x/lib/libc/gen/Symbol.map
  projects/tcp_cc_7.x/lib/libc/gen/dlfcn.c
  projects/tcp_cc_7.x/lib/libc/include/libc_private.h
  projects/tcp_cc_7.x/lib/libc/net/getaddrinfo.c
  projects/tcp_cc_7.x/lib/libc/net/gethostbydns.c
  projects/tcp_cc_7.x/lib/libc/stdio/vfprintf.c
  projects/tcp_cc_7.x/lib/libc/stdio/vfwprintf.c
  projects/tcp_cc_7.x/lib/libc/stdlib/Symbol.map
  projects/tcp_cc_7.x/lib/libc/stdlib/malloc.c
  projects/tcp_cc_7.x/lib/libc/string/ffsll.c   (props changed)
  projects/tcp_cc_7.x/lib/libc/string/flsll.c   (props changed)
  projects/tcp_cc_7.x/lib/libc/string/strdup.3
  projects/tcp_cc_7.x/lib/libc/sys/mincore.2
  projects/tcp_cc_7.x/lib/libc/sys/send.2
  projects/tcp_cc_7.x/lib/libc/sys/shmctl.2
  projects/tcp_cc_7.x/lib/libc/uuid/Symbol.map
  projects/tcp_cc_7.x/lib/libc_r/   (props changed)
  projects/tcp_cc_7.x/lib/libcam/   (props changed)
  projects/tcp_cc_7.x/lib/libdisk/   (props changed)
  projects/tcp_cc_7.x/lib/libelf/   (props changed)
  projects/tcp_cc_7.x/lib/libelf/Makefile
  projects/tcp_cc_7.x/lib/libfetch/   (props changed)
  projects/tcp_cc_7.x/lib/libftpio/   (props changed)
  projects/tcp_cc_7.x/lib/libgeom/   (props changed)
  projects/tcp_cc_7.x/lib/libgssapi/   (props changed)
  projects/tcp_cc_7.x/lib/libkse/   (props changed)
  projects/tcp_cc_7.x/lib/libkvm/   (props changed)
  projects/tcp_cc_7.x/lib/libmagic/   (props changed)
  projects/tcp_cc_7.x/lib/libstand/   (props changed)
  projects/tcp_cc_7.x/lib/libthr/   (props changed)
  projects/tcp_cc_7.x/lib/libthr/Makefile
  projects/tcp_cc_7.x/lib/libthr/arch/amd64/include/pthread_md.h
  projects/tcp_cc_7.x/lib/libthr/arch/i386/Makefile.inc
  projects/tcp_cc_7.x/lib/libthr/pthread.map
  projects/tcp_cc_7.x/lib/libthr/thread/Makefile.inc
  projects/tcp_cc_7.x/lib/libthr/thread/thr_attr.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_clean.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_create.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_event.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_exit.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_fork.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_init.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_mutex.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_once.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_private.h
  projects/tcp_cc_7.x/lib/libthr/thread/thr_pspinlock.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_resume_np.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_rtld.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_sem.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_sig.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_spinlock.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_suspend_np.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_syscalls.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_umtx.c
  projects/tcp_cc_7.x/lib/libthr/thread/thr_umtx.h
  projects/tcp_cc_7.x/lib/libthread_db/   (props changed)
  projects/tcp_cc_7.x/lib/libthread_db/libc_r_db.c
  projects/tcp_cc_7.x/lib/libthread_db/libpthread_db.c
  projects/tcp_cc_7.x/lib/libthread_db/libthr_db.c
  projects/tcp_cc_7.x/lib/libthread_db/thread_db.c
  projects/tcp_cc_7.x/lib/libutil/   (props changed)
  projects/tcp_cc_7.x/lib/msun/   (props changed)
  projects/tcp_cc_7.x/libexec/   (props changed)
  projects/tcp_cc_7.x/libexec/rpc.rstatd/   (props changed)
  projects/tcp_cc_7.x/libexec/rtld-elf/   (props changed)
  projects/tcp_cc_7.x/libexec/rtld-elf/Symbol.map
  projects/tcp_cc_7.x/libexec/rtld-elf/rtld.c
  projects/tcp_cc_7.x/libexec/rtld-elf/rtld_lock.c
  projects/tcp_cc_7.x/libexec/rtld-elf/rtld_lock.h
  projects/tcp_cc_7.x/release/   (props changed)
  projects/tcp_cc_7.x/release/picobsd/bridge/PICOBSD
  projects/tcp_cc_7.x/release/picobsd/bridge/config
  projects/tcp_cc_7.x/release/picobsd/bridge/crunch.conf
  projects/tcp_cc_7.x/release/picobsd/build/picobsd
  projects/tcp_cc_7.x/release/picobsd/floppy.tree/etc/rc1
  projects/tcp_cc_7.x/release/picobsd/mfs_tree/etc/rc
  projects/tcp_cc_7.x/release/scripts/src-install.sh   (props changed)
  projects/tcp_cc_7.x/rescue/   (props changed)
  projects/tcp_cc_7.x/sbin/   (props changed)
  projects/tcp_cc_7.x/sbin/atacontrol/   (props changed)
  projects/tcp_cc_7.x/sbin/atacontrol/atacontrol.8
  projects/tcp_cc_7.x/sbin/atacontrol/atacontrol.c
  projects/tcp_cc_7.x/sbin/ddb/   (props changed)
  projects/tcp_cc_7.x/sbin/devd/   (props changed)
  projects/tcp_cc_7.x/sbin/devd/devd.conf.5
  projects/tcp_cc_7.x/sbin/devfs/   (props changed)
  projects/tcp_cc_7.x/sbin/dhclient/   (props changed)
  projects/tcp_cc_7.x/sbin/dumpfs/   (props changed)
  projects/tcp_cc_7.x/sbin/fdisk/   (props changed)
  projects/tcp_cc_7.x/sbin/fdisk_pc98/   (props changed)
  projects/tcp_cc_7.x/sbin/fdisk_pc98/fdisk.c
  projects/tcp_cc_7.x/sbin/fsck/   (props changed)
  projects/tcp_cc_7.x/sbin/fsck/fsck.8
  projects/tcp_cc_7.x/sbin/fsck/fsck.c
  projects/tcp_cc_7.x/sbin/fsck/fsutil.h
  projects/tcp_cc_7.x/sbin/fsck_ffs/   (props changed)
  projects/tcp_cc_7.x/sbin/geom/   (props changed)
  projects/tcp_cc_7.x/sbin/geom/class/label/   (props changed)
  projects/tcp_cc_7.x/sbin/geom/class/label/glabel.8
  projects/tcp_cc_7.x/sbin/geom/class/part/   (props changed)
  projects/tcp_cc_7.x/sbin/geom/class/part/geom_part.c
  projects/tcp_cc_7.x/sbin/geom/misc/   (props changed)
  projects/tcp_cc_7.x/sbin/ifconfig/   (props changed)
  projects/tcp_cc_7.x/sbin/ifconfig/ifclone.c
  projects/tcp_cc_7.x/sbin/ifconfig/ifconfig.c
  projects/tcp_cc_7.x/sbin/ifconfig/ifgroup.c
  projects/tcp_cc_7.x/sbin/init/   (props changed)
  projects/tcp_cc_7.x/sbin/ipfw/   (props changed)
  projects/tcp_cc_7.x/sbin/ipfw/Makefile
  projects/tcp_cc_7.x/sbin/ipfw/ipfw.8
  projects/tcp_cc_7.x/sbin/ipfw/ipfw2.c
  projects/tcp_cc_7.x/sbin/md5/   (props changed)
  projects/tcp_cc_7.x/sbin/mdconfig/   (props changed)
  projects/tcp_cc_7.x/sbin/mksnap_ffs/   (props changed)
  projects/tcp_cc_7.x/sbin/mount/   (props changed)
  projects/tcp_cc_7.x/sbin/mount/mount.8
  projects/tcp_cc_7.x/sbin/mount/mount.c
  projects/tcp_cc_7.x/sbin/mount/mount_fs.c
  projects/tcp_cc_7.x/sbin/mount_msdosfs/   (props changed)
  projects/tcp_cc_7.x/sbin/mount_msdosfs/mount_msdosfs.8
  projects/tcp_cc_7.x/sbin/natd/   (props changed)
  projects/tcp_cc_7.x/sbin/ping6/   (props changed)
  projects/tcp_cc_7.x/sbin/route/   (props changed)
  projects/tcp_cc_7.x/sbin/route/route.c
  projects/tcp_cc_7.x/sbin/sconfig/   (props changed)
  projects/tcp_cc_7.x/sbin/shutdown/   (props changed)
  projects/tcp_cc_7.x/sbin/shutdown/shutdown.8
  projects/tcp_cc_7.x/secure/lib/libssh/   (props changed)
  projects/tcp_cc_7.x/secure/libexec/sftp-server/   (props changed)
  projects/tcp_cc_7.x/secure/usr.bin/ssh/   (props changed)
  projects/tcp_cc_7.x/secure/usr.sbin/sshd/   (props changed)
  projects/tcp_cc_7.x/share/   (props changed)
  projects/tcp_cc_7.x/share/colldef/   (props changed)
  projects/tcp_cc_7.x/share/doc/bind9/   (props changed)
  projects/tcp_cc_7.x/share/examples/   (props changed)
  projects/tcp_cc_7.x/share/man/man3/   (props changed)
  projects/tcp_cc_7.x/share/man/man4/   (props changed)
  projects/tcp_cc_7.x/share/man/man4/Makefile
  projects/tcp_cc_7.x/share/man/man4/altq.4
  projects/tcp_cc_7.x/share/man/man4/bce.4
  projects/tcp_cc_7.x/share/man/man4/crypto.4
  projects/tcp_cc_7.x/share/man/man4/fxp.4
  projects/tcp_cc_7.x/share/man/man4/geom.4
  projects/tcp_cc_7.x/share/man/man4/igb.4   (props changed)
  projects/tcp_cc_7.x/share/man/man4/malo.4
  projects/tcp_cc_7.x/share/man/man4/re.4
  projects/tcp_cc_7.x/share/man/man4/tap.4
  projects/tcp_cc_7.x/share/man/man4/txp.4
  projects/tcp_cc_7.x/share/man/man4/uplcom.4
  projects/tcp_cc_7.x/share/man/man4/wlan.4
  projects/tcp_cc_7.x/share/man/man5/   (props changed)
  projects/tcp_cc_7.x/share/man/man7/   (props changed)
  projects/tcp_cc_7.x/share/man/man8/   (props changed)
  projects/tcp_cc_7.x/share/man/man8/diskless.8
  projects/tcp_cc_7.x/share/man/man9/   (props changed)
  projects/tcp_cc_7.x/share/man/man9/Makefile
  projects/tcp_cc_7.x/share/man/man9/VOP_STRATEGY.9
  projects/tcp_cc_7.x/share/man/man9/bus_dma.9
  projects/tcp_cc_7.x/share/man/man9/condvar.9
  projects/tcp_cc_7.x/share/man/man9/disk.9
  projects/tcp_cc_7.x/share/man/man9/sleep.9
  projects/tcp_cc_7.x/share/man/man9/vm_map_find.9
  projects/tcp_cc_7.x/share/misc/   (props changed)
  projects/tcp_cc_7.x/share/misc/bsd-family-tree
  projects/tcp_cc_7.x/share/misc/iso3166
  projects/tcp_cc_7.x/share/mk/   (props changed)
  projects/tcp_cc_7.x/share/mk/bsd.cpu.mk
  projects/tcp_cc_7.x/share/mk/bsd.kmod.mk
  projects/tcp_cc_7.x/share/sendmail/   (props changed)
  projects/tcp_cc_7.x/share/syscons/   (props changed)
  projects/tcp_cc_7.x/share/syscons/keymaps/   (props changed)
  projects/tcp_cc_7.x/share/termcap/   (props changed)
  projects/tcp_cc_7.x/share/termcap/termcap.src
  projects/tcp_cc_7.x/share/timedef/   (props changed)
  projects/tcp_cc_7.x/share/zoneinfo/   (props changed)
  projects/tcp_cc_7.x/share/zoneinfo/leapseconds
  projects/tcp_cc_7.x/share/zoneinfo/northamerica
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/amd64/acpica/madt.c
  projects/tcp_cc_7.x/sys/amd64/amd64/cpu_switch.S
  projects/tcp_cc_7.x/sys/amd64/amd64/elf_machdep.c
  projects/tcp_cc_7.x/sys/amd64/amd64/fpu.c
  projects/tcp_cc_7.x/sys/amd64/amd64/machdep.c
  projects/tcp_cc_7.x/sys/amd64/amd64/pmap.c
  projects/tcp_cc_7.x/sys/amd64/amd64/trap.c
  projects/tcp_cc_7.x/sys/amd64/conf/GENERIC
  projects/tcp_cc_7.x/sys/amd64/conf/NOTES
  projects/tcp_cc_7.x/sys/amd64/ia32/ia32_signal.c
  projects/tcp_cc_7.x/sys/amd64/include/fpu.h
  projects/tcp_cc_7.x/sys/amd64/include/pcb.h
  projects/tcp_cc_7.x/sys/amd64/include/pmap.h
  projects/tcp_cc_7.x/sys/amd64/include/vmparam.h
  projects/tcp_cc_7.x/sys/amd64/linux32/linux32_sysvec.c
  projects/tcp_cc_7.x/sys/arm/arm/elf_machdep.c
  projects/tcp_cc_7.x/sys/arm/arm/pmap.c
  projects/tcp_cc_7.x/sys/arm/conf/AVILA
  projects/tcp_cc_7.x/sys/arm/include/vmparam.h
  projects/tcp_cc_7.x/sys/boot/Makefile
  projects/tcp_cc_7.x/sys/boot/i386/btx/btx/btx.S
  projects/tcp_cc_7.x/sys/boot/i386/libi386/Makefile
  projects/tcp_cc_7.x/sys/boot/i386/libi386/bioscd.c
  projects/tcp_cc_7.x/sys/boot/i386/libi386/biosdisk.c
  projects/tcp_cc_7.x/sys/boot/i386/libi386/devicename.c
  projects/tcp_cc_7.x/sys/boot/i386/libi386/libi386.h
  projects/tcp_cc_7.x/sys/boot/i386/loader/Makefile
  projects/tcp_cc_7.x/sys/boot/i386/loader/main.c
  projects/tcp_cc_7.x/sys/boot/pc98/libpc98/bioscd.c
  projects/tcp_cc_7.x/sys/boot/pc98/libpc98/biosdisk.c
  projects/tcp_cc_7.x/sys/boot/sparc64/loader/locore.S
  projects/tcp_cc_7.x/sys/boot/sparc64/loader/main.c
  projects/tcp_cc_7.x/sys/cam/cam_periph.c
  projects/tcp_cc_7.x/sys/cam/cam_periph.h
  projects/tcp_cc_7.x/sys/cam/cam_sim.c
  projects/tcp_cc_7.x/sys/cam/cam_sim.h
  projects/tcp_cc_7.x/sys/cam/cam_xpt.c
  projects/tcp_cc_7.x/sys/cam/cam_xpt_sim.h
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_all.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_all.h
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_cd.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_ch.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_da.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_low.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_pass.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_pt.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_sa.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_ses.c
  projects/tcp_cc_7.x/sys/cam/scsi/scsi_sg.c
  projects/tcp_cc_7.x/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/tcp_cc_7.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/tcp_cc_7.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/tcp_cc_7.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/tcp_cc_7.x/sys/compat/freebsd32/freebsd32_misc.c
  projects/tcp_cc_7.x/sys/compat/ia32/ia32_sysvec.c
  projects/tcp_cc_7.x/sys/compat/linprocfs/linprocfs.c
  projects/tcp_cc_7.x/sys/compat/linux/linux_file.c
  projects/tcp_cc_7.x/sys/compat/linux/linux_getcwd.c
  projects/tcp_cc_7.x/sys/compat/linux/linux_misc.h
  projects/tcp_cc_7.x/sys/compat/ndis/kern_ndis.c
  projects/tcp_cc_7.x/sys/compat/ndis/subr_hal.c
  projects/tcp_cc_7.x/sys/compat/ndis/subr_ndis.c
  projects/tcp_cc_7.x/sys/compat/ndis/subr_ntoskrnl.c
  projects/tcp_cc_7.x/sys/compat/svr4/svr4_misc.c
  projects/tcp_cc_7.x/sys/compat/svr4/svr4_sysvec.c
  projects/tcp_cc_7.x/sys/conf/NOTES
  projects/tcp_cc_7.x/sys/conf/files
  projects/tcp_cc_7.x/sys/conf/files.amd64
  projects/tcp_cc_7.x/sys/conf/files.arm
  projects/tcp_cc_7.x/sys/conf/files.i386
  projects/tcp_cc_7.x/sys/conf/files.pc98
  projects/tcp_cc_7.x/sys/conf/files.powerpc
  projects/tcp_cc_7.x/sys/conf/files.sparc64
  projects/tcp_cc_7.x/sys/conf/files.sun4v
  projects/tcp_cc_7.x/sys/conf/kern.mk
  projects/tcp_cc_7.x/sys/conf/kern.pre.mk
  projects/tcp_cc_7.x/sys/conf/newvers.sh
  projects/tcp_cc_7.x/sys/conf/options
  projects/tcp_cc_7.x/sys/conf/options.sparc64
  projects/tcp_cc_7.x/sys/contrib/altq/altq/altq_subr.c
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/acpica/acpi_cpu.c
  projects/tcp_cc_7.x/sys/dev/ae/if_ae.c
  projects/tcp_cc_7.x/sys/dev/arcmsr/arcmsr.c
  projects/tcp_cc_7.x/sys/dev/ata/ata-all.c
  projects/tcp_cc_7.x/sys/dev/ata/ata-all.h
  projects/tcp_cc_7.x/sys/dev/ata/ata-chipset.c
  projects/tcp_cc_7.x/sys/dev/ata/ata-pci.h
  projects/tcp_cc_7.x/sys/dev/ata/ata-queue.c
  projects/tcp_cc_7.x/sys/dev/ata/ata-raid.c
  projects/tcp_cc_7.x/sys/dev/ata/ata-raid.h
  projects/tcp_cc_7.x/sys/dev/ata/atapi-cam.c
  projects/tcp_cc_7.x/sys/dev/ata/atapi-cd.c
  projects/tcp_cc_7.x/sys/dev/ath/ah_osdep.c
  projects/tcp_cc_7.x/sys/dev/ath/ah_osdep.h
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_rate/amrr/amrr.c
  projects/tcp_cc_7.x/sys/dev/ath/ath_rate/onoe/onoe.c
  projects/tcp_cc_7.x/sys/dev/ath/ath_rate/sample/sample.c
  projects/tcp_cc_7.x/sys/dev/ath/if_ath.c
  projects/tcp_cc_7.x/sys/dev/ath/if_ath_pci.c
  projects/tcp_cc_7.x/sys/dev/ath/if_athvar.h
  projects/tcp_cc_7.x/sys/dev/atkbdc/psm.c
  projects/tcp_cc_7.x/sys/dev/bce/if_bce.c
  projects/tcp_cc_7.x/sys/dev/bce/if_bcefw.h
  projects/tcp_cc_7.x/sys/dev/bce/if_bcereg.h
  projects/tcp_cc_7.x/sys/dev/bge/if_bge.c
  projects/tcp_cc_7.x/sys/dev/bge/if_bgereg.h
  projects/tcp_cc_7.x/sys/dev/cardbus/cardbus.c
  projects/tcp_cc_7.x/sys/dev/ciss/ciss.c
  projects/tcp_cc_7.x/sys/dev/cm/smc90cx6.c
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/cxgb_multiq.c
  projects/tcp_cc_7.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/tcp_cc_7.x/sys/dev/dc/dcphy.c
  projects/tcp_cc_7.x/sys/dev/dc/pnphy.c
  projects/tcp_cc_7.x/sys/dev/drm/ati_pcigart.c
  projects/tcp_cc_7.x/sys/dev/drm/drmP.h
  projects/tcp_cc_7.x/sys/dev/drm/drm_bufs.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_linux_list.h
  projects/tcp_cc_7.x/sys/dev/drm/drm_lock.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_pci.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_pciids.h
  projects/tcp_cc_7.x/sys/dev/drm/drm_scatter.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_sysctl.c
  projects/tcp_cc_7.x/sys/dev/drm/drm_vm.c
  projects/tcp_cc_7.x/sys/dev/drm/i915_dma.c
  projects/tcp_cc_7.x/sys/dev/drm/i915_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/i915_drv.h
  projects/tcp_cc_7.x/sys/dev/drm/i915_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/mach64_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/mach64_drv.h
  projects/tcp_cc_7.x/sys/dev/drm/mach64_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/mga_dma.c
  projects/tcp_cc_7.x/sys/dev/drm/mga_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/mga_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/r128_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/r128_drv.h
  projects/tcp_cc_7.x/sys/dev/drm/r128_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/radeon_cp.c
  projects/tcp_cc_7.x/sys/dev/drm/radeon_drm.h
  projects/tcp_cc_7.x/sys/dev/drm/radeon_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/radeon_drv.h
  projects/tcp_cc_7.x/sys/dev/drm/radeon_irq.c
  projects/tcp_cc_7.x/sys/dev/drm/radeon_state.c
  projects/tcp_cc_7.x/sys/dev/drm/savage_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/sis_drv.c
  projects/tcp_cc_7.x/sys/dev/drm/tdfx_drv.c
  projects/tcp_cc_7.x/sys/dev/ed/if_ed.c
  projects/tcp_cc_7.x/sys/dev/hptiop/hptiop.h
  projects/tcp_cc_7.x/sys/dev/hwpmc/hwpmc_mod.c
  projects/tcp_cc_7.x/sys/dev/isp/isp.c
  projects/tcp_cc_7.x/sys/dev/kbdmux/kbdmux.c
  projects/tcp_cc_7.x/sys/dev/malo/if_malo_pci.c
  projects/tcp_cc_7.x/sys/dev/malo/if_malohal.c
  projects/tcp_cc_7.x/sys/dev/mca/mca_bus.c
  projects/tcp_cc_7.x/sys/dev/mii/ip1000phy.c
  projects/tcp_cc_7.x/sys/dev/mii/ip1000phyreg.h
  projects/tcp_cc_7.x/sys/dev/mmc/mmc.c
  projects/tcp_cc_7.x/sys/dev/mmc/mmcreg.h
  projects/tcp_cc_7.x/sys/dev/mmc/mmcsd.c
  projects/tcp_cc_7.x/sys/dev/mpt/mpt.c
  projects/tcp_cc_7.x/sys/dev/mpt/mpt.h
  projects/tcp_cc_7.x/sys/dev/mpt/mpt_cam.c
  projects/tcp_cc_7.x/sys/dev/mpt/mpt_raid.c
  projects/tcp_cc_7.x/sys/dev/mpt/mpt_user.c
  projects/tcp_cc_7.x/sys/dev/msk/if_msk.c
  projects/tcp_cc_7.x/sys/dev/msk/if_mskreg.h
  projects/tcp_cc_7.x/sys/dev/mxge/eth_z8e.h
  projects/tcp_cc_7.x/sys/dev/mxge/ethp_z8e.h
  projects/tcp_cc_7.x/sys/dev/mxge/if_mxge.c
  projects/tcp_cc_7.x/sys/dev/mxge/if_mxge_var.h
  projects/tcp_cc_7.x/sys/dev/mxge/mxge_mcp.h
  projects/tcp_cc_7.x/sys/dev/mxge/rss_eth_z8e.h
  projects/tcp_cc_7.x/sys/dev/mxge/rss_ethp_z8e.h
  projects/tcp_cc_7.x/sys/dev/my/if_my.c
  projects/tcp_cc_7.x/sys/dev/nfe/if_nfe.c
  projects/tcp_cc_7.x/sys/dev/nfe/if_nfereg.h
  projects/tcp_cc_7.x/sys/dev/nfe/if_nfevar.h
  projects/tcp_cc_7.x/sys/dev/nsp/nsp.c
  projects/tcp_cc_7.x/sys/dev/nve/if_nve.c
  projects/tcp_cc_7.x/sys/dev/nve/if_nvereg.h
  projects/tcp_cc_7.x/sys/dev/pci/pci.c
  projects/tcp_cc_7.x/sys/dev/pci/pci_user.c
  projects/tcp_cc_7.x/sys/dev/pci/pcireg.h
  projects/tcp_cc_7.x/sys/dev/ppc/ppc_isa.c
  projects/tcp_cc_7.x/sys/dev/puc/pucdata.c
  projects/tcp_cc_7.x/sys/dev/re/if_re.c
  projects/tcp_cc_7.x/sys/dev/sdhci/sdhci.c
  projects/tcp_cc_7.x/sys/dev/sound/pci/ds1.c
  projects/tcp_cc_7.x/sys/dev/sound/pci/hda/hdac.c
  projects/tcp_cc_7.x/sys/dev/stg/tmc18c30.c
  projects/tcp_cc_7.x/sys/dev/twa/tw_cl_init.c
  projects/tcp_cc_7.x/sys/dev/twa/tw_osl.h
  projects/tcp_cc_7.x/sys/dev/twa/tw_osl_freebsd.c
  projects/tcp_cc_7.x/sys/dev/txp/3c990img.h
  projects/tcp_cc_7.x/sys/dev/txp/if_txp.c
  projects/tcp_cc_7.x/sys/dev/txp/if_txpreg.h
  projects/tcp_cc_7.x/sys/dev/uart/uart_bus_pci.c
  projects/tcp_cc_7.x/sys/dev/usb/ubsa.c
  projects/tcp_cc_7.x/sys/dev/usb/ucom.c
  projects/tcp_cc_7.x/sys/dev/usb/ugen.c
  projects/tcp_cc_7.x/sys/dev/usb/umass.c
  projects/tcp_cc_7.x/sys/dev/usb/uplcom.c
  projects/tcp_cc_7.x/sys/dev/usb/usb.h
  projects/tcp_cc_7.x/sys/dev/usb/usb_subr.c
  projects/tcp_cc_7.x/sys/dev/usb/usbdevs
  projects/tcp_cc_7.x/sys/dev/usb/usbdi.c
  projects/tcp_cc_7.x/sys/dev/usb/usbdi.h
  projects/tcp_cc_7.x/sys/fs/cd9660/cd9660_lookup.c
  projects/tcp_cc_7.x/sys/fs/cd9660/cd9660_node.c
  projects/tcp_cc_7.x/sys/fs/cd9660/cd9660_node.h
  projects/tcp_cc_7.x/sys/fs/cd9660/cd9660_vfsops.c
  projects/tcp_cc_7.x/sys/fs/cd9660/cd9660_vnops.c
  projects/tcp_cc_7.x/sys/fs/coda/coda_vnops.c
  projects/tcp_cc_7.x/sys/fs/devfs/devfs_devs.c
  projects/tcp_cc_7.x/sys/fs/devfs/devfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/hpfs/hpfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/msdosfs/msdosfs_conv.c
  projects/tcp_cc_7.x/sys/fs/msdosfs/msdosfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/ntfs/ntfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/nwfs/nwfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/procfs/procfs.c
  projects/tcp_cc_7.x/sys/fs/procfs/procfs_map.c
  projects/tcp_cc_7.x/sys/fs/smbfs/smbfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/tmpfs/tmpfs.h
  projects/tcp_cc_7.x/sys/fs/tmpfs/tmpfs_subr.c
  projects/tcp_cc_7.x/sys/fs/tmpfs/tmpfs_vnops.c
  projects/tcp_cc_7.x/sys/fs/udf/ecma167-udf.h
  projects/tcp_cc_7.x/sys/fs/udf/udf.h
  projects/tcp_cc_7.x/sys/fs/udf/udf_vfsops.c
  projects/tcp_cc_7.x/sys/fs/udf/udf_vnops.c
  projects/tcp_cc_7.x/sys/geom/geom.h
  projects/tcp_cc_7.x/sys/geom/geom_dev.c
  projects/tcp_cc_7.x/sys/geom/geom_subr.c
  projects/tcp_cc_7.x/sys/geom/geom_vfs.c
  projects/tcp_cc_7.x/sys/geom/journal/g_journal.c
  projects/tcp_cc_7.x/sys/geom/journal/g_journal.h
  projects/tcp_cc_7.x/sys/geom/label/g_label.c
  projects/tcp_cc_7.x/sys/geom/label/g_label.h
  projects/tcp_cc_7.x/sys/geom/label/g_label_msdosfs.c
  projects/tcp_cc_7.x/sys/geom/label/g_label_ufs.c
  projects/tcp_cc_7.x/sys/geom/part/g_part.c
  projects/tcp_cc_7.x/sys/geom/part/g_part.h
  projects/tcp_cc_7.x/sys/geom/part/g_part_apm.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_bsd.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_gpt.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_if.m
  projects/tcp_cc_7.x/sys/geom/part/g_part_mbr.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_pc98.c
  projects/tcp_cc_7.x/sys/geom/part/g_part_vtoc8.c
  projects/tcp_cc_7.x/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/tcp_cc_7.x/sys/gnu/fs/reiserfs/reiserfs_vnops.c
  projects/tcp_cc_7.x/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/tcp_cc_7.x/sys/i386/acpica/madt.c
  projects/tcp_cc_7.x/sys/i386/conf/GENERIC
  projects/tcp_cc_7.x/sys/i386/conf/NOTES
  projects/tcp_cc_7.x/sys/i386/i386/elf_machdep.c
  projects/tcp_cc_7.x/sys/i386/i386/machdep.c
  projects/tcp_cc_7.x/sys/i386/i386/mp_machdep.c
  projects/tcp_cc_7.x/sys/i386/i386/pmap.c
  projects/tcp_cc_7.x/sys/i386/i386/vm86.c
  projects/tcp_cc_7.x/sys/i386/ibcs2/ibcs2_misc.c
  projects/tcp_cc_7.x/sys/i386/ibcs2/ibcs2_sysi86.c
  projects/tcp_cc_7.x/sys/i386/include/npx.h
  projects/tcp_cc_7.x/sys/i386/include/pcb.h
  projects/tcp_cc_7.x/sys/i386/include/pmap.h
  projects/tcp_cc_7.x/sys/i386/include/vmparam.h
  projects/tcp_cc_7.x/sys/i386/isa/npx.c
  projects/tcp_cc_7.x/sys/i386/linux/linux_sysvec.c
  projects/tcp_cc_7.x/sys/ia64/ia64/elf_machdep.c
  projects/tcp_cc_7.x/sys/ia64/ia64/mca.c
  projects/tcp_cc_7.x/sys/ia64/ia64/pmap.c
  projects/tcp_cc_7.x/sys/ia64/include/mca.h
  projects/tcp_cc_7.x/sys/ia64/include/vmparam.h
  projects/tcp_cc_7.x/sys/isa/syscons_isa.c
  projects/tcp_cc_7.x/sys/kern/imgact_elf.c
  projects/tcp_cc_7.x/sys/kern/kern_condvar.c
  projects/tcp_cc_7.x/sys/kern/kern_conf.c
  projects/tcp_cc_7.x/sys/kern/kern_descrip.c
  projects/tcp_cc_7.x/sys/kern/kern_environment.c
  projects/tcp_cc_7.x/sys/kern/kern_exec.c
  projects/tcp_cc_7.x/sys/kern/kern_jail.c
  projects/tcp_cc_7.x/sys/kern/kern_ktrace.c
  projects/tcp_cc_7.x/sys/kern/kern_linker.c
  projects/tcp_cc_7.x/sys/kern/kern_malloc.c
  projects/tcp_cc_7.x/sys/kern/kern_mbuf.c
  projects/tcp_cc_7.x/sys/kern/kern_mib.c
  projects/tcp_cc_7.x/sys/kern/kern_proc.c
  projects/tcp_cc_7.x/sys/kern/kern_synch.c
  projects/tcp_cc_7.x/sys/kern/kern_sysctl.c
  projects/tcp_cc_7.x/sys/kern/kern_tc.c
  projects/tcp_cc_7.x/sys/kern/kern_thr.c
  projects/tcp_cc_7.x/sys/kern/kern_time.c
  projects/tcp_cc_7.x/sys/kern/kern_umtx.c
  projects/tcp_cc_7.x/sys/kern/kern_xxx.c
  projects/tcp_cc_7.x/sys/kern/sched_ule.c
  projects/tcp_cc_7.x/sys/kern/subr_bus.c
  projects/tcp_cc_7.x/sys/kern/subr_disk.c
  projects/tcp_cc_7.x/sys/kern/subr_param.c
  projects/tcp_cc_7.x/sys/kern/subr_smp.c
  projects/tcp_cc_7.x/sys/kern/subr_taskqueue.c
  projects/tcp_cc_7.x/sys/kern/sys_generic.c
  projects/tcp_cc_7.x/sys/kern/sysv_sem.c
  projects/tcp_cc_7.x/sys/kern/sysv_shm.c
  projects/tcp_cc_7.x/sys/kern/uipc_sem.c
  projects/tcp_cc_7.x/sys/kern/uipc_socket.c
  projects/tcp_cc_7.x/sys/kern/uipc_usrreq.c
  projects/tcp_cc_7.x/sys/kern/vfs_bio.c
  projects/tcp_cc_7.x/sys/kern/vfs_cache.c
  projects/tcp_cc_7.x/sys/kern/vfs_default.c
  projects/tcp_cc_7.x/sys/kern/vfs_init.c
  projects/tcp_cc_7.x/sys/kern/vfs_mount.c
  projects/tcp_cc_7.x/sys/kern/vfs_subr.c
  projects/tcp_cc_7.x/sys/kern/vfs_syscalls.c
  projects/tcp_cc_7.x/sys/kern/vfs_vnops.c
  projects/tcp_cc_7.x/sys/libkern/iconv.c
  projects/tcp_cc_7.x/sys/modules/Makefile
  projects/tcp_cc_7.x/sys/modules/ath/Makefile
  projects/tcp_cc_7.x/sys/modules/drm/radeon/Makefile
  projects/tcp_cc_7.x/sys/modules/geom/geom_part/Makefile
  projects/tcp_cc_7.x/sys/modules/opensolaris/Makefile
  projects/tcp_cc_7.x/sys/modules/pcn/Makefile
  projects/tcp_cc_7.x/sys/modules/sem/Makefile
  projects/tcp_cc_7.x/sys/modules/sis/Makefile
  projects/tcp_cc_7.x/sys/net/bpf.c
  projects/tcp_cc_7.x/sys/net/if.c
  projects/tcp_cc_7.x/sys/net/if_gif.h
  projects/tcp_cc_7.x/sys/net/if_media.h
  projects/tcp_cc_7.x/sys/net/if_tap.c
  projects/tcp_cc_7.x/sys/net/if_tap.h
  projects/tcp_cc_7.x/sys/net/if_vlan.c
  projects/tcp_cc_7.x/sys/net/route.c
  projects/tcp_cc_7.x/sys/net/route.h
  projects/tcp_cc_7.x/sys/net/rtsock.c
  projects/tcp_cc_7.x/sys/netatalk/ddp_usrreq.c
  projects/tcp_cc_7.x/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  projects/tcp_cc_7.x/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/tcp_cc_7.x/sys/netgraph/ng_base.c
  projects/tcp_cc_7.x/sys/netinet/in.c
  projects/tcp_cc_7.x/sys/netinet/in_gif.c
  projects/tcp_cc_7.x/sys/netinet/in_pcb.c
  projects/tcp_cc_7.x/sys/netinet/in_pcb.h
  projects/tcp_cc_7.x/sys/netinet/in_rmx.c
  projects/tcp_cc_7.x/sys/netinet/in_systm.h
  projects/tcp_cc_7.x/sys/netinet/ip.h
  projects/tcp_cc_7.x/sys/netinet/ip_dummynet.c
  projects/tcp_cc_7.x/sys/netinet/ip_fw2.c
  projects/tcp_cc_7.x/sys/netinet/ip_fw_pfil.c
  projects/tcp_cc_7.x/sys/netinet/ip_icmp.c
  projects/tcp_cc_7.x/sys/netinet/ip_icmp.h
  projects/tcp_cc_7.x/sys/netinet/ip_input.c
  projects/tcp_cc_7.x/sys/netinet/ip_options.c
  projects/tcp_cc_7.x/sys/netinet/raw_ip.c
  projects/tcp_cc_7.x/sys/netinet/sctp.h
  projects/tcp_cc_7.x/sys/netinet/sctp_asconf.c
  projects/tcp_cc_7.x/sys/netinet/sctp_asconf.h
  projects/tcp_cc_7.x/sys/netinet/sctp_auth.c
  projects/tcp_cc_7.x/sys/netinet/sctp_auth.h
  projects/tcp_cc_7.x/sys/netinet/sctp_constants.h
  projects/tcp_cc_7.x/sys/netinet/sctp_crc32.c
  projects/tcp_cc_7.x/sys/netinet/sctp_header.h
  projects/tcp_cc_7.x/sys/netinet/sctp_indata.c
  projects/tcp_cc_7.x/sys/netinet/sctp_indata.h
  projects/tcp_cc_7.x/sys/netinet/sctp_input.c
  projects/tcp_cc_7.x/sys/netinet/sctp_lock_bsd.h
  projects/tcp_cc_7.x/sys/netinet/sctp_os_bsd.h
  projects/tcp_cc_7.x/sys/netinet/sctp_output.c
  projects/tcp_cc_7.x/sys/netinet/sctp_output.h
  projects/tcp_cc_7.x/sys/netinet/sctp_pcb.c
  projects/tcp_cc_7.x/sys/netinet/sctp_pcb.h
  projects/tcp_cc_7.x/sys/netinet/sctp_structs.h
  projects/tcp_cc_7.x/sys/netinet/sctp_sysctl.c
  projects/tcp_cc_7.x/sys/netinet/sctp_sysctl.h
  projects/tcp_cc_7.x/sys/netinet/sctp_timer.c
  projects/tcp_cc_7.x/sys/netinet/sctp_uio.h
  projects/tcp_cc_7.x/sys/netinet/sctp_usrreq.c
  projects/tcp_cc_7.x/sys/netinet/sctp_var.h
  projects/tcp_cc_7.x/sys/netinet/sctputil.c
  projects/tcp_cc_7.x/sys/netinet/sctputil.h
  projects/tcp_cc_7.x/sys/netinet/tcp_debug.h
  projects/tcp_cc_7.x/sys/netinet/tcp_hostcache.c
  projects/tcp_cc_7.x/sys/netinet/tcp_input.c
  projects/tcp_cc_7.x/sys/netinet/tcp_output.c
  projects/tcp_cc_7.x/sys/netinet/tcp_subr.c
  projects/tcp_cc_7.x/sys/netinet/tcp_syncache.c
  projects/tcp_cc_7.x/sys/netinet/tcp_timer.c
  projects/tcp_cc_7.x/sys/netinet/tcp_timewait.c
  projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c
  projects/tcp_cc_7.x/sys/netinet/udp_usrreq.c
  projects/tcp_cc_7.x/sys/netinet6/icmp6.c
  projects/tcp_cc_7.x/sys/netinet6/in6.c
  projects/tcp_cc_7.x/sys/netinet6/in6_gif.c
  projects/tcp_cc_7.x/sys/netinet6/in6_ifattach.c
  projects/tcp_cc_7.x/sys/netinet6/in6_pcb.c
  projects/tcp_cc_7.x/sys/netinet6/in6_pcb.h
  projects/tcp_cc_7.x/sys/netinet6/in6_rmx.c
  projects/tcp_cc_7.x/sys/netinet6/in6_src.c
  projects/tcp_cc_7.x/sys/netinet6/ip6_input.c
  projects/tcp_cc_7.x/sys/netinet6/ip6_output.c
  projects/tcp_cc_7.x/sys/netinet6/raw_ip6.c
  projects/tcp_cc_7.x/sys/netinet6/sctp6_usrreq.c
  projects/tcp_cc_7.x/sys/netinet6/udp6_usrreq.c
  projects/tcp_cc_7.x/sys/netipsec/ipsec.c
  projects/tcp_cc_7.x/sys/netipsec/ipsec.h
  projects/tcp_cc_7.x/sys/netipsec/ipsec6.h
  projects/tcp_cc_7.x/sys/netipsec/ipsec_mbuf.c
  projects/tcp_cc_7.x/sys/netipsec/key.c
  projects/tcp_cc_7.x/sys/netipsec/xform_ipip.c
  projects/tcp_cc_7.x/sys/nfsclient/nfs_vfsops.c
  projects/tcp_cc_7.x/sys/nfsclient/nfs_vnops.c
  projects/tcp_cc_7.x/sys/nfsserver/nfs_serv.c
  projects/tcp_cc_7.x/sys/pc98/cbus/syscons_cbus.c
  projects/tcp_cc_7.x/sys/pc98/conf/GENERIC
  projects/tcp_cc_7.x/sys/pc98/conf/NOTES
  projects/tcp_cc_7.x/sys/pc98/pc98/machdep.c
  projects/tcp_cc_7.x/sys/pci/if_rlreg.h
  projects/tcp_cc_7.x/sys/powerpc/include/pcb.h
  projects/tcp_cc_7.x/sys/powerpc/include/pcpu.h
  projects/tcp_cc_7.x/sys/powerpc/include/vmparam.h
  projects/tcp_cc_7.x/sys/powerpc/powerpc/elf_machdep.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/genassym.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/machdep.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/mmu_oea.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/pmap_dispatch.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/swtch.S
  projects/tcp_cc_7.x/sys/powerpc/powerpc/trap.c
  projects/tcp_cc_7.x/sys/powerpc/powerpc/trap_subr.S
  projects/tcp_cc_7.x/sys/security/audit/audit.c
  projects/tcp_cc_7.x/sys/security/audit/audit.h
  projects/tcp_cc_7.x/sys/security/audit/audit_arg.c
  projects/tcp_cc_7.x/sys/security/audit/audit_bsm.c
  projects/tcp_cc_7.x/sys/security/audit/audit_bsm_klib.c
  projects/tcp_cc_7.x/sys/security/audit/audit_pipe.c
  projects/tcp_cc_7.x/sys/security/audit/audit_private.h
  projects/tcp_cc_7.x/sys/security/audit/audit_syscalls.c
  projects/tcp_cc_7.x/sys/security/audit/audit_worker.c
  projects/tcp_cc_7.x/sys/security/mac_bsdextended/mac_bsdextended.c
  projects/tcp_cc_7.x/sys/sparc64/central/central.c
  projects/tcp_cc_7.x/sys/sparc64/conf/GENERIC
  projects/tcp_cc_7.x/sys/sparc64/ebus/ebus.c
  projects/tcp_cc_7.x/sys/sparc64/fhc/fhc.c
  projects/tcp_cc_7.x/sys/sparc64/include/asi.h
  projects/tcp_cc_7.x/sys/sparc64/include/bus_private.h
  projects/tcp_cc_7.x/sys/sparc64/include/cache.h
  projects/tcp_cc_7.x/sys/sparc64/include/clock.h
  projects/tcp_cc_7.x/sys/sparc64/include/cpu.h
  projects/tcp_cc_7.x/sys/sparc64/include/cpufunc.h
  projects/tcp_cc_7.x/sys/sparc64/include/intr_machdep.h
  projects/tcp_cc_7.x/sys/sparc64/include/iommureg.h
  projects/tcp_cc_7.x/sys/sparc64/include/iommuvar.h
  projects/tcp_cc_7.x/sys/sparc64/include/pcpu.h
  projects/tcp_cc_7.x/sys/sparc64/include/smp.h
  projects/tcp_cc_7.x/sys/sparc64/include/tick.h
  projects/tcp_cc_7.x/sys/sparc64/include/tlb.h
  projects/tcp_cc_7.x/sys/sparc64/include/trap.h
  projects/tcp_cc_7.x/sys/sparc64/include/tte.h
  projects/tcp_cc_7.x/sys/sparc64/include/ver.h
  projects/tcp_cc_7.x/sys/sparc64/include/vmparam.h
  projects/tcp_cc_7.x/sys/sparc64/isa/isa.c
  projects/tcp_cc_7.x/sys/sparc64/pci/apb.c
  projects/tcp_cc_7.x/sys/sparc64/pci/ofw_pcib.c
  projects/tcp_cc_7.x/sys/sparc64/pci/ofw_pcibus.c
  projects/tcp_cc_7.x/sys/sparc64/pci/psycho.c
  projects/tcp_cc_7.x/sys/sparc64/pci/psychoreg.h
  projects/tcp_cc_7.x/sys/sparc64/pci/psychovar.h
  projects/tcp_cc_7.x/sys/sparc64/sbus/dma_sbus.c
  projects/tcp_cc_7.x/sys/sparc64/sbus/sbus.c
  projects/tcp_cc_7.x/sys/sparc64/sbus/sbusvar.h
  projects/tcp_cc_7.x/sys/sparc64/sparc64/cache.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/cheetah.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/clock.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/db_disasm.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/eeprom.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/elf_machdep.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/exception.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/genassym.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/intr_machdep.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/iommu.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/locore.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/machdep.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/mp_exception.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/mp_locore.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/mp_machdep.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/nexus.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/pmap.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/rtc.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/sc_machdep.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/spitfire.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/support.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/swtch.S
  projects/tcp_cc_7.x/sys/sparc64/sparc64/tick.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/tlb.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/trap.c
  projects/tcp_cc_7.x/sys/sparc64/sparc64/upa.c
  projects/tcp_cc_7.x/sys/sun4v/include/asi.h
  projects/tcp_cc_7.x/sys/sun4v/include/trap.h
  projects/tcp_cc_7.x/sys/sun4v/include/tte.h
  projects/tcp_cc_7.x/sys/sun4v/include/vmparam.h
  projects/tcp_cc_7.x/sys/sun4v/sun4v/pmap.c
  projects/tcp_cc_7.x/sys/sun4v/sun4v/trap.c
  projects/tcp_cc_7.x/sys/sys/disk.h
  projects/tcp_cc_7.x/sys/sys/diskpc98.h
  projects/tcp_cc_7.x/sys/sys/file.h
  projects/tcp_cc_7.x/sys/sys/imgact_elf.h
  projects/tcp_cc_7.x/sys/sys/jail.h
  projects/tcp_cc_7.x/sys/sys/kobj.h
  projects/tcp_cc_7.x/sys/sys/ksem.h
  projects/tcp_cc_7.x/sys/sys/mman.h
  projects/tcp_cc_7.x/sys/sys/mount.h
  projects/tcp_cc_7.x/sys/sys/param.h
  projects/tcp_cc_7.x/sys/sys/pciio.h
  projects/tcp_cc_7.x/sys/sys/proc.h
  projects/tcp_cc_7.x/sys/sys/shm.h
  projects/tcp_cc_7.x/sys/sys/sx.h
  projects/tcp_cc_7.x/sys/sys/sysctl.h
  projects/tcp_cc_7.x/sys/sys/systm.h
  projects/tcp_cc_7.x/sys/sys/umtx.h
  projects/tcp_cc_7.x/sys/sys/user.h
  projects/tcp_cc_7.x/sys/sys/vnode.h
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_alloc.c
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_extern.h
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_inode.c
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_snapshot.c
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_softdep.c
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_vfsops.c
  projects/tcp_cc_7.x/sys/ufs/ffs/ffs_vnops.c
  projects/tcp_cc_7.x/sys/ufs/ufs/inode.h
  projects/tcp_cc_7.x/sys/ufs/ufs/ufs_inode.c
  projects/tcp_cc_7.x/sys/ufs/ufs/ufs_lookup.c
  projects/tcp_cc_7.x/sys/ufs/ufs/ufs_vnops.c
  projects/tcp_cc_7.x/sys/ufs/ufs/ufsmount.h
  projects/tcp_cc_7.x/sys/vm/device_pager.c
  projects/tcp_cc_7.x/sys/vm/memguard.c
  projects/tcp_cc_7.x/sys/vm/pmap.h
  projects/tcp_cc_7.x/sys/vm/vm.h
  projects/tcp_cc_7.x/sys/vm/vm_extern.h
  projects/tcp_cc_7.x/sys/vm/vm_fault.c
  projects/tcp_cc_7.x/sys/vm/vm_init.c
  projects/tcp_cc_7.x/sys/vm/vm_kern.c
  projects/tcp_cc_7.x/sys/vm/vm_map.c
  projects/tcp_cc_7.x/sys/vm/vm_map.h
  projects/tcp_cc_7.x/sys/vm/vm_meter.c
  projects/tcp_cc_7.x/sys/vm/vm_mmap.c
  projects/tcp_cc_7.x/sys/vm/vm_object.c
  projects/tcp_cc_7.x/sys/vm/vm_object.h
  projects/tcp_cc_7.x/sys/vm/vm_page.c
  projects/tcp_cc_7.x/sys/vm/vm_page.h
  projects/tcp_cc_7.x/sys/vm/vm_pageout.c
  projects/tcp_cc_7.x/sys/vm/vm_pager.c
  projects/tcp_cc_7.x/sys/vm/vm_phys.c
  projects/tcp_cc_7.x/sys/vm/vm_phys.h
  projects/tcp_cc_7.x/sys/vm/vnode_pager.c
  projects/tcp_cc_7.x/tools/build/   (props changed)
  projects/tcp_cc_7.x/tools/regression/atm/   (props changed)
  projects/tcp_cc_7.x/tools/regression/file/flock/   (props changed)
  projects/tcp_cc_7.x/tools/regression/usr.bin/   (props changed)
  projects/tcp_cc_7.x/tools/regression/usr.bin/tr/   (props changed)
  projects/tcp_cc_7.x/tools/sched/   (props changed)
  projects/tcp_cc_7.x/tools/tools/crypto/   (props changed)
  projects/tcp_cc_7.x/tools/tools/editing/   (props changed)
  projects/tcp_cc_7.x/tools/tools/nanobsd/   (props changed)
  projects/tcp_cc_7.x/tools/tools/usb/   (props changed)
  projects/tcp_cc_7.x/tools/tools/usb/print-usb-if-vids.sh
  projects/tcp_cc_7.x/usr.bin/   (props changed)
  projects/tcp_cc_7.x/usr.bin/basename/   (props changed)
  projects/tcp_cc_7.x/usr.bin/bluetooth/rfcomm_sppd/   (props changed)
  projects/tcp_cc_7.x/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
  projects/tcp_cc_7.x/usr.bin/calendar/   (props changed)
  projects/tcp_cc_7.x/usr.bin/cksum/   (props changed)
  projects/tcp_cc_7.x/usr.bin/comm/   (props changed)
  projects/tcp_cc_7.x/usr.bin/cpuset/   (props changed)
  projects/tcp_cc_7.x/usr.bin/csup/   (props changed)
  projects/tcp_cc_7.x/usr.bin/csup/Makefile
  projects/tcp_cc_7.x/usr.bin/dirname/   (props changed)
  projects/tcp_cc_7.x/usr.bin/du/   (props changed)
  projects/tcp_cc_7.x/usr.bin/du/du.1
  projects/tcp_cc_7.x/usr.bin/du/du.c
  projects/tcp_cc_7.x/usr.bin/fetch/   (props changed)
  projects/tcp_cc_7.x/usr.bin/file/   (props changed)
  projects/tcp_cc_7.x/usr.bin/gprof/   (props changed)
  projects/tcp_cc_7.x/usr.bin/gprof/gprof.c
  projects/tcp_cc_7.x/usr.bin/gzip/   (props changed)
  projects/tcp_cc_7.x/usr.bin/ipcrm/   (props changed)
  projects/tcp_cc_7.x/usr.bin/ipcs/   (props changed)
  projects/tcp_cc_7.x/usr.bin/kdump/   (props changed)
  projects/tcp_cc_7.x/usr.bin/ktrace/   (props changed)
  projects/tcp_cc_7.x/usr.bin/ldd/   (props changed)
  projects/tcp_cc_7.x/usr.bin/lockf/   (props changed)
  projects/tcp_cc_7.x/usr.bin/logger/   (props changed)
  projects/tcp_cc_7.x/usr.bin/make/   (props changed)
  projects/tcp_cc_7.x/usr.bin/make/Makefile
  projects/tcp_cc_7.x/usr.bin/make/buf.c
  projects/tcp_cc_7.x/usr.bin/make/for.c
  projects/tcp_cc_7.x/usr.bin/make/globals.h
  projects/tcp_cc_7.x/usr.bin/make/job.c
  projects/tcp_cc_7.x/usr.bin/make/job.h
  projects/tcp_cc_7.x/usr.bin/make/main.c
  projects/tcp_cc_7.x/usr.bin/make/make.1
  projects/tcp_cc_7.x/usr.bin/make/make.c
  projects/tcp_cc_7.x/usr.bin/make/make.h
  projects/tcp_cc_7.x/usr.bin/make/parse.c
  projects/tcp_cc_7.x/usr.bin/make/suff.c
  projects/tcp_cc_7.x/usr.bin/make/var.c
  projects/tcp_cc_7.x/usr.bin/ncal/   (props changed)
  projects/tcp_cc_7.x/usr.bin/ncal/ncal.1
  projects/tcp_cc_7.x/usr.bin/ncal/ncal.c
  projects/tcp_cc_7.x/usr.bin/netstat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/netstat/inet.c
  projects/tcp_cc_7.x/usr.bin/netstat/main.c
  projects/tcp_cc_7.x/usr.bin/netstat/unix.c
  projects/tcp_cc_7.x/usr.bin/nsupdate/   (props changed)
  projects/tcp_cc_7.x/usr.bin/procstat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/procstat/procstat_files.c
  projects/tcp_cc_7.x/usr.bin/sed/   (props changed)
  projects/tcp_cc_7.x/usr.bin/shar/   (props changed)
  projects/tcp_cc_7.x/usr.bin/sockstat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/sockstat/sockstat.c
  projects/tcp_cc_7.x/usr.bin/stat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/stat/stat.c
  projects/tcp_cc_7.x/usr.bin/su/   (props changed)
  projects/tcp_cc_7.x/usr.bin/systat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/systat/netstat.c
  projects/tcp_cc_7.x/usr.bin/tar/   (props changed)
  projects/tcp_cc_7.x/usr.bin/tar/write.c
  projects/tcp_cc_7.x/usr.bin/top/   (props changed)
  projects/tcp_cc_7.x/usr.bin/truncate/   (props changed)
  projects/tcp_cc_7.x/usr.bin/truss/   (props changed)
  projects/tcp_cc_7.x/usr.bin/units/   (props changed)
  projects/tcp_cc_7.x/usr.bin/vmstat/   (props changed)
  projects/tcp_cc_7.x/usr.bin/wc/   (props changed)
  projects/tcp_cc_7.x/usr.bin/whereis/   (props changed)
  projects/tcp_cc_7.x/usr.bin/window/   (props changed)
  projects/tcp_cc_7.x/usr.bin/xargs/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/Makefile
  projects/tcp_cc_7.x/usr.sbin/adduser/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/arp/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/arp/arp.8
  projects/tcp_cc_7.x/usr.sbin/arp/arp.c
  projects/tcp_cc_7.x/usr.sbin/bluetooth/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/bluetooth/Makefile
  projects/tcp_cc_7.x/usr.sbin/bluetooth/hcsecd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/bluetooth/hcsecd/hcsecd.c
  projects/tcp_cc_7.x/usr.sbin/bluetooth/hcseriald/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/bluetooth/hcseriald/hcseriald.c
  projects/tcp_cc_7.x/usr.sbin/bluetooth/rfcomm_pppd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
  projects/tcp_cc_7.x/usr.sbin/bluetooth/sdpd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/bluetooth/sdpd/sd.c
  projects/tcp_cc_7.x/usr.sbin/bsnmpd/modules/snmp_pf/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/burncd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/burncd/Makefile
  projects/tcp_cc_7.x/usr.sbin/burncd/burncd.c
  projects/tcp_cc_7.x/usr.sbin/cdcontrol/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/config/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/cpucontrol/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/cron/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/cron/cron/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/crunch/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/crunch/crunchgen/crunched_main.c
  projects/tcp_cc_7.x/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/tcp_cc_7.x/usr.sbin/crunch/crunchide/crunchide.c
  projects/tcp_cc_7.x/usr.sbin/eeprom/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/eeprom/ofw_options.c
  projects/tcp_cc_7.x/usr.sbin/extattr/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/freebsd-update/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/fwcontrol/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/gstat/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/gstat/gstat.8
  projects/tcp_cc_7.x/usr.sbin/gstat/gstat.c
  projects/tcp_cc_7.x/usr.sbin/ifmcstat/ifmcstat.c
  projects/tcp_cc_7.x/usr.sbin/iostat/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/jail/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/jexec/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/jexec/jexec.c
  projects/tcp_cc_7.x/usr.sbin/jls/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/mergemaster/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/mergemaster/mergemaster.8
  projects/tcp_cc_7.x/usr.sbin/mergemaster/mergemaster.sh
  projects/tcp_cc_7.x/usr.sbin/mountd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/mtree/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/ndiscvt/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/newsyslog/newsyslog.conf.5   (props changed)
  projects/tcp_cc_7.x/usr.sbin/nscd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/ntp/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/pciconf/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/pciconf/pciconf.8
  projects/tcp_cc_7.x/usr.sbin/pciconf/pciconf.c
  projects/tcp_cc_7.x/usr.sbin/pkg_install/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/pmcstat/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/portsnap/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/portsnap/phttpget/phttpget.c
  projects/tcp_cc_7.x/usr.sbin/powerd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/pw/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/rpc.lockd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/rpc.statd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/rpc.yppasswdd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/sade/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/sade/disks.c
  projects/tcp_cc_7.x/usr.sbin/setfib/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/sysinstall/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/sysinstall/devices.c
  projects/tcp_cc_7.x/usr.sbin/sysinstall/disks.c
  projects/tcp_cc_7.x/usr.sbin/sysinstall/sysinstall.8
  projects/tcp_cc_7.x/usr.sbin/syslogd/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/syslogd/Makefile
  projects/tcp_cc_7.x/usr.sbin/syslogd/syslogd.c
  projects/tcp_cc_7.x/usr.sbin/traceroute/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/tzsetup/   (props changed)
  projects/tcp_cc_7.x/usr.sbin/wpa/wpa_supplicant/   (props changed)

Modified: projects/tcp_cc_7.x/Makefile
==============================================================================
--- projects/tcp_cc_7.x/Makefile	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/Makefile	Thu Apr  9 05:41:34 2009	(r190861)
@@ -285,22 +285,30 @@ KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
 .ORDER: universe_prologue universe_${target} universe_epilogue
 universe_${target}:
+.if !defined(MAKE_JUST_KERNELS)
 	@echo ">> ${target} started on `LC_ALL=C date`"
-	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
+	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+	    ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
-	    __MAKE_CONF=/dev/null \
-	    > _.${target}.buildworld 2>&1
+	    > _.${target}.buildworld 2>&1 || \
+	    echo "${target} world failed," \
+	    "check _.${target}.buildworld for details")
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
+.endif
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
-	-cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
-	    > ${.CURDIR}/_.${target}.makeLINT 2>&1
+	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
+	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+	    echo "${target} 'make LINT' failed," \
+	    "check _.${target}.makeLINT for details")
 .endif
 .for kernel in ${KERNCONFS}
-	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
+	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+	    ${MAKE} ${JFLAG} buildkernel \
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
-	    __MAKE_CONF=/dev/null \
-	    > _.${target}.${kernel} 2>&1
+	    > _.${target}.${kernel} 2>&1 || \
+	    echo "${target} ${kernel} kernel failed," \
+	    "check _.${target}.${kernel} for details")
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor

Modified: projects/tcp_cc_7.x/Makefile.inc1
==============================================================================
--- projects/tcp_cc_7.x/Makefile.inc1	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/Makefile.inc1	Thu Apr  9 05:41:34 2009	(r190861)
@@ -597,10 +597,14 @@ installcheck_UGID:
 #
 # Installs everything compiled by a 'buildworld'.
 #
+.if ${MK_INFO} != "no"
+_install-info=	install-info
+.endif
+
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
 	for prog in [ awk cap_mkdb cat chflags chmod chown \
-	    date echo egrep find grep install-info \
+	    date echo egrep find grep ${_install-info} \
 	    ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
 	    test true uname wc zic; do \
 		cp `which $$prog` ${INSTALLTMP}; \

Modified: projects/tcp_cc_7.x/UPDATING
==============================================================================
--- projects/tcp_cc_7.x/UPDATING	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/UPDATING	Thu Apr  9 05:41:34 2009	(r190861)
@@ -8,6 +8,41 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20090326:
+	Following bug-fixes to TCP connection state flags, netstat, systat,
+	and sockstat will need to be rebuilt in order to properly print
+	connections in the TIMEWAIT state.
+
+20090318:
+	Change IPv6 ephemeral port allocation from sequential to
+	random allocation, like IPv4 has done for more than four years.
+ 	The implementation shares infrastructure with IPv4. This
+	means that there is only one set of sysctls to control both
+	IPv4 and IPv6. See ip(4) man page for details.
+
+20090312:
+	A workaround is committed to allow the creation of System V shared
+	memory segment of size > 2 GB on the 64-bit architectures.
+	Due to a limitation of the existing ABI, the shm_segsz member
+	of the struct shmid_ds, returned by shmctl(IPC_STAT) call is
+	wrong for large segments. Note that limits must be explicitely
+	raised to allow such segments to be created.
+
+	The management interface that is used by ipcs(1) has to be changed
+	in incompatible way. Rebuild the ipcs(1) utility with the new
+	headers after the update. Buildworld/installworld takes care
+	of this issue automatically.
+
+20090312:
+	The open-source Atheros HAL has been merged from HEAD
+	to STABLE.
+	The kernel compile-time option AH_SUPPORT_AR5416 has been
+	added to support certain newer Atheros parts, particularly
+	PCI-Express chipsets.
+	The following modules are no longer available, and should be
+	removed from MODULES_OVERRIDE and/or loader.conf:-
+	 ath_hal ath_rate_amrr ath_rate_onoe ath_rate_sample
+
 20090207:
 	ZFS users on amd64 machines with 4GB or more of RAM should
 	reevaluate their need for setting vm.kmem_size_max and

Modified: projects/tcp_cc_7.x/bin/pax/file_subs.c
==============================================================================
--- projects/tcp_cc_7.x/bin/pax/file_subs.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/bin/pax/file_subs.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -425,19 +425,11 @@ node_creat(ARCHD *arcn)
 	 * we were able to create the node. set uid/gid, modes and times
 	 */
 	if (pids)
-		res = ((arcn->type == PAX_SLK) ?
-		    set_lids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid) :
-		    set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid));
+		res = set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid);
 	else
 		res = 0;
 
 	/*
-	 * symlinks are done now.
-	 */
-	if (arcn->type == PAX_SLK)
-		return(0);
-
-	/*
 	 * IMPORTANT SECURITY NOTE:
 	 * if not preserving mode or we cannot set uid/gid, then PROHIBIT any
 	 * set uid/gid bits
@@ -632,7 +624,7 @@ chk_path( char *name, uid_t st_uid, gid_
  *	used by -t to reset access times).
  *	When ign is zero, only those times the user has asked for are set, the
  *	other ones are left alone. We do not assume the un-documented feature
- *	of many utimes() implementations that consider a 0 time value as a do
+ *	of many lutimes() implementations that consider a 0 time value as a do
  *	not set request.
  */
 
@@ -661,7 +653,7 @@ set_ftime(char *fnm, time_t mtime, time_
 	/*
 	 * set the times
 	 */
-	if (utimes(fnm, tv) < 0)
+	if (lutimes(fnm, tv) < 0)
 		syswarn(1, errno, "Access/modification time set failed on: %s",
 		    fnm);
 	return;
@@ -677,30 +669,6 @@ set_ftime(char *fnm, time_t mtime, time_
 int
 set_ids(char *fnm, uid_t uid, gid_t gid)
 {
-	if (chown(fnm, uid, gid) < 0) {
-		/*
-		 * ignore EPERM unless in verbose mode or being run by root.
-		 * if running as pax, POSIX requires a warning.
-		 */
-		if (strcmp(NM_PAX, argv0) == 0 || errno != EPERM || vflag ||
-		    geteuid() == 0)
-			syswarn(1, errno, "Unable to set file uid/gid of %s",
-			    fnm);
-		return(-1);
-	}
-	return(0);
-}
-
-/*
- * set_lids()
- *	set the uid and gid of a file system node
- * Return:
- *	0 when set, -1 on failure
- */
-
-int
-set_lids(char *fnm, uid_t uid, gid_t gid)
-{
 	if (lchown(fnm, uid, gid) < 0) {
 		/*
 		 * ignore EPERM unless in verbose mode or being run by root.
@@ -724,7 +692,7 @@ void
 set_pmode(char *fnm, mode_t mode)
 {
 	mode &= ABITS;
-	if (chmod(fnm, mode) < 0)
+	if (lchmod(fnm, mode) < 0)
 		syswarn(1, errno, "Could not set permissions on %s", fnm);
 	return;
 }

Modified: projects/tcp_cc_7.x/bin/sh/miscbltin.c
==============================================================================
--- projects/tcp_cc_7.x/bin/sh/miscbltin.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/bin/sh/miscbltin.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -147,6 +147,7 @@ readcmd(int argc __unused, char **argv _
 		if (tcgetattr(0, &told) == 0) {
 			memcpy(&tnew, &told, sizeof(told));
 			cfmakeraw(&tnew);
+			tnew.c_iflag |= told.c_iflag & ICRNL;
 			tcsetattr(0, TCSANOW, &tnew);
 			tsaved = 1;
 		}

Modified: projects/tcp_cc_7.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/tcp_cc_7.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -1739,15 +1739,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		 * Arches which are 32-bit only just use the normal
 		 * library path.
 		 */
-#if defined(__i386__)
-		int use_32 = 1;  /* use /usr/lib/... -sson */
-#else
 		int use_32 = 0;
 #endif
-#endif
 
 		(void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o",
-		    use_32 ? "":"32");
+		    use_32 ? "32":"");
 
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;

Modified: projects/tcp_cc_7.x/contrib/bind9/CHANGES
==============================================================================
--- projects/tcp_cc_7.x/contrib/bind9/CHANGES	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/bind9/CHANGES	Thu Apr  9 05:41:34 2009	(r190861)
@@ -1,3 +1,8 @@
+	--- 9.4.3-P2 released ---
+
+2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
+			algorithms. [RT #19479]
+
 	--- 9.4.3-P1 released ---
 
 2522.	[security]	Handle -1 from DSA_do_verify().

Modified: projects/tcp_cc_7.x/contrib/bind9/lib/dns/validator.c
==============================================================================
--- projects/tcp_cc_7.x/contrib/bind9/lib/dns/validator.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/bind9/lib/dns/validator.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.119.18.41 2008/08/21 04:59:42 marka Exp $ */
+/* $Id: validator.c,v 1.119.18.41.2.1 2009/03/17 02:23:49 marka Exp $ */
 
 /*! \file */
 
@@ -211,6 +211,37 @@ exit_check(dns_validator_t *val) {
 	return (ISC_TRUE);
 }
 
+/*
+ * Check that we have atleast one supported algorithm in the DLV RRset.
+ */
+static inline isc_boolean_t
+dlv_algorithm_supported(dns_validator_t *val) {
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	dns_rdata_dlv_t dlv;
+	isc_result_t result;
+
+	for (result = dns_rdataset_first(&val->dlv);
+	     result == ISC_R_SUCCESS;
+	     result = dns_rdataset_next(&val->dlv)) {
+		dns_rdata_reset(&rdata);
+		dns_rdataset_current(&val->dlv, &rdata);
+		result = dns_rdata_tostruct(&rdata, &dlv, NULL);
+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
+
+		if (!dns_resolver_algorithm_supported(val->view->resolver,
+						      val->event->name,
+						      dlv.algorithm))
+			continue;
+
+		if (dlv.digest_type != DNS_DSDIGEST_SHA256 &&
+		    dlv.digest_type != DNS_DSDIGEST_SHA1)
+			continue;
+
+		return (ISC_TRUE);
+	}
+	return (ISC_FALSE);
+}
+
 /*%
  * Look in the NSEC record returned from a DS query to see if there is
  * a NS RRset at this name.  If it is found we are at a delegation point.
@@ -2297,19 +2328,36 @@ dlvfetched(isc_task_t *task, isc_event_t
 				sizeof(namebuf));
 		dns_rdataset_clone(&val->frdataset, &val->dlv);
 		val->havedlvsep = ISC_TRUE;
-		validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-		dlv_validator_start(val);
+		if (dlv_algorithm_supported(val)) {
+			validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
+				      namebuf);
+			dlv_validator_start(val);
+		} else {
+			validator_log(val, ISC_LOG_DEBUG(3),
+				      "DLV %s found with no supported algorithms",
+				      namebuf);
+			markanswer(val);
+			validator_done(val, ISC_R_SUCCESS);
+		}
 	} else if (eresult == DNS_R_NXRRSET ||
 		   eresult == DNS_R_NXDOMAIN ||
 		   eresult == DNS_R_NCACHENXRRSET ||
 		   eresult == DNS_R_NCACHENXDOMAIN) {
-		   result = finddlvsep(val, ISC_TRUE);
+		result = finddlvsep(val, ISC_TRUE);
 		if (result == ISC_R_SUCCESS) {
-			dns_name_format(dns_fixedname_name(&val->dlvsep),
-					namebuf, sizeof(namebuf));
-			validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
-				      namebuf);
-			dlv_validator_start(val);
+			if (dlv_algorithm_supported(val)) {
+				dns_name_format(dns_fixedname_name(&val->dlvsep),
+						namebuf, sizeof(namebuf));
+				validator_log(val, ISC_LOG_DEBUG(3),
+					      "DLV %s found", namebuf);
+				dlv_validator_start(val);
+			} else {
+				validator_log(val, ISC_LOG_DEBUG(3),
+					      "DLV %s found with no supported "
+					      "algorithms", namebuf);
+				markanswer(val);
+				validator_done(val, ISC_R_SUCCESS);
+			}
 		} else if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV not found");
 			markanswer(val);
@@ -2372,9 +2420,16 @@ startfinddlvsep(dns_validator_t *val, dn
 	}
 	dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf,
 			sizeof(namebuf));
-	validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-	dlv_validator_start(val);
-	return (DNS_R_WAIT);
+	if (dlv_algorithm_supported(val)) {
+		validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
+		dlv_validator_start(val);
+		return (DNS_R_WAIT);
+	} 
+	validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found with no supported "
+		      "algorithms", namebuf);
+	markanswer(val);
+	validator_done(val, ISC_R_SUCCESS);
+	return (ISC_R_SUCCESS);
 }
 
 /*%

Modified: projects/tcp_cc_7.x/contrib/bind9/version
==============================================================================
--- projects/tcp_cc_7.x/contrib/bind9/version	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/bind9/version	Thu Apr  9 05:41:34 2009	(r190861)
@@ -1,4 +1,4 @@
-# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $
+# $Id: version,v 1.29.134.23.2.2 2009/03/17 02:23:49 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=4
 PATCHVER=3
 RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2

Modified: projects/tcp_cc_7.x/contrib/csup/GNUmakefile
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/GNUmakefile	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/GNUmakefile	Thu Apr  9 05:41:34 2009	(r190861)
@@ -12,8 +12,9 @@ GROUP?=	0
 UNAME=	$(shell uname -s)
 
 SRCS=	attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
-	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c pathcomp.c \
-	parse.c proto.c status.c stream.c threads.c token.c updater.c
+	globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \
+	pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \
+	stream.c threads.c token.c updater.c
 OBJS=	$(SRCS:.c=.o)
 
 WARNS=	-Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \

Modified: projects/tcp_cc_7.x/contrib/csup/Makefile
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/Makefile	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/Makefile	Thu Apr  9 05:41:34 2009	(r190861)
@@ -9,10 +9,11 @@ UNAME!=		/usr/bin/uname -s
 PROG=	csup
 SRCS=	attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
 	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
-	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
+	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \
+	rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c
 
 CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
-WARNS?=		6
+WARNS?=		1
 
 # A bit of tweaking is needed to get this Makefile working
 # with the bsd.prog.mk of all the *BSD OSes...

Modified: projects/tcp_cc_7.x/contrib/csup/TODO
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/TODO	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/TODO	Thu Apr  9 05:41:34 2009	(r190861)
@@ -28,4 +28,3 @@ MISSING FEATURES:
   checkout files (files in CVS/ subdirectores), a command line override
   to only update a specific collection and a third verbosity level to
   display commit log messages.
-- Add support for CVS mode (maybe?).

Modified: projects/tcp_cc_7.x/contrib/csup/config.c
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/config.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/config.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -133,7 +133,6 @@ config_init(const char *file, struct col
 			coll->co_options &= ~CO_CHECKRCS;
 		/* In recent versions, we always try to set the file modes. */
 		coll->co_options |= CO_SETMODE;
-		/* XXX We don't support the rsync updating algorithm yet. */
 		coll->co_options |= CO_NORSYNC;
 		error = config_parse_refusefiles(coll);
 		if (error)
@@ -444,10 +443,6 @@ coll_add(char *name)
 		    "\"%s\"\n", cur_coll->co_name);
 		exit(1);
 	}
-	if (!(cur_coll->co_options & CO_CHECKOUTMODE)) {
-		lprintf(-1, "Client only supports checkout mode\n");
-		exit(1);
-	}
 	if (!STAILQ_EMPTY(&colls)) {
 		coll = STAILQ_LAST(&colls, coll, co_next);
 		if (strcmp(coll->co_host, cur_coll->co_host) != 0) {

Modified: projects/tcp_cc_7.x/contrib/csup/csup.1
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/csup.1	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/csup.1	Thu Apr  9 05:41:34 2009	(r190861)
@@ -442,8 +442,6 @@ They are called
 mode and
 .Em checkout
 mode.
-.Nm
-only supports the checkout mode for now.
 .Pp
 In CVS mode, the client receives copies of the actual RCS files making
 up the master CVS repository.  CVS mode is the default mode of operation.

Modified: projects/tcp_cc_7.x/contrib/csup/detailer.c
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/detailer.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/detailer.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -30,13 +30,21 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "detailer.h"
 #include "fixups.h"
+#include "globtree.h"
 #include "misc.h"
 #include "mux.h"
 #include "proto.h"
+#include "rcsfile.h"
+#include "rsyncfile.h"
 #include "status.h"
 #include "stream.h"
 
@@ -56,8 +64,16 @@ struct detailer {
 static int	detailer_batch(struct detailer *);
 static int	detailer_coll(struct detailer *, struct coll *,
 		    struct status *);
-static int	detailer_dofile(struct detailer *, struct coll *,
+static int	detailer_dofile_co(struct detailer *, struct coll *,
 		    struct status *, char *);
+static int	detailer_dofile_rcs(struct detailer *, struct coll *, 
+		    char *, char *);
+static int	detailer_dofile_regular(struct detailer *, char *, char *);
+static int	detailer_dofile_rsync(struct detailer *, char *, char *);
+static int	detailer_checkrcsattr(struct detailer *, struct coll *, char *,
+		    struct fattr *, int);
+int		detailer_send_details(struct detailer *, struct coll *, char *,
+		    char *, struct fattr *);
 
 void *
 detailer(void *arg)
@@ -186,8 +202,13 @@ detailer_batch(struct detailer *d)
 			}
 			if (fixup->f_coll != coll)
 				break;
-			error = proto_printf(wr, "Y %s %s %s\n", fixup->f_name,
-			    coll->co_tag, coll->co_date);
+			if (coll->co_options & CO_CHECKOUTMODE)
+				error = proto_printf(wr, "Y %s %s %s\n",
+				    fixup->f_name, coll->co_tag, coll->co_date);
+			else {
+				error = proto_printf(wr, "A %s\n",
+				    fixup->f_name);
+			}
 			if (error)
 				return (DETAILER_ERR_WRITE);
 			fixup = NULL;
@@ -208,12 +229,14 @@ detailer_batch(struct detailer *d)
 static int
 detailer_coll(struct detailer *d, struct coll *coll, struct status *st)
 {
+	struct fattr *rcsattr;
 	struct stream *rd, *wr;
-	char *cmd, *file, *line, *msg;
-	int error;
+	char *attr, *cmd, *file, *line, *msg, *path, *target;
+	int error, attic;
 
 	rd = d->rd;
 	wr = d->wr;
+	attic = 0;
 	line = stream_getln(rd, NULL);
 	if (line == NULL)
 		return (DETAILER_ERR_READ);
@@ -226,17 +249,84 @@ detailer_coll(struct detailer *d, struct
 			/* Delete file. */
 			file = proto_get_ascii(&line);
 			if (file == NULL || line != NULL)
-				return (DETAILER_ERR_PROTO);
+				return (DETAILER_ERR_PROTO); 
 			error = proto_printf(wr, "D %s\n", file);
 			if (error)
 				return (DETAILER_ERR_WRITE);
 			break;
+		case 'I':
+		case 'i':
+		case 'j':
+			/* Directory operations. */
+			file = proto_get_ascii(&line);
+			if (file == NULL || line != NULL)
+				return (DETAILER_ERR_PROTO);
+			error = proto_printf(wr, "%s %s\n", cmd, file);
+			if (error)
+				return (DETAILER_ERR_WRITE);
+			break;
+		case 'J':
+			/* Set directory attributes. */
+			file = proto_get_ascii(&line);
+			attr = proto_get_ascii(&line);
+			if (file == NULL || line != NULL || attr == NULL)
+				return (DETAILER_ERR_PROTO);
+			error = proto_printf(wr, "%s %s %s\n", cmd, file, attr);
+			if (error)
+				return (DETAILER_ERR_WRITE);
+			break;
+		case 'H':
+		case 'h':
+			/* Create a hard link. */
+			file = proto_get_ascii(&line);
+			target = proto_get_ascii(&line);
+			if (file == NULL || target == NULL)
+				return (DETAILER_ERR_PROTO);
+			error = proto_printf(wr, "%s %s %s\n", cmd, file,
+			    target);
+			break;
+		case 't':
+			file = proto_get_ascii(&line);
+			attr = proto_get_ascii(&line);
+			if (file == NULL || attr == NULL || line != NULL) {
+				return (DETAILER_ERR_PROTO);
+			}
+			rcsattr = fattr_decode(attr);
+			if (rcsattr == NULL) {
+				return (DETAILER_ERR_PROTO);
+			}
+			error = detailer_checkrcsattr(d, coll, file, rcsattr,
+			    1);
+			break;
+
+		case 'T':
+			file = proto_get_ascii(&line);
+			attr = proto_get_ascii(&line);
+			if (file == NULL || attr == NULL || line != NULL)
+				return (DETAILER_ERR_PROTO);
+			rcsattr = fattr_decode(attr);
+			if (rcsattr == NULL)
+				return (DETAILER_ERR_PROTO);
+			error = detailer_checkrcsattr(d, coll, file, rcsattr,
+			    0);
+			break;
+
 		case 'U':
 			/* Add or update file. */
 			file = proto_get_ascii(&line);
 			if (file == NULL || line != NULL)
 				return (DETAILER_ERR_PROTO);
-			error = detailer_dofile(d, coll, st, file);
+			if (coll->co_options & CO_CHECKOUTMODE) {
+				error = detailer_dofile_co(d, coll, st, file);
+			} else {
+				path = cvspath(coll->co_prefix, file, 0);
+				rcsattr = fattr_frompath(path, FATTR_NOFOLLOW);
+				error = detailer_send_details(d, coll, file,
+				    path, rcsattr);
+				if (rcsattr != NULL)
+					fattr_free(rcsattr);
+				free(path);
+			}
 			if (error)
 				return (error);
 			break;
@@ -261,14 +351,110 @@ detailer_coll(struct detailer *d, struct
 	return (0);
 }
 
+/*
+ * Tell the server to update a regular file.
+ */
 static int
-detailer_dofile(struct detailer *d, struct coll *coll, struct status *st,
-    char *file)
+detailer_dofile_regular(struct detailer *d, char *name, char *path)
 {
+	struct stream *wr;
+	struct stat st;
 	char md5[MD5_DIGEST_SIZE];
+	int error;
+	
+	wr = d->wr;
+	error = stat(path, &st);
+	/* If we don't have it or it's unaccessible, we want it again. */
+	if (error) {
+		proto_printf(wr, "A %s\n", name);
+		return (0);
+	}
+
+	/* If not, we want the file to be updated. */
+	error = MD5_File(path, md5);
+	if (error) {
+		lprintf(-1, "Error reading \"%s\"\n", name);
+		return (error);
+	}
+	error = proto_printf(wr, "R %s %O %s\n", name, st.st_size, md5);
+	if (error)
+		return (DETAILER_ERR_WRITE);
+	return (0);
+}
+
+/*
+ * Tell the server to update a file with the rsync algorithm.
+ */
+static int
+detailer_dofile_rsync(struct detailer *d, char *name, char *path)
+{
+	struct stream *wr;
+	struct rsyncfile *rf;
+
+	wr = d->wr;
+	rf = rsync_open(path, 0, 1);
+	if (rf == NULL) {
+		/* Fallback if we fail in opening it. */
+		proto_printf(wr, "A %s\n", name);
+		return (0);
+	}
+	proto_printf(wr, "r %s %z %z\n", name, rsync_filesize(rf),
+	    rsync_blocksize(rf));
+	/* Detail the blocks. */
+	while (rsync_nextblock(rf) != 0)
+		proto_printf(wr, "%s %s\n", rsync_rsum(rf), rsync_blockmd5(rf));
+	proto_printf(wr, ".\n");
+	rsync_close(rf);
+	return (0);
+}
+
+/*
+ * Tell the server to update an RCS file that we have, or send it if we don't.
+ */
+static int
+detailer_dofile_rcs(struct detailer *d, struct coll *coll, char *name,
+    char *path)
+{
+	struct stream *wr;
+	struct fattr *fa;
+	struct rcsfile *rf;
+	int error;
+
+	wr = d->wr;
+	path = atticpath(coll->co_prefix, name);
+	fa = fattr_frompath(path, FATTR_NOFOLLOW);
+	if (fa == NULL) {
+		/* We don't have it, so send request to get it. */
+		error = proto_printf(wr, "A %s\n", name);
+		if (error)
+			return (DETAILER_ERR_WRITE);
+		free(path);
+		return (0);
+	}
+
+	rf = rcsfile_frompath(path, name, coll->co_cvsroot, coll->co_tag, 1);
+	free(path);
+	if (rf == NULL) {
+		error = proto_printf(wr, "A %s\n", name);
+		if (error)
+			return (DETAILER_ERR_WRITE);
+		return (0);
+	}
+	/* Tell to update the RCS file. The client version details follow. */
+	rcsfile_send_details(rf, wr);
+	rcsfile_free(rf);
+	fattr_free(fa);
+	return (0);
+}
+
+static int
+detailer_dofile_co(struct detailer *d, struct coll *coll, struct status *st,
+    char *file)
+{
 	struct stream *wr;
 	struct fattr *fa;
 	struct statusrec *sr;
+	char md5[MD5_DIGEST_SIZE];
 	char *path;
 	int error, ret;
 
@@ -337,3 +523,81 @@ detailer_dofile(struct detailer *d, stru
 		return (DETAILER_ERR_WRITE);
 	return (0);
 }
+
+int
+detailer_checkrcsattr(struct detailer *d, struct coll *coll, char *name,
+    struct fattr *server_attr, int attic)
+{
+	struct fattr *client_attr;
+	char *attr, *path;
+	int error;
+
+	/*
+	 * I don't think we can use the status file, since it only records file
+	 * attributes in cvsmode.
+	 */
+	client_attr = NULL;
+	path = cvspath(coll->co_prefix, name, attic);
+	if (path == NULL) {
+		return (DETAILER_ERR_PROTO);
+	}
+
+	if (access(path, F_OK) == 0 && 
+	    ((client_attr = fattr_frompath(path, FATTR_NOFOLLOW)) != NULL) &&
+	    fattr_equal(client_attr, server_attr)) {
+		attr = fattr_encode(client_attr, NULL, 0);
+		if (attic) {
+			error = proto_printf(d->wr, "l %s %s\n", name, attr);
+		} else {
+			error = proto_printf(d->wr, "L %s %s\n", name, attr);
+		}
+		free(attr);
+		free(path);
+		fattr_free(client_attr);
+		if (error)
+			return (DETAILER_ERR_WRITE);
+		return (0);
+	}
+	/* We don't have it, so tell the server to send it. */
+	error = detailer_send_details(d, coll, name, path, client_attr);
+	fattr_free(client_attr);
+	free(path);
+	return (error);
+}
+
+int
+detailer_send_details(struct detailer *d, struct coll *coll, char *name,
+    char *path, struct fattr *fa)
+{
+	int error;
+	size_t len;
+
+       /*
+        * Try to check if the file exists either live or dead to see if we can
+        * edit it and put it live or dead, rather than receiving the entire
+        * file.
+	*/
+	if (fa == NULL) {
+		path = atticpath(coll->co_prefix, name); 
+		fa = fattr_frompath(path, FATTR_NOFOLLOW);
+	}
+	if (fa == NULL) {
+		error = proto_printf(d->wr, "A %s\n", name);
+		if (error)
+			return (DETAILER_ERR_WRITE);
+	} else if (fattr_type(fa) == FT_FILE) {
+		if (isrcs(name, &len) && !(coll->co_options & CO_NORCS)) {
+			detailer_dofile_rcs(d, coll, name, path);
+		} else if (!(coll->co_options & CO_NORSYNC) &&
+		    !globtree_test(coll->co_norsync, name)) {
+			detailer_dofile_rsync(d, name, path);
+		} else {
+			detailer_dofile_regular(d, name, path);
+		}
+	} else {
+		error = proto_printf(d->wr, "N %s\n", name);
+		if (error)
+			return (DETAILER_ERR_WRITE);
+	}
+	return (0);
+}

Modified: projects/tcp_cc_7.x/contrib/csup/diff.c
==============================================================================
--- projects/tcp_cc_7.x/contrib/csup/diff.c	Wed Apr  8 22:19:39 2009	(r190860)
+++ projects/tcp_cc_7.x/contrib/csup/diff.c	Thu Apr  9 05:41:34 2009	(r190861)
@@ -26,9 +26,12 @@
  * $FreeBSD$
  */
 
+#include <sys/limits.h>
+
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -36,15 +39,20 @@
 #include "keyword.h"
 #include "misc.h"
 #include "stream.h"
+#include "queue.h"
 
 typedef long lineno_t;
 
 #define	EC_ADD	0
 #define	EC_DEL	1
+#define	MAXKEY	LONG_MAX
 
 /* Editing command and state. */
 struct editcmd {
 	int cmd;
+	long key;
+	int havetext;
+	int offset;
 	lineno_t where;
 	lineno_t count;
 	lineno_t lasta;
@@ -55,20 +63,28 @@ struct editcmd {
 	struct diffinfo *di;
 	struct stream *orig;
 	struct stream *dest;
+	LIST_ENTRY(editcmd) next;
+};
+
+struct diffstart {
+	LIST_HEAD(, editcmd) dhead;
 };
 
 static int	diff_geteditcmd(struct editcmd *, char *);
 static int	diff_copyln(struct editcmd *, lineno_t);
+static int	diff_ignoreln(struct editcmd *, lineno_t);
 static void	diff_write(struct editcmd *, void *, size_t);
+static int	diff_insert_edit(struct diffstart *, struct editcmd *);
+static void	diff_free(struct diffstart *);
 
 int
 diff_apply(struct stream *rd, struct stream *orig, struct stream *dest,
-    struct keyword *keyword, struct diffinfo *di)
+    struct keyword *keyword, struct diffinfo *di, int comode)
 {
 	struct editcmd ec;
 	lineno_t i;
-	char *line;
 	size_t size;
+	char *line;
 	int empty, error, noeol;
 
 	memset(&ec, 0, sizeof(ec));
@@ -104,7 +120,7 @@ diff_apply(struct stream *rd, struct str
 				line = stream_getln(rd, &size);
 				if (line == NULL)
 					return (-1);
-				if (line[0] == '.') {
+				if (comode && line[0] == '.') {
 					line++;
 					size--;
 				}
@@ -124,10 +140,10 @@ diff_apply(struct stream *rd, struct str
 		}
 		line = stream_getln(rd, NULL);
 	}
-	if (line == NULL)
+	if (comode && line == NULL)
 		return (-1);
 	/* If we got ".+", there's no ending newline. */
-	if (strcmp(line, ".+") == 0 && !empty)
+	if (comode && strcmp(line, ".+") == 0 && !empty)
 		noeol = 1;
 	ec.where = 0;
 	while ((line = stream_getln(orig, &size)) != NULL)
@@ -143,6 +159,198 @@ diff_apply(struct stream *rd, struct str
 	return (0);
 }
 
+/*
+ * Reverse a diff using the same algorithm as in cvsup.
+ */
+static int
+diff_write_reverse(struct stream *dest, struct diffstart *ds)
+{
+	struct editcmd *ec, *nextec;
+	long editline, endline, firstoutputlinedeleted;
+	long num_added, num_deleted, startline;
+	int num;
+
+	nextec = LIST_FIRST(&ds->dhead);
+	editline = 0;
+	num = 0;
+	while (nextec != NULL) {
+		ec = nextec;
+		nextec = LIST_NEXT(nextec, next);
+		if (nextec == NULL)
+			break;
+		num++;
+		num_deleted = 0;
+		if (ec->havetext)
+			num_deleted = ec->count;
+		num_added = num_deleted + nextec->offset - ec->offset;
+		if (num_deleted > 0) {
+			firstoutputlinedeleted = ec->key - num_deleted + 1;
+			stream_printf(dest, "d%ld %ld\n", firstoutputlinedeleted,
+			    num_deleted);
+			if (num_added <= 0)
+				continue;
+		}
+		if (num_added > 0) {
+			stream_printf(dest, "a%ld %ld\n", ec->key, num_added);
+			startline = ec->key - num_deleted + 1 + ec->offset;
+			endline = startline + num_added - 1;
+
+			/* Copy lines from original file. First ignore some. */
+			ec->editline = editline;
+			diff_ignoreln(ec,  startline - 1);
+			diff_copyln(ec, endline);
+			editline = ec->editline;
+		}
+	}
+	return (0);
+}
+
+/* 
+ * Insert a diff into the list sorted on key. Should perhaps use quicker
+ * algorithms than insertion sort, but do this for now.
+ */
+static int
+diff_insert_edit(struct diffstart *ds, struct editcmd *ec)
+{
+	struct editcmd *curec;
+
+	if (ec == NULL)
+		return (0);
+
+	if (LIST_EMPTY(&ds->dhead)) {
+		LIST_INSERT_HEAD(&ds->dhead, ec, next);
+		return (0);
+	}
+
+	/* Insertion sort based on key. */
+	LIST_FOREACH(curec, &ds->dhead, next) {
+		if (ec->key < curec->key) {
+			LIST_INSERT_BEFORE(curec, ec, next);
+			return (0);
+		}
+		if (LIST_NEXT(curec, next) == NULL)
+			break;
+	}
+	/* Just insert it after. */
+	LIST_INSERT_AFTER(curec, ec, next);
+	return (0);
+}
+
+static void 
+diff_free(struct diffstart *ds)
+{
+	struct editcmd *ec;
+
+	while(!LIST_EMPTY(&ds->dhead)) {
+		ec = LIST_FIRST(&ds->dhead);
+		LIST_REMOVE(ec, next);
+		free(ec);
+	}
+}
+
+/*
+ * Write the reverse diff from the diff in rd, and original file into
+ * destination. This algorithm is the same as used in cvsup.
+ */
+int
+diff_reverse(struct stream *rd, struct stream *orig, struct stream *dest,
+    struct keyword *keyword, struct diffinfo *di)
+{
+	struct diffstart ds;
+	struct editcmd ec, *addec, *delec;
+	lineno_t i;
+	char *line;
+	int error, offset;
+
+	memset(&ec, 0, sizeof(ec));
+	ec.orig = orig;
+	ec.dest = dest;
+	ec.keyword = keyword;
+	ec.di = di;
+	addec = NULL;
+	delec = NULL;
+	ec.havetext = 0;
+	offset = 0;
+	LIST_INIT(&ds.dhead);
+
+	/* Start with next since we need it. */
+	line = stream_getln(rd, NULL);
+	/* First we build up the list of diffs from input. */
+	while (line != NULL) {
+		error = diff_geteditcmd(&ec, line);
+		if (error)
+			break;
+		if (ec.cmd == EC_ADD) {
+			addec = xmalloc(sizeof(struct editcmd));
+			*addec = ec;
+			addec->havetext = 1;
+			/* Ignore the lines we was supposed to add. */
+			for (i = 0; i < ec.count; i++) {
+				line = stream_getln(rd, NULL);
+				if (line == NULL)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list