From owner-p4-projects@FreeBSD.ORG Sat Nov 20 19:54:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA78716A4D0; Sat, 20 Nov 2004 19:54:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7903716A4CE for ; Sat, 20 Nov 2004 19:54:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1954C43D2F for ; Sat, 20 Nov 2004 19:54:45 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAKJsiQp062270 for ; Sat, 20 Nov 2004 19:54:45 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAKJsiKA062267 for perforce@freebsd.org; Sat, 20 Nov 2004 19:54:44 GMT (envelope-from peter@freebsd.org) Date: Sat, 20 Nov 2004 19:54:44 GMT Message-Id: <200411201954.iAKJsiKA062267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 65571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Nov 2004 19:54:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=65571 Change 65571 by peter@peter_daintree on 2004/11/20 19:54:18 IFC @65569 Affected files ... .. //depot/projects/hammer/Makefile.inc1#76 integrate .. //depot/projects/hammer/UPDATING#67 integrate .. //depot/projects/hammer/bin/pax/tar.c#5 integrate .. //depot/projects/hammer/bin/ps/Makefile#6 integrate .. //depot/projects/hammer/bin/ps/ps.c#18 integrate .. //depot/projects/hammer/bin/rm/rm.c#10 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#6 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#6 integrate .. //depot/projects/hammer/etc/ppp/ppp.conf#2 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#30 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk-own#3 integrate .. //depot/projects/hammer/etc/rc.d/serial#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/hammer/include/Makefile#35 integrate .. //depot/projects/hammer/lib/Makefile#45 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#14 integrate .. //depot/projects/hammer/lib/libc/Makefile#19 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#19 integrate .. //depot/projects/hammer/lib/libc/gen/getnetgrent.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/ntp_gettime.c#2 delete .. //depot/projects/hammer/lib/libc/i386/net/htonl.S#3 integrate .. //depot/projects/hammer/lib/libc/i386/net/ntohl.S#3 integrate .. //depot/projects/hammer/lib/libc/net/rcmd.c#4 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#4 integrate .. //depot/projects/hammer/lib/libc/rpc/netnamer.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#8 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#7 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#27 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/hammer/lib/librpcsvc/Makefile#3 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#6 integrate .. //depot/projects/hammer/lib/libxpg4/Makefile#4 delete .. //depot/projects/hammer/lib/libxpg4/fakelib.c#3 delete .. //depot/projects/hammer/libexec/Makefile#25 integrate .. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#9 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#21 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#3 integrate .. //depot/projects/hammer/libexec/ftpd/popen.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#15 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/lockdflt.c#3 delete .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#3 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#16 integrate .. //depot/projects/hammer/release/picobsd/bridge/PICOBSD#3 integrate .. //depot/projects/hammer/release/picobsd/floppy.tree/etc/ppp/ppp.conf#2 integrate .. //depot/projects/hammer/release/picobsd/mfs_tree/etc/remote#2 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#5 integrate .. //depot/projects/hammer/sbin/comcontrol/comcontrol.8#4 integrate .. //depot/projects/hammer/sbin/gpt/create.c#7 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#6 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#9 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#14 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.8#7 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#8 integrate .. //depot/projects/hammer/sbin/slattach/slattach.8#5 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#30 integrate .. //depot/projects/hammer/share/examples/ppp/ppp.conf.sample#5 integrate .. //depot/projects/hammer/share/examples/ppp/ppp.conf.span-isp#3 integrate .. //depot/projects/hammer/share/examples/pppd/options.sample#2 integrate .. //depot/projects/hammer/share/examples/startslip/slip.sh#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#56 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#5 integrate .. //depot/projects/hammer/share/man/man4/hptmv.4#1 branch .. //depot/projects/hammer/share/man/man4/ixgb.4#6 integrate .. //depot/projects/hammer/share/man/man4/mouse.4#3 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#5 integrate .. //depot/projects/hammer/share/man/man4/re.4#11 integrate .. //depot/projects/hammer/share/man/man4/rl.4#11 integrate .. //depot/projects/hammer/share/man/man4/sk.4#7 integrate .. //depot/projects/hammer/share/man/man4/vkbd.4#1 branch .. //depot/projects/hammer/share/man/man4/vlan.4#8 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#29 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#44 integrate .. //depot/projects/hammer/share/man/man5/remote.5#6 integrate .. //depot/projects/hammer/share/man/man7/ports.7#10 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#11 integrate .. //depot/projects/hammer/share/man/man9/Makefile#43 integrate .. //depot/projects/hammer/share/man/man9/get_cyclecount.9#2 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#3 integrate .. //depot/projects/hammer/share/man/man9/psignal.9#2 integrate .. //depot/projects/hammer/share/man/man9/signal.9#8 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#26 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#24 integrate .. //depot/projects/hammer/share/numericdef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/genassym.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#27 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#106 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#27 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/exception.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/hammer/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/arm/include/param.h#6 integrate .. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/hammer/sys/boot/common/commands.c#6 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#21 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#21 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#21 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#25 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#9 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#11 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#16 integrate .. //depot/projects/hammer/sys/conf/NOTES#74 integrate .. //depot/projects/hammer/sys/conf/files#93 integrate .. //depot/projects/hammer/sys/conf/files.i386#44 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#25 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#27 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#38 integrate .. //depot/projects/hammer/sys/conf/options.i386#29 integrate .. //depot/projects/hammer/sys/conf/options.pc98#27 integrate .. //depot/projects/hammer/sys/crypto/blowfish/arch/i386/bf_enc.S#2 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#16 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#1 branch .. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#1 branch .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#1 branch .. //depot/projects/hammer/sys/dev/acpi_support/acpi_toshiba.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#27 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_snc.c#2 delete .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#17 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#17 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#34 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#37 integrate .. //depot/projects/hammer/sys/dev/mc146818/mc146818.c#1 branch .. //depot/projects/hammer/sys/dev/mc146818/mc146818reg.h#1 branch .. //depot/projects/hammer/sys/dev/mc146818/mc146818var.h#1 branch .. //depot/projects/hammer/sys/dev/md/md.c#44 integrate .. //depot/projects/hammer/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/hammer/sys/dev/mk48txx/mk48txxreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mk48txx/mk48txxvar.h#1 branch .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#5 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#16 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#1 branch .. //depot/projects/hammer/sys/dev/vkbd/vkbd_var.h#1 branch .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#18 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#17 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#10 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#11 delete .. //depot/projects/hammer/sys/i386/acpica/acpi_panasonic.c#5 delete .. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#11 delete .. //depot/projects/hammer/sys/i386/conf/NOTES#57 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#13 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#43 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#61 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#11 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#29 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#6 integrate .. //depot/projects/hammer/sys/i386/include/cpu.h#9 integrate .. //depot/projects/hammer/sys/i386/include/endian.h#8 integrate .. //depot/projects/hammer/sys/i386/include/param.h#11 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/genassym.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#44 integrate .. //depot/projects/hammer/sys/ia64/include/param.h#8 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_bmap.c#5 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/hammer/sys/kern/init_main.c#30 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#51 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#17 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#24 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#14 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#35 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#35 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#16 integrate .. //depot/projects/hammer/sys/kern/tty.c#34 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#39 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#45 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#27 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#39 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#62 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#25 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#11 integrate .. //depot/projects/hammer/sys/modules/Makefile#60 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_asus/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_snc/Makefile#2 delete .. //depot/projects/hammer/sys/modules/acpi/acpi_sony/Makefile#1 branch .. //depot/projects/hammer/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/vkbd/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.h#16 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/hammer/sys/netinet/in.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#28 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#25 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#15 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#28 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#37 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#26 integrate .. //depot/projects/hammer/sys/pci/if_sfreg.h#4 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#31 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#9 integrate .. //depot/projects/hammer/sys/powerpc/include/param.h#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#29 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_msg.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_sysv_sem.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_sysv_shm.c#1 branch .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#11 integrate .. //depot/projects/hammer/sys/sparc64/include/eeprom.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/param.h#7 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#34 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#1 branch .. //depot/projects/hammer/sys/sys/buf.h#19 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#11 integrate .. //depot/projects/hammer/sys/sys/mac.h#21 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#23 integrate .. //depot/projects/hammer/sys/sys/msg.h#5 integrate .. //depot/projects/hammer/sys/sys/proc.h#71 integrate .. //depot/projects/hammer/sys/sys/sem.h#5 integrate .. //depot/projects/hammer/sys/sys/shm.h#4 integrate .. //depot/projects/hammer/sys/sys/syscall.h#35 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#35 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#35 integrate .. //depot/projects/hammer/sys/sys/systm.h#27 integrate .. //depot/projects/hammer/sys/sys/user.h#15 integrate .. //depot/projects/hammer/sys/sys/vnode.h#35 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#34 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#27 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#8 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#35 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#16 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/hammer/tools/debugscripts/dot.gdbinit#5 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.i386#3 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.kernel#3 integrate .. //depot/projects/hammer/tools/test/ppsapi/Makefile#3 integrate .. //depot/projects/hammer/tools/test/ppsapi/README#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#8 integrate .. //depot/projects/hammer/usr.bin/Makefile#38 integrate .. //depot/projects/hammer/usr.bin/chkey/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/chpass/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#16 integrate .. //depot/projects/hammer/usr.bin/file/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/gcore/aoutcore.c#3 integrate .. //depot/projects/hammer/usr.bin/make/config.h#5 integrate .. //depot/projects/hammer/usr.bin/make/main.c#18 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#14 integrate .. //depot/projects/hammer/usr.bin/newkey/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/pkill/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.c#5 integrate .. //depot/projects/hammer/usr.bin/tr/str.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#58 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#9 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#3 integrate .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/amd/include/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/bthid_config.h#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/bthidd.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/bthidd.h#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/client.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/hid.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/kbd.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/kbd.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/lexer.l#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/parser.y#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/server.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/session.c#2 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate .. //depot/projects/hammer/usr.sbin/jail/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#10 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#9 integrate .. //depot/projects/hammer/usr.sbin/ppp/README.changes#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/defs.h#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#12 integrate .. //depot/projects/hammer/usr.sbin/pppd/cbcp.c#3 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/anonFTP.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#19 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#13 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#30 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#5 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#9 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#18 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#76 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -404,11 +404,21 @@ cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) + cd ${.CURDIR}/kerberos5/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif .endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools .endfor +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.for _t in obj depend all + cd ${.CURDIR}/kerberos5/tools; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} +.endfor +.endif cd ${.CURDIR}; \ ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries .for _t in obj depend all @@ -992,7 +1002,7 @@ lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ + lib/libsbuf lib/libtacplus lib/libutil \ lib/libz lib/msun lib/libopie__L lib/libtacplus__L: lib/libmd__L @@ -1029,6 +1039,10 @@ lib/libradius__L: lib/libmd__L .endif +.if !defined(NO_NIS) +_prebuild_libs+= lib/libypclnt +.endif + _generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/hammer/UPDATING#67 (text+ko) ==== @@ -23,6 +23,10 @@ developers choose to disable these features on build machines to maximize performance. +20041116: + Support for systems with an 80386 CPU has been removed. Please + use FreeBSD 5.x or earlier on systems with an 80386. + 20041110: We have had a hack which would mount the root filesystem R/W if the device were named 'md*'. As part of the vnode @@ -1969,4 +1973,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ +$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ ==== //depot/projects/hammer/bin/pax/tar.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $"); #include #include @@ -387,7 +387,13 @@ * copy out the name and values in the stat buffer */ hd = (HD_TAR *)buf; - arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1); + /* + * old tar format specifies the name always be null-terminated, + * but let's be robust to broken archives. + * the same applies to handling links below. + */ + arcn->nlen = l_strncpy(arcn->name, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name)) - 1); arcn->name[arcn->nlen] = '\0'; arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) & 0xfff); @@ -417,7 +423,7 @@ */ arcn->type = PAX_SLK; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; arcn->sb.st_mode |= S_IFLNK; break; @@ -429,7 +435,7 @@ arcn->type = PAX_HLK; arcn->sb.st_nlink = 2; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; /* @@ -533,7 +539,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { + if (arcn->ln_nlen >= (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -749,12 +755,19 @@ */ dest = arcn->name; if (*(hd->prefix) != '\0') { - cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2); + cnt = l_strncpy(dest, hd->prefix, + MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2)); dest += cnt; *dest++ = '/'; cnt++; } - arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt); + /* + * ustar format specifies the name may be unterminated + * if it fills the entire field. this also applies to + * the prefix and the linkname. + */ + arcn->nlen = cnt + l_strncpy(dest, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1)); arcn->name[arcn->nlen] = '\0'; /* @@ -848,7 +861,7 @@ * copy the link name */ arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1)); arcn->ln_name[arcn->ln_nlen] = '\0'; break; case CONTTYPE: @@ -900,7 +913,7 @@ */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || (arcn->type == PAX_HRG)) && - (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { + (arcn->ln_nlen > (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } @@ -925,17 +938,16 @@ * occur, we remove the / and copy the first part to the prefix */ *pt = '\0'; - l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix) - 1); + l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix)); *pt++ = '/'; } else memset(hd->prefix, 0, sizeof(hd->prefix)); /* * copy the name part. this may be the whole path or the part after - * the prefix + * the prefix. both the name and prefix may fill the entire field. */ - l_strncpy(hd->name, pt, sizeof(hd->name) - 1); - hd->name[sizeof(hd->name) - 1] = '\0'; + l_strncpy(hd->name, pt, sizeof(hd->name)); /* * set the fields in the header that are type dependent @@ -978,8 +990,8 @@ hd->typeflag = SYMTYPE; else hd->typeflag = LNKTYPE; - l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1); - hd->linkname[sizeof(hd->linkname) - 1] = '\0'; + /* the link name may occupy the entire field in ustar */ + l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname)); memset(hd->devmajor, 0, sizeof(hd->devmajor)); memset(hd->devminor, 0, sizeof(hd->devminor)); if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3)) @@ -1072,9 +1084,9 @@ * check to see if the file name is small enough to fit in the name * field. if so just return a pointer to the name. */ - if (len < TNMSZ) + if (len <= TNMSZ) return(name); - if (len > (TPFSZ + TNMSZ)) + if (len > (TPFSZ + TNMSZ + 1)) return(NULL); /* @@ -1083,7 +1095,7 @@ * to find the biggest piece to fit in the name field (or the smallest * prefix we can find) */ - start = name + len - TNMSZ; + start = name + len - TNMSZ - 1; while ((*start != '\0') && (*start != '/')) ++start; @@ -1101,7 +1113,7 @@ * the file would then expand on extract to //str. The len == 0 below * makes this special case follow the spec to the letter. */ - if ((len >= TPFSZ) || (len == 0)) + if ((len > TPFSZ) || (len == 0)) return(NULL); /* ==== //depot/projects/hammer/bin/ps/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.25 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.26 2004/11/13 17:12:22 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -13,7 +13,5 @@ CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} LDADD= -lm -lkvm -#BINGRP= kmem -#BINMODE=2555 .include ==== //depot/projects/hammer/bin/ps/ps.c#18 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.109 2004/11/19 16:11:54 csjp Exp $"); #include #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,7 @@ } l; }; +static int check_procfs(void); static int addelem_gid(struct listinfo *, const char *); static int addelem_pid(struct listinfo *, const char *); static int addelem_tty(struct listinfo *, const char *); @@ -171,7 +173,7 @@ struct winsize ws; const char *nlistf, *memf; char *cols; - int all, ch, dropgid, elem, flag, _fmt, i, lineno; + int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; @@ -196,7 +198,7 @@ if (argc > 1) argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]); - all = dropgid = _fmt = nselectors = optfatal = 0; + all = _fmt = nselectors = optfatal = 0; prtheader = showthreads = wflag = xkeep_implied = 0; xkeep = -1; /* Neither -x nor -X. */ init_list(&gidlist, addelem_gid, sizeof(gid_t), "group"); @@ -278,14 +280,12 @@ break; case 'M': memf = optarg; - dropgid = 1; break; case 'm': sortby = SORTMEM; break; case 'N': nlistf = optarg; - dropgid = 1; break; case 'O': parsefmt(o1, 1); @@ -404,6 +404,14 @@ argv += optind; /* + * If the user specified ps -e then they want a copy of the process + * environment kvm_getenvv(3) attempts to open /proc//mem. + * Check to make sure that procfs is mounted on /proc, otherwise + * print a warning informing the user that output will be incomplete. + */ + if (needenv == 1 && check_procfs() == 0) + warnx("Process environment requires procfs(5)"); + /* * If there arguments after processing all the options, attempt * to treat them as a list of process ids. */ @@ -423,14 +431,6 @@ if (xkeep < 0) /* Neither -X nor -x was specified. */ xkeep = xkeep_implied; - - /* - * Discard setgid privileges if not the running kernel so that bad - * guys can't print interesting stuff from kernel memory. - */ - if (dropgid) - setgid(getgid()); - kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (kd == 0) errx(1, "%s", errbuf); @@ -1176,6 +1176,18 @@ return (newopts); } +static int +check_procfs(void) +{ + struct statfs mnt; + + if (statfs("/proc", &mnt) < 0) + return (0); + if (strcmp(mnt.f_fstypename, "procfs") != 0) + return (0); + return (1); +} + static void usage(void) { ==== //depot/projects/hammer/bin/rm/rm.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.52 2004/11/13 04:07:01 jkh Exp $"); #include #include @@ -192,8 +192,11 @@ flags |= FTS_NOSTAT; if (Wflag) flags |= FTS_WHITEOUT; - if (!(fts = fts_open(argv, flags, NULL))) + if (!(fts = fts_open(argv, flags, NULL))) { + if (fflag && errno == ENOENT) + return; err(1, "fts_open"); + } while ((p = fts_read(fts)) != NULL) { switch (p->fts_info) { case FTS_DNR: ==== //depot/projects/hammer/bin/rmdir/rmdir.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.17 2004/05/16 20:41:11 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.19 2004/11/20 00:41:08 ru Exp $"); #include #include @@ -78,15 +78,14 @@ usage(); for (errors = 0; *argv; argv++) { - if (pflag) { - errors |= rm_path(*argv); + if (rmdir(*argv) < 0) { + warn("%s", *argv); + errors = 1; } else { - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } if (vflag) printf("%s\n", *argv); + if (pflag) + errors |= rm_path(*argv); } } @@ -104,9 +103,11 @@ *++p = '\0'; while ((p = strrchr(path, '/')) != NULL) { /* Delete trailing slashes. */ - while (--p > path && *p == '/') + while (--p >= path && *p == '/') ; *++p = '\0'; + if (p == path) + break; if (rmdir(path) < 0) { warn("%s", path); ==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.4 2004/10/07 15:39:02 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.5 2004/11/14 17:05:54 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -349,7 +349,7 @@ .It Ar set limit Sets hard limits on the memory pools used by the packet filter. See -.Xr pool 9 +.Xr zone 9 for an explanation of memory pools. .Pp For example, ==== //depot/projects/hammer/etc/ppp/ppp.conf#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # See /usr/share/examples/ppp/ for some examples # -# $FreeBSD: src/etc/ppp/ppp.conf,v 1.8 2001/06/21 15:42:26 brian Exp $ +# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $ ################################################################# default: @@ -13,9 +13,9 @@ ident user-ppp VERSION (built COMPILATIONDATE) # Ensure that "device" references the correct serial port - # for your modem. (cuaa0 = COM1, cuaa1 = COM2) + # for your modem. (cuad0 = COM1, cuad1 = COM2) # - set device /dev/cuaa1 + set device /dev/cuad1 set speed 115200 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ ==== //depot/projects/hammer/etc/rc.d/Makefile#30 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.47 2004/11/16 04:20:09 wes Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -28,7 +28,7 @@ pccard pcvt pf pflog \ power_profile ppp-user pppoed preseedrandom pwcheck \ quota \ - random rarpd rcconf.sh resolv root \ + ramdisk ramdisk-own random rarpd rcconf.sh resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore securelevel sendmail \ serial sppp sshd swap1 \ ==== //depot/projects/hammer/etc/rc.d/ramdisk-own#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.4 2004/11/16 04:14:28 wes Exp $ # # PROVIDE: ramdisk-own @@ -39,7 +39,6 @@ ramdisk_own_start() { -set -x for unit in $ramdisk_units; do device="/dev/md$unit" dir=`mount | grep $device | cut -d' ' -f3` ==== //depot/projects/hammer/etc/rc.d/serial#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.22 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.24 2004/11/14 19:51:34 obrien Exp $ # # PROVIDE: serial @@ -45,73 +45,69 @@ default() { # Reset everything changed by the other functions to initial defaults. - ci=$1; shift # call in device identifier - co=$1; shift # call out device identifier + dc=$1; shift # device name character drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait - stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 - stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/cual${co}${i} -clocal -crtscts -hupcl 0 + comcontrol /dev/tty${dc}${i} dtrwait 300 drainwait $drainwait + stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/tty${dc}${i}.lock -clocal -crtscts -hupcl 0 + stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/cua${dc}${i}.lock -clocal -crtscts -hupcl 0 done } maybe() { # Special settings. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # Don't use ^R; it breaks bash's ^R when typed ahead. - stty < /dev/ttyi${ci}${i} reprint undef - stty < /dev/cuai${co}${i} reprint undef + stty < /dev/tty${dc}${i}.init reprint undef + stty < /dev/cua${dc}${i}.init reprint undef # Lock clocal off on dialin device for security. - stty < /dev/ttyl${ci}${i} clocal + stty < /dev/tty${dc}${i}.lock clocal # Lock the speeds to use old binaries that don't support them. # Any legal speed works to lock the initial speed. - stty < /dev/ttyl${ci}${i} 300 - stty < /dev/cual${co}${i} 300 + stty < /dev/tty${dc}${i}.lock 300 + stty < /dev/cua${dc}${i}.lock 300 done } modem() { # Modem that supports CTS and perhaps RTS handshaking. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # may depend on modem - comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 + comcontrol /dev/tty${dc}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 115200 - stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 115200 - stty < /dev/cual${co}${i} crtscts + stty < /dev/tty${dc}${i}.init crtscts 115200 + stty < /dev/tty${dc}${i}.lock crtscts + stty < /dev/cua${dc}${i}.init crtscts 115200 + stty < /dev/cua${dc}${i}.lock crtscts done } mouse() { # Mouse on either callin or callout port. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # Lock clocal on, hupcl off. # Standard speed for Microsoft mouse. - stty < /dev/ttyi${ci}${i} clocal -hupcl 1200 - stty < /dev/ttyl${ci}${i} clocal hupcl - stty < /dev/cuai${co}${i} clocal -hupcl 1200 - stty < /dev/cual${co}${i} clocal hupcl + stty < /dev/tty${dc}${i}.init clocal -hupcl 1200 + stty < /dev/tty${dc}${i}.lock clocal hupcl + stty < /dev/cua${dc}${i}.init clocal -hupcl 1200 + stty < /dev/cua${dc}${i}.lock clocal hupcl done } @@ -123,15 +119,14 @@ # provided at most one side runs getty. # Same as modem() except we want a faster speed and no dtrwait. - ci=$1; shift - co=$1; shift + dc=$1; shift - modem ${ci} ${co} $* + modem ${dc} $* for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 0 - stty < /dev/ttyi${ci}${i} 115200 - stty < /dev/cuai${co}${i} 115200 >>> TRUNCATED FOR MAIL (1000 lines) <<<