svn commit: r186349 - in projects/cambria: . contrib/bsnmp/snmp_mibII contrib/ipfilter/ipsend contrib/netcat contrib/openpam etc etc/devd etc/mtree etc/rc.d gnu/usr.bin/groff/tmac include include/a...

Sam Leffler sam at FreeBSD.org
Fri Dec 19 17:29:21 PST 2008 

Author: sam
Date: Sat Dec 20 01:29:19 2008
New Revision: 186349
URL: http://svn.freebsd.org/changeset/base/186349

Log:
  MFH @ 186335

Added:
  projects/cambria/etc/devd/
     - copied from r186348, head/etc/devd/
  projects/cambria/lib/libc/include/isc/platform.h
     - copied unchanged from r186348, head/lib/libc/include/isc/platform.h
  projects/cambria/sys/dev/ofw/ofw_if.m
     - copied unchanged from r186348, head/sys/dev/ofw/ofw_if.m
  projects/cambria/sys/dev/ofw/ofw_standard.c
     - copied unchanged from r186348, head/sys/dev/ofw/ofw_standard.c
  projects/cambria/sys/dev/ofw/ofwvar.h
     - copied unchanged from r186348, head/sys/dev/ofw/ofwvar.h
  projects/cambria/sys/net/if_llatbl.c
     - copied unchanged from r186348, head/sys/net/if_llatbl.c
  projects/cambria/sys/net/if_llatbl.h
     - copied unchanged from r186348, head/sys/net/if_llatbl.h
  projects/cambria/sys/powerpc/mpc85xx/mpc85xx.h
     - copied unchanged from r186348, head/sys/powerpc/mpc85xx/mpc85xx.h
  projects/cambria/tools/tools/tionxcl/
     - copied from r186348, head/tools/tools/tionxcl/
  projects/cambria/usr.sbin/makefs/
     - copied from r186348, head/usr.sbin/makefs/
Deleted:
  projects/cambria/sys/modules/ath_rate_amrr/
  projects/cambria/sys/modules/ath_rate_onoe/
  projects/cambria/sys/modules/ath_rate_sample/
  projects/cambria/sys/sparc64/include/ofw_bus.h
  projects/cambria/sys/sparc64/sparc64/ofw_bus.c
  projects/cambria/sys/sun4v/include/ofw_bus.h
  projects/cambria/usr.sbin/sysinstall/tape.c
