Date: Mon, 9 Sep 2002 16:59:28 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17290 for review Message-ID: <200209092359.g89NxSrV032394@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17290 Change 17290 by peter@peter_daintree on 2002/09/09 16:59:05 IFC @17289 Affected files ... .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/ia64/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#3 integrate .. //depot/projects/ia64/crypto/openssh/session.c#13 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.h#4 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#12 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#19 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#6 integrate .. //depot/projects/ia64/etc/rc.d/accounting#3 integrate .. //depot/projects/ia64/etc/rc.d/amd#5 integrate .. //depot/projects/ia64/etc/rc.d/apmd#4 integrate .. //depot/projects/ia64/etc/rc.d/archdep#1 branch .. //depot/projects/ia64/etc/rc.d/bootparams#3 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#3 integrate .. //depot/projects/ia64/etc/rc.d/fsck#3 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#3 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#3 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#3 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#4 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#4 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#3 integrate .. //depot/projects/ia64/etc/rc.d/lpd#3 integrate .. //depot/projects/ia64/etc/rc.d/motd#4 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/ia64/etc/rc.d/mountd#7 integrate .. //depot/projects/ia64/etc/rc.d/moused#2 integrate .. //depot/projects/ia64/etc/rc.d/named#4 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#7 integrate .. //depot/projects/ia64/etc/rc.d/nfslocking#3 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#4 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#3 integrate .. //depot/projects/ia64/etc/rc.d/pcvt#2 integrate .. //depot/projects/ia64/etc/rc.d/root#3 integrate .. //depot/projects/ia64/etc/rc.d/route6d#4 integrate .. //depot/projects/ia64/etc/rc.d/routed#3 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#5 integrate .. //depot/projects/ia64/etc/rc.d/rtadvd#3 integrate .. //depot/projects/ia64/etc/rc.d/savecore#3 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#4 integrate .. //depot/projects/ia64/etc/rc.d/sendmail#4 integrate .. //depot/projects/ia64/etc/rc.d/swap1#3 integrate .. //depot/projects/ia64/etc/rc.d/syscons#4 integrate .. //depot/projects/ia64/etc/rc.d/sysctl#5 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#3 integrate .. //depot/projects/ia64/etc/rc.d/ttys#3 integrate .. //depot/projects/ia64/etc/rc.d/virecover#3 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#3 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#4 integrate .. //depot/projects/ia64/etc/rc.subr#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#7 integrate .. //depot/projects/ia64/gnu/lib/libdialog/gauge.c#4 integrate .. //depot/projects/ia64/include/ctype.h#5 integrate .. //depot/projects/ia64/include/dirent.h#3 integrate .. //depot/projects/ia64/include/inttypes.h#6 integrate .. //depot/projects/ia64/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/ia64/include/rune.h#3 integrate .. //depot/projects/ia64/include/runetype.h#5 integrate .. //depot/projects/ia64/include/search.h#5 integrate .. //depot/projects/ia64/include/stdio.h#7 integrate .. //depot/projects/ia64/include/stdlib.h#12 integrate .. //depot/projects/ia64/include/time.h#9 integrate .. //depot/projects/ia64/include/unistd.h#10 integrate .. //depot/projects/ia64/include/wchar.h#7 integrate .. //depot/projects/ia64/lib/libc/gen/getgrouplist.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/siglist.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbtowc.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/multibyte.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstol.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wcstol.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstoul.c#1 branch .. //depot/projects/ia64/lib/libc/net/inet.3#5 integrate .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#6 integrate .. //depot/projects/ia64/lib/libc/net/inet_pton.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#11 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/setvbuf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#11 integrate .. //depot/projects/ia64/lib/libc/stdio/vprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#12 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoimax.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoll.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.3#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoull.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoumax.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/tdelete.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#5 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.c#5 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/string/strcat.3#4 integrate .. //depot/projects/ia64/lib/libc/string/strcat.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strncat.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strncpy.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strtok.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcscat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcscpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsncat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsncpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsstr.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcstok.3#1 branch .. //depot/projects/ia64/lib/libc/string/wcstok.c#1 branch .. //depot/projects/ia64/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/ia64/lib/libc/string/wmemcpy.c#4 integrate .. //depot/projects/ia64/lib/libmd/mdXhl.c#3 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#42 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/ia64/release/i386/dokern.sh#8 integrate .. //depot/projects/ia64/release/i386/drivers.conf#6 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#1 branch .. //depot/projects/ia64/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#7 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/ia64/sbin/ping/ping.c#9 integrate .. //depot/projects/ia64/sbin/ping6/ping6.c#7 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#11 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#6 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#18 integrate .. //depot/projects/ia64/share/man/man4/Makefile#16 integrate .. //depot/projects/ia64/share/man/man4/bge.4#3 integrate .. //depot/projects/ia64/share/man/man4/gre.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/ia64/share/man/man8/rc.sendmail.8#3 integrate .. //depot/projects/ia64/share/man/man9/signal.9#2 integrate .. //depot/projects/ia64/share/man/man9/style.9#13 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#9 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#5 integrate .. //depot/projects/ia64/share/termcap/reorder#3 integrate .. //depot/projects/ia64/share/termcap/termcap.src#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#17 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/ia64/sys/conf/NOTES#23 integrate .. //depot/projects/ia64/sys/conf/files#40 integrate .. //depot/projects/ia64/sys/conf/files.i386#18 integrate .. //depot/projects/ia64/sys/conf/options#29 integrate .. //depot/projects/ia64/sys/conf/options.i386#8 integrate .. //depot/projects/ia64/sys/conf/options.pc98#9 integrate .. //depot/projects/ia64/sys/conf/options.x86_64#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#3 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#5 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs.h#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#11 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#7 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#9 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/ia64/sys/geom/geom.h#9 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#7 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#8 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#21 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/ia64/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#8 integrate .. //depot/projects/ia64/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/ia64/sys/i386/linux/linux_ptrace.c#4 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/ia64/sys/i386/svr4/svr4_genassym.c#2 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#47 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#6 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#17 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#8 integrate .. //depot/projects/ia64/sys/libkern/strlcat.c#2 integrate .. //depot/projects/ia64/sys/libkern/strlcpy.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#20 integrate .. //depot/projects/ia64/sys/modules/aout/Makefile#1 branch .. //depot/projects/ia64/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/ia64/sys/modules/linux/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/ia64/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/ia64/sys/net/ethernet.h#5 integrate .. //depot/projects/ia64/sys/net/if_gif.c#8 integrate .. //depot/projects/ia64/sys/net/if_gif.h#5 integrate .. //depot/projects/ia64/sys/net/if_gre.c#1 branch .. //depot/projects/ia64/sys/net/if_gre.h#1 branch .. //depot/projects/ia64/sys/netatalk/at.h#2 integrate .. //depot/projects/ia64/sys/netinet/in.h#13 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_gre.c#1 branch .. //depot/projects/ia64/sys/netinet/ip_gre.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/ia64/sys/netns/ns.h#4 integrate .. //depot/projects/ia64/sys/netns/ns_if.h#3 integrate .. //depot/projects/ia64/sys/nfs/nfsnode.h#3 delete .. //depot/projects/ia64/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#22 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#10 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#6 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#7 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#8 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#9 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#22 integrate .. //depot/projects/ia64/sys/sys/bio.h#9 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#16 integrate .. //depot/projects/ia64/sys/sys/extattr.h#4 integrate .. //depot/projects/ia64/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/ia64/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/ia64/sys/sys/proc.h#30 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/ia64/sys/sys/systm.h#19 integrate .. //depot/projects/ia64/sys/sys/timetc.h#7 integrate .. //depot/projects/ia64/sys/sys/ucontext.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#9 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#5 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#15 integrate .. //depot/projects/ia64/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/ia64/tools/regression/geom/Data/disk.msdos.ext.xml#2 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T001/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T002/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T003/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T004/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T005/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T012/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T014/ref.conf#5 integrate .. //depot/projects/ia64/tools/regression/geom/geom_simdisk.c#6 integrate .. //depot/projects/ia64/tools/regression/geom/geom_simdisk_xml.c#5 integrate .. //depot/projects/ia64/usr.bin/basename/basename.c#7 integrate .. //depot/projects/ia64/usr.bin/catman/catman.c#2 integrate .. //depot/projects/ia64/usr.bin/chflags/chflags.c#6 integrate .. //depot/projects/ia64/usr.bin/col/col.c#6 integrate .. //depot/projects/ia64/usr.bin/colcrt/colcrt.c#6 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#9 integrate .. //depot/projects/ia64/usr.bin/cut/cut.c#7 integrate .. //depot/projects/ia64/usr.bin/enigma/enigma.c#3 integrate .. //depot/projects/ia64/usr.bin/env/env.c#6 integrate .. //depot/projects/ia64/usr.bin/expand/expand.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/extern.h#5 integrate .. //depot/projects/ia64/usr.bin/finger/finger.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/lprint.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/net.c#5 integrate .. //depot/projects/ia64/usr.bin/finger/sprint.c#6 integrate .. //depot/projects/ia64/usr.bin/finger/util.c#6 integrate .. //depot/projects/ia64/usr.bin/fold/fold.c#7 integrate .. //depot/projects/ia64/usr.bin/from/from.c#4 integrate .. //depot/projects/ia64/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/ia64/usr.bin/gcore/gcore.c#5 integrate .. //depot/projects/ia64/usr.bin/gcore/md-nop.c#3 integrate .. //depot/projects/ia64/usr.bin/getconf/confstr.gperf#3 integrate .. //depot/projects/ia64/usr.bin/getconf/sysconf.gperf#2 integrate .. //depot/projects/ia64/usr.bin/getopt/getopt.c#5 integrate .. //depot/projects/ia64/usr.bin/hesinfo/hesinfo.c#7 integrate .. //depot/projects/ia64/usr.bin/hexdump/conv.c#6 integrate .. //depot/projects/ia64/usr.bin/hexdump/display.c#9 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexdump.c#3 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexdump.h#5 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexsyntax.c#4 integrate .. //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#7 integrate .. //depot/projects/ia64/usr.bin/hexdump/parse.c#8 integrate .. //depot/projects/ia64/usr.bin/id/id.c#5 integrate .. //depot/projects/ia64/usr.bin/ipcrm/ipcrm.c#6 integrate .. //depot/projects/ia64/usr.bin/join/join.c#7 integrate .. //depot/projects/ia64/usr.bin/kdump/mkioctls#5 integrate .. //depot/projects/ia64/usr.bin/last/last.c#6 integrate .. //depot/projects/ia64/usr.bin/lastcomm/lastcomm.c#5 integrate .. //depot/projects/ia64/usr.bin/leave/leave.c#4 integrate .. //depot/projects/ia64/usr.bin/lex/flex.skl#2 integrate .. //depot/projects/ia64/usr.bin/lock/lock.c#6 integrate .. //depot/projects/ia64/usr.bin/logger/logger.c#6 integrate .. //depot/projects/ia64/usr.bin/logname/logname.c#5 integrate .. //depot/projects/ia64/usr.bin/look/look.c#6 integrate .. //depot/projects/ia64/usr.bin/m4/main.c#9 integrate .. //depot/projects/ia64/usr.bin/make/make.1#7 integrate .. //depot/projects/ia64/usr.bin/makewhatis/makewhatis.c#4 integrate .. //depot/projects/ia64/usr.bin/mesg/mesg.c#5 integrate .. //depot/projects/ia64/usr.bin/mkfifo/mkfifo.c#4 integrate .. //depot/projects/ia64/usr.bin/msgs/msgs.c#6 integrate .. //depot/projects/ia64/usr.bin/ncplogin/ncplogin.c#4 integrate .. //depot/projects/ia64/usr.bin/netstat/atalk.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/if.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/ia64/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/ipx.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/iso.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/mbuf.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/netgraph.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/ia64/usr.bin/netstat/ns.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/route.c#6 integrate .. //depot/projects/ia64/usr.bin/nice/nice.c#7 integrate .. //depot/projects/ia64/usr.bin/pr/extern.h#3 integrate .. //depot/projects/ia64/usr.bin/pr/pr.c#6 integrate .. //depot/projects/ia64/usr.bin/printenv/printenv.c#5 integrate .. //depot/projects/ia64/usr.bin/printf/printf.c#6 integrate .. //depot/projects/ia64/usr.bin/rev/rev.c#5 integrate .. //depot/projects/ia64/usr.bin/rsh/rsh.c#7 integrate .. //depot/projects/ia64/usr.bin/rwall/rwall.c#3 integrate .. //depot/projects/ia64/usr.bin/script/script.c#6 integrate .. //depot/projects/ia64/usr.bin/soelim/soelim.c#4 integrate .. //depot/projects/ia64/usr.bin/tee/tee.c#7 integrate .. //depot/projects/ia64/usr.bin/time/time.c#6 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#7 integrate .. //depot/projects/ia64/usr.bin/tput/tput.c#7 integrate .. //depot/projects/ia64/usr.bin/tr/tr.c#8 integrate .. //depot/projects/ia64/usr.bin/tset/tset.c#4 integrate .. //depot/projects/ia64/usr.bin/tsort/tsort.c#5 integrate .. //depot/projects/ia64/usr.bin/ul/ul.c#5 integrate .. //depot/projects/ia64/usr.bin/uname/uname.c#5 integrate .. //depot/projects/ia64/usr.bin/unexpand/unexpand.c#6 integrate .. //depot/projects/ia64/usr.bin/uniq/uniq.c#9 integrate .. //depot/projects/ia64/usr.bin/unvis/unvis.c#4 integrate .. //depot/projects/ia64/usr.bin/users/users.c#3 integrate .. //depot/projects/ia64/usr.bin/vis/vis.c#5 integrate .. //depot/projects/ia64/usr.bin/what/what.c#5 integrate .. //depot/projects/ia64/usr.bin/write/write.c#6 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#10 integrate .. //depot/projects/ia64/usr.bin/xstr/xstr.c#4 integrate .. //depot/projects/ia64/usr.bin/yes/yes.c#2 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.8#3 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#6 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#9 integrate .. //depot/projects/ia64/usr.sbin/mrouted/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mapper.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mrinfo.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mtrace.c#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/info.h#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/pkgwrap.c#1 branch .. //depot/projects/ia64/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/index.c#5 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/ia64/usr.sbin/traceroute6/traceroute6.c#2 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#3 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.2 2002/05/10 19:05:07 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.3 2002/09/09 06:56:29 obrien Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -85,7 +85,7 @@ the final CPP_PREDEFINES value. */ #define FBSD_CPP_PREDEFINES \ - "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500003 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" + "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500004 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" #endif /* ! FREEBSD_NATIVE */ ==== //depot/projects/ia64/contrib/tar/src/buffer.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.2 2002/06/04 17:31:15 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.3 2002/09/09 06:00:16 sobomax Exp $ */ #include "system.h" @@ -1332,6 +1332,9 @@ might become clever enough to just stop working, once there is no more work to do, we might have to revise this area in such time. */ + if (fast_read_option && namelist_freed) + kill(child_pid, SIGTERM); + if (access_mode == ACCESS_READ && ! _isrmt (archive) && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode))) @@ -1358,12 +1361,13 @@ break; } - if (WIFSIGNALED (wait_status)) - ERROR ((0, 0, _("Child died with signal %d"), - WTERMSIG (wait_status))); - else if (WEXITSTATUS (wait_status) != 0) - ERROR ((0, 0, _("Child returned status %d"), - WEXITSTATUS (wait_status))); + if (!fast_read_option || !namelist_freed) + if (WIFSIGNALED (wait_status)) + ERROR ((0, 0, _("Child died with signal %d"), + WTERMSIG (wait_status))); + else if (WEXITSTATUS (wait_status) != 0) + ERROR ((0, 0, _("Child returned status %d"), + WEXITSTATUS (wait_status))); } #endif /* !MSDOS */ ==== //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#2 (text+ko) ==== @@ -21,7 +21,7 @@ 4) Import the sources: - $ cvs import src/crypto/openssh-portable OPENSSH OpenSSH_X_YpZ + $ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ 5) Resolve conflicts. Remember to bump the version number and addendum in version.h. @@ -127,4 +127,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.2 2002/07/05 15:25:55 des Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.3 2002/09/09 02:00:28 kuriyama Exp $ ==== //depot/projects/ia64/crypto/openssh/monitor.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ #include "includes.h" RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.8 2002/07/10 23:04:07 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.9 2002/09/09 16:49:11 ume Exp $"); #include <openssl/dh.h> @@ -1113,8 +1113,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -1124,7 +1124,7 @@ /* Record that there was a login on that tty from the remote host. */ record_login(s->pid, s->tty, pw->pw_name, pw->pw_uid, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); } static void ==== //depot/projects/ia64/crypto/openssh/session.c#13 (text+ko) ==== @@ -34,7 +34,7 @@ #include "includes.h" RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.36 2002/08/05 16:06:35 ache Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.37 2002/09/09 16:49:11 ume Exp $"); #include "ssh.h" #include "ssh1.h" @@ -669,8 +669,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -680,7 +680,7 @@ record_utmp_only(pid, s->tty, s->pw->pw_name, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); } #endif @@ -721,8 +721,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -735,7 +735,7 @@ record_login(pid, s->tty, pw->pw_name, pw->pw_uid, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); #ifdef USE_PAM /* ==== //depot/projects/ia64/crypto/openssh/sshlogin.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #include "includes.h" RCSID("$OpenBSD: sshlogin.c,v 1.4 2002/06/23 03:30:17 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/sshlogin.c,v 1.6 2002/06/29 11:48:59 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/sshlogin.c,v 1.7 2002/09/09 16:49:11 ume Exp $"); #include "loginrec.h" @@ -66,12 +66,12 @@ */ void record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, - const char *host, struct sockaddr * addr) + const char *host, struct sockaddr * addr, socklen_t addrlen) { struct logininfo *li; li = login_alloc_entry(pid, user, host, ttyname); - login_set_addr(li, addr, sizeof(struct sockaddr)); + login_set_addr(li, addr, addrlen); login_login(li); login_free_entry(li); } @@ -79,12 +79,12 @@ #ifdef LOGIN_NEEDS_UTMPX void record_utmp_only(pid_t pid, const char *ttyname, const char *user, - const char *host, struct sockaddr * addr) + const char *host, struct sockaddr * addr, socklen_t addrlen) { struct logininfo *li; li = login_alloc_entry(pid, user, host, ttyname); - login_set_addr(li, addr, sizeof(struct sockaddr)); + login_set_addr(li, addr, addrlen); login_utmp_only(li); login_free_entry(li); } ==== //depot/projects/ia64/crypto/openssh/sshlogin.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: sshlogin.h,v 1.3 2001/06/26 17:27:25 markus Exp $ */ +/* $FreeBSD: src/crypto/openssh/sshlogin.h,v 1.2 2002/09/09 16:49:11 ume Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -16,13 +17,13 @@ void record_login(pid_t, const char *, const char *, uid_t, - const char *, struct sockaddr *); + const char *, struct sockaddr *, socklen_t); void record_logout(pid_t, const char *, const char *); u_long get_last_login_time(uid_t, const char *, char *, u_int); #ifdef LOGIN_NEEDS_UTMPX void record_utmp_only(pid_t, const char *, const char *, const char *, - struct sockaddr *); + struct sockaddr *, socklen_t); #endif #endif ==== //depot/projects/ia64/etc/defaults/pccard.conf#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.241 2002/07/26 06:12:14 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.242 2002/09/06 17:45:36 iwasaki Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -1857,6 +1857,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Corega KK Wireless LAN PCCL-11 +card "corega" "WL PCCL-11" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # D Link DWL-650 11Mbps WLAN Card card "D" "Link DWL-650 11Mbps WLAN Card" config auto "wi" ? ==== //depot/projects/ia64/etc/defaults/rc.conf#19 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.157 2002/09/02 16:35:01 gordon Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.159 2002/09/05 20:14:40 gordon Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -157,6 +157,8 @@ rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). rarpd_flags="" # Flags to rarpd. +bootparamd_enable="NO" # Run bootparamd (or NO). +bootparamd_flags="" # Flags to bootparamd xtend_enable="NO" # Run the X-10 power controller daemon. xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. @@ -361,8 +363,7 @@ mta_start_script="/etc/rc.sendmail" # Script to start your chosen MTA, called by /etc/rc. # Settings for /etc/rc.sendmail: -sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). - # If NONE, don't start any sendmail processes. +sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO). sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost" ==== //depot/projects/ia64/etc/rc.d/Makefile#6 (text+ko) ==== @@ -1,20 +1,21 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.5 2002/09/02 20:49:26 gordon Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ - apm apmd atm1 atm2.sh atm3.sh bgfsck ccd cleanvar cleartmp cron devdb \ - devfs diskless dmesg dumpon fsck inetd initdiskless initrandom ip6fw \ - ipfilter ipfw ipmon ipnat ipsec ipxrouted isdnd kadmind kerberos \ - keyserv ldconfig local localdaemons lomac lpd motd mountcritlocal \ - mountcritremote mountd moused mroute6d mrouted msgs named network1 \ - network2 network3 network_ipv6 nfsclient nfsd nfslocking nfsserver \ - ntpd ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota \ - random rarpd root route6d routed rpcbind rtadvd rwho savecore \ - securelevel sendmail serial sppp sshd swap1 syscons sysctl syslogd \ - timed ttys usbd vinum virecover ypbind yppasswdd ypserv ypset \ - ypupdated ypxfrd + apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ + cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ + ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ + localdaemons lomac lpd motd mountcritlocal mountcritremote \ + mountd moused mroute6d mrouted msgs named network1 network2 \ + network3 network_ipv6 nfsclient nfsd nfslocking nfsserver ntpd \ + ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ + rarpd root route6d routed rpcbind rtadvd rwho savecore \ + securelevel sendmail serial sppp sshd swap1 syscons sysctl \ + syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \ + ypset ypupdated ypxfrd FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} ==== //depot/projects/ia64/etc/rc.d/accounting#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: accounting @@ -20,7 +20,7 @@ accounting_start() { - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) _dir=`dirname "$accounting_file"` if [ ! -d `dirname "$_dir"` ]; then ==== //depot/projects/ia64/etc/rc.d/amd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.6 2002/08/14 05:44:32 gordon Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.7 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: amd @@ -15,7 +15,7 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) start_precmd="amd_precmd" command_args="&" @@ -30,7 +30,7 @@ amd_precmd() { - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if ! checkyesno nfs_client_enable ; then force_depend nfsclient || return 1 ==== //depot/projects/ia64/etc/rc.d/apmd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.3 2002/07/07 04:16:53 dougb Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.4 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: apmd @@ -15,7 +15,7 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) start_precmd="apmd_prestart" ;; ==== //depot/projects/ia64/etc/rc.d/bootparams#3 (text+ko) ==== @@ -1,19 +1,28 @@ #!/bin/sh # # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.4 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: bootparams # REQUIRE: rpcbind DAEMON # BEFORE: LOGIN +# KEYWORD: FreeBSD . /etc/rc.subr name="bootparamd" -rcvar=$name -command="/usr/sbin/rpc.${name}" +rcvar=`set_rcvar` required_files="/etc/bootparams" +case ${OSTYPE} in +FreeBSD) + command="/usr/sbin/${name}" + ;; +NetBSD) + command="/usr/sbin/rpc.${name}" + ;; +esac + load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: cleartmp @@ -28,7 +28,7 @@ find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) # Remove X lock files, since they will prevent you from # restarting X ==== //depot/projects/ia64/etc/rc.d/fsck#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: fsck @@ -34,7 +34,7 @@ trap : 3 echo "Starting file system checks:" - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if checkyesno background_fsck; then fsck -F -p @@ -60,7 +60,7 @@ stop_boot ;; 8) - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if checkyesno fsck_y_enable; then echo "File system preen failed, trying fsck -y." ==== //depot/projects/ia64/etc/rc.d/ipfilter#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: ipfilter @@ -14,7 +14,7 @@ rcvar=`set_rcvar` load_rc_config $name -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) stop_precmd="test -f ${ipfilter_rules}" ;; @@ -36,7 +36,7 @@ ipfilter_prestart() { -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then @@ -76,7 +76,7 @@ ipfilter_start() { echo "Enabling ipfilter." - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) ${ipfilter_program:-/sbin/ipf} -Fa -f \ "${ipfilter_rules}" ${ipfilter_flags} @@ -95,7 +95,7 @@ ipfilter_stop() >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209092359.g89NxSrV032394>