Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jan 2010 11:29:57 +0000 (UTC)
From:      Luigi Rizzo <luigi@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r201492 - in user/luigi/ipfw3-head: . bin/kenv bin/pax bin/pkill bin/sh contrib/top crypto/heimdal/kcm etc etc/defaults etc/mtree etc/rc.d games/fortune/datfiles games/fortune/strfile g...
Message-ID:  <201001041129.o04BTvvO045099@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: luigi
Date: Mon Jan  4 11:29:55 2010
New Revision: 201492
URL: http://svn.freebsd.org/changeset/base/201492

Log:
  svn merge -r 201048:201486 from head

Added:
  user/luigi/ipfw3-head/lib/libarchive/archive_hash.h
     - copied unchanged from r201486, head/lib/libarchive/archive_hash.h
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_compression_uu.c
     - copied unchanged from r201486, head/lib/libarchive/archive_read_support_compression_uu.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_zip.c
     - copied unchanged from r201486, head/lib/libarchive/archive_write_set_format_zip.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_cpio.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_cpio.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_cpio_1.cpio.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_cpio_1.cpio.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_lzma.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_lzma.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_lzma_1.tlz.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_lzma_1.tlz.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_lzma_2.tlz.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_lzma_2.tlz.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_lzma_3.tlz.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_compat_lzma_3.tlz.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_fuzz_1.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_fuzz_1.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_ar.ar.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_ar.ar.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_cpio_bin_lzma.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_cpio_bin_lzma.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_multi_extent.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_multi_extent.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isojoliet_long.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isojoliet_long.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isojoliet_rr.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isojoliet_rr.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isorr_ce.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isorr_ce.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isorr_new_bz2.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isorr_new_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isorr_rr_moved.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isorr_rr_moved.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isozisofs_bz2.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_isozisofs_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_mtree.mtree.uu
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_mtree.mtree.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_tlz.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_format_tlz.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_uu.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_read_uu.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_symlink.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_write_disk_symlink.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_zip.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_write_format_zip.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_zip_empty.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_write_format_zip_empty.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_zip_no_compression.c
     - copied unchanged from r201486, head/lib/libarchive/test/test_write_format_zip_no_compression.c
  user/luigi/ipfw3-head/sbin/geom/class/cache/gcache.8
     - copied unchanged from r201486, head/sbin/geom/class/cache/gcache.8
  user/luigi/ipfw3-head/sys/arm/arm/cpufunc_asm_fa526.S
     - copied unchanged from r201486, head/sys/arm/arm/cpufunc_asm_fa526.S
  user/luigi/ipfw3-head/sys/arm/conf/CNS11XXNAS
     - copied unchanged from r201486, head/sys/arm/conf/CNS11XXNAS
  user/luigi/ipfw3-head/sys/arm/econa/
     - copied from r201486, head/sys/arm/econa/
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot1.S
     - copied unchanged from r201486, head/sys/boot/pc98/boot2/boot1.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot2.c
     - copied unchanged from r201486, head/sys/boot/pc98/boot2/boot2.c
  user/luigi/ipfw3-head/sys/boot/pc98/libpc98/libpc98.h
     - copied unchanged from r201486, head/sys/boot/pc98/libpc98/libpc98.h
  user/luigi/ipfw3-head/sys/boot/pc98/libpc98/pc98_sys.c
     - copied unchanged from r201486, head/sys/boot/pc98/libpc98/pc98_sys.c
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu
     - copied unchanged from r201486, head/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu
     - copied unchanged from r201486, head/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu
     - copied unchanged from r201486, head/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu
     - copied unchanged from r201486, head/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu
  user/luigi/ipfw3-head/sys/ia64/ia64/bus_machdep.c
     - copied unchanged from r201486, head/sys/ia64/ia64/bus_machdep.c
  user/luigi/ipfw3-head/sys/modules/iwnfw/iwn1000/
     - copied from r201486, head/sys/modules/iwnfw/iwn1000/
  user/luigi/ipfw3-head/sys/modules/iwnfw/iwn6000/
     - copied from r201486, head/sys/modules/iwnfw/iwn6000/
  user/luigi/ipfw3-head/sys/sys/_umtx.h
     - copied unchanged from r201486, head/sys/sys/_umtx.h
  user/luigi/ipfw3-head/tools/regression/bin/sh/builtins/builtin1.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/builtins/builtin1.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/builtins/command6.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/builtins/command6.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/builtins/command6.0.stdout
     - copied unchanged from r201486, head/tools/regression/bin/sh/builtins/command6.0.stdout
  user/luigi/ipfw3-head/tools/regression/bin/sh/builtins/command7.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/builtins/command7.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/builtins/type2.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/builtins/type2.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/expansion/arith1.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/expansion/arith1.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/expansion/arith2.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/expansion/arith2.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/expansion/cmdsubst1.0
     - copied unchanged from r201486, head/tools/regression/bin/sh/expansion/cmdsubst1.0
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/directive-t0/
     - copied from r201486, head/tools/regression/usr.bin/make/syntax/directive-t0/
Deleted:
  user/luigi/ipfw3-head/lib/libarchive/test/test_fuzz_1.iso.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
  user/luigi/ipfw3-head/share/examples/pppd/
  user/luigi/ipfw3-head/share/examples/slattach/
  user/luigi/ipfw3-head/share/examples/sliplogin/
  user/luigi/ipfw3-head/share/examples/startslip/
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/asm.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/asm.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/bios.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot.c
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot2.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/dinode.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/disk.c
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/fs.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/inode.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/io.c
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/probe_keyboard.c
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/quota.h
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/serial.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/serial_16550.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/serial_8251.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/start.S
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/sys.c
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/table.c
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu
  user/luigi/ipfw3-head/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu
