Date: Thu, 10 Apr 2008 09:07:09 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139717 for review Message-ID: <200804100907.m3A979lS025451@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=139717 Change 139717 by piso@piso_ferret on 2008/04/10 09:06:27 IFC@139709 Affected files ... .. //depot/projects/soc2005/libalias/Makefile#16 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#29 integrate .. //depot/projects/soc2005/libalias/UPDATING#25 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.1#4 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.h#2 integrate .. //depot/projects/soc2005/libalias/bin/ls/print.c#3 integrate .. //depot/projects/soc2005/libalias/bin/ls/util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/nc.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#4 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#19 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#12 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ppp#7 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/zfs#5 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/soc2005/libalias/include/complex.h#3 integrate .. //depot/projects/soc2005/libalias/include/stdio.h#4 integrate .. //depot/projects/soc2005/libalias/include/string.h#2 integrate .. //depot/projects/soc2005/libalias/include/unistd.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/err.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/namespace.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/memchr.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/memrchr.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/soc2005/libalias/lib/libstand/nfs.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_cond.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#8 integrate .. //depot/projects/soc2005/libalias/lib/msun/Makefile#6 integrate .. //depot/projects/soc2005/libalias/lib/msun/Symbol.map#6 integrate .. //depot/projects/soc2005/libalias/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/man/hypot.3#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/man/remainder.3#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypot.c#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/math.h#5 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/soc2005/libalias/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/gpt/gpt.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifclone.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/restore/dirs.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/restore/interactive.c#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#18 integrate .. //depot/projects/soc2005/libalias/share/man/man4/asmc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bpf.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#17 integrate .. //depot/projects/soc2005/libalias/share/man/man9/lock.9#8 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rwlock.9#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sleep.9#4 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/soc2005/libalias/share/mk/sys.mk#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/exception.S#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/intr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/locore.S#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/kb920x_machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/Makefile.arm#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#32 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#37 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#29 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/de/if_de.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#20 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#15 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfereg.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#18 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/soc2005/libalias/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/interrupt.c#8 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#14 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_clock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_event.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exec.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_ule.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#23 integrate .. //depot/projects/soc2005/libalias/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/em/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/igb/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.c#12 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_loop.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_input.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#27 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rl.c#10 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/intr_machdep.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/intr_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/_lockmgr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/_stack.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/callout.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/fcntl.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/imgact.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/interrupt.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/namei.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#24 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#19 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/stack.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/stat.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/time.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/umtx.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#13 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/uma.h#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/uma_core.c#8 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_kern.c#7 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_map.c#10 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#17 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_phys.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/soc2005/libalias/tools/tools/README#6 integrate .. //depot/projects/soc2005/libalias/tools/tools/mctest/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/ktrace/ktrace.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/stand.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -36,7 +36,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz 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,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080331: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal ==== //depot/projects/soc2005/libalias/UPDATING#25 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/soc2005/libalias/bin/ls/ls.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/soc2005/libalias/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/soc2005/libalias/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/soc2005/libalias/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/soc2005/libalias/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/soc2005/libalias/contrib/netcat/nc.1#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.7 2007/03/28 01:57:03 delphij Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $ .\" -.Dd May 21, 2006 +.Dd April 2, 2008 .Dt NC 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm nc .Bk -words -.Op Fl 46DEdhklnorStUuvz +.Op Fl 46DEdhklnoOrStUuvz .Op Fl e Ar IPsec_policy .Op Fl i Ar interval .Op Fl P Ar proxy_username @@ -146,6 +146,7 @@ .It Fl n Do not do any DNS or service lookups on any specified addresses, hostnames or ports. +.\" .It Fl o .Dq Once-only mode . By default, @@ -155,6 +156,10 @@ Specifying .Fl o will make it terminate on EOF as well. +.It Fl o +Disables the use of TCP options on the socket, by setting the boolean +TCP_NOOPT +socket option. .It Fl P Ar proxy_username Specifies a username to present to a proxy server that requires authentication. If no username is specified then authentication will not be attempted. @@ -435,7 +440,8 @@ .Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42 .Sh SEE ALSO .Xr cat 1 , -.Xr ssh 1 +.Xr ssh 1 , +.Xr tcp 4 .Sh AUTHORS Original implementation by *Hobbit* .Aq hobbit@avian.org . ==== //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/contrib/netcat/netcat.c,v 1.6 2007/07/01 12:08:04 gnn Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.7 2008/04/01 13:54:24 bms Exp $ */ /* @@ -78,6 +78,7 @@ int lflag; /* Bind to local port */ int nflag; /* Don't do name look up */ int oflag; /* Once only: stop on EOF */ +int Oflag; /* Do not use TCP options */ char *Pflag; /* Proxy username */ char *pflag; /* Localport flag */ int rflag; /* Random ports flag */ @@ -138,7 +139,7 @@ sv = NULL; while ((ch = getopt(argc, argv, - "46e:DEdhi:jklnoP:p:rSs:tT:Uuvw:X:x:z")) != -1) { + "46e:DEdhi:jklnoOP:p:rSs:tT:Uuvw:X:x:z")) != -1) { switch (ch) { case '4': family = AF_INET; @@ -202,6 +203,9 @@ case 'o': oflag = 1; break; + case 'O': + Oflag = 1; + break; case 'P': Pflag = optarg; break; @@ -600,6 +604,11 @@ if (ipsec_policy[1] != NULL) add_ipsec_policy(s, ipsec_policy[1]); #endif + if (Oflag) { + if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, + &Oflag, sizeof(Oflag)) == -1) + err(1, "disable TCP options"); + } if (bind(s, (struct sockaddr *)res0->ai_addr, res0->ai_addrlen) == 0) @@ -829,6 +838,11 @@ &Tflag, sizeof(Tflag)) == -1) err(1, "set IP ToS"); } + if (Oflag) { + if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, + &Oflag, sizeof(Oflag)) == -1) + err(1, "disable TCP options"); + } } int @@ -868,6 +882,7 @@ \t-k Keep inbound sockets open for multiple connects\n\ \t-l Listen mode, for inbound connects\n\ \t-n Suppress name/port resolutions\n\ + \t-O Disable TCP options\n\ \t-P proxyuser\tUsername for proxy authentication\n\ \t-p port\t Specify local port for remote connects\n\ \t-r Randomize remote ports\n\ @@ -915,9 +930,9 @@ usage(int ret) { #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DEdhklnrStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DEdhklnorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n"); #else - fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n"); #endif fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); ==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#19 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/soc2005/libalias/etc/rc.d/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include <bsd.own.mk> @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/soc2005/libalias/etc/rc.d/ppp#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 @@ -61,7 +62,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/soc2005/libalias/etc/rc.d/wpa_supplicant#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/soc2005/libalias/etc/rc.d/zfs#5 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.6 2008/03/19 14:44:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.7 2008/04/02 19:29:16 dougb Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# BEFORE: mountcritremote . /etc/rc.subr ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#17 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.258 2008/03/03 10:06:52 dds Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.260 2008/04/03 10:22:56 yar Exp $ % ======================================================================= || || @@ -11483,6 +11483,14 @@ % As Zeus said to Narcissus, "Watch yourself." >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804100907.m3A979lS025451>