Modified:
  projects/cambria/   (props changed)
  projects/cambria/UPDATING
  projects/cambria/contrib/bsnmp/snmp_mibII/mibII.c
  projects/cambria/contrib/bsnmp/snmp_mibII/mibII_route.c
  projects/cambria/contrib/ipfilter/ipsend/44arp.c
  projects/cambria/contrib/netcat/   (props changed)
  projects/cambria/contrib/netcat/FREEBSD-vendor
  projects/cambria/contrib/netcat/atomicio.c   (props changed)
  projects/cambria/contrib/netcat/atomicio.h   (props changed)
  projects/cambria/contrib/netcat/nc.1
  projects/cambria/contrib/netcat/netcat.c
  projects/cambria/contrib/netcat/socks.c   (props changed)
  projects/cambria/contrib/openpam/   (props changed)
  projects/cambria/etc/Makefile
  projects/cambria/etc/devd.conf
  projects/cambria/etc/mtree/BSD.root.dist
  projects/cambria/etc/rc.d/defaultroute
  projects/cambria/etc/regdomain.xml
  projects/cambria/gnu/usr.bin/groff/tmac/mdoc.local
  projects/cambria/include/arpa/nameser.h
  projects/cambria/include/resolv.h
  projects/cambria/lib/libarchive/archive_read_support_format_ar.c
  projects/cambria/lib/libarchive/test/main.c
  projects/cambria/lib/libarchive/test/test_compat_gtar.c
  projects/cambria/lib/libarchive/test/test_write_compress.c
  projects/cambria/lib/libarchive/test/test_write_format_ar.c
  projects/cambria/lib/libc/include/isc/eventlib.h   (contents, props changed)
  projects/cambria/lib/libc/inet/inet_net_pton.c
  projects/cambria/lib/libc/net/rcmd.3
  projects/cambria/lib/libc/resolv/res_debug.c
  projects/cambria/lib/libc/resolv/res_mkquery.c
  projects/cambria/lib/libc/resolv/res_query.c
  projects/cambria/lib/libc/resolv/res_send.c
  projects/cambria/lib/libfetch/fetch.3
  projects/cambria/lib/libfetch/fetch.c
  projects/cambria/lib/libfetch/fetch.h
  projects/cambria/lib/libfetch/http.c
  projects/cambria/lib/libstand/if_ether.h
  projects/cambria/lib/libutil/kinfo_getfile.c
  projects/cambria/lib/libutil/kinfo_getvmmap.c
  projects/cambria/libexec/bootpd/rtmsg.c
  projects/cambria/release/doc/en_US.ISO8859-1/hardware/article.sgml
  projects/cambria/release/picobsd/tinyware/ns/ns.c
  projects/cambria/sbin/atacontrol/atacontrol.8
  projects/cambria/sbin/devd/devd.cc
  projects/cambria/sbin/devd/devd.conf.5
  projects/cambria/sbin/geom/misc/subr.c
  projects/cambria/sbin/ifconfig/ifieee80211.c
  projects/cambria/sbin/ifconfig/regdomain.c
  projects/cambria/sbin/ifconfig/regdomain.h
  projects/cambria/sbin/ipfw/ipfw.8
  projects/cambria/sbin/ipfw/ipfw2.c
  projects/cambria/sbin/mount/mount.c
  projects/cambria/sbin/mount/mount_fs.c
  projects/cambria/sbin/route/route.c
  projects/cambria/sbin/routed/table.c
  projects/cambria/share/man/man4/Makefile
  projects/cambria/share/man/man4/acpi_aiboost.4
  projects/cambria/share/man/man4/acpi_asus.4
  projects/cambria/share/man/man4/fxp.4
  projects/cambria/share/man/man4/route.4
  projects/cambria/share/man/man9/VOP_STRATEGY.9
  projects/cambria/share/man/man9/rtalloc.9
  projects/cambria/share/man/man9/rtentry.9
  projects/cambria/share/man/man9/style.9
  projects/cambria/sys/amd64/amd64/exception.S
  projects/cambria/sys/amd64/amd64/identcpu.c
  projects/cambria/sys/amd64/conf/DEFAULTS
  projects/cambria/sys/amd64/include/elf.h
  projects/cambria/sys/amd64/include/specialreg.h
  projects/cambria/sys/amd64/linux32/linux32_sysvec.c
  projects/cambria/sys/arm/conf/DEFAULTS
  projects/cambria/sys/arm/conf/EP80219
  projects/cambria/sys/arm/include/elf.h
  projects/cambria/sys/boot/Makefile
  projects/cambria/sys/boot/i386/gptzfsboot/Makefile
  projects/cambria/sys/boot/i386/zfsboot/Makefile
  projects/cambria/sys/boot/powerpc/uboot/conf.c
  projects/cambria/sys/boot/uboot/common/main.c
  projects/cambria/sys/boot/uboot/lib/devicename.c
  projects/cambria/sys/boot/zfs/zfsimpl.c
  projects/cambria/sys/cam/cam_periph.c
  projects/cambria/sys/cam/cam_periph.h
  projects/cambria/sys/cam/cam_sim.c
  projects/cambria/sys/cam/cam_sim.h
  projects/cambria/sys/cam/cam_xpt.c
  projects/cambria/sys/cam/scsi/scsi_da.c
  projects/cambria/sys/compat/svr4/svr4_sysvec.c
  projects/cambria/sys/conf/NOTES
  projects/cambria/sys/conf/files
  projects/cambria/sys/conf/files.powerpc
  projects/cambria/sys/conf/files.sparc64
  projects/cambria/sys/conf/files.sun4v
  projects/cambria/sys/contrib/pf/net/pf.c
  projects/cambria/sys/contrib/pf/net/pf_if.c
  projects/cambria/sys/contrib/pf/net/pf_subr.c
  projects/cambria/sys/contrib/rdma/rdma_addr.c
  projects/cambria/sys/crypto/rc4/rc4.c
  projects/cambria/sys/dev/acpica/acpi_smbat.c
  projects/cambria/sys/dev/ata/ata-pci.c
  projects/cambria/sys/dev/ata/ata-pci.h
  projects/cambria/sys/dev/ata/chipsets/ata-ahci.c
  projects/cambria/sys/dev/ata/chipsets/ata-sis.c
  projects/cambria/sys/dev/ath/ath_hal/ah.c   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_debug.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_decode.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_desc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_devid.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v1.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v1.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v14.c
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v14.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v3.c   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_eeprom_v3.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_internal.h   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_regdomain.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ah_soc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_power.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210desc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210phy.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5210reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_power.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211desc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211phy.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/ar5211reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5211/boss.ini   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar2316.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar2317.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar2413.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar2425.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5111.c   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5112.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212.ini   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_power.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212desc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212phy.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5212reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5311reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5212/ar5413.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312.h   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c   (contents, props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_power.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312phy.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5312reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar2133.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416.ini   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_power.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416desc.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416phy.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar5416reg.h   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar9160.ini   (props changed)
  projects/cambria/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c   (props changed)
  projects/cambria/sys/dev/atkbdc/psm.c
  projects/cambria/sys/dev/bce/if_bce.c
  projects/cambria/sys/dev/cxgb/common/cxgb_ael1002.c
  projects/cambria/sys/dev/cxgb/cxgb_main.c
  projects/cambria/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/cambria/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
  projects/cambria/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
  projects/cambria/sys/dev/drm/drmP.h
  projects/cambria/sys/dev/drm/drm_drv.c
  projects/cambria/sys/dev/drm/drm_scatter.c
  projects/cambria/sys/dev/fxp/if_fxp.c
  projects/cambria/sys/dev/hwpmc/hwpmc_core.c
  projects/cambria/sys/dev/hwpmc/hwpmc_logging.c
  projects/cambria/sys/dev/hwpmc/hwpmc_mod.c
  projects/cambria/sys/dev/isp/isp.c
  projects/cambria/sys/dev/md/md.c
  projects/cambria/sys/dev/mfi/mfi.c
  projects/cambria/sys/dev/mfi/mfi_pci.c
  projects/cambria/sys/dev/nfe/if_nfe.c
  projects/cambria/sys/dev/ofw/ofw_bus_subr.c
  projects/cambria/sys/dev/ofw/ofw_bus_subr.h
  projects/cambria/sys/dev/ofw/openfirm.c
  projects/cambria/sys/dev/ofw/openfirm.h
  projects/cambria/sys/dev/ofw/openfirmio.c
  projects/cambria/sys/dev/ofw/openpromio.c
  projects/cambria/sys/dev/re/if_re.c
  projects/cambria/sys/dev/snp/snp.c
  projects/cambria/sys/dev/sound/pci/hda/hdac.c
  projects/cambria/sys/dev/usb/ucom.c
  projects/cambria/sys/dev/usb/ucomvar.h
  projects/cambria/sys/dev/usb/uftdi.c
  projects/cambria/sys/fs/hpfs/hpfs_vnops.c
  projects/cambria/sys/fs/msdosfs/msdosfs_vnops.c
  projects/cambria/sys/fs/ntfs/ntfs_vnops.c
  projects/cambria/sys/fs/nwfs/nwfs_vnops.c
  projects/cambria/sys/fs/smbfs/smbfs_vnops.c
  projects/cambria/sys/geom/geom_vfs.c
  projects/cambria/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/cambria/sys/gnu/fs/reiserfs/reiserfs_vnops.c
  projects/cambria/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/cambria/sys/i386/conf/DEFAULTS
  projects/cambria/sys/i386/i386/exception.s
  projects/cambria/sys/i386/i386/identcpu.c
  projects/cambria/sys/i386/include/elf.h
  projects/cambria/sys/i386/include/specialreg.h
  projects/cambria/sys/i386/linux/linux_sysvec.c
  projects/cambria/sys/ia64/include/elf.h
  projects/cambria/sys/kern/imgact_elf.c
  projects/cambria/sys/kern/kern_cpu.c
  projects/cambria/sys/kern/kern_mbuf.c
  projects/cambria/sys/kern/subr_kobj.c
  projects/cambria/sys/kern/subr_param.c
  projects/cambria/sys/kern/subr_trap.c
  projects/cambria/sys/kern/tty.c
  projects/cambria/sys/kern/tty_pts.c
  projects/cambria/sys/kern/vfs_lookup.c
  projects/cambria/sys/kern/vfs_mount.c
  projects/cambria/sys/kern/vfs_subr.c
  projects/cambria/sys/kern/vfs_syscalls.c
  projects/cambria/sys/mips/conf/DEFAULTS
  projects/cambria/sys/mips/include/elf.h
  projects/cambria/sys/mips/mips/elf_machdep.c
  projects/cambria/sys/modules/Makefile
  projects/cambria/sys/modules/ath/Makefile
  projects/cambria/sys/modules/cxgb/Makefile
  projects/cambria/sys/net/ieee8023ad_lacp.c
  projects/cambria/sys/net/if.c
  projects/cambria/sys/net/if_arcsubr.c
  projects/cambria/sys/net/if_atmsubr.c
  projects/cambria/sys/net/if_ethersubr.c
  projects/cambria/sys/net/if_fddisubr.c
  projects/cambria/sys/net/if_fwsubr.c
  projects/cambria/sys/net/if_iso88025subr.c
  projects/cambria/sys/net/if_lagg.c
  projects/cambria/sys/net/if_media.h
  projects/cambria/sys/net/if_var.h
  projects/cambria/sys/net/pfil.c
  projects/cambria/sys/net/pfil.h
  projects/cambria/sys/net/radix.c
  projects/cambria/sys/net/radix_mpath.c
  projects/cambria/sys/net/route.c
  projects/cambria/sys/net/route.h
  projects/cambria/sys/net/rtsock.c
  projects/cambria/sys/net80211/_ieee80211.h
  projects/cambria/sys/net80211/ieee80211.c
  projects/cambria/sys/net80211/ieee80211_acl.c
  projects/cambria/sys/net80211/ieee80211_crypto.h
  projects/cambria/sys/net80211/ieee80211_crypto_ccmp.c
  projects/cambria/sys/net80211/ieee80211_crypto_tkip.c
  projects/cambria/sys/net80211/ieee80211_crypto_wep.c
  projects/cambria/sys/net80211/ieee80211_ddb.c
  projects/cambria/sys/net80211/ieee80211_dfs.h
  projects/cambria/sys/net80211/ieee80211_freebsd.c
  projects/cambria/sys/net80211/ieee80211_hostap.c
  projects/cambria/sys/net80211/ieee80211_input.c
  projects/cambria/sys/net80211/ieee80211_ioctl.c
  projects/cambria/sys/net80211/ieee80211_node.c
  projects/cambria/sys/net80211/ieee80211_node.h
  projects/cambria/sys/net80211/ieee80211_output.c
  projects/cambria/sys/net80211/ieee80211_power.c
  projects/cambria/sys/net80211/ieee80211_proto.c
  projects/cambria/sys/net80211/ieee80211_regdomain.c
  projects/cambria/sys/net80211/ieee80211_scan.c
  projects/cambria/sys/net80211/ieee80211_scan_sta.c
  projects/cambria/sys/net80211/ieee80211_sta.c
  projects/cambria/sys/net80211/ieee80211_var.h
  projects/cambria/sys/netgraph/netflow/netflow.c
  projects/cambria/sys/netgraph/netgraph.h
  projects/cambria/sys/netgraph/ng_base.c
  projects/cambria/sys/netgraph/ng_mppc.c
  projects/cambria/sys/netgraph/ng_tty.c
  projects/cambria/sys/netinet/icmp6.h
  projects/cambria/sys/netinet/icmp_var.h
  projects/cambria/sys/netinet/if_atm.c
  projects/cambria/sys/netinet/if_ether.c
  projects/cambria/sys/netinet/if_ether.h
  projects/cambria/sys/netinet/in.c
  projects/cambria/sys/netinet/in_mcast.c
  projects/cambria/sys/netinet/in_pcb.c
  projects/cambria/sys/netinet/in_pcb.h
  projects/cambria/sys/netinet/in_proto.c
  projects/cambria/sys/netinet/in_rmx.c
  projects/cambria/sys/netinet/in_var.h
  projects/cambria/sys/netinet/ip_carp.c
  projects/cambria/sys/netinet/ip_fastfwd.c
  projects/cambria/sys/netinet/ip_fw.h
  projects/cambria/sys/netinet/ip_fw2.c
  projects/cambria/sys/netinet/ip_fw_pfil.c
  projects/cambria/sys/netinet/ip_input.c
  projects/cambria/sys/netinet/ip_output.c
  projects/cambria/sys/netinet/raw_ip.c
  projects/cambria/sys/netinet/tcp_hostcache.c
  projects/cambria/sys/netinet/tcp_input.c
  projects/cambria/sys/netinet/tcp_subr.c
  projects/cambria/sys/netinet/tcp_syncache.c
  projects/cambria/sys/netinet/tcp_timewait.c
  projects/cambria/sys/netinet/tcp_usrreq.c
  projects/cambria/sys/netinet/tcp_var.h
  projects/cambria/sys/netinet/vinet.h
  projects/cambria/sys/netinet6/icmp6.c
  projects/cambria/sys/netinet6/in6.c
  projects/cambria/sys/netinet6/in6_pcb.c
  projects/cambria/sys/netinet6/in6_rmx.c
  projects/cambria/sys/netinet6/in6_src.c
  projects/cambria/sys/netinet6/in6_var.h
  projects/cambria/sys/netinet6/ip6_input.c
  projects/cambria/sys/netinet6/ip6_output.c
  projects/cambria/sys/netinet6/ip6_var.h
  projects/cambria/sys/netinet6/nd6.c
  projects/cambria/sys/netinet6/nd6.h
  projects/cambria/sys/netinet6/nd6_nbr.c
  projects/cambria/sys/netinet6/nd6_rtr.c
  projects/cambria/sys/netinet6/raw_ip6.c
  projects/cambria/sys/netinet6/raw_ip6.h
  projects/cambria/sys/netinet6/udp6_usrreq.c
  projects/cambria/sys/netinet6/vinet6.h
  projects/cambria/sys/netipsec/ipip_var.h
  projects/cambria/sys/netipsec/ipsec.c
  projects/cambria/sys/netipsec/key.c
  projects/cambria/sys/nfsserver/nfs_serv.c
  projects/cambria/sys/pc98/conf/DEFAULTS
  projects/cambria/sys/pci/if_rl.c
  projects/cambria/sys/pci/if_rlreg.h
  projects/cambria/sys/powerpc/aim/locore.S
  projects/cambria/sys/powerpc/aim/machdep.c
  projects/cambria/sys/powerpc/aim/ofw_machdep.c
  projects/cambria/sys/powerpc/booke/interrupt.c
  projects/cambria/sys/powerpc/booke/locore.S
  projects/cambria/sys/powerpc/booke/machdep.c
  projects/cambria/sys/powerpc/include/elf.h
  projects/cambria/sys/powerpc/include/ofw_machdep.h
  projects/cambria/sys/powerpc/include/param.h
  projects/cambria/sys/powerpc/include/spr.h
  projects/cambria/sys/powerpc/mpc85xx/lbc.c
  projects/cambria/sys/powerpc/mpc85xx/lbc.h
  projects/cambria/sys/powerpc/mpc85xx/mpc85xx.c
  projects/cambria/sys/powerpc/mpc85xx/nexus.c
  projects/cambria/sys/powerpc/mpc85xx/ocpbus.c
  projects/cambria/sys/powerpc/ofw/ofw_pcib_pci.c
  projects/cambria/sys/powerpc/ofw/ofw_pcibus.c
  projects/cambria/sys/powerpc/ofw/ofw_syscons.c
  projects/cambria/sys/powerpc/ofw/ofw_syscons.h
  projects/cambria/sys/powerpc/powermac/cuda.c
  projects/cambria/sys/powerpc/powermac/cudavar.h
  projects/cambria/sys/powerpc/powermac/grackle.c
  projects/cambria/sys/powerpc/powermac/gracklevar.h
  projects/cambria/sys/powerpc/powermac/macio.c
  projects/cambria/sys/powerpc/powermac/uninorth.c
  projects/cambria/sys/powerpc/powermac/uninorthvar.h
  projects/cambria/sys/powerpc/powerpc/pmap_dispatch.c
  projects/cambria/sys/sparc64/conf/DEFAULTS
  projects/cambria/sys/sparc64/ebus/ebus.c
  projects/cambria/sys/sparc64/include/elf.h
  projects/cambria/sys/sparc64/include/ofw_machdep.h
  projects/cambria/sys/sparc64/isa/ofw_isa.c
  projects/cambria/sys/sparc64/pci/apb.c
  projects/cambria/sys/sparc64/pci/ofw_pci.h
  projects/cambria/sys/sparc64/pci/ofw_pcib.c
  projects/cambria/sys/sparc64/pci/ofw_pcib_subr.c
  projects/cambria/sys/sparc64/pci/ofw_pcibus.c
  projects/cambria/sys/sparc64/pci/psycho.c
  projects/cambria/sys/sparc64/pci/schizo.c
  projects/cambria/sys/sparc64/sbus/sbus.c
  projects/cambria/sys/sparc64/sparc64/machdep.c
  projects/cambria/sys/sparc64/sparc64/mp_machdep.c
  projects/cambria/sys/sparc64/sparc64/ofw_machdep.c
  projects/cambria/sys/sparc64/sparc64/support.S
  projects/cambria/sys/sparc64/sparc64/trap.c
  projects/cambria/sys/sparc64/sparc64/vm_machdep.c
  projects/cambria/sys/sun4v/conf/DEFAULTS
  projects/cambria/sys/sun4v/include/elf.h
  projects/cambria/sys/sun4v/sun4v/machdep.c
  projects/cambria/sys/sun4v/sun4v/mp_machdep.c
  projects/cambria/sys/sun4v/sun4v/support.S
  projects/cambria/sys/sun4v/sun4v/trap.c
  projects/cambria/sys/sys/buf_ring.h
  projects/cambria/sys/sys/elf_common.h
  projects/cambria/sys/sys/imgact_elf.h
  projects/cambria/sys/sys/kobj.h
  projects/cambria/sys/sys/mount.h
  projects/cambria/sys/sys/param.h
  projects/cambria/sys/sys/ttyhook.h
  projects/cambria/sys/sys/vtoc.h
  projects/cambria/sys/ufs/ufs/ufs_vfsops.c
  projects/cambria/sys/ufs/ufs/ufs_vnops.c
  projects/cambria/tools/regression/bin/sh/builtins/type1.0.stderr   (props changed)
  projects/cambria/tools/tools/nanobsd/nanobsd.sh
  projects/cambria/usr.bin/cpuset/cpuset.1
  projects/cambria/usr.bin/fetch/fetch.1
  projects/cambria/usr.bin/fetch/fetch.c
  projects/cambria/usr.bin/ipcs/ipcs.c
  projects/cambria/usr.bin/make/globals.h
  projects/cambria/usr.bin/make/job.c
  projects/cambria/usr.bin/make/job.h
  projects/cambria/usr.bin/make/main.c
  projects/cambria/usr.bin/make/make.c
  projects/cambria/usr.bin/netstat/route.c
  projects/cambria/usr.bin/procstat/procstat.1
  projects/cambria/usr.bin/procstat/procstat_files.c
  projects/cambria/usr.bin/procstat/procstat_vm.c
  projects/cambria/usr.bin/tar/util.c
  projects/cambria/usr.sbin/Makefile
  projects/cambria/usr.sbin/arp/arp.c
  projects/cambria/usr.sbin/burncd/Makefile
  projects/cambria/usr.sbin/burncd/burncd.c
  projects/cambria/usr.sbin/jls/jls.c
  projects/cambria/usr.sbin/mergemaster/mergemaster.sh
  projects/cambria/usr.sbin/ndp/ndp.c
  projects/cambria/usr.sbin/ppp/route.c
  projects/cambria/usr.sbin/route6d/route6d.c
  projects/cambria/usr.sbin/sysinstall/Makefile
  projects/cambria/usr.sbin/sysinstall/cdrom.c
  projects/cambria/usr.sbin/sysinstall/config.c
  projects/cambria/usr.sbin/sysinstall/devices.c
  projects/cambria/usr.sbin/sysinstall/dispatch.c
  projects/cambria/usr.sbin/sysinstall/dist.c
  projects/cambria/usr.sbin/sysinstall/dist.h
  projects/cambria/usr.sbin/sysinstall/label.c
  projects/cambria/usr.sbin/sysinstall/main.c
  projects/cambria/usr.sbin/sysinstall/media.c
  projects/cambria/usr.sbin/sysinstall/menus.c
  projects/cambria/usr.sbin/sysinstall/options.c
  projects/cambria/usr.sbin/sysinstall/sysinstall.8
  projects/cambria/usr.sbin/sysinstall/sysinstall.h
  projects/cambria/usr.sbin/sysinstall/system.c
  projects/cambria/usr.sbin/sysinstall/user.c
  projects/cambria/usr.sbin/syslogd/Makefile
  projects/cambria/usr.sbin/syslogd/syslogd.c

Modified: projects/cambria/UPDATING
==============================================================================
--- projects/cambria/UPDATING	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/UPDATING	Sat Dec 20 01:29:19 2008	(r186349)
@@ -22,6 +22,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081219:
+	With __FreeBSD_version 800060 the makefs tool is part of
+	the base system (it was a port).
+
+20081216:
+	The afdata and ifnet locks have been changed from mutexes to 
+	rwlocks, network modules will need to be re-compiled.
+
+20081214:
+	__FreeBSD_version 800059 incorporates the new arp-v2 rewrite.
+	RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated.
+	The new code reduced struct rtentry{} by 16 bytes on 32-bit 
+	architecture and 40 bytes on 64-bit architecture. The userland
+	applications "arp" and "ndp" have been updated accordingly.
+	The output from "netstat -r" shows only routing entries and
+	none of the L2 information.
+
 20081130:
 	__FreeBSD_version 800057 marks the switchover from the
 	binary ath hal to source code. Users must add the line:

Modified: projects/cambria/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- projects/cambria/contrib/bsnmp/snmp_mibII/mibII.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/bsnmp/snmp_mibII/mibII.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -48,8 +48,7 @@ static void *route_fd;
 /* if-index allocator */
 static uint32_t next_if_index = 1;
 
-/* re-fetch arp table */
-static int update_arp;
+/* currently fetching the arp table */
 static int in_update_arp;
 
 /* OR registrations */
@@ -911,36 +910,6 @@ mib_find_ifa(struct in_addr addr)
 }
 
 /*
- * Process a new ARP entry
- */
-static void
-process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl,
-    const struct sockaddr_in *sa)
-{
-	struct mibif *ifp;
-	struct mibarp *at;
-
-	/* IP arp table entry */
-	if (sdl->sdl_alen == 0) {
-		update_arp = 1;
-		return;
-	}
-	if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL)
-		return;
-	/* have a valid entry */
-	if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL &&
-	    (at = mib_arp_create(ifp, sa->sin_addr,
-	    sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL)
-		return;
-
-	if (rtm->rtm_rmx.rmx_expire == 0)
-		at->flags |= MIBARP_PERM;
-	else
-		at->flags &= ~MIBARP_PERM;
-	at->flags |= MIBARP_FOUND;
-}
-
-/*
  * Handle a routing socket message.
  */
 static void