Modified:
  user/luigi/ipfw3-head/COPYRIGHT
  user/luigi/ipfw3-head/MAINTAINERS
  user/luigi/ipfw3-head/Makefile.inc1
  user/luigi/ipfw3-head/ObsoleteFiles.inc
  user/luigi/ipfw3-head/bin/kenv/kenv.c
  user/luigi/ipfw3-head/bin/pax/ftree.c
  user/luigi/ipfw3-head/bin/pkill/pkill.c
  user/luigi/ipfw3-head/bin/sh/arith.y
  user/luigi/ipfw3-head/bin/sh/error.c
  user/luigi/ipfw3-head/bin/sh/eval.c
  user/luigi/ipfw3-head/bin/sh/exec.c
  user/luigi/ipfw3-head/bin/sh/exec.h
  user/luigi/ipfw3-head/bin/sh/expand.c
  user/luigi/ipfw3-head/bin/sh/output.h
  user/luigi/ipfw3-head/bin/sh/parser.c
  user/luigi/ipfw3-head/bin/sh/sh.1
  user/luigi/ipfw3-head/crypto/heimdal/kcm/connect.c
  user/luigi/ipfw3-head/etc/defaults/rc.conf
  user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist
  user/luigi/ipfw3-head/etc/network.subr
  user/luigi/ipfw3-head/etc/rc.d/named
  user/luigi/ipfw3-head/etc/rc.d/nsswitch
  user/luigi/ipfw3-head/etc/rc.firewall
  user/luigi/ipfw3-head/games/fortune/datfiles/fortunes
  user/luigi/ipfw3-head/games/fortune/strfile/strfile.c
  user/luigi/ipfw3-head/games/fortune/unstr/unstr.c
  user/luigi/ipfw3-head/games/number/number.c
  user/luigi/ipfw3-head/include/paths.h
  user/luigi/ipfw3-head/lib/Makefile.inc
  user/luigi/ipfw3-head/lib/csu/Makefile.inc
  user/luigi/ipfw3-head/lib/csu/arm/Makefile
  user/luigi/ipfw3-head/lib/csu/i386-elf/Makefile
  user/luigi/ipfw3-head/lib/csu/mips/Makefile
  user/luigi/ipfw3-head/lib/libarchive/Makefile
  user/luigi/ipfw3-head/lib/libarchive/archive.h
  user/luigi/ipfw3-head/lib/libarchive/archive_read.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_compression_all.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_compression_xz.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_format_cpio.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_format_iso9660.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_format_mtree.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_format_tar.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_disk.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_private.h
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_by_name.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_cpio.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_cpio_newc.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_mtree.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_pax.c
  user/luigi/ipfw3-head/lib/libarchive/test/Makefile
  user/luigi/ipfw3-head/lib/libarchive/test/main.c
  user/luigi/ipfw3-head/lib/libarchive/test/test.h
  user/luigi/ipfw3-head/lib/libarchive/test/test_acl_pax.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_bzip2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_compat_solaris_tar_acl.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_entry.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_entry_strmode.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_extattr_freebsd.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_fuzz.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_open_fd.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_open_file.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_pax_filename_encoding.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_compress_program.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_data_large.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_disk.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_disk_entry_from_file.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_extract.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_ar.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_iso_gz.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isojoliet_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_isorr_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_mtree.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_pax_bz2.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_tar.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_format_tbz.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_read_large.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_tar_large.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_compress_program.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_failures.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_hardlink.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_perms.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_secure.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_sparse.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_disk_times.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_cpio_empty.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_cpio_newc.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_cpio_odc.c
  user/luigi/ipfw3-head/lib/libarchive/test/test_write_format_tar_ustar.c
  user/luigi/ipfw3-head/lib/libauditd/Makefile
  user/luigi/ipfw3-head/lib/libautofs/Makefile
  user/luigi/ipfw3-head/lib/libbegemot/Makefile
  user/luigi/ipfw3-head/lib/libbsm/Makefile
  user/luigi/ipfw3-head/lib/libbz2/Makefile
  user/luigi/ipfw3-head/lib/libc/gen/time.3
  user/luigi/ipfw3-head/lib/libc/gen/time.c
  user/luigi/ipfw3-head/lib/libc/posix1e/Makefile.inc
  user/luigi/ipfw3-head/lib/libc/stdtime/localtime.c
  user/luigi/ipfw3-head/lib/libc/sys/clock_gettime.2
  user/luigi/ipfw3-head/lib/libc/sys/kqueue.2
  user/luigi/ipfw3-head/lib/libcalendar/Makefile
  user/luigi/ipfw3-head/lib/libcam/Makefile
  user/luigi/ipfw3-head/lib/libcompat/Makefile
  user/luigi/ipfw3-head/lib/libcrypt/Makefile
  user/luigi/ipfw3-head/lib/libdevinfo/Makefile
  user/luigi/ipfw3-head/lib/libdevstat/Makefile
  user/luigi/ipfw3-head/lib/libdwarf/Makefile
  user/luigi/ipfw3-head/lib/libedit/Makefile
  user/luigi/ipfw3-head/lib/libelf/Makefile
  user/luigi/ipfw3-head/lib/libexpat/Makefile
  user/luigi/ipfw3-head/lib/libftpio/Makefile
  user/luigi/ipfw3-head/lib/libgeom/geom_getxml.c
  user/luigi/ipfw3-head/lib/libgpib/Makefile
  user/luigi/ipfw3-head/lib/libgssapi/Makefile
  user/luigi/ipfw3-head/lib/libipsec/Makefile
  user/luigi/ipfw3-head/lib/libipx/Makefile
  user/luigi/ipfw3-head/lib/libjail/Makefile
  user/luigi/ipfw3-head/lib/libkiconv/Makefile
  user/luigi/ipfw3-head/lib/libkvm/Makefile
  user/luigi/ipfw3-head/lib/libmagic/Makefile
  user/luigi/ipfw3-head/lib/libmd/Makefile
  user/luigi/ipfw3-head/lib/libmilter/Makefile
  user/luigi/ipfw3-head/lib/libmp/Makefile
  user/luigi/ipfw3-head/lib/libncp/Makefile
  user/luigi/ipfw3-head/lib/libngatm/Makefile
  user/luigi/ipfw3-head/lib/libopie/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/Makefile.inc
  user/luigi/ipfw3-head/lib/libpam/modules/pam_exec/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/pam_krb5/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/pam_radius/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/pam_ssh/Makefile
  user/luigi/ipfw3-head/lib/libpcap/Makefile
  user/luigi/ipfw3-head/lib/libpmc/Makefile
  user/luigi/ipfw3-head/lib/libproc/Makefile
  user/luigi/ipfw3-head/lib/libradius/Makefile
  user/luigi/ipfw3-head/lib/librpcsec_gss/Makefile
  user/luigi/ipfw3-head/lib/librt/Makefile
  user/luigi/ipfw3-head/lib/libsbuf/Makefile
  user/luigi/ipfw3-head/lib/libsm/Makefile
  user/luigi/ipfw3-head/lib/libsmdb/Makefile
  user/luigi/ipfw3-head/lib/libsmutil/Makefile
  user/luigi/ipfw3-head/lib/libstand/Makefile
  user/luigi/ipfw3-head/lib/libtacplus/Makefile
  user/luigi/ipfw3-head/lib/libthread_db/Makefile
  user/luigi/ipfw3-head/lib/libufs/Makefile
  user/luigi/ipfw3-head/lib/libugidfw/Makefile
  user/luigi/ipfw3-head/lib/libugidfw/ugidfw.c
  user/luigi/ipfw3-head/lib/libulog/Makefile
  user/luigi/ipfw3-head/lib/libusb/Makefile
  user/luigi/ipfw3-head/lib/libutil/Makefile
  user/luigi/ipfw3-head/lib/libvgl/Makefile
  user/luigi/ipfw3-head/lib/libwrap/Makefile
  user/luigi/ipfw3-head/lib/liby/Makefile
  user/luigi/ipfw3-head/lib/libypclnt/Makefile
  user/luigi/ipfw3-head/lib/libz/Makefile
  user/luigi/ipfw3-head/lib/ncurses/Makefile.inc
  user/luigi/ipfw3-head/libexec/Makefile.inc
  user/luigi/ipfw3-head/libexec/atrun/Makefile
  user/luigi/ipfw3-head/libexec/bootpd/Makefile
  user/luigi/ipfw3-head/libexec/bootpd/Makefile.inc
  user/luigi/ipfw3-head/libexec/bootpd/tools/Makefile.inc
  user/luigi/ipfw3-head/libexec/comsat/comsat.c
  user/luigi/ipfw3-head/libexec/fingerd/Makefile
  user/luigi/ipfw3-head/libexec/getty/Makefile
  user/luigi/ipfw3-head/libexec/mail.local/Makefile
  user/luigi/ipfw3-head/libexec/mknetid/Makefile
  user/luigi/ipfw3-head/libexec/pppoed/Makefile
  user/luigi/ipfw3-head/libexec/rbootd/Makefile
  user/luigi/ipfw3-head/libexec/revnetgroup/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rquotad/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rstatd/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rusersd/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rusersd/rusers_proc.c
  user/luigi/ipfw3-head/libexec/rpc.rusersd/rusersd.c
  user/luigi/ipfw3-head/libexec/rpc.rwalld/Makefile
  user/luigi/ipfw3-head/libexec/rpc.sprayd/Makefile
  user/luigi/ipfw3-head/libexec/rshd/Makefile
  user/luigi/ipfw3-head/libexec/rtld-aout/shlib.c
  user/luigi/ipfw3-head/libexec/rtld-aout/support.c
  user/luigi/ipfw3-head/libexec/rtld-elf/Makefile
  user/luigi/ipfw3-head/libexec/smrsh/Makefile
  user/luigi/ipfw3-head/libexec/talkd/Makefile
  user/luigi/ipfw3-head/libexec/tcpd/Makefile
  user/luigi/ipfw3-head/libexec/tftp-proxy/Makefile
  user/luigi/ipfw3-head/libexec/tftpd/Makefile
  user/luigi/ipfw3-head/libexec/ulog-helper/Makefile
  user/luigi/ipfw3-head/libexec/ypxfr/Makefile
  user/luigi/ipfw3-head/release/Makefile
  user/luigi/ipfw3-head/sbin/comcontrol/comcontrol.c
  user/luigi/ipfw3-head/sbin/geom/class/cache/Makefile
  user/luigi/ipfw3-head/sbin/geom/core/geom.8
  user/luigi/ipfw3-head/sbin/growfs/growfs.c
  user/luigi/ipfw3-head/sbin/ldconfig/ldconfig.c
  user/luigi/ipfw3-head/sbin/mount/vfslist.c
  user/luigi/ipfw3-head/sbin/mount_msdosfs/mount_msdosfs.8
  user/luigi/ipfw3-head/sbin/mount_msdosfs/mount_msdosfs.c
  user/luigi/ipfw3-head/sbin/mount_nullfs/mount_nullfs.c
  user/luigi/ipfw3-head/sbin/newfs/mkfs.c
  user/luigi/ipfw3-head/sbin/rcorder/ealloc.c
  user/luigi/ipfw3-head/sbin/rcorder/hash.c
  user/luigi/ipfw3-head/sbin/rcorder/rcorder.c
  user/luigi/ipfw3-head/sbin/reboot/reboot.c
  user/luigi/ipfw3-head/sbin/shutdown/shutdown.c
  user/luigi/ipfw3-head/sbin/umount/umount.c
  user/luigi/ipfw3-head/secure/Makefile
  user/luigi/ipfw3-head/secure/Makefile.inc
  user/luigi/ipfw3-head/share/examples/Makefile
  user/luigi/ipfw3-head/share/man/man4/mfi.4
  user/luigi/ipfw3-head/share/man/man5/rc.conf.5
  user/luigi/ipfw3-head/share/misc/bsd-family-tree
  user/luigi/ipfw3-head/share/mk/bsd.sys.mk
  user/luigi/ipfw3-head/share/zoneinfo/asia
  user/luigi/ipfw3-head/sys/amd64/amd64/mem.c
  user/luigi/ipfw3-head/sys/amd64/conf/GENERIC
  user/luigi/ipfw3-head/sys/amd64/include/cpufunc.h
  user/luigi/ipfw3-head/sys/arm/arm/cpufunc.c
  user/luigi/ipfw3-head/sys/arm/arm/elf_trampoline.c
  user/luigi/ipfw3-head/sys/arm/arm/mem.c
  user/luigi/ipfw3-head/sys/arm/include/cpuconf.h
  user/luigi/ipfw3-head/sys/arm/include/cpufunc.h
  user/luigi/ipfw3-head/sys/boot/common/module.c
  user/luigi/ipfw3-head/sys/boot/pc98/Makefile.inc
  user/luigi/ipfw3-head/sys/boot/pc98/boot0.5/selector.s
  user/luigi/ipfw3-head/sys/boot/pc98/boot2/Makefile
  user/luigi/ipfw3-head/sys/boot/pc98/libpc98/Makefile
  user/luigi/ipfw3-head/sys/boot/pc98/loader/main.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/luigi/ipfw3-head/sys/conf/Makefile.arm
  user/luigi/ipfw3-head/sys/conf/files
  user/luigi/ipfw3-head/sys/conf/files.ia64
  user/luigi/ipfw3-head/sys/conf/options.arm
  user/luigi/ipfw3-head/sys/dev/adlink/adlink.c
  user/luigi/ipfw3-head/sys/dev/agp/agp.c
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aicasm/Makefile
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aicasm/aicasm.c
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  user/luigi/ipfw3-head/sys/dev/ath/if_ath.c
  user/luigi/ipfw3-head/sys/dev/bge/if_bge.c
  user/luigi/ipfw3-head/sys/dev/bktr/bktr_os.c
  user/luigi/ipfw3-head/sys/dev/cardbus/cardbus_cis.c
  user/luigi/ipfw3-head/sys/dev/dc/if_dc.c
  user/luigi/ipfw3-head/sys/dev/dc/if_dcreg.h
  user/luigi/ipfw3-head/sys/dev/drm/drm_vm.c
  user/luigi/ipfw3-head/sys/dev/exca/excareg.h
  user/luigi/ipfw3-head/sys/dev/fb/creator.c
  user/luigi/ipfw3-head/sys/dev/fb/fb.c
  user/luigi/ipfw3-head/sys/dev/fb/fbreg.h
  user/luigi/ipfw3-head/sys/dev/fb/machfb.c
  user/luigi/ipfw3-head/sys/dev/fb/s3_pci.c
  user/luigi/ipfw3-head/sys/dev/fb/vesa.c
  user/luigi/ipfw3-head/sys/dev/fb/vga.c
  user/luigi/ipfw3-head/sys/dev/fb/vgareg.h
  user/luigi/ipfw3-head/sys/dev/firewire/fwdev.c
  user/luigi/ipfw3-head/sys/dev/firewire/fwmem.c
  user/luigi/ipfw3-head/sys/dev/hifn/hifn7751.c
  user/luigi/ipfw3-head/sys/dev/hwpmc/hwpmc_mod.c
  user/luigi/ipfw3-head/sys/dev/isp/isp.c
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwn.c
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwnreg.h
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwnvar.h
  user/luigi/ipfw3-head/sys/dev/ksyms/ksyms.c
  user/luigi/ipfw3-head/sys/dev/mge/if_mge.c
  user/luigi/ipfw3-head/sys/dev/mii/tdkphy.c
  user/luigi/ipfw3-head/sys/dev/mk48txx/mk48txx.c
  user/luigi/ipfw3-head/sys/dev/mpt/mpt_pci.c
  user/luigi/ipfw3-head/sys/dev/pccard/card_if.m
  user/luigi/ipfw3-head/sys/dev/pci/pci.c
  user/luigi/ipfw3-head/sys/dev/pci/pci_private.h
  user/luigi/ipfw3-head/sys/dev/siis/siis.c
  user/luigi/ipfw3-head/sys/dev/siis/siis.h
  user/luigi/ipfw3-head/sys/dev/sound/pcm/dsp.c
  user/luigi/ipfw3-head/sys/dev/syscons/syscons.c
  user/luigi/ipfw3-head/sys/dev/tdfx/tdfx_pci.c
  user/luigi/ipfw3-head/sys/dev/usb/serial/uipaq.c
  user/luigi/ipfw3-head/sys/dev/usb/usbdevs
  user/luigi/ipfw3-head/sys/dev/xen/blkfront/blkfront.c
  user/luigi/ipfw3-head/sys/dev/xl/if_xl.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clrpcops.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clstate.c
  user/luigi/ipfw3-head/sys/fs/nfsserver/nfs_nfsdstate.c
  user/luigi/ipfw3-head/sys/geom/geom_io.c
  user/luigi/ipfw3-head/sys/geom/part/g_part_gpt.c
  user/luigi/ipfw3-head/sys/i386/conf/GENERIC
  user/luigi/ipfw3-head/sys/i386/i386/elan-mmcr.c
  user/luigi/ipfw3-head/sys/i386/i386/mem.c
  user/luigi/ipfw3-head/sys/i386/include/cpufunc.h
  user/luigi/ipfw3-head/sys/i386/xbox/xboxfb.c
  user/luigi/ipfw3-head/sys/ia64/conf/GENERIC
  user/luigi/ipfw3-head/sys/ia64/ia64/machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/mem.c
  user/luigi/ipfw3-head/sys/ia64/ia64/mp_machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/nexus.c
  user/luigi/ipfw3-head/sys/ia64/ia64/sys_machdep.c
  user/luigi/ipfw3-head/sys/ia64/include/bus.h
  user/luigi/ipfw3-head/sys/ia64/include/cpufunc.h
  user/luigi/ipfw3-head/sys/isa/vga_isa.c
  user/luigi/ipfw3-head/sys/kern/kern_conf.c
  user/luigi/ipfw3-head/sys/kern/kern_event.c
  user/luigi/ipfw3-head/sys/kern/kern_umtx.c
  user/luigi/ipfw3-head/sys/kern/sched_4bsd.c
  user/luigi/ipfw3-head/sys/kern/sched_ule.c
  user/luigi/ipfw3-head/sys/kern/subr_bus.c
  user/luigi/ipfw3-head/sys/kern/subr_devstat.c
  user/luigi/ipfw3-head/sys/kern/subr_witness.c
  user/luigi/ipfw3-head/sys/kern/tty.c
  user/luigi/ipfw3-head/sys/mips/mips/mem.c
  user/luigi/ipfw3-head/sys/modules/iwnfw/Makefile
  user/luigi/ipfw3-head/sys/modules/iwnfw/iwn4965/Makefile
  user/luigi/ipfw3-head/sys/modules/iwnfw/iwn5000/Makefile
  user/luigi/ipfw3-head/sys/net/if.c
  user/luigi/ipfw3-head/sys/net/if.h
  user/luigi/ipfw3-head/sys/net/if_llatbl.c
  user/luigi/ipfw3-head/sys/net/if_llatbl.h
  user/luigi/ipfw3-head/sys/net/if_var.h
  user/luigi/ipfw3-head/sys/net/if_vlan.c
  user/luigi/ipfw3-head/sys/net/route.c
  user/luigi/ipfw3-head/sys/net/route.h
  user/luigi/ipfw3-head/sys/net/rtsock.c
  user/luigi/ipfw3-head/sys/netinet/if_ether.c
  user/luigi/ipfw3-head/sys/netinet/in.c
  user/luigi/ipfw3-head/sys/netinet/ip_mroute.c
  user/luigi/ipfw3-head/sys/netinet6/in6.c
  user/luigi/ipfw3-head/sys/netinet6/nd6.c
  user/luigi/ipfw3-head/sys/pc98/cbus/gdc.c
  user/luigi/ipfw3-head/sys/pc98/conf/GENERIC
  user/luigi/ipfw3-head/sys/powerpc/conf/GENERIC
  user/luigi/ipfw3-head/sys/powerpc/ofw/ofw_syscons.c
  user/luigi/ipfw3-head/sys/powerpc/powerpc/mem.c
  user/luigi/ipfw3-head/sys/security/mac_lomac/mac_lomac.c
  user/luigi/ipfw3-head/sys/sparc64/conf/GENERIC
  user/luigi/ipfw3-head/sys/sparc64/conf/NOTES
  user/luigi/ipfw3-head/sys/sparc64/pci/fire.c
  user/luigi/ipfw3-head/sys/sparc64/pci/psycho.c
  user/luigi/ipfw3-head/sys/sparc64/pci/psychovar.h
  user/luigi/ipfw3-head/sys/sparc64/pci/schizo.c
  user/luigi/ipfw3-head/sys/sparc64/pci/schizovar.h
  user/luigi/ipfw3-head/sys/sparc64/sparc64/eeprom.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/machdep.c
  user/luigi/ipfw3-head/sys/sun4v/conf/GENERIC
  user/luigi/ipfw3-head/sys/sys/conf.h
  user/luigi/ipfw3-head/sys/sys/copyright.h
  user/luigi/ipfw3-head/sys/sys/event.h
  user/luigi/ipfw3-head/sys/sys/ttydevsw.h
  user/luigi/ipfw3-head/sys/sys/umtx.h
  user/luigi/ipfw3-head/sys/vm/device_pager.c
  user/luigi/ipfw3-head/sys/xen/gnttab.c
  user/luigi/ipfw3-head/tools/regression/acct/Makefile
  user/luigi/ipfw3-head/tools/regression/acct/regress.t   (contents, props changed)
  user/luigi/ipfw3-head/tools/regression/bin/date/regress.sh
  user/luigi/ipfw3-head/tools/regression/bin/mv/regress.sh
  user/luigi/ipfw3-head/tools/regression/fifo/fifo_misc/fifo_misc.c
  user/luigi/ipfw3-head/tools/regression/usr.bin/Makefile
  user/luigi/ipfw3-head/tools/regression/usr.bin/jot/regress.sh
  user/luigi/ipfw3-head/tools/regression/usr.bin/lastcomm/values.sh
  user/luigi/ipfw3-head/usr.bin/Makefile.inc
  user/luigi/ipfw3-head/usr.bin/apply/Makefile
  user/luigi/ipfw3-head/usr.bin/ar/Makefile
  user/luigi/ipfw3-head/usr.bin/ar/acpyacc.y
  user/luigi/ipfw3-head/usr.bin/ar/ar.c
  user/luigi/ipfw3-head/usr.bin/ar/read.c
  user/luigi/ipfw3-head/usr.bin/at/Makefile
  user/luigi/ipfw3-head/usr.bin/at/at.c
  user/luigi/ipfw3-head/usr.bin/atm/sscop/Makefile
  user/luigi/ipfw3-head/usr.bin/awk/Makefile
  user/luigi/ipfw3-head/usr.bin/banner/banner.c
  user/luigi/ipfw3-head/usr.bin/biff/biff.c
  user/luigi/ipfw3-head/usr.bin/bluetooth/bthost/Makefile
  user/luigi/ipfw3-head/usr.bin/bsdiff/Makefile.inc
  user/luigi/ipfw3-head/usr.bin/bzip2/Makefile
  user/luigi/ipfw3-head/usr.bin/calendar/Makefile
  user/luigi/ipfw3-head/usr.bin/catman/Makefile
  user/luigi/ipfw3-head/usr.bin/chkey/Makefile
  user/luigi/ipfw3-head/usr.bin/chpass/Makefile
  user/luigi/ipfw3-head/usr.bin/colldef/Makefile
  user/luigi/ipfw3-head/usr.bin/compile_et/Makefile
  user/luigi/ipfw3-head/usr.bin/compress/Makefile
  user/luigi/ipfw3-head/usr.bin/cpio/Makefile
  user/luigi/ipfw3-head/usr.bin/cpio/test/Makefile
  user/luigi/ipfw3-head/usr.bin/cpuset/Makefile
  user/luigi/ipfw3-head/usr.bin/ctags/Makefile
  user/luigi/ipfw3-head/usr.bin/dig/Makefile
  user/luigi/ipfw3-head/usr.bin/du/Makefile
  user/luigi/ipfw3-head/usr.bin/elf2aout/Makefile
  user/luigi/ipfw3-head/usr.bin/elfdump/Makefile
  user/luigi/ipfw3-head/usr.bin/env/Makefile
  user/luigi/ipfw3-head/usr.bin/fetch/Makefile
  user/luigi/ipfw3-head/usr.bin/fetch/fetch.c
  user/luigi/ipfw3-head/usr.bin/file2c/Makefile
  user/luigi/ipfw3-head/usr.bin/find/Makefile
  user/luigi/ipfw3-head/usr.bin/find/function.c
  user/luigi/ipfw3-head/usr.bin/finger/Makefile
  user/luigi/ipfw3-head/usr.bin/fstat/Makefile
  user/luigi/ipfw3-head/usr.bin/fsync/Makefile
  user/luigi/ipfw3-head/usr.bin/ftp/Makefile
  user/luigi/ipfw3-head/usr.bin/gcore/Makefile
  user/luigi/ipfw3-head/usr.bin/gencat/Makefile
  user/luigi/ipfw3-head/usr.bin/gencat/gencat.c
  user/luigi/ipfw3-head/usr.bin/getent/Makefile
  user/luigi/ipfw3-head/usr.bin/gprof/Makefile
  user/luigi/ipfw3-head/usr.bin/gprof/aout.c
  user/luigi/ipfw3-head/usr.bin/gzip/Makefile
  user/luigi/ipfw3-head/usr.bin/head/Makefile
  user/luigi/ipfw3-head/usr.bin/hexdump/Makefile
  user/luigi/ipfw3-head/usr.bin/host/Makefile
  user/luigi/ipfw3-head/usr.bin/id/Makefile
  user/luigi/ipfw3-head/usr.bin/ipcrm/Makefile
  user/luigi/ipfw3-head/usr.bin/ipcs/Makefile
  user/luigi/ipfw3-head/usr.bin/kdump/Makefile
  user/luigi/ipfw3-head/usr.bin/keylogin/Makefile
  user/luigi/ipfw3-head/usr.bin/ktrace/Makefile
  user/luigi/ipfw3-head/usr.bin/ktrdump/Makefile
  user/luigi/ipfw3-head/usr.bin/lam/lam.c
  user/luigi/ipfw3-head/usr.bin/last/Makefile
  user/luigi/ipfw3-head/usr.bin/lastcomm/Makefile
  user/luigi/ipfw3-head/usr.bin/ldd/Makefile
  user/luigi/ipfw3-head/usr.bin/leave/Makefile
  user/luigi/ipfw3-head/usr.bin/less/Makefile.common
  user/luigi/ipfw3-head/usr.bin/lex/Makefile
  user/luigi/ipfw3-head/usr.bin/lex/flex.skl
  user/luigi/ipfw3-head/usr.bin/lex/initscan.c
  user/luigi/ipfw3-head/usr.bin/lex/lib/Makefile
  user/luigi/ipfw3-head/usr.bin/limits/Makefile
  user/luigi/ipfw3-head/usr.bin/locate/Makefile.inc
  user/luigi/ipfw3-head/usr.bin/locate/locate/Makefile
  user/luigi/ipfw3-head/usr.bin/lock/Makefile
  user/luigi/ipfw3-head/usr.bin/logger/Makefile
  user/luigi/ipfw3-head/usr.bin/login/Makefile
  user/luigi/ipfw3-head/usr.bin/login/login.c
  user/luigi/ipfw3-head/usr.bin/login/login_fbtab.c
  user/luigi/ipfw3-head/usr.bin/logins/Makefile
  user/luigi/ipfw3-head/usr.bin/logname/Makefile
  user/luigi/ipfw3-head/usr.bin/look/Makefile
  user/luigi/ipfw3-head/usr.bin/lsvfs/Makefile
  user/luigi/ipfw3-head/usr.bin/m4/Makefile
  user/luigi/ipfw3-head/usr.bin/mail/Makefile
  user/luigi/ipfw3-head/usr.bin/make/Makefile
  user/luigi/ipfw3-head/usr.bin/make/job.c
  user/luigi/ipfw3-head/usr.bin/make/parse.c
  user/luigi/ipfw3-head/usr.bin/minigzip/Makefile
  user/luigi/ipfw3-head/usr.bin/mkfifo/Makefile
  user/luigi/ipfw3-head/usr.bin/mklocale/Makefile
  user/luigi/ipfw3-head/usr.bin/mklocale/lex.l
  user/luigi/ipfw3-head/usr.bin/mklocale/yacc.y
  user/luigi/ipfw3-head/usr.bin/mkstr/Makefile
  user/luigi/ipfw3-head/usr.bin/mkuzip/Makefile
  user/luigi/ipfw3-head/usr.bin/msgs/Makefile
  user/luigi/ipfw3-head/usr.bin/nc/Makefile
  user/luigi/ipfw3-head/usr.bin/ncplist/Makefile
  user/luigi/ipfw3-head/usr.bin/newkey/Makefile
  user/luigi/ipfw3-head/usr.bin/nfsstat/Makefile
  user/luigi/ipfw3-head/usr.bin/nl/Makefile
  user/luigi/ipfw3-head/usr.bin/nohup/Makefile
  user/luigi/ipfw3-head/usr.bin/nslookup/Makefile
  user/luigi/ipfw3-head/usr.bin/nsupdate/Makefile
  user/luigi/ipfw3-head/usr.bin/opieinfo/Makefile
  user/luigi/ipfw3-head/usr.bin/opiekey/Makefile
  user/luigi/ipfw3-head/usr.bin/opiepasswd/Makefile
  user/luigi/ipfw3-head/usr.bin/passwd/Makefile
  user/luigi/ipfw3-head/usr.bin/passwd/passwd.c
  user/luigi/ipfw3-head/usr.bin/pr/Makefile
  user/luigi/ipfw3-head/usr.bin/printf/Makefile
  user/luigi/ipfw3-head/usr.bin/procstat/Makefile
  user/luigi/ipfw3-head/usr.bin/renice/renice.c
  user/luigi/ipfw3-head/usr.bin/revoke/Makefile
  user/luigi/ipfw3-head/usr.bin/rlogin/Makefile
  user/luigi/ipfw3-head/usr.bin/rpcgen/Makefile
  user/luigi/ipfw3-head/usr.bin/rpcgen/rpc_hout.c
  user/luigi/ipfw3-head/usr.bin/rpcgen/rpc_main.c
  user/luigi/ipfw3-head/usr.bin/rpcinfo/Makefile
  user/luigi/ipfw3-head/usr.bin/rsh/Makefile
  user/luigi/ipfw3-head/usr.bin/rup/Makefile
  user/luigi/ipfw3-head/usr.bin/ruptime/Makefile
  user/luigi/ipfw3-head/usr.bin/rusers/Makefile
  user/luigi/ipfw3-head/usr.bin/rwho/Makefile
  user/luigi/ipfw3-head/usr.bin/script/script.c
  user/luigi/ipfw3-head/usr.bin/sed/Makefile
  user/luigi/ipfw3-head/usr.bin/showmount/showmount.c
  user/luigi/ipfw3-head/usr.bin/smbutil/Makefile
  user/luigi/ipfw3-head/usr.bin/sockstat/Makefile
  user/luigi/ipfw3-head/usr.bin/sockstat/sockstat.c
  user/luigi/ipfw3-head/usr.bin/su/Makefile
  user/luigi/ipfw3-head/usr.bin/systat/Makefile
  user/luigi/ipfw3-head/usr.bin/tail/Makefile
  user/luigi/ipfw3-head/usr.bin/tail/misc.c
  user/luigi/ipfw3-head/usr.bin/tar/Makefile
  user/luigi/ipfw3-head/usr.bin/tar/test/Makefile
  user/luigi/ipfw3-head/usr.bin/tcopy/Makefile
  user/luigi/ipfw3-head/usr.bin/telnet/Makefile
  user/luigi/ipfw3-head/usr.bin/tftp/tftp.c
  user/luigi/ipfw3-head/usr.bin/time/Makefile
  user/luigi/ipfw3-head/usr.bin/top/Makefile
  user/luigi/ipfw3-head/usr.bin/tr/Makefile
  user/luigi/ipfw3-head/usr.bin/truss/Makefile
  user/luigi/ipfw3-head/usr.bin/truss/syscalls.c
  user/luigi/ipfw3-head/usr.bin/unifdef/Makefile
  user/luigi/ipfw3-head/usr.bin/unzip/Makefile
  user/luigi/ipfw3-head/usr.bin/users/Makefile
  user/luigi/ipfw3-head/usr.bin/uudecode/Makefile
  user/luigi/ipfw3-head/usr.bin/uuencode/Makefile
  user/luigi/ipfw3-head/usr.bin/vacation/Makefile
  user/luigi/ipfw3-head/usr.bin/vgrind/Makefile
  user/luigi/ipfw3-head/usr.bin/vi/Makefile
  user/luigi/ipfw3-head/usr.bin/vmstat/Makefile
  user/luigi/ipfw3-head/usr.bin/w/Makefile
  user/luigi/ipfw3-head/usr.bin/wall/Makefile
  user/luigi/ipfw3-head/usr.bin/wall/wall.c
  user/luigi/ipfw3-head/usr.bin/wc/Makefile
  user/luigi/ipfw3-head/usr.bin/wc/wc.c
  user/luigi/ipfw3-head/usr.bin/whereis/Makefile
  user/luigi/ipfw3-head/usr.bin/who/Makefile
  user/luigi/ipfw3-head/usr.bin/write/Makefile
  user/luigi/ipfw3-head/usr.bin/xargs/Makefile
  user/luigi/ipfw3-head/usr.bin/xinstall/Makefile
  user/luigi/ipfw3-head/usr.bin/xlint/xlint/Makefile
  user/luigi/ipfw3-head/usr.bin/yacc/Makefile
  user/luigi/ipfw3-head/usr.bin/yacc/skeleton.c
  user/luigi/ipfw3-head/usr.bin/ypcat/Makefile
  user/luigi/ipfw3-head/usr.bin/ypmatch/Makefile
  user/luigi/ipfw3-head/usr.bin/ypwhich/Makefile
  user/luigi/ipfw3-head/usr.sbin/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/ac/Makefile
  user/luigi/ipfw3-head/usr.sbin/accton/Makefile
  user/luigi/ipfw3-head/usr.sbin/accton/accton.c
  user/luigi/ipfw3-head/usr.sbin/acpi/acpiconf/Makefile
  user/luigi/ipfw3-head/usr.sbin/acpi/acpidump/Makefile
  user/luigi/ipfw3-head/usr.sbin/acpi/iasl/Makefile
  user/luigi/ipfw3-head/usr.sbin/amd/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/ancontrol/ancontrol.c
  user/luigi/ipfw3-head/usr.sbin/apm/Makefile
  user/luigi/ipfw3-head/usr.sbin/apmd/Makefile
  user/luigi/ipfw3-head/usr.sbin/arp/arp.c
  user/luigi/ipfw3-head/usr.sbin/asf/Makefile
  user/luigi/ipfw3-head/usr.sbin/asf/asf_kld.c
  user/luigi/ipfw3-head/usr.sbin/audit/Makefile
  user/luigi/ipfw3-head/usr.sbin/auditd/Makefile
  user/luigi/ipfw3-head/usr.sbin/auditreduce/Makefile
  user/luigi/ipfw3-head/usr.sbin/authpf/Makefile
  user/luigi/ipfw3-head/usr.sbin/boot0cfg/Makefile
  user/luigi/ipfw3-head/usr.sbin/bootparamd/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/bsnmpd/bsnmpd/Makefile
  user/luigi/ipfw3-head/usr.sbin/bsnmpd/gensnmptree/Makefile
  user/luigi/ipfw3-head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
  user/luigi/ipfw3-head/usr.sbin/btxld/Makefile
  user/luigi/ipfw3-head/usr.sbin/burncd/Makefile
  user/luigi/ipfw3-head/usr.sbin/cdcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/chkgrp/Makefile
  user/luigi/ipfw3-head/usr.sbin/chown/Makefile
  user/luigi/ipfw3-head/usr.sbin/chroot/Makefile
  user/luigi/ipfw3-head/usr.sbin/chroot/chroot.c
  user/luigi/ipfw3-head/usr.sbin/clear_locks/Makefile
  user/luigi/ipfw3-head/usr.sbin/config/Makefile
  user/luigi/ipfw3-head/usr.sbin/config/lang.l
  user/luigi/ipfw3-head/usr.sbin/cpucontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/cpucontrol/cpucontrol.c
  user/luigi/ipfw3-head/usr.sbin/cron/cron/Makefile
  user/luigi/ipfw3-head/usr.sbin/crunch/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/crunch/examples/really-big.conf
  user/luigi/ipfw3-head/usr.sbin/ctm/ctm/Makefile
  user/luigi/ipfw3-head/usr.sbin/ctm/ctm_dequeue/Makefile
  user/luigi/ipfw3-head/usr.sbin/ctm/ctm_rmail/Makefile
  user/luigi/ipfw3-head/usr.sbin/ctm/ctm_smail/Makefile
  user/luigi/ipfw3-head/usr.sbin/daemon/Makefile
  user/luigi/ipfw3-head/usr.sbin/dconschat/Makefile
  user/luigi/ipfw3-head/usr.sbin/devinfo/Makefile
  user/luigi/ipfw3-head/usr.sbin/digictl/Makefile
  user/luigi/ipfw3-head/usr.sbin/diskinfo/Makefile
  user/luigi/ipfw3-head/usr.sbin/dnssec-dsfromkey/Makefile
  user/luigi/ipfw3-head/usr.sbin/dnssec-keyfromlabel/Makefile
  user/luigi/ipfw3-head/usr.sbin/dnssec-keygen/Makefile
  user/luigi/ipfw3-head/usr.sbin/dnssec-signzone/Makefile
  user/luigi/ipfw3-head/usr.sbin/dumpcis/Makefile
  user/luigi/ipfw3-head/usr.sbin/editmap/Makefile
  user/luigi/ipfw3-head/usr.sbin/edquota/Makefile
  user/luigi/ipfw3-head/usr.sbin/eeprom/Makefile
  user/luigi/ipfw3-head/usr.sbin/eeprom/eeprom.c
  user/luigi/ipfw3-head/usr.sbin/extattr/Makefile
  user/luigi/ipfw3-head/usr.sbin/extattrctl/Makefile
  user/luigi/ipfw3-head/usr.sbin/extattrctl/extattrctl.c
  user/luigi/ipfw3-head/usr.sbin/faithd/Makefile
  user/luigi/ipfw3-head/usr.sbin/faithd/faithd.c
  user/luigi/ipfw3-head/usr.sbin/fdcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/fdformat/Makefile
  user/luigi/ipfw3-head/usr.sbin/fdread/Makefile
  user/luigi/ipfw3-head/usr.sbin/fdwrite/Makefile
  user/luigi/ipfw3-head/usr.sbin/fifolog/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/fifolog/lib/getdate.y
  user/luigi/ipfw3-head/usr.sbin/ftp-proxy/libevent/Makefile
  user/luigi/ipfw3-head/usr.sbin/getfmac/Makefile
  user/luigi/ipfw3-head/usr.sbin/getpmac/Makefile
  user/luigi/ipfw3-head/usr.sbin/gstat/Makefile
  user/luigi/ipfw3-head/usr.sbin/inetd/Makefile
  user/luigi/ipfw3-head/usr.sbin/inetd/inetd.c
  user/luigi/ipfw3-head/usr.sbin/iostat/Makefile
  user/luigi/ipfw3-head/usr.sbin/ip6addrctl/Makefile
  user/luigi/ipfw3-head/usr.sbin/ipfwpcap/Makefile
  user/luigi/ipfw3-head/usr.sbin/jail/Makefile
  user/luigi/ipfw3-head/usr.sbin/jexec/Makefile
  user/luigi/ipfw3-head/usr.sbin/jls/Makefile
  user/luigi/ipfw3-head/usr.sbin/kbdcontrol/kbdcontrol.c
  user/luigi/ipfw3-head/usr.sbin/kernbb/Makefile
  user/luigi/ipfw3-head/usr.sbin/lastlogin/Makefile
  user/luigi/ipfw3-head/usr.sbin/lastlogin/lastlogin.c
  user/luigi/ipfw3-head/usr.sbin/lmcconfig/Makefile
  user/luigi/ipfw3-head/usr.sbin/lpr/common_source/Makefile
  user/luigi/ipfw3-head/usr.sbin/lpr/filters.ru/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/lpr/lpc/Makefile
  user/luigi/ipfw3-head/usr.sbin/lpr/lpd/Makefile
  user/luigi/ipfw3-head/usr.sbin/lpr/lpr/Makefile
  user/luigi/ipfw3-head/usr.sbin/lptcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/mailstats/Makefile
  user/luigi/ipfw3-head/usr.sbin/mailwrapper/Makefile
  user/luigi/ipfw3-head/usr.sbin/makemap/Makefile
  user/luigi/ipfw3-head/usr.sbin/memcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/mergemaster/mergemaster.8
  user/luigi/ipfw3-head/usr.sbin/mergemaster/mergemaster.sh
  user/luigi/ipfw3-head/usr.sbin/mixer/Makefile
  user/luigi/ipfw3-head/usr.sbin/mld6query/Makefile
  user/luigi/ipfw3-head/usr.sbin/mlxcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/mount_portalfs/mount_portalfs.c
  user/luigi/ipfw3-head/usr.sbin/mount_smbfs/Makefile
  user/luigi/ipfw3-head/usr.sbin/moused/Makefile
  user/luigi/ipfw3-head/usr.sbin/mptable/Makefile
  user/luigi/ipfw3-head/usr.sbin/mtree/Makefile
  user/luigi/ipfw3-head/usr.sbin/named-checkconf/Makefile
  user/luigi/ipfw3-head/usr.sbin/named-checkzone/Makefile
  user/luigi/ipfw3-head/usr.sbin/named/Makefile
  user/luigi/ipfw3-head/usr.sbin/ndiscvt/ndiscvt.c
  user/luigi/ipfw3-head/usr.sbin/ndp/Makefile
  user/luigi/ipfw3-head/usr.sbin/newsyslog/Makefile
  user/luigi/ipfw3-head/usr.sbin/nfsd/Makefile
  user/luigi/ipfw3-head/usr.sbin/nfsd/nfsd.c
  user/luigi/ipfw3-head/usr.sbin/nghook/Makefile
  user/luigi/ipfw3-head/usr.sbin/nscd/nscd.conf.5
  user/luigi/ipfw3-head/usr.sbin/ntp/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/ntp/doc/Makefile
  user/luigi/ipfw3-head/usr.sbin/nvram/Makefile
  user/luigi/ipfw3-head/usr.sbin/ofwdump/Makefile
  user/luigi/ipfw3-head/usr.sbin/pciconf/Makefile
  user/luigi/ipfw3-head/usr.sbin/pkg_install/add/main.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/create/main.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/delete/Makefile
  user/luigi/ipfw3-head/usr.sbin/pkg_install/delete/main.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/info/Makefile
  user/luigi/ipfw3-head/usr.sbin/pkg_install/info/main.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/updating/Makefile
  user/luigi/ipfw3-head/usr.sbin/pkg_install/version/Makefile
  user/luigi/ipfw3-head/usr.sbin/pkg_install/version/main.c
  user/luigi/ipfw3-head/usr.sbin/pmcannotate/Makefile
  user/luigi/ipfw3-head/usr.sbin/pmcannotate/pmcannotate.c
  user/luigi/ipfw3-head/usr.sbin/pmccontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/pmcstat/Makefile
  user/luigi/ipfw3-head/usr.sbin/pnpinfo/Makefile
  user/luigi/ipfw3-head/usr.sbin/portsnap/make_index/Makefile
  user/luigi/ipfw3-head/usr.sbin/portsnap/phttpget/Makefile
  user/luigi/ipfw3-head/usr.sbin/portsnap/portsnap/portsnap.sh
  user/luigi/ipfw3-head/usr.sbin/powerd/Makefile
  user/luigi/ipfw3-head/usr.sbin/powerd/powerd.c
  user/luigi/ipfw3-head/usr.sbin/pppctl/Makefile
  user/luigi/ipfw3-head/usr.sbin/praliases/Makefile
  user/luigi/ipfw3-head/usr.sbin/praudit/Makefile
  user/luigi/ipfw3-head/usr.sbin/procctl/Makefile
  user/luigi/ipfw3-head/usr.sbin/pstat/Makefile
  user/luigi/ipfw3-head/usr.sbin/pw/Makefile
  user/luigi/ipfw3-head/usr.sbin/pwd_mkdb/Makefile
  user/luigi/ipfw3-head/usr.sbin/quotaon/Makefile
  user/luigi/ipfw3-head/usr.sbin/quotaon/quotaon.c
  user/luigi/ipfw3-head/usr.sbin/repquota/Makefile
  user/luigi/ipfw3-head/usr.sbin/rip6query/Makefile
  user/luigi/ipfw3-head/usr.sbin/rip6query/rip6query.c
  user/luigi/ipfw3-head/usr.sbin/rmt/Makefile
  user/luigi/ipfw3-head/usr.sbin/rmt/rmt.c
  user/luigi/ipfw3-head/usr.sbin/rndc-confgen/Makefile
  user/luigi/ipfw3-head/usr.sbin/rndc/Makefile
  user/luigi/ipfw3-head/usr.sbin/route6d/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.lockd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.statd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.umntall/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.umntall/mounttab.c
  user/luigi/ipfw3-head/usr.sbin/rpc.yppasswdd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.ypupdated/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpc.ypxfrd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rpcbind/Makefile
  user/luigi/ipfw3-head/usr.sbin/rrenumd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rtadvd/Makefile
  user/luigi/ipfw3-head/usr.sbin/rtprio/Makefile
  user/luigi/ipfw3-head/usr.sbin/rtsold/Makefile
  user/luigi/ipfw3-head/usr.sbin/rwhod/Makefile
  user/luigi/ipfw3-head/usr.sbin/sa/Makefile
  user/luigi/ipfw3-head/usr.sbin/sa/main.c
  user/luigi/ipfw3-head/usr.sbin/sa/pdb.c
  user/luigi/ipfw3-head/usr.sbin/sa/usrdb.c
  user/luigi/ipfw3-head/usr.sbin/sendmail/Makefile
  user/luigi/ipfw3-head/usr.sbin/setfmac/Makefile
  user/luigi/ipfw3-head/usr.sbin/setpmac/Makefile
  user/luigi/ipfw3-head/usr.sbin/smbmsg/Makefile
  user/luigi/ipfw3-head/usr.sbin/snapinfo/snapinfo.c
  user/luigi/ipfw3-head/usr.sbin/sysinstall/Makefile
  user/luigi/ipfw3-head/usr.sbin/sysinstall/disks.c
  user/luigi/ipfw3-head/usr.sbin/sysinstall/label.c
  user/luigi/ipfw3-head/usr.sbin/tcpdchk/Makefile
  user/luigi/ipfw3-head/usr.sbin/tcpdmatch/Makefile
  user/luigi/ipfw3-head/usr.sbin/tcpdrop/Makefile
  user/luigi/ipfw3-head/usr.sbin/tcpdump/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/traceroute/Makefile
  user/luigi/ipfw3-head/usr.sbin/traceroute6/Makefile
  user/luigi/ipfw3-head/usr.sbin/tzsetup/Makefile
  user/luigi/ipfw3-head/usr.sbin/uathload/Makefile
  user/luigi/ipfw3-head/usr.sbin/usbdevs/Makefile
  user/luigi/ipfw3-head/usr.sbin/vidcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/vipw/Makefile
  user/luigi/ipfw3-head/usr.sbin/wake/Makefile
  user/luigi/ipfw3-head/usr.sbin/wake/wake.8
  user/luigi/ipfw3-head/usr.sbin/watchdogd/Makefile
  user/luigi/ipfw3-head/usr.sbin/watchdogd/watchdogd.c
  user/luigi/ipfw3-head/usr.sbin/wlandebug/Makefile
  user/luigi/ipfw3-head/usr.sbin/wlconfig/Makefile
  user/luigi/ipfw3-head/usr.sbin/yp_mkdb/Makefile
  user/luigi/ipfw3-head/usr.sbin/ypbind/Makefile
  user/luigi/ipfw3-head/usr.sbin/yppoll/Makefile
  user/luigi/ipfw3-head/usr.sbin/yppush/Makefile
  user/luigi/ipfw3-head/usr.sbin/yppush/yppush_main.c
  user/luigi/ipfw3-head/usr.sbin/ypserv/Makefile
  user/luigi/ipfw3-head/usr.sbin/ypset/Makefile
  user/luigi/ipfw3-head/usr.sbin/zic/zdump/Makefile
  user/luigi/ipfw3-head/usr.sbin/zic/zic/Makefile
