Date: Wed, 30 Dec 2009 16:52:22 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 172392 for review Message-ID: <200912301652.nBUGqM5m008306@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172392 Change 172392 by mav@mav_mavbook on 2009/12/30 16:51:33 IFC Affected files ... .. //depot/projects/scottl-camlock/src/MAINTAINERS#7 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#21 integrate .. //depot/projects/scottl-camlock/src/bin/kenv/kenv.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/ftree.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/util.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/arith.y#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/cd.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#9 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#8 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/input.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/main.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mkbuiltins#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mkinit.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mystring.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/options.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/options.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/output.h#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#10 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.h#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.c#7 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.h#3 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#10 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#9 integrate .. //depot/projects/scottl-camlock/src/games/fortune/strfile/strfile.c#3 integrate .. //depot/projects/scottl-camlock/src/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/scottl-camlock/src/games/number/number.c#3 integrate .. //depot/projects/scottl-camlock/src/include/paths.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_crc32.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_hash.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_xz.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_raw.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_virtual.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_private.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_compress.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_xz.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/filter_fork.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/tar.5#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/main.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_bzip2.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_entry_strmode.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_extattr_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_open_fd.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_open_file.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_data_large.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_extract.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tbz.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_tar_large.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_failures.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_sparse.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_times.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libexpat/libbsdxml.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_mech_switch.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_setutxfile.3#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/rusersd.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-aout/support.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/process.c#3 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#5 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/build/mfs.mtree#2 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#5 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/master.passwd#2 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/PICOBSD#1 branch .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/PICOBSD.hints#1 branch .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/config#1 branch .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/crunch.conf#1 branch .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/floppy.tree.exclude#1 branch .. //depot/projects/scottl-camlock/src/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/gjournal.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/vfslist.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nullfs/mount_nullfs.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/natd/natd.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/nfsiod/nfsiod.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/rcorder/ealloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/rcorder/hash.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/rcorder/rcorder.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/routed/if.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/umount/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/umount/umount.c#3 integrate .. //depot/projects/scottl-camlock/src/secure/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/share/examples/pppd/auth-down.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/auth-up.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/chap-secrets.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/chat.sh.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/ip-down.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/ip-up.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/options.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/pap-secrets.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/ppp.deny.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/pppd/ppp.shells.sample#2 delete .. //depot/projects/scottl-camlock/src/share/examples/slattach/unit-command.sh#2 delete .. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.hosts#2 delete .. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.login#2 delete .. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.logout#2 delete .. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.slparms#2 delete .. //depot/projects/scottl-camlock/src/share/examples/startslip/sldown.sh#2 delete .. //depot/projects/scottl-camlock/src/share/examples/startslip/slip.sh#2 delete .. //depot/projects/scottl-camlock/src/share/examples/startslip/slup.sh#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/ifmib.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/termios.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/tty.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/u3g.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ucom.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#46 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#60 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#17 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.sparc64#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fbreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/machfb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/led/led.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xbox/xboxfb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_devstat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_accf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn1000/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn4965/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5000/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn6000/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/atm/uni/ng_uni.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_encap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/krpc_subr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/gdc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/firereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/firevar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/file.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-crossfs.test#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/acpyacc.y#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/read.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/function.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/extern.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/lprint.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/net.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/sprint.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/util.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mklocale/lex.l#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mklocale/yacc.y#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/wall.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wc/wc.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/lang.l#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/cpucontrol.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/eeprom.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/lib/getdate.y#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsd.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/pmcannotate.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/ppp.8.m4#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/mounttab.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/rwhod.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sa/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sa/pdb.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sa/usrdb.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.sh#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/watchdogd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/ypinit.sh#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.155 2009/12/06 23:48:38 cperciva Exp $ +$FreeBSD: src/MAINTAINERS,v 1.156 2009/12/30 14:41:02 mjacob Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -48,7 +48,6 @@ 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. ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.215 2009/12/05 17:46:51 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.216 2009/12/29 20:20:51 trasz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,29 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 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 ==== //depot/projects/scottl-camlock/src/bin/kenv/kenv.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.8 2005/09/13 19:01:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.9 2009/12/29 08:45:07 ed Exp $"); #include <sys/types.h> #include <sys/sysctl.h> @@ -118,7 +118,7 @@ } static int -kdumpenv() +kdumpenv(void) { char *buf, *cp; int buflen, envlen; ==== //depot/projects/scottl-camlock/src/bin/pax/ftree.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.25 2009/12/29 08:45:50 ed Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -219,7 +219,7 @@ */ void -ftree_notsel() +ftree_notsel(void) { if (ftent != NULL) (void)fts_set(ftsp, ftent, FTS_SKIP); ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.4 2009/05/17 04:34:14 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.5 2009/12/28 22:56:30 antoine Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -113,14 +113,14 @@ static kvm_t *kd; static pid_t mypid; -static struct listhead euidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(list); -static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead sidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead jidlist = SLIST_HEAD_INITIALIZER(list); +static struct listhead euidlist = SLIST_HEAD_INITIALIZER(euidlist); +static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(ruidlist); +static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(rgidlist); +static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(pgrplist); +static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(ppidlist); +static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(tdevlist); +static struct listhead sidlist = SLIST_HEAD_INITIALIZER(sidlist); +static struct listhead jidlist = SLIST_HEAD_INITIALIZER(jidlist); static void usage(void) __attribute__((__noreturn__)); static int killact(const struct kinfo_proc *); ==== //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.10 2009/12/26 10:06:45 trasz Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -100,11 +100,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be merged is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } @@ -252,9 +251,10 @@ return (-1); } - if (acl_brand != ACL_BRAND_NFS4) { + if (branding_mismatch(acl_brand, ACL_BRAND_NFS4)) { warnx("%s: branding mismatch; existing ACL is NFSv4, " - "entry to be added is POSIX.1e", filename); + "entry to be added is %s", filename, + brand_name(acl_brand)); return (-1); } ==== //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.8 2009/12/26 10:06:45 trasz Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -53,11 +53,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be removed is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } ==== //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.6 2009/09/07 16:19:32 trasz Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.7 2009/12/26 10:06:45 trasz Exp $ */ #ifndef _SETFACL_H @@ -71,6 +71,8 @@ int set_acl_mask(acl_t *prev_acl, const char *filename); /* util.c */ void *zmalloc(size_t size); +const char *brand_name(int brand); +int branding_mismatch(int brand1, int brand2); uint have_mask; uint need_mask; ==== //depot/projects/scottl-camlock/src/bin/setfacl/util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.8 2009/12/26 11:03:10 trasz Exp $"); #include <err.h> #include <stdlib.h> @@ -43,3 +43,26 @@ err(1, "calloc() failed"); return (ptr); } + +const char * +brand_name(int brand) +{ + switch (brand) { + case ACL_BRAND_NFS4: + return "NFSv4"; + case ACL_BRAND_POSIX: + return "POSIX.1e"; + default: + return "unknown"; + } +} + +int +branding_mismatch(int brand1, int brand2) +{ + if (brand1 == ACL_BRAND_UNKNOWN || brand2 == ACL_BRAND_UNKNOWN) + return (0); + if (brand1 != brand2) + return (1); + return (0); +} ==== //depot/projects/scottl-camlock/src/bin/sh/arith.y#4 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.25 2009/12/30 15:59:40 jilles Exp $"); #include <limits.h> #include <stdio.h> @@ -85,9 +85,9 @@ 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 @@ -314,7 +314,7 @@ int expcmd(int argc, char **argv) { - char *p; + const char *p; char *concat; char **ap; arith_t i; ==== //depot/projects/scottl-camlock/src/bin/sh/cd.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.39 2009/12/27 18:04:05 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -79,7 +79,7 @@ int cdcmd(int argc, char **argv) { - char *dest; + const char *dest; const char *path; char *p; struct stat statb; ==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.71 2009/12/27 18:04:05 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -74,7 +74,7 @@ #endif -MKINIT int evalskip; /* set if we are skipping commands */ +int evalskip; /* set if we are skipping commands */ STATIC int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ @@ -407,8 +407,7 @@ flags &=~ EV_TESTED; redirect(n->nredir.redirect, 0); evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */ - } - if (! backgnd) { + } else if (! backgnd) { INTOFF; exitstatus = waitforjob(jp, (int *)NULL); INTON; @@ -849,7 +848,7 @@ listsetvar(cmdenviron); commandname = argv[0]; argptr = argv + 1; - optptr = NULL; /* initialize nextopt */ + nextopt_optptr = NULL; /* initialize nextopt */ builtin_flags = flags; exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); ==== //depot/projects/scottl-camlock/src/bin/sh/eval.h#3 (text+ko) ==== @@ -30,11 +30,12 @@ * SUCH DAMAGE. * * @(#)eval.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/eval.h,v 1.13 2009/06/13 21:17:45 jilles Exp $ + * $FreeBSD: src/bin/sh/eval.h,v 1.14 2009/12/27 18:04:05 jilles Exp $ */ extern char *commandname; /* currently executing command */ extern int exitstatus; /* exit status of last command */ +extern int oexitstatus; /* saved exit status */ extern struct strlist *cmdenviron; /* environment for builtin command */ ==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.39 2009/12/27 18:04:05 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, const char *path, int index) +shellexec(char **argv, char **envp, const char *path, int idx) { char *cmdname; int e; @@ -120,7 +120,7 @@ } else { e = ENOENT; while ((cmdname = padvance(&path, argv[0])) != NULL) { - if (--index < 0 && pathopt == NULL) { + if (--idx < 0 && pathopt == NULL) { tryexec(cmdname, argv, envp); if (errno != ENOENT && errno != ENOTDIR) e = errno; @@ -268,17 +268,17 @@ STATIC void printentry(struct tblentry *cmdp, int verbose) { - int index; + int idx; const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { - index = cmdp->param.index; + idx = cmdp->param.index; path = pathval(); do { name = padvance(&path, cmdp->cmdname); stunalloc(name); - } while (--index >= 0); + } while (--idx >= 0); out1str(name); } else if (cmdp->cmdtype == CMDBUILTIN) { out1fmt("builtin %s", cmdp->cmdname); @@ -314,7 +314,7 @@ const char *path) { struct tblentry *cmdp; - int index; + int idx; int prev; char *fullname; struct stat statb; @@ -354,11 +354,11 @@ } e = ENOENT; - index = -1; + idx = -1; loop: while ((fullname = padvance(&path, name)) != NULL) { stunalloc(fullname); - index++; + idx++; if (pathopt) { if (prefix("builtin", pathopt)) { if ((i = find_builtin(name, &spec)) < 0) @@ -377,8 +377,8 @@ } } /* if rehash, don't redo absolute path names */ - if (fullname[0] == '/' && index <= prev) { - if (index < prev) + if (fullname[0] == '/' && idx <= prev) { + if (idx < prev) goto loop; TRACE(("searchexec \"%s\": no change\n", name)); goto success; @@ -415,7 +415,7 @@ INTOFF; cmdp = cmdlookup(name, 1); cmdp->cmdtype = CMDNORMAL; - cmdp->param.index = index; + cmdp->param.index = idx; INTON; goto success; } @@ -494,18 +494,18 @@ changepath(const char *newval) { const char *old, *new; - int index; + int idx; int firstchange; int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ - index = 0; + idx = 0; bltin = -1; for (;;) { if (*old != *new) { - firstchange = index; + firstchange = idx; if ((*old == '\0' && *new == ':') || (*old == ':' && *new == '\0')) firstchange++; @@ -514,9 +514,9 @@ if (*new == '\0') break; if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = index; + bltin = idx; if (*new == ':') { - index++; + idx++; } new++, old++; } @@ -724,15 +724,14 @@ { struct cmdentry entry; struct tblentry *cmdp; - char **pp; + const char *const *pp; struct alias *ap; int i; - int error = 0; - extern char *const parsekwd[]; + int error1 = 0; for (i = 1; i < argc; i++) { /* First look at the keywords */ - for (pp = (char **)parsekwd; *pp; pp++) + for (pp = parsekwd; *pp; pp++) if (**pp == *argv[i] && equal(*pp, argv[i])) break; @@ -793,7 +792,7 @@ if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: %s\n", argv[i], strerror(errno)); - error |= 127; + error1 |= 127; } } break; @@ -818,11 +817,11 @@ default: if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: not found\n", argv[i]); - error |= 127; + error1 |= 127; break; } } - return error; + return error1; } /* >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912301652.nBUGqM5m008306>