@@ -1080,46 +1049,12 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		}
 		break;
 #endif
-
 	  case RTM_GET:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_ADD:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_DELETE:
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO))
+
+		if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
 			mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
 			    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
 		break;
@@ -1289,7 +1224,8 @@ update_ifa_info(void)
 
 /*
  * Update arp table
- */
+ *
+*/
 void
 mib_arp_update(void)
 {
@@ -1305,11 +1241,11 @@ mib_arp_update(void)
 	TAILQ_FOREACH(at, &mibarp_list, link)
 		at->flags &= ~MIBARP_FOUND;
 
-	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) {
+	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) {
 		in_update_arp = 0;
 		return;
 	}
-
+	
 	next = buf;
 	while (next < buf + needed) {
 		rtm = (struct rt_msghdr *)(void *)next;
@@ -1326,7 +1262,6 @@ mib_arp_update(void)
 		at = at1;
 	}
 	mibarpticks = get_ticks();
-	update_arp = 0;
 	in_update_arp = 0;
 }
 
@@ -1634,8 +1569,8 @@ mibII_idle(void)
 		mib_arp_update();
 		mib_iflist_bad = 0;
 	}
-	if (update_arp)
-		mib_arp_update();
+
+	mib_arp_update();
 }
 
 

Modified: projects/cambria/contrib/bsnmp/snmp_mibII/mibII_route.c
==============================================================================
--- projects/cambria/contrib/bsnmp/snmp_mibII/mibII_route.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/bsnmp/snmp_mibII/mibII_route.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -186,8 +186,7 @@ mib_sroute_process(struct rt_msghdr *rtm
 	memcpy(r->index, key.index, sizeof(r->index));
 	r->ifindex = (ifp == NULL) ? 0 : ifp->index;
 
-	r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 :
-	    (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
+	r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
 
 	/* cannot really know, what protocol it runs */
 	r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 :

Modified: projects/cambria/contrib/ipfilter/ipsend/44arp.c
==============================================================================
--- projects/cambria/contrib/ipfilter/ipsend/44arp.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/ipfilter/ipsend/44arp.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -88,7 +88,12 @@ char	*addr, *eaddr;
 	mib[2] = 0;
 	mib[3] = AF_INET;
 	mib[4] = NET_RT_FLAGS;
+#ifdef RTF_LLINFO
 	mib[5] = RTF_LLINFO;
+#else
+	mib[5] = 0;
+#endif	
+
 	if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1)
 	    {
 		perror("route-sysctl-estimate");

Modified: projects/cambria/contrib/netcat/FREEBSD-vendor
==============================================================================
--- projects/cambria/contrib/netcat/FREEBSD-vendor	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/netcat/FREEBSD-vendor	Sat Dec 20 01:29:19 2008	(r186349)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 Project:	netcat (aka src/usr.bin/nc in OpenBSD)
 ProjectURL:	http://www.openbsd.org/
-Version:	4.3
+Version:	4.4
 VendorTag:	OPENBSD
-VersionTag:	OPENBSD_4_3
+VersionTag:	OPENBSD_4_4
 License:	BSD

Modified: projects/cambria/contrib/netcat/nc.1
==============================================================================
--- projects/cambria/contrib/netcat/nc.1	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/netcat/nc.1	Sat Dec 20 01:29:19 2008	(r186349)
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
+.\"     $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd $Mdocdate$
+.Dd $Mdocdate: May 6 2008 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -36,9 +36,12 @@
 .Sh SYNOPSIS
 .Nm nc
 .Bk -words
-.Op Fl 46DdEhklnOorStUuvz
+.Op Fl 46DdEhklnorStUuvz
 .Op Fl e Ar IPsec_policy
+.Op Fl I Ar length
 .Op Fl i Ar interval
+.Op Fl -no-tcpopt
+.Op Fl O Ar length
 .Op Fl P Ar proxy_username
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
@@ -118,6 +121,8 @@ each direction is needed.
 Prints out
 .Nm
 help.
+.It Fl I Ar length
+Specifies the size of the TCP receive buffer.
 .It Fl i Ar interval
 Specifies a delay time interval between lines of text sent and received.
 Also causes a delay time between connections to multiple ports.
@@ -146,10 +151,13 @@ option are ignored.
 .It Fl n
 Do not do any DNS or service lookups on any specified addresses,
 hostnames or ports.
-.It Fl O
+.It Fl -no-tcpopt
 Disables the use of TCP options on the socket, by setting the boolean
 TCP_NOOPT
 socket option.
+.It Fl O Ar length
+Specifies the size of the TCP send buffer.
+When
 .It Fl o
 .Dq Once-only mode .
 By default,

Modified: projects/cambria/contrib/netcat/netcat.c
==============================================================================
--- projects/cambria/contrib/netcat/netcat.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/contrib/netcat/netcat.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.89 2007/02/20 14:11:17 jmc Exp $ */
+/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj at monkey.org>
  *
@@ -50,6 +50,7 @@
 
 #include <err.h>
 #include <errno.h>
+#include <getopt.h>
 #include <netdb.h>
 #include <poll.h>
 #include <stdarg.h>
@@ -78,7 +79,7 @@ int	kflag;					/* More than one connect 
 int	lflag;					/* Bind to local port */
 int	nflag;					/* Don't do name look up */
 int	oflag;					/* Once only: stop on EOF */
-int	Oflag;					/* Do not use TCP options */
+int	FreeBSD_Oflag;				/* Do not use TCP options */
 char   *Pflag;					/* Proxy username */
 char   *pflag;					/* Localport flag */
 int	rflag;					/* Random ports flag */
@@ -89,6 +90,8 @@ int	vflag;					/* Verbosity */
 int	xflag;					/* Socks proxy */
 int	zflag;					/* Port Scan Flag */
 int	Dflag;					/* sodebug */
+int	Iflag;					/* TCP receive buffer size */
+int	Oflag;					/* TCP send buffer size */
 int	Sflag;					/* TCP MD5 signature option */
 int	Tflag = -1;				/* IP Type of Service */
 
@@ -129,6 +132,10 @@ main(int argc, char *argv[])
 	char *proxy;
 	const char *errstr, *proxyhost = "", *proxyport = NULL;
 	struct addrinfo proxyhints;
+	struct option longopts[] = {
+		{ "no-tcpopt",	no_argument,	&FreeBSD_Oflag,	1 },
+		{ NULL,		0,		NULL,		0 }
+	};
 
 	ret = 1;
 	ipsec_count = 0;
@@ -138,8 +145,9 @@ main(int argc, char *argv[])
 	uport = NULL;
 	sv = NULL;
 
-	while ((ch = getopt(argc, argv,
-	    "46e:DEdhi:jklnoOP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
+	while ((ch = getopt_long(argc, argv,
+	    "46e:DEdhi:jklnoI:O:P:p:rSs:tT:Uuvw:X:x:z",
+	    longopts, NULL)) != -1) {
 		switch (ch) {
 		case '4':
 			family = AF_INET;
@@ -203,9 +211,6 @@ main(int argc, char *argv[])
 		case 'o':
 			oflag = 1;
 			break;
-		case 'O':
-			Oflag = 1;
-			break;
 		case 'P':
 			Pflag = optarg;
 			break;
@@ -244,12 +249,28 @@ main(int argc, char *argv[])
 		case 'D':
 			Dflag = 1;
 			break;
+		case 'I':
+			Iflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+			if (errstr != NULL)
+				errx(1, "TCP receive window %s: %s",
+				    errstr, optarg);
+			break;
+		case 'O':
+			Oflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+			if (errstr != NULL) {
+			    if (strcmp(errstr, "invalid") != 0)
+				errx(1, "TCP send window %s: %s",
+				    errstr, optarg);
+			}
+			break;
 		case 'S':
 			Sflag = 1;
 			break;
 		case 'T':
 			Tflag = parse_iptos(optarg);
 			break;
+		case 0:
+			break;
 		default:
 			usage(1);
 		}
@@ -512,7 +533,7 @@ int
 remote_connect(const char *host, const char *port, struct addrinfo hints)
 {
 	struct addrinfo *res, *res0;
-	int s, error;
+	int s, error, on = 1;
 
 	if ((error = getaddrinfo(host, port, &hints, &res)))
 		errx(1, "getaddrinfo: %s", gai_strerror(error));
@@ -533,6 +554,10 @@ remote_connect(const char *host, const c
 		if (sflag || pflag) {
 			struct addrinfo ahints, *ares;
 
+#ifdef SO_BINDANY
+			/* try SO_BINDANY, but don't insist */
+			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
+#endif
 			memset(&ahints, 0, sizeof(struct addrinfo));
 			ahints.ai_family = res0->ai_family;
 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -604,9 +629,9 @@ local_listen(char *host, char *port, str
 		if (ipsec_policy[1] != NULL)
 			add_ipsec_policy(s, ipsec_policy[1]);
 #endif
-		if (Oflag) {
+		if (FreeBSD_Oflag) {
 			if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT,
-			    &Oflag, sizeof(Oflag)) == -1)
+			    &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1)
 				err(1, "disable TCP options");
 		}
 
@@ -838,9 +863,19 @@ set_common_sockopts(int s)
 		    &Tflag, sizeof(Tflag)) == -1)
 			err(1, "set IP ToS");
 	}
+	if (Iflag) {
+		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+		    &Iflag, sizeof(Iflag)) == -1)
+			err(1, "set TCP receive buffer size");
+	}
 	if (Oflag) {
-		if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT,
+		if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
 		    &Oflag, sizeof(Oflag)) == -1)
+			err(1, "set TCP send buffer size");
+	}
+	if (FreeBSD_Oflag) {
+		if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT,
+		    &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1)
 			err(1, "disable TCP options");
 	}
 }