Directory Properties:
  user/luigi/ipfw3-head/   (props changed)
  user/luigi/ipfw3-head/cddl/contrib/opensolaris/   (props changed)
  user/luigi/ipfw3-head/contrib/bind9/   (props changed)
  user/luigi/ipfw3-head/contrib/cpio/   (props changed)
  user/luigi/ipfw3-head/contrib/csup/   (props changed)
  user/luigi/ipfw3-head/contrib/ee/   (props changed)
  user/luigi/ipfw3-head/contrib/expat/   (props changed)
  user/luigi/ipfw3-head/contrib/file/   (props changed)
  user/luigi/ipfw3-head/contrib/gdb/   (props changed)
  user/luigi/ipfw3-head/contrib/gdtoa/   (props changed)
  user/luigi/ipfw3-head/contrib/less/   (props changed)
  user/luigi/ipfw3-head/contrib/libpcap/   (props changed)
  user/luigi/ipfw3-head/contrib/ncurses/   (props changed)
  user/luigi/ipfw3-head/contrib/netcat/   (props changed)
  user/luigi/ipfw3-head/contrib/ntp/   (props changed)
  user/luigi/ipfw3-head/contrib/openbsm/   (props changed)
  user/luigi/ipfw3-head/contrib/openpam/   (props changed)
  user/luigi/ipfw3-head/contrib/pf/   (props changed)
  user/luigi/ipfw3-head/contrib/sendmail/   (props changed)
  user/luigi/ipfw3-head/contrib/tcpdump/   (props changed)
  user/luigi/ipfw3-head/contrib/tcsh/   (props changed)
  user/luigi/ipfw3-head/contrib/top/   (props changed)
  user/luigi/ipfw3-head/contrib/top/install-sh   (props changed)
  user/luigi/ipfw3-head/contrib/wpa/   (props changed)
  user/luigi/ipfw3-head/crypto/openssh/   (props changed)
  user/luigi/ipfw3-head/crypto/openssl/   (props changed)
  user/luigi/ipfw3-head/lib/libc/   (props changed)
  user/luigi/ipfw3-head/lib/libc/stdtime/   (props changed)
  user/luigi/ipfw3-head/lib/libutil/   (props changed)
  user/luigi/ipfw3-head/sbin/   (props changed)
  user/luigi/ipfw3-head/sbin/ipfw/   (props changed)
  user/luigi/ipfw3-head/share/zoneinfo/   (props changed)
  user/luigi/ipfw3-head/sys/   (props changed)
  user/luigi/ipfw3-head/sys/amd64/include/xen/   (props changed)
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/   (props changed)
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/   (props changed)
  user/luigi/ipfw3-head/sys/contrib/pf/   (props changed)
  user/luigi/ipfw3-head/sys/dev/xen/xenpci/   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/lastcomm/regress.t   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t0/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t0/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t0/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t1/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t1/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t1/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t2/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t2/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t2/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t3/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t3/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/basic/t3/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/replace/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/shell/select/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/basic/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.status.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/t0/expected.status.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/t0/expected.stderr.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/variables/t0/expected.stdout.1   (props changed)
  user/luigi/ipfw3-head/tools/regression/usr.sbin/sa/regress.t   (props changed)
  user/luigi/ipfw3-head/usr.bin/csup/   (props changed)
  user/luigi/ipfw3-head/usr.bin/procstat/   (props changed)
  user/luigi/ipfw3-head/usr.sbin/zic/   (props changed)