@@ -878,11 +913,13 @@ help(void)
 #endif
 	fprintf(stderr, "\
 	\t-h		This help text\n\
+	\t-I length	TCP receive buffer length\n\
 	\t-i secs\t	Delay interval for lines sent, ports scanned\n\
 	\t-k		Keep inbound sockets open for multiple connects\n\
 	\t-l		Listen mode, for inbound connects\n\
 	\t-n		Suppress name/port resolutions\n\
-	\t-O		Disable TCP options\n\
+	\t--no-tcpopt	Disable TCP options\n\
+	\t-O length	TCP send buffer length\n\
 	\t-o		Terminate on EOF on input\n\
 	\t-P proxyuser\tUsername for proxy authentication\n\
 	\t-p port\t	Specify local port for remote connects\n\
@@ -931,10 +968,11 @@ void
 usage(int ret)
 {
 #ifdef IPSEC
-	fprintf(stderr, "usage: nc [-46DdEhklnOorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n");
+	fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n");
 #else
-	fprintf(stderr, "usage: nc [-46DdhklnOorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
+	fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n");
 #endif
+	fprintf(stderr, "\t  [-O send_buffer_len] [-P proxy_username] [-p source_port]\n");
 	fprintf(stderr, "\t  [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
 	fprintf(stderr, "\t  [-x proxy_address[:port]] [hostname] [port[s]]\n");
 	if (ret)

Modified: projects/cambria/etc/Makefile
==============================================================================
--- projects/cambria/etc/Makefile	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/etc/Makefile	Sat Dec 20 01:29:19 2008	(r186349)
@@ -162,6 +162,7 @@ distribution:
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
+	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install

Modified: projects/cambria/etc/devd.conf
==============================================================================
--- projects/cambria/etc/devd.conf	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/etc/devd.conf	Sat Dec 20 01:29:19 2008	(r186349)
@@ -277,29 +277,6 @@ notify 0 {
 	action			"mixer vol +10";
 };
 
-# The next blocks enable volume hotkeys that can be found on the Asus EeePC
-# The four keys above the keyboard notify 0x1a through to 0x1d respectively
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x13";
-        action                  "mixer 0";
-};
-
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x14";
-        action                  "mixer vol -10";
-};
-
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x15";
-        action                  "mixer vol +10";
-};
-
 /* EXAMPLES TO END OF FILE
 
 # The following might be an example of something that a vendor might

Modified: projects/cambria/etc/mtree/BSD.root.dist
==============================================================================
--- projects/cambria/etc/mtree/BSD.root.dist	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/etc/mtree/BSD.root.dist	Sat Dec 20 01:29:19 2008	(r186349)
@@ -28,6 +28,8 @@
         ..
         defaults
         ..
+        devd
+        ..
         gnats
         ..
         gss

Modified: projects/cambria/etc/rc.d/defaultroute
==============================================================================
--- projects/cambria/etc/rc.d/defaultroute	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/etc/rc.d/defaultroute	Sat Dec 20 01:29:19 2008	(r186349)
@@ -30,7 +30,7 @@ defaultroute_start()
 		defif=`get_default_if -inet`
 		if [ -n "${defif}" ]; then
 			if [ ${delay} -ne ${if_up_delay} ]; then
-				echo "($defif)"
+				echo -n "($defif)"
 			fi
 			break
 		fi
@@ -42,6 +42,8 @@ defaultroute_start()
 		sleep 1
 		delay=`expr $delay - 1`
 	done
+
+	echo
 }
 
 load_rc_config $name

Modified: projects/cambria/etc/regdomain.xml
==============================================================================
--- projects/cambria/etc/regdomain.xml	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/etc/regdomain.xml	Sat Dec 20 01:29:19 2008	(r186349)
@@ -39,7 +39,7 @@
 -->
 <rd id="debug">
   <name>DEBUG</name>
-  <sku>0</sku>
+  <sku>0x1ff</sku>
 </rd>
 
 <rd id="fcc">
@@ -1080,6 +1080,75 @@
     </band>
   </netband>
 </rd>
+
+<rd id="sr9">
+  <name>SR9</name>
+  <sku>0x0298</sku>
+  <defcc ref="SR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="xr9">
+  <name>XR9</name>
+  <sku>0x299</sku>
+  <defcc ref="XR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S2_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="gz901">
+  <name>GZ901</name>
+  <sku>0x29a</sku>
+  <defcc ref="GZ901"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_908_923_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
 </regulatory-domains>
 
 <country-codes>
@@ -1201,6 +1270,9 @@
 <country id="GT">
   <isocc>320</isocc> <name>Guatemala</name> <rd ref="none"/>
 </country>
+<country id="GZ901">
+  <isocc>5002</isocc> <name>ZComax GZ-901</name> <rd ref="gz901"/>
+</country>
 <country id="HN">
   <isocc>340</isocc> <name>Honduras</name> <rd ref="none"/>
 </country>
@@ -1396,6 +1468,12 @@
 <country id="TR">
   <isocc>792</isocc> <name>Turkey</name> <rd ref="etsi"/>
 </country>
+<country id="SR9">
+  <isocc>5000</isocc> <name>Ubiquiti SR9</name> <rd ref="sr9"/>
+</country>
+<country id="XR9">
+  <isocc>5001</isocc> <name>Ubiquiti XR9</name> <rd ref="xr9"/>
+</country>
 <country id="UA">
   <isocc>804</isocc> <name>Ukraine</name> <rd ref="none"/>
 </country>
@@ -1426,6 +1504,10 @@
 <country id="ZW">
   <isocc>716</isocc> <name>Zimbabwe</name> <rd ref="none"/>
 </country>
+
+<country id="DEBUG">
+  <isocc>0</isocc> <name>Debug</name> <rd ref="debug"/>
+</country>
 </country-codes>
 
 <!--
@@ -1575,6 +1657,61 @@
   <freqstart>2512</freqstart> <freqend>2732</freqend>
   <chanwidth>20</chanwidth> <chansep>5</chansep>
 </freqband>
+
+<freqband id="S1_907_922_5">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_907_922_10">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_912_917">
+  <freqstart>2427</freqstart> <freqend>2432</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S2_907_922_5">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S2_907_922_10">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S2_912_917">
+  <freqstart>2432</freqstart> <freqend>2437</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S1_908_923_5">
+  <freqstart>2447</freqstart> <freqend>2467</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_913_918_10">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_913_918">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
 </shared-frequency-bands>
 
 </regulatory-data>

Modified: projects/cambria/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- projects/cambria/gnu/usr.bin/groff/tmac/mdoc.local	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/gnu/usr.bin/groff/tmac/mdoc.local	Sat Dec 20 01:29:19 2008	(r186349)
@@ -69,6 +69,8 @@
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-6.3    6.3
+.ds doc-operating-system-FreeBSD-6.4    6.4
+.ds doc-operating-system-FreeBSD-7.1    7.1
 .ds doc-operating-system-FreeBSD-8.0    8.0
 .
 .ec

Modified: projects/cambria/include/arpa/nameser.h
==============================================================================
--- projects/cambria/include/arpa/nameser.h	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/include/arpa/nameser.h	Sat Dec 20 01:29:19 2008	(r186349)
@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -424,9 +424,10 @@ typedef enum __ns_cert_types {
 #define NS_NXT_MAX 127
 
 /*%
- * EDNS0 extended flags, host order.
+ * EDNS0 extended flags and option codes, host order.
  */
 #define NS_OPT_DNSSEC_OK	0x8000U
+#define NS_OPT_NSID             3
 
 /*%
  * Inline versions of get/put short/long.  Pointer is advanced.

Modified: projects/cambria/include/resolv.h
==============================================================================
--- projects/cambria/include/resolv.h	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/include/resolv.h	Sat Dec 20 01:29:19 2008	(r186349)
@@ -50,7 +50,7 @@
 
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $
+ *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -245,6 +245,7 @@ union res_sockaddr_union {
 #define	RES_NOCHECKNAME	0x00008000	/*%< do not check names for sanity. */
 #define	RES_KEEPTSIG	0x00010000	/*%< do not strip TSIG records */
 #define	RES_BLAST	0x00020000	/*%< blast all recursive servers */
+#define RES_NSID	0x00040000      /*%< request name server ID */
 #define RES_NOTLDQUERY	0x00100000	/*%< don't unqualified name as a tld */
 #define RES_USE_DNSSEC	0x00200000	/*%< use DNSSEC using OK bit in OPT */
 /* #define RES_DEBUG2	0x00400000 */	/* nslookup internal */
@@ -386,6 +387,7 @@ extern const struct res_sym __p_rcode_sy
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
 #define res_nopt		__res_nopt
+#define res_nopt_rdata       	__res_nopt_rdata
 #define res_ndestroy		__res_ndestroy
 #define	res_nametoclass		__res_nametoclass
 #define	res_nametotype		__res_nametotype
@@ -474,6 +476,8 @@ int		res_findzonecut2(res_state, const c
 				 union res_sockaddr_union *, int);
 void		res_nclose(res_state);
 int		res_nopt(res_state, int, u_char *, int, int);
+int		res_nopt_rdata(res_state, int, u_char *, int, u_char *,
+			       u_short, u_short, u_char *);
 void		res_send_setqhook(res_send_qhook);
 void		res_send_setrhook(res_send_rhook);
 int		__res_vinit(res_state, int);

Modified: projects/cambria/lib/libarchive/archive_read_support_format_ar.c
==============================================================================
--- projects/cambria/lib/libarchive/archive_read_support_format_ar.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/lib/libarchive/archive_read_support_format_ar.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -192,7 +192,7 @@ archive_read_format_ar_read_header(struc
 	/* Verify the magic signature on the file header. */
 	if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) {
 		archive_set_error(&a->archive, EINVAL,
-		    "Consistency check failed");
+		    "Incorrect file header signature");
 		return (ARCHIVE_WARN);
 	}
 