Modified: user/luigi/ipfw3-head/COPYRIGHT
==============================================================================
--- user/luigi/ipfw3-head/COPYRIGHT	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/COPYRIGHT	Mon Jan  4 11:29:55 2010	(r201492)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: user/luigi/ipfw3-head/MAINTAINERS
==============================================================================
--- user/luigi/ipfw3-head/MAINTAINERS	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/MAINTAINERS	Mon Jan  4 11:29:55 2010	(r201492)
@@ -48,7 +48,6 @@ iostat(8)	ken	Pre-commit review requeste
 cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
-isp(4)		mjacob	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
 tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.

Modified: user/luigi/ipfw3-head/Makefile.inc1
==============================================================================
--- user/luigi/ipfw3-head/Makefile.inc1	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/Makefile.inc1	Mon Jan  4 11:29:55 2010	(r201492)
@@ -940,6 +940,11 @@ _mklocale=	usr.bin/mklocale
 _sed=		usr.bin/sed
 .endif
 
+.if ${BOOTSTRAPPING} < 900006
+_lex=		usr.bin/lex
+_yacc=		usr.bin/yacc
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -966,6 +971,8 @@ bootstrap-tools:
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
+    ${_lex} \
+    ${_yacc} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \

Modified: user/luigi/ipfw3-head/ObsoleteFiles.inc
==============================================================================
--- user/luigi/ipfw3-head/ObsoleteFiles.inc	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/ObsoleteFiles.inc	Mon Jan  4 11:29:55 2010	(r201492)
@@ -14,6 +14,32 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100103: ntptrace(8) removed
+OLD_FILES+=usr/sbin/ntptrace
+OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
+# 20091229: remove no longer relevant examples
+OLD_FILES+=usr/share/examples/pppd/auth-down.sample
+OLD_FILES+=usr/share/examples/pppd/auth-up.sample
+OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
+OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
+OLD_FILES+=usr/share/examples/pppd/ip-down.sample
+OLD_FILES+=usr/share/examples/pppd/ip-up.sample
+OLD_FILES+=usr/share/examples/pppd/options.sample
+OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
+OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
+OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
+OLD_DIRS+=usr/share/examples/pppd
+OLD_FILES+=usr/share/examples/slattach/unit-command.sh
+OLD_DIRS+=usr/share/examples/slattach
+OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
+OLD_FILES+=usr/share/examples/sliplogin/slip.login
+OLD_FILES+=usr/share/examples/sliplogin/slip.logout
+OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
+OLD_DIRS+=usr/share/examples/sliplogin
+OLD_FILES+=usr/share/examples/startslip/sldown.sh
+OLD_FILES+=usr/share/examples/startslip/slip.sh
+OLD_FILES+=usr/share/examples/startslip/slup.sh
+OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6.
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6