Modified: projects/cambria/lib/libarchive/test/main.c
==============================================================================
--- projects/cambria/lib/libarchive/test/main.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/lib/libarchive/test/main.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -897,7 +897,7 @@ int main(int argc, char **argv)
 	time_t now;
 	char *refdir_alloc = NULL;
 	char *progname, *p;
-	char *tmp;
+	const char *tmp;
 	char tmpdir[256];
 	char tmpdir_timestamp[256];
 

Modified: projects/cambria/lib/libarchive/test/test_compat_gtar.c
==============================================================================
--- projects/cambria/lib/libarchive/test/test_compat_gtar.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/lib/libarchive/test/test_compat_gtar.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -43,6 +43,7 @@ test_compat_gtar_1(void)
 	char name[] = "test_compat_gtar_1.tgz";
 	struct archive_entry *ae;
 	struct archive *a;
+	int r;
 
 	assert((a = archive_read_new()) != NULL);
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
@@ -51,7 +52,11 @@ test_compat_gtar_1(void)
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240));
 
 	/* Read first entry. */
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae));
+	if (r != ARCHIVE_OK) {
+		archive_read_finish(a);
+		return;
+	}
 	assertEqualString(
 		"12345678901234567890123456789012345678901234567890"
 		"12345678901234567890123456789012345678901234567890"
@@ -66,7 +71,11 @@ test_compat_gtar_1(void)
 	assertEqualInt(0100644, archive_entry_mode(ae));
 
 	/* Read second entry. */
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae));
+	if (r != ARCHIVE_OK) {
+		archive_read_finish(a);
+		return;
+	}
 	assertEqualString(
 		"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"
 		"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"

Modified: projects/cambria/lib/libarchive/test/test_write_compress.c
==============================================================================
--- projects/cambria/lib/libarchive/test/test_write_compress.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/lib/libarchive/test/test_write_compress.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -85,11 +85,11 @@ DEFINE_TEST(test_write_compress)
 
 	for (i = 0; i < 100; i++) {
 		sprintf(path, "file%03d", i);
-		assertEqualInt(0, archive_read_next_header(a, &ae));
+		if (!assertEqualInt(0, archive_read_next_header(a, &ae)))
+			break;
 		assertEqualString(path, archive_entry_pathname(ae));
 		assertEqualInt(datasize, archive_entry_size(ae));
 	}
-
 	assert(0 == archive_read_close(a));
 #if ARCHIVE_VERSION_NUMBER < 2000000
 	archive_read_finish(a);

Modified: projects/cambria/lib/libarchive/test/test_write_format_ar.c
==============================================================================
--- projects/cambria/lib/libarchive/test/test_write_format_ar.c	Sat Dec 20 01:11:10 2008	(r186348)
+++ projects/cambria/lib/libarchive/test/test_write_format_ar.c	Sat Dec 20 01:29:19 2008	(r186349)
@@ -73,8 +73,8 @@ DEFINE_TEST(test_write_format_ar)
 	archive_entry_copy_pathname(ae, "ggghhhjjjrrrttt.o");
 	archive_entry_set_filetype(ae, AE_IFREG);
 	archive_entry_set_size(ae, 7);
-	assertA(0 == archive_write_header(a, ae));
-	assertA(7 == archive_write_data(a, "7777777", 7));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	assertEqualIntA(a, 7, archive_write_data(a, "7777777", 7));
 	archive_entry_free(ae);
 
 	/* test full pathname */
@@ -82,8 +82,8 @@ DEFINE_TEST(test_write_format_ar)
 	archive_entry_copy_pathname(ae, "/usr/home/xx/iiijjjdddsssppp.o");
 	archive_entry_set_mode(ae, S_IFREG | 0755);
 	archive_entry_set_size(ae, 8);
-	assertA(0 == archive_write_header(a, ae));
-	assertA(8 == archive_write_data(a, "88877766", 8));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	assertEqualIntA(a, 8, archive_write_data(a, "88877766", 8));
 	archive_entry_free(ae);
 
 	/* trailing "/" should be rejected */
@@ -105,46 +105,46 @@ DEFINE_TEST(test_write_format_ar)
 #if ARCHIVE_VERSION_NUMBER < 2000000
 	archive_write_finish(a);
 #else
-	assert(0 == archive_write_finish(a));
+	assertEqualInt(0, archive_write_finish(a));
 #endif
 
 	/*
 	 * Now, read the data back.
 	 */
 	assert((a = archive_read_new()) != NULL);
-	assertA(0 == archive_read_support_format_all(a));
-	assertA(0 == archive_read_support_compression_all(a));
-	assertA(0 == archive_read_open_memory(a, buff, used));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
 
-	assertA(0 == archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
 	assertEqualInt(0, archive_entry_mtime(ae));
 	assertEqualString("//", archive_entry_pathname(ae));
 	assertEqualInt(0, archive_entry_size(ae));
 
-	assertA(0 == archive_read_next_header(a, &ae));
-	assert(1 == archive_entry_mtime(ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt(1, archive_entry_mtime(ae));
 	assertEqualString("abcdefghijklmn.o", archive_entry_pathname(ae));
-	assert(8 == archive_entry_size(ae));
-	assertA(8 == archive_read_data(a, buff2, 10));
-	assert(0 == memcmp(buff2, "87654321", 8));
+	assertEqualInt(8, archive_entry_size(ae));
+	assertEqualIntA(a, 8, archive_read_data(a, buff2, 10));
+	assertEqualMem(buff2, "87654321", 8);
 
-	assert(0 == archive_read_next_header(a, &ae));
+	assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
 	assertEqualString("ggghhhjjjrrrttt.o", archive_entry_pathname(ae));
-	assert(7 == archive_entry_size(ae));
-	assertA(7 == archive_read_data(a, buff2, 11));
-	assert(0 == memcmp(buff2, "7777777", 7));
+	assertEqualInt(7, archive_entry_size(ae));
+	assertEqualIntA(a, 7, archive_read_data(a, buff2, 11));
+	assertEqualMem(buff2, "7777777", 7);
 
-	assert(0 == archive_read_next_header(a, &ae));
+	assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
 	assertEqualString("iiijjjdddsssppp.o", archive_entry_pathname(ae));
-	assert(8 == archive_entry_size(ae));
-	assertA(8 == archive_read_data(a, buff2, 17));
-	assert(0 == memcmp(buff2, "88877766", 8));
+	assertEqualInt(8, archive_entry_size(ae));
+	assertEqualIntA(a, 8, archive_read_data(a, buff2, 17));
+	assertEqualMem(buff2, "88877766", 8);
 
-	assert(0 == archive_read_close(a));
+	assertEqualIntA(a, 0, archive_read_close(a));
 #if ARCHIVE_VERSION_NUMBER < 2000000
 	archive_read_finish(a);
 #else
-	assert(0 == archive_read_finish(a));
+	assertEqualInt(0, archive_read_finish(a));
 #endif
 
 	/*
@@ -152,18 +152,18 @@ DEFINE_TEST(test_write_format_ar)
 	 */
 	memset(buff, 0, sizeof(buff));
 	assert((a = archive_write_new()) != NULL);
-	assertA(0 == archive_write_set_format_ar_bsd(a));
-	assertA(0 == archive_write_set_compression_bzip2(a));
-	assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ar_bsd(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used));
 
 	/* write a entry need long name extension */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "ttttyyyyuuuuiiii.o");
 	archive_entry_set_filetype(ae, AE_IFREG);
 	archive_entry_set_size(ae, 5);
-	assertA(0 == archive_write_header(a, ae));
-	assertA(5 == archive_entry_size(ae));
-	assertA(5 == archive_write_data(a, "12345", 7));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	assertEqualInt(5, archive_entry_size(ae));
+	assertEqualIntA(a, 5, archive_write_data(a, "12345", 7));
 	archive_entry_free(ae);
 
 	/* write a entry with a short name */
@@ -171,41 +171,41 @@ DEFINE_TEST(test_write_format_ar)
 	archive_entry_copy_pathname(ae, "ttyy.o");
 	archive_entry_set_filetype(ae, AE_IFREG);
 	archive_entry_set_size(ae, 6);
-	assertA(0 == archive_write_header(a, ae));
-	assertA(6 == archive_write_data(a, "555555", 7));
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	assertEqualIntA(a, 6, archive_write_data(a, "555555", 7));
 	archive_entry_free(ae);
 	archive_write_close(a);
 #if ARCHIVE_VERSION_NUMBER < 2000000
 	archive_write_finish(a);
 #else
-	assert(0 == archive_write_finish(a));
+	assertEqualInt(0, archive_write_finish(a));
 #endif
 
 	/* Now, Read the data back */
 	assert((a = archive_read_new()) != NULL);
-	assertA(0 == archive_read_support_format_all(a));
-	assertA(0 == archive_read_support_compression_all(a));
-	assertA(0 == archive_read_open_memory(a, buff, used));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
 
 	assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
 	assertEqualString("ttttyyyyuuuuiiii.o", archive_entry_pathname(ae));
 	assertEqualInt(5, archive_entry_size(ae));
-	assertA(5 == archive_read_data(a, buff2, 10));
-	assert(0 == memcmp(buff2, "12345", 5));
+	assertEqualIntA(a, 5, archive_read_data(a, buff2, 10));
+	assertEqualMem(buff2, "12345", 5);
 
-	assert(0 == archive_read_next_header(a, &ae));
+	assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
 	assertEqualString("ttyy.o", archive_entry_pathname(ae));
-	assert(6 == archive_entry_size(ae));
-	assertA(6 == archive_read_data(a, buff2, 10));
-	assert(0 == memcmp(buff2, "555555", 6));
+	assertEqualInt(6, archive_entry_size(ae));
+	assertEqualIntA(a, 6, archive_read_data(a, buff2, 10));
+	assertEqualMem(buff2, "555555", 6);
 
 	/* Test EOF */

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

More information about the svn-src-projects mailing list