Modified: user/luigi/ipfw3-head/bin/kenv/kenv.c
==============================================================================
--- user/luigi/ipfw3-head/bin/kenv/kenv.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/kenv/kenv.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -118,7 +118,7 @@ main(int argc, char **argv)
 }
 
 static int
-kdumpenv()
+kdumpenv(void)
 {
 	char *buf, *cp;
 	int buflen, envlen;

Modified: user/luigi/ipfw3-head/bin/pax/ftree.c
==============================================================================
--- user/luigi/ipfw3-head/bin/pax/ftree.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/pax/ftree.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -219,7 +219,7 @@ ftree_sel(ARCHD *arcn)
  */
 
 void
-ftree_notsel()
+ftree_notsel(void)
 {
 	if (ftent != NULL)
 		(void)fts_set(ftsp, ftent, FTS_SKIP);

Modified: user/luigi/ipfw3-head/bin/pkill/pkill.c
==============================================================================
--- user/luigi/ipfw3-head/bin/pkill/pkill.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/pkill/pkill.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -670,9 +670,6 @@ makelist(struct listhead *head, enum lis
 				if (li->li_number == 0)
 					li->li_number = -1;	/* any jail */
 				break;
-			case LT_TTY:
-				usage();
-				/* NOTREACHED */
 			default:
 				break;
 			}
@@ -708,6 +705,10 @@ makelist(struct listhead *head, enum lis
 			if (stat(buf, &st) != -1)
 				goto foundtty;
 
+			snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s", cp);
+			if (stat(buf, &st) != -1)
+				goto foundtty;
+
 			if (errno == ENOENT)
 				errx(STATUS_BADUSAGE, "No such tty: `%s'", sp);
 			err(STATUS_ERROR, "Cannot access `%s'", sp);

Modified: user/luigi/ipfw3-head/bin/sh/arith.y
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/arith.y	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/arith.y	Mon Jan  4 11:29:55 2010	(r201492)
@@ -85,9 +85,9 @@ expr:
 	ARITH_LPAREN expr ARITH_RPAREN
 		{ $$ = $2; } |
 	expr ARITH_OR expr
-		{ $$ = $1 ? $1 : $3 ? $3 : 0; } |
+		{ $$ = $1 || $3; } |
 	expr ARITH_AND expr
-		{ $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } |
+		{ $$ = $1 && $3; } |
 	expr ARITH_BOR expr
 		{ $$ = $1 | $3; } |
 	expr ARITH_BXOR expr

Modified: user/luigi/ipfw3-head/bin/sh/error.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/error.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/error.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -160,8 +160,8 @@ exverror(int cond, const char *msg, va_l
 #endif
 	if (msg) {
 		if (commandname)
-			outfmt(&errout, "%s: ", commandname);
-		doformat(&errout, msg, ap);
+			outfmt(out2, "%s: ", commandname);
+		doformat(out2, msg, ap);
 		out2c('\n');
 	}
 	flushall();

Modified: user/luigi/ipfw3-head/bin/sh/eval.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/eval.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/eval.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -646,7 +646,7 @@ evalcommand(union node *cmd, int flags, 
 		out2str(ps4val());
 		for (sp = varlist.list ; sp ; sp = sp->next) {
 			if (sep != 0)
-				outc(' ', &errout);
+				out2c(' ');
 			p = sp->text;
 			while (*p != '=' && *p != '\0')
 				out2c(*p++);
@@ -658,7 +658,7 @@ evalcommand(union node *cmd, int flags, 
 		}
 		for (sp = arglist.list ; sp ; sp = sp->next) {
 			if (sep != 0)
-				outc(' ', &errout);
+				out2c(' ');
 			/* Disambiguate command looking like assignment. */
 			if (sp == arglist.list &&
 					strchr(sp->text, '=') != NULL &&
@@ -670,7 +670,7 @@ evalcommand(union node *cmd, int flags, 
 				out2qstr(sp->text);
 			sep = ' ';
 		}
-		outc('\n', &errout);
+		out2c('\n');
 		flushout(&errout);
 	}
 
@@ -722,10 +722,10 @@ evalcommand(union node *cmd, int flags, 
 					break;
 				if ((cmdentry.u.index = find_builtin(*argv,
 				    &cmdentry.special)) < 0) {
-					outfmt(&errout, "%s: not found\n", *argv);
-					exitstatus = 127;
-					flushout(&errout);
-					return;
+					cmdentry.u.index = BLTINCMD;
+					argv--;
+					argc++;
+					break;
 				}
 				if (cmdentry.u.index != BLTINCMD)
 					break;
@@ -792,20 +792,20 @@ evalcommand(union node *cmd, int flags, 
 			unreffunc(cmdentry.u.func);
 			poplocalvars();
 			localvars = savelocalvars;
+			funcnest--;
 			handler = savehandler;
 			longjmp(handler->loc, 1);
 		}
 		handler = &jmploc;
+		funcnest++;
 		INTON;
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			mklocal(sp->text);
-		funcnest++;
 		exitstatus = oexitstatus;
 		if (flags & EV_TESTED)
 			evaltree(getfuncnode(cmdentry.u.func), EV_TESTED);
 		else
 			evaltree(getfuncnode(cmdentry.u.func), 0);
-		funcnest--;
 		INTOFF;
 		unreffunc(cmdentry.u.func);
 		poplocalvars();
@@ -813,6 +813,7 @@ evalcommand(union node *cmd, int flags, 
 		freeparam(&shellparam);
 		shellparam = saveparam;
 		handler = savehandler;
+		funcnest--;
 		popredir();
 		INTON;
 		if (evalskip == SKIPFUNC) {
@@ -831,6 +832,7 @@ evalcommand(union node *cmd, int flags, 
 			memout.nextc = memout.buf;
 			memout.bufsize = 64;
 			mode |= REDIR_BACKQ;
+			cmdentry.special = 0;
 		}
 		savecmdname = commandname;
 		savetopfile = getcurrentfile();
@@ -864,20 +866,21 @@ cmddone:
 			}
 		}
 		handler = savehandler;
+		if (flags == EV_BACKCMD) {
+			backcmd->buf = memout.buf;
+			backcmd->nleft = memout.nextc - memout.buf;
+			memout.buf = NULL;
+		}
 		if (e != -1) {
 			if ((e != EXERROR && e != EXEXEC)
 			    || cmdentry.special)
 				exraise(e);
 			popfilesupto(savetopfile);
-			FORCEINTON;
+			if (flags != EV_BACKCMD)
+				FORCEINTON;
 		}
 		if (cmdentry.u.index != EXECCMD)
 			popredir();
-		if (flags == EV_BACKCMD) {
-			backcmd->buf = memout.buf;
-			backcmd->nleft = memout.nextc - memout.buf;
-			memout.buf = NULL;
-		}
 	} else {
 #ifdef DEBUG
 		trputs("normal command:  ");  trargs(argv);
@@ -942,12 +945,17 @@ prehash(union node *n)
  */
 
 /*
- * No command given, or a bltin command with no arguments.
+ * No command given, a bltin command with no arguments, or a bltin command
+ * with an invalid name.
  */
 
 int
-bltincmd(int argc __unused, char **argv __unused)
+bltincmd(int argc, char **argv)
 {
+	if (argc > 1) {
+		out2fmt_flush("%s: not found\n", argv[1]);
+		return 127;
+	}
 	/*
 	 * Preserve exitstatus of a previous possible redirection
 	 * as POSIX mandates
@@ -1022,7 +1030,7 @@ commandcmd(int argc, char **argv)
 	if (cmd != -1) {
 		if (argc != 1)
 			error("wrong number of arguments");
-		return typecmd_impl(2, argv - 1, cmd);
+		return typecmd_impl(2, argv - 1, cmd, path);
 	}
 	if (argc != 0) {
 		old = handler;

Modified: user/luigi/ipfw3-head/bin/sh/exec.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/exec.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/exec.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -255,7 +255,7 @@ hashcmd(int argc __unused, char **argv _
 				if (cmdp != NULL)
 					printentry(cmdp, verbose);
 				else
-					outfmt(&errout, "%s: not found\n", name);
+					outfmt(out2, "%s: not found\n", name);
 			}
 			flushall();
 		}
@@ -720,7 +720,7 @@ unsetfunc(const char *name)
  */
 
 int
-typecmd_impl(int argc, char **argv, int cmd)
+typecmd_impl(int argc, char **argv, int cmd, const char *path)
 {
 	struct cmdentry entry;
 	struct tblentry *cmdp;
@@ -729,6 +729,9 @@ typecmd_impl(int argc, char **argv, int 
 	int i;
 	int error1 = 0;
 
+	if (path != pathval())
+		clearcmdentry(0);
+
 	for (i = 1; i < argc; i++) {
 		/* First look at the keywords */
 		for (pp = parsekwd; *pp; pp++)
@@ -761,17 +764,17 @@ typecmd_impl(int argc, char **argv, int 
 		}
 		else {
 			/* Finally use brute force */
-			find_command(argv[i], &entry, 0, pathval());
+			find_command(argv[i], &entry, 0, path);
 		}
 
 		switch (entry.cmdtype) {
 		case CMDNORMAL: {
 			if (strchr(argv[i], '/') == NULL) {
-				const char *path = pathval();
+				const char *path2 = path;
 				char *name;
 				int j = entry.u.index;
 				do {
-					name = padvance(&path, argv[i]);
+					name = padvance(&path2, argv[i]);
 					stunalloc(name);
 				} while (--j >= 0);
 				if (cmd == TYPECMD_SMALLV)
@@ -821,6 +824,10 @@ typecmd_impl(int argc, char **argv, int 
 			break;
 		}
 	}
+
+	if (path != pathval())
+		clearcmdentry(0);
+
 	return error1;
 }
 
@@ -831,5 +838,5 @@ typecmd_impl(int argc, char **argv, int 
 int
 typecmd(int argc, char **argv)
 {
-	return typecmd_impl(argc, argv, TYPECMD_TYPE);
+	return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1));
 }

Modified: user/luigi/ipfw3-head/bin/sh/exec.h
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/exec.h	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/exec.h	Mon Jan  4 11:29:55 2010	(r201492)
@@ -71,6 +71,6 @@ void deletefuncs(void);
 void addcmdentry(const char *, struct cmdentry *);
 void defun(const char *, union node *);
 int unsetfunc(const char *);
-int typecmd_impl(int, char **, int);
+int typecmd_impl(int, char **, int, const char *);
 int typecmd(int, char **);
 void clearcmdentry(int);

Modified: user/luigi/ipfw3-head/bin/sh/expand.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/expand.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/expand.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -526,7 +526,7 @@ subevalvar(char *p, char *str, int strlo
 
 	case VSQUESTION:
 		if (*p != CTLENDVAR) {
-			outfmt(&errout, "%s\n", startp);
+			outfmt(out2, "%s\n", startp);
 			error((char *)NULL);
 		}
 		error("%.*s: parameter %snot set", (int)(p - str - 1),

Modified: user/luigi/ipfw3-head/bin/sh/output.h
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/output.h	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/output.h	Mon Jan  4 11:29:55 2010	(r201492)
@@ -46,11 +46,12 @@ struct output {
 	short flags;
 };
 
-extern struct output output;
-extern struct output errout;
+extern struct output output; /* to fd 1 */
+extern struct output errout; /* to fd 2 */
 extern struct output memout;
-extern struct output *out1;
-extern struct output *out2;
+extern struct output *out1; /* &memout if backquote, otherwise &output */
+extern struct output *out2; /* &memout if backquote with 2>&1, otherwise
+			       &errout */
 
 void out1str(const char *);
 void out1qstr(const char *);

Modified: user/luigi/ipfw3-head/bin/sh/parser.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/parser.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/parser.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -1311,11 +1311,16 @@ parsebackq: {
 	int savelen;
 	int saveprompt;
 	const int bq_startlinno = plinno;
+	char *volatile ostr = NULL;
+	struct parsefile *const savetopfile = getcurrentfile();
 
 	str = NULL;
 	if (setjmp(jmploc.loc)) {
+		popfilesupto(savetopfile);
 		if (str)
 			ckfree(str);
+		if (ostr)
+			ckfree(ostr);
 		handler = savehandler;
 		if (exception == EXERROR) {
 			startlinno = bq_startlinno;
@@ -1335,13 +1340,12 @@ parsebackq: {
                 /* We must read until the closing backquote, giving special
                    treatment to some slashes, and then push the string and
                    reread it as input, interpreting it normally.  */
-                char *out;
+                char *oout;
                 int c;
-                int savelen;
-                char *str;
+                int olen;
 
 
-                STARTSTACKSTR(out);
+                STARTSTACKSTR(oout);
 		for (;;) {
 			if (needprompt) {
 				setprompt(2);
@@ -1368,7 +1372,7 @@ parsebackq: {
 				}
                                 if (c != '\\' && c != '`' && c != '$'
                                     && (!dblquote || c != '"'))
-                                        STPUTC('\\', out);
+                                        STPUTC('\\', oout);
 				break;
 
 			case '\n':
@@ -1384,16 +1388,16 @@ parsebackq: {
 			default:
 				break;
 			}
-			STPUTC(c, out);
+			STPUTC(c, oout);
                 }
 done:
-                STPUTC('\0', out);
-                savelen = out - stackblock();
-                if (savelen > 0) {
-                        str = ckmalloc(savelen);
-                        memcpy(str, stackblock(), savelen);
-			setinputstring(str, 1);
-                }
+                STPUTC('\0', oout);
+                olen = oout - stackblock();
+		INTOFF;
+		ostr = ckmalloc(olen);
+		memcpy(ostr, stackblock(), olen);
+		setinputstring(ostr, 1);
+		INTON;
         }
 	nlpp = &bqlist;
 	while (*nlpp)
@@ -1435,6 +1439,12 @@ done:
 		str = NULL;
 		INTON;
 	}
+	if (ostr) {
+		INTOFF;
+		ckfree(ostr);
+		ostr = NULL;
+		INTON;
+	}
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);
@@ -1550,8 +1560,8 @@ STATIC void
 synerror(const char *msg)
 {
 	if (commandname)
-		outfmt(&errout, "%s: %d: ", commandname, startlinno);
-	outfmt(&errout, "Syntax error: %s\n", msg);
+		outfmt(out2, "%s: %d: ", commandname, startlinno);
+	outfmt(out2, "Syntax error: %s\n", msg);
 	error((char *)NULL);
 }
 

Modified: user/luigi/ipfw3-head/bin/sh/sh.1
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/sh.1	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/bin/sh/sh.1	Mon Jan  4 11:29:55 2010	(r201492)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 24, 2009
+.Dd December 31, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -865,7 +865,7 @@ command is:
 If
 .Ic in
 and the following words are omitted,
-.Ic in Li $@
+.Ic in Li \&"$@\&"
 is used instead.
 The words are expanded, and then the list is executed
 repeatedly with the variable set to each word in turn.
@@ -1080,7 +1080,7 @@ and
 is
 .Dq Li "def ghi" ,
 then
-.Dq Li $@
+.Li \&"$@\&"
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -2137,7 +2137,7 @@ and not found.
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2201,6 +2201,9 @@ The maximal amount of CPU time to be use
 The maximal number of simultaneous processes for this user ID.
 .It Fl v Ar virtualmem
 The maximal virtual size of a process, in kilobytes.
+.It Fl w Ar swapuse
+The maximum amount of swap space reserved or used for this user ID,
+in kilobytes.
 .El
 .It Ic umask Oo Fl S Oc Op Ar mask
 Set the file creation mask (see

Modified: user/luigi/ipfw3-head/crypto/heimdal/kcm/connect.c
==============================================================================
--- user/luigi/ipfw3-head/crypto/heimdal/kcm/connect.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/crypto/heimdal/kcm/connect.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -149,7 +149,7 @@ update_client_creds(int s, kcm_client *p
 	struct sockcred *sc;
 	
 	memset(&msg, 0, sizeof(msg));
-	crmsgsize = CMSG_SPACE(SOCKCREDSIZE(NGROUPS));
+	crmsgsize = CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX));
 	if (crmsgsize == 0)
 	    return 1 ;
 

Modified: user/luigi/ipfw3-head/etc/defaults/rc.conf
==============================================================================
--- user/luigi/ipfw3-head/etc/defaults/rc.conf	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/defaults/rc.conf	Mon Jan  4 11:29:55 2010	(r201492)
@@ -213,6 +213,8 @@ ifconfig_lo0="inet 127.0.0.1"	# default 
 #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
 #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
 #ifconfig_fxp0_name="net0"	# Change interface name from fxp0 to net0.
+#vlans_fxp0="101 vlan0"		# vlan(4) interfaces for fxp0 device
+#create_arg_vlan0="vlan 102"	# vlan tag for vlan0 device
 #wlans_ath0="wlan0"		# wlan(4) interfaces for ath0 device
 #wlandebug_wlan0="scan+auth+assoc"	# Set debug flags with wlanddebug(8)
 #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
@@ -265,7 +267,7 @@ inetd_flags="-wW -C 60"		# Optional flag
 named_enable="NO"		# Run named, the DNS server (or NO).
 named_program="/usr/sbin/named" # Path to named, if you want a different one.
 named_conf="/etc/namedb/named.conf" 	# Path to the configuration file
-#named_flags="-c /etc/namedb/named.conf" # Uncomment for named not in /usr/sbin
+#named_flags=""			# Use this for flags OTHER than -u and -c
 named_pidfile="/var/run/named/pid" # Must set this in named.conf as well
 named_uid="bind" 		# User to run named as
 named_chrootdir="/var/named"	# Chroot directory (or "" not to auto-chroot it)

Modified: user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist
==============================================================================
--- user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist	Mon Jan  4 11:29:55 2010	(r201492)
@@ -265,8 +265,6 @@
             ..
             ppp
             ..
-            pppd
-            ..
             printing
             ..
             scsi_target
@@ -283,16 +281,10 @@
                 srcs
                 ..
             ..
-            slattach
-            ..
-            sliplogin
-            ..
             smbfs
                 print
                 ..
             ..
-            startslip
-            ..
             sunrpc
                 dir
                 ..

Modified: user/luigi/ipfw3-head/etc/network.subr
==============================================================================
--- user/luigi/ipfw3-head/etc/network.subr	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/network.subr	Mon Jan  4 11:29:55 2010	(r201492)
@@ -971,7 +971,7 @@ clone_down()
 #
 childif_create()
 {
-	local cfg child child_wlans create_args debug_flags ifn i
+	local cfg child child_vlans child_wlans create_args debug_flags ifn i
 	cfg=1
 	ifn=$1
 
@@ -999,6 +999,32 @@ childif_create()
 		fi
 	done
 
+	# Create vlan interfaces
+	child_vlans=`get_if_var $ifn vlans_IF`
+
+	if [ -n "${child_vlans}" ]; then
+		load_kld if_vlan
+	fi
+
+	for child in ${child_vlans}; do
+		if expr $child : '[1-9][0-9]*$' >/dev/null 2>&1; then
+			child="${ifn}.${child}"
+			create_args=`get_if_var $child create_args_IF`
+			ifconfig $child create ${create_args} && cfg=0
+		else
+			create_args="vlandev $ifn `get_if_var $child create_args_IF`"
+			if expr $child : 'vlan[0-9][0-9]*$' >/dev/null 2>&1; then
+				ifconfig $child create ${create_args} && cfg=0
+			else
+				i=`ifconfig vlan create ${create_args}`
+				ifconfig $i name $child && cfg=0
+			fi
+		fi
+		if autoif $child; then
+			ifn_start $child
+		fi
+	done
+
 	return ${cfg}
 }
 
@@ -1007,11 +1033,31 @@ childif_create()
 #
 childif_destroy()
 {
-	local cfg child child_wlans ifn
+	local cfg child child_vlans child_wlans ifn
 	cfg=1
 
-	child_wlans="`get_if_var $ifn wlans_IF` `get_if_var $ifn vaps_IF`"
+	child_wlans=`get_if_var $ifn wlans_IF`
 	for child in ${child_wlans}; do
+		if ! ifexists $child; then
+			continue
+		fi
+		if autoif $child; then
+			ifn_stop $child
+		fi
+		ifconfig $child destroy && cfg=0
+	done
+
+	child_vlans=`get_if_var $ifn vlans_IF`
+	for child in ${child_vlans}; do
+		if expr $child : '[1-9][0-9]*$' >/dev/null 2>&1; then
+			child="${ifn}.${child}"
+		fi
+		if ! ifexists $child; then
+			continue
+		fi
+		if autoif $child; then
+			ifn_stop $child
+		fi
 		ifconfig $child destroy && cfg=0
 	done
 

Modified: user/luigi/ipfw3-head/etc/rc.d/named
==============================================================================
--- user/luigi/ipfw3-head/etc/rc.d/named	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/rc.d/named	Mon Jan  4 11:29:55 2010	(r201492)
@@ -43,19 +43,19 @@ chroot_autoupdate()
 		warn "chroot directory structure not updated"
 	fi
 
-	# Create /etc/namedb symlink
+	# Create (or update) the configuration directory symlink
 	#
-	if [ ! -L /etc/namedb ]; then
-		if [ -d /etc/namedb ]; then
-			warn "named chroot: /etc/namedb is a directory!"
-		elif [ -e /etc/namedb ]; then
-			warn "named chroot: /etc/namedb exists!"
+	if [ ! -L "${named_conf%/*}" ]; then
+		if [ -d "${named_conf%/*}" ]; then
+			warn "named chroot: ${named_conf%/*} is a directory!"
+		elif [ -e "${named_conf%/*}" ]; then
+			warn "named chroot: ${named_conf%/*} exists!"
 		else
-			ln -s ${named_chrootdir}/etc/namedb /etc/namedb
+			ln -s ${named_confdir} ${named_conf%/*}
 		fi
 	else
 		# Make sure it points to the right place.
-		ln -shf ${named_chrootdir}/etc/namedb /etc/namedb
+		ln -shf ${named_confdir} ${named_conf%/*}
 	fi
 
 	# Mount a devfs in the chroot directory if needed
@@ -179,12 +179,12 @@ named_prestart()
 	# Create an rndc.key file for the user if none exists
 	#
 	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
-	    -c ${named_chrootdir}/etc/namedb/rndc.key"
-	if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
+	    -c ${named_confdir}/rndc.key"
+	if [ -s "${named_confdir}/rndc.conf" ]; then
 		unset confgen_command
 	fi
-	if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
-		case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+	if [ -s "${named_confdir}/rndc.key" ]; then
+		case `stat -f%Su ${named_confdir}/rndc.key` in
 		root|$named_uid) ;;
 		*) $confgen_command ;;
 		esac
@@ -198,8 +198,8 @@ named_prestart()
 			warn "named_auto_forward enabled, but no /etc/resolv.conf"
 
 			# Empty the file in case it is included in named.conf
-			[ -s "${named_chrootdir}/etc/namedb/auto_forward.conf" ] &&
-			    create_file ${named_chrootdir}/etc/namedb/auto_forward.conf
+			[ -s "${named_confdir}/auto_forward.conf" ] &&
+			    create_file ${named_confdir}/auto_forward.conf
 
 			${command%/named}/named-checkconf $named_conf ||
 			    err 3 'named-checkconf for $named_conf failed'
@@ -248,19 +248,19 @@ named_prestart()
 			mv /var/run/naf-resolv.conf /etc/resolv.conf
 		fi
 
-		if cmp -s ${named_chrootdir}/etc/namedb/auto_forward.conf \
+		if cmp -s ${named_confdir}/auto_forward.conf \
 		    /var/run/auto_forward.conf; then
 			unlink /var/run/auto_forward.conf
 		else
-			[ -e "${named_chrootdir}/etc/namedb/auto_forward.conf" ] &&
-			    unlink ${named_chrootdir}/etc/namedb/auto_forward.conf
+			[ -e "${named_confdir}/auto_forward.conf" ] &&
+			    unlink ${named_confdir}/auto_forward.conf
 			mv /var/run/auto_forward.conf \
-			    ${named_chrootdir}/etc/namedb/auto_forward.conf
+			    ${named_confdir}/auto_forward.conf
 		fi
 	else
 		# Empty the file in case it is included in named.conf
-		[ -s "${named_chrootdir}/etc/namedb/auto_forward.conf" ] &&
-		    create_file ${named_chrootdir}/etc/namedb/auto_forward.conf
+		[ -s "${named_confdir}/auto_forward.conf" ] &&
+		    create_file ${named_confdir}/auto_forward.conf
 	fi
 
 	${command%/named}/named-checkconf $named_conf ||
@@ -274,5 +274,6 @@ load_rc_config $name
 required_dirs="$named_chrootdir"	# if it is set, it must exist
 required_files="${named_conf:=/etc/namedb/named.conf}"
 pidfile="${named_pidfile:-/var/run/named/pid}"
+named_confdir="${named_chrootdir}${named_conf%/*}"
 
 run_rc_command "$1"

Modified: user/luigi/ipfw3-head/etc/rc.d/nsswitch
==============================================================================
--- user/luigi/ipfw3-head/etc/rc.d/nsswitch	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/rc.d/nsswitch	Mon Jan  4 11:29:55 2010	(r201492)
@@ -77,10 +77,10 @@ generate_host_conf()
 	nis)
 		echo "nis" >> $host_conf
 		;;
-	*=*)
+	cache | *=*)
 		;;
 	*)
-		printf "Warning: unrecognized source [%s]", $_s > "/dev/stderr"
+		printf "Warning: unrecognized source [%s]\n" $_s >&2
 		;;
 	esac
     done

Modified: user/luigi/ipfw3-head/etc/rc.firewall
==============================================================================
--- user/luigi/ipfw3-head/etc/rc.firewall	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/etc/rc.firewall	Mon Jan  4 11:29:55 2010	(r201492)
@@ -230,18 +230,30 @@ case ${firewall_type} in
 
 	# Allow setup of incoming email
 	${fwcmd} add pass tcp from any to me 25 setup
+	if [ -n "$net6" ]; then
+		${fwcmd} add pass tcp from any to me6 25 setup
+	fi
 
 	# Allow setup of outgoing TCP connections only
 	${fwcmd} add pass tcp from me to any setup
+	if [ -n "$net6" ]; then
+		${fwcmd} add pass tcp from me6 to any setup
+	fi
 
 	# Disallow setup of all other TCP connections
 	${fwcmd} add deny tcp from any to any setup
 
 	# Allow DNS queries out in the world
 	${fwcmd} add pass udp from me to any 53 keep-state
+	if [ -n "$net6" ]; then
+		${fwcmd} add pass udp from me6 to any 53 keep-state
+	fi
 
 	# Allow NTP queries out in the world
 	${fwcmd} add pass udp from me to any 123 keep-state
+	if [ -n "$net6" ]; then
+		${fwcmd} add pass udp from me6 to any 123 keep-state
+	fi
 
 	# Everything else is denied by default, unless the
 	# IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel
@@ -388,14 +400,25 @@ case ${firewall_type} in
 
 	# Allow setup of incoming email
 	${fwcmd} add pass tcp from any to me 25 setup
+	if [ -n "$inet6" ]; then
+		${fwcmd} add pass tcp from any to me6 25 setup
+	fi
 
 	# Allow access to our DNS
 	${fwcmd} add pass tcp from any to me 53 setup
 	${fwcmd} add pass udp from any to me 53
 	${fwcmd} add pass udp from me 53 to any
+	if [ -n "$inet6" ]; then
+		${fwcmd} add pass tcp from any to me6 53 setup
+		${fwcmd} add pass udp from any to me6 53
+		${fwcmd} add pass udp from me6 53 to any
+	fi
 
 	# Allow access to our WWW
 	${fwcmd} add pass tcp from any to me 80 setup
+	if [ -n "$inet6" ]; then
+		${fwcmd} add pass tcp from any to me6 80 setup
+	fi
 
 	# Reject&Log all setup of incoming connections from the outside
 	${fwcmd} add deny log ip4 from any to any in via ${oif} setup proto tcp
@@ -409,9 +432,15 @@ case ${firewall_type} in
 
 	# Allow DNS queries out in the world
 	${fwcmd} add pass udp from me to any 53 keep-state
+	if [ -n "$inet6" ]; then
+		${fwcmd} add pass udp from me6 to any 53 keep-state
+	fi
 
 	# Allow NTP queries out in the world
 	${fwcmd} add pass udp from me to any 123 keep-state
+	if [ -n "$inet6" ]; then
+		${fwcmd} add pass udp from me6 to any 123 keep-state
+	fi
 
 	# Everything else is denied by default, unless the
 	# IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel

Modified: user/luigi/ipfw3-head/games/fortune/datfiles/fortunes
==============================================================================
--- user/luigi/ipfw3-head/games/fortune/datfiles/fortunes	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/games/fortune/datfiles/fortunes	Mon Jan  4 11:29:55 2010	(r201492)
@@ -1604,6 +1604,13 @@ friends and family, and then justify thi
 for doing it."
 		-- Bruce Feirstein, "Nice Guys Sleep Alone"
 %
+	As we know, there are known knowns.  There are things we know we
+know.  We also know there are known unknowns.  That is to say, we know
+there're some things we do not know.  But there're also unknown unknowns;
+the ones we don't know we don't know."
+		-- Defense Secretary Donald Rumsfeld,
+		   about the invasion to Iraq.
+%
 	At a recent meeting in Snowmass, Colorado, a participant from
 Los Angeles fainted from hyperoxygenation, and we had to hold his head
 under the exhaust of a bus until he revived.
@@ -46372,6 +46379,13 @@ constitutions, displaying the utmost imp
 overturning everything.
 		-- Plato, "Republic", 370 B.C.
 %
+The investment community feels very putupon.  They feel there is no
+reason why they shouldn't earn $1 million to $200 million a year,
+and they don't want to be held responsible for the global financial
+meltdown.
+		-- Daniel Fass, chairman of Obama's
+		financial-industry fundraising party
+%
 The IQ of the group is the lowest IQ of a member of
 the group divided by the number of people in the group.
 %

Modified: user/luigi/ipfw3-head/games/fortune/strfile/strfile.c
==============================================================================
--- user/luigi/ipfw3-head/games/fortune/strfile/strfile.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/games/fortune/strfile/strfile.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -146,7 +146,8 @@ static void	usage(void);
  *	CHUNKSIZE blocks; if the latter, we just write each pointer,
  *	and then seek back to the beginning to write in the table.
  */
-int main(int ac, char *av[])
+int
+main(int ac, char *av[])
 {
 	char		*sp, dc;
 	FILE		*inf, *outf;
@@ -264,9 +265,8 @@ int main(int ac, char *av[])
 /*
  *	This routine evaluates arguments from the command line
  */
-void getargs(argc, argv)
-int	argc;
-char	**argv;
+void
+getargs(int argc, char **argv)
 {
 	int	ch;
 
@@ -318,7 +318,8 @@ char	**argv;
 	}
 }
 
-void usage()
+void
+usage(void)
 {
 	(void) fprintf(stderr,
 	    "strfile [-Ciorsx] [-c char] source_file [output_file]\n");
@@ -329,9 +330,8 @@ void usage()
  * add_offset:
  *	Add an offset to the list, or write it out, as appropriate.
  */
-void add_offset(fp, off)
-FILE	*fp;
-off_t	off;
+void
+add_offset(FILE *fp, off_t off)
 {
 	off_t beoff;
 
@@ -349,7 +349,8 @@ off_t	off;
  * do_order:
  *	Order the strings alphabetically (possibly ignoring case).
  */
-void do_order()
+void
+do_order(void)
 {
 	uint32_t i;
 	off_t	*lp;
@@ -368,8 +369,8 @@ void do_order()
 	Tbl.str_flags |= STR_ORDERED;
 }
 
-static int stable_collate_range_cmp(c1, c2)
-	int c1, c2;
+static int
+stable_collate_range_cmp(int c1, int c2)
 {
 	static char s1[2], s2[2];
 	int ret;
@@ -385,8 +386,8 @@ static int stable_collate_range_cmp(c1, 
  * cmp_str:
  *	Compare two strings in the file
  */
-int cmp_str(s1, s2)
-const void	*s1, *s2;
+int
+cmp_str(const void *s1, const void *s2)
 {
 	const STR	*p1, *p2;
 	int	c1, c2;
@@ -441,7 +442,8 @@ const void	*s1, *s2;
  *	not to randomize across delimiter boundaries.  All
  *	randomization is done within each block.
  */
-void randomize()
+void
+randomize(void)
 {
 	uint32_t cnt, i;
 	off_t	tmp;

Modified: user/luigi/ipfw3-head/games/fortune/unstr/unstr.c
==============================================================================
--- user/luigi/ipfw3-head/games/fortune/unstr/unstr.c	Mon Jan  4 11:11:37 2010	(r201491)
+++ user/luigi/ipfw3-head/games/fortune/unstr/unstr.c	Mon Jan  4 11:29:55 2010	(r201492)
@@ -79,7 +79,8 @@ FILE	*Inf, *Dataf;
 void order_unstr(STRFILE *);
 
 /* ARGSUSED */
-int main(int ac, char **av)
+int
+main(int ac, char **av)
 {
 	static STRFILE	tbl;		/* description table */
 
@@ -109,8 +110,8 @@ int main(int ac, char **av)
 	exit(0);
 }
 
-void order_unstr(tbl)
-STRFILE	*tbl;
+void
+order_unstr(STRFILE *tbl)
 {
 	uint32_t i;

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001041129.o04BTvvO045099>