Date: Wed, 14 Aug 2002 16:58:38 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 15984 for review Message-ID: <200208142358.g7ENwcIA072022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15984 Change 15984 by peter@peter_daintree on 2002/08/14 16:58:07 IFC @15983 Affected files ... .. //depot/projects/ia64/etc/defaults/rc.conf#16 integrate .. //depot/projects/ia64/etc/rc#15 integrate .. //depot/projects/ia64/etc/rc.d/amd#4 integrate .. //depot/projects/ia64/etc/rc.d/keyserv#2 integrate .. //depot/projects/ia64/etc/rc.d/mountd#5 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#4 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#3 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#4 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#3 integrate .. //depot/projects/ia64/etc/rc.d/ypset#2 integrate .. //depot/projects/ia64/etc/rc.d/ypupdated#2 integrate .. //depot/projects/ia64/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/ia64/etc/rc.network#15 integrate .. //depot/projects/ia64/etc/rc.subr#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/ia64/gnu/usr.bin/ld/ld.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/ld/ld.1aout#2 integrate .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/ia64/include/arpa/inet.h#8 integrate .. //depot/projects/ia64/include/search.h#3 integrate .. //depot/projects/ia64/include/time.h#6 integrate .. //depot/projects/ia64/include/wchar.h#5 integrate .. //depot/projects/ia64/kerberos5/include/config.h#3 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/collate.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/collate.h#5 integrate .. //depot/projects/ia64/lib/libc/net/inet.3#3 integrate .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#4 integrate .. //depot/projects/ia64/lib/libc/net/inet_pton.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fgets.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputs.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/gets.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/local.h#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/wbuf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#10 integrate .. //depot/projects/ia64/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/ia64/lib/libc/string/strcat.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strcat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strncat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strncpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#3 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/ia64/libexec/Makefile#5 integrate .. //depot/projects/ia64/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/ia64/libexec/comsat/comsat.8#3 integrate .. //depot/projects/ia64/libexec/fingerd/fingerd.8#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/ia64/libexec/getty/gettytab.5#2 integrate .. //depot/projects/ia64/release/Makefile#19 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/ia64/sbin/fsirand/fsirand.8#3 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/ia64/sbin/init/init.8#3 integrate .. //depot/projects/ia64/sbin/mount/mount.8#6 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/ia64/sbin/natd/natd.8#5 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#10 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#8 integrate .. //depot/projects/ia64/share/man/man4/Makefile#13 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#3 integrate .. //depot/projects/ia64/share/man/man4/gif.4#6 integrate .. //depot/projects/ia64/share/man/man4/pcic.4#4 integrate .. //depot/projects/ia64/share/man/man4/sio.4#4 integrate .. //depot/projects/ia64/share/man/man4/snp.4#5 integrate .. //depot/projects/ia64/share/man/man4/ti.4#3 integrate .. //depot/projects/ia64/share/man/man4/ucom.4#3 integrate .. //depot/projects/ia64/share/man/man4/uvisor.4#1 branch .. //depot/projects/ia64/share/man/man4/wi.4#7 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#18 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#10 integrate .. //depot/projects/ia64/share/man/man8/man8.alpha/MAKEDEV.8#4 integrate .. //depot/projects/ia64/share/man/man8/man8.i386/MAKEDEV.8#5 integrate .. //depot/projects/ia64/share/man/man8/picobsd.8#10 integrate .. //depot/projects/ia64/share/man/man8/yp.8#2 integrate .. //depot/projects/ia64/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/ia64/share/man/man9/style.9#11 integrate .. //depot/projects/ia64/share/man/man9/ucred.9#7 integrate .. //depot/projects/ia64/share/man/man9/uidinfo.9#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#9 integrate .. //depot/projects/ia64/sys/boot/forth/loader.4th.8#5 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/ia64/sys/conf/NOTES#19 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#17 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_sym.h#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/ia64/sys/net/bpfdesc.h#4 integrate .. //depot/projects/ia64/sys/net/if_var.h#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/ia64/sys/sys/_label.h#1 branch .. //depot/projects/ia64/sys/sys/mac.h#2 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#8 integrate .. //depot/projects/ia64/sys/sys/mount.h#14 integrate .. //depot/projects/ia64/sys/sys/pipe.h#4 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#20 integrate .. //depot/projects/ia64/sys/sys/ucred.h#11 integrate .. //depot/projects/ia64/sys/sys/vnode.h#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_ihash.c#6 integrate .. //depot/projects/ia64/usr.bin/at/at.man#8 integrate .. //depot/projects/ia64/usr.bin/biff/biff.1#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.1#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.c#5 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#6 integrate .. //depot/projects/ia64/usr.bin/colldef/scan.l#5 integrate .. //depot/projects/ia64/usr.bin/csplit/csplit.1#5 integrate .. //depot/projects/ia64/usr.bin/fstat/fstat.c#9 integrate .. //depot/projects/ia64/usr.bin/join/join.1#5 integrate .. //depot/projects/ia64/usr.bin/rsh/rsh.c#6 integrate .. //depot/projects/ia64/usr.bin/stat/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/stat/stat.1#2 integrate .. //depot/projects/ia64/usr.bin/stat/stat.c#2 integrate .. //depot/projects/ia64/usr.sbin/acpi/amldb/amldb.8#3 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#4 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/ia64/usr.sbin/keyserv/keyserv.8#3 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.8#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#12 integrate .. //depot/projects/ia64/usr.sbin/ypserv/ypserv.8#4 integrate Differences ... ==== //depot/projects/ia64/etc/defaults/rc.conf#16 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.154 2002/07/25 15:44:00 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.155 2002/08/14 05:37:15 gordon Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -167,7 +167,7 @@ sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one. sshd_flags="" # Additional flags for sshd. -### Network daemon (NFS): All need portmap_enable="YES" ### +### Network daemon (NFS): All need rpcbind_enable="YES" ### amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" @@ -175,16 +175,16 @@ nfs_access_cache="2" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). -single_mountd_enable="NO" # Run mountd only (or NO). +mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. nfs_reserved_port_only="NO" # Provide NFS only on secure port (or NO). nfs_bufpackets="DEFAULT" # bufspace (in packets) for client (or DEFAULT) rpc_lockd_enable="NO" # Run NFS rpc.lockd needed for client/server. rpc_statd_enable="NO" # Run NFS rpc.statd needed for client/server. -portmap_enable="NO" # Run the portmapper service (YES/NO). -portmap_program="/usr/sbin/rpcbind" # path to portmap, if you want a different one. -portmap_flags="" # Flags to portmap (if enabled). +rpcbind_enable="NO" # Run the portmapper service (YES/NO). +rpcbind_program="/usr/sbin/rpcbind" # path to rpcbind, if you want a different one. +rpcbind_flags="" # Flags to rpcbind (if enabled). rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO). keyserv_enable="NO" # Run the SecureRPC keyserver (or NO). keyserv_flags="" # Flags to keyserv (if enabled). @@ -195,11 +195,11 @@ ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. ntpdate_flags="-b" # Flags to ntpdate (if enabled). -xntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). -xntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. -xntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled). +ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). +ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. +ntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled). -# Network Information Services (NIS) options: All need portmap_enable="YES" ### +# Network Information Services (NIS) options: All need rpcbind_enable="YES" ### nis_client_enable="NO" # We're an NIS client (or NO). nis_client_flags="" # Flags to ypbind (if enabled). nis_ypset_enable="NO" # Run ypset at boot time (or NO). ==== //depot/projects/ia64/etc/rc#15 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.314 2002/06/13 22:30:02 gordon Exp $ +# $FreeBSD: src/etc/rc,v 1.316 2002/08/14 05:58:44 gordon Exp $ # # System startup script run by init on autoboot @@ -78,8 +78,6 @@ autoboot=yes _boot="faststart" rc_fast=yes # run_rc_command(): do fast booting - export autoboot - export rc_fast else autoboot=no _boot="start" @@ -122,6 +120,17 @@ . /etc/rc.conf fi +# XXX - Deprecated variable name support +# for rpcbind and ntpd +# +[ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable" +[ -n "$portmap_program" ] && rpcbind_program="$portmap_program" +[ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags" +[ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable" +[ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" +[ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" +[ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + feed_dev_random() { if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then # echo "Using ${1} as an entropy file" @@ -153,11 +162,12 @@ esac } -chkdepend amd amd_enable portmap portmap_enable +chkdepend amd amd_enable rpcbind rpcbind_enable chkdepend amd amd_enable NFS nfs_client_enable -chkdepend NFS nfs_server_enable portmap portmap_enable -chkdepend NIS nis_server_enable portmap portmap_enable -chkdepend NIS nis_client_enable portmap portmap_enable +chkdepend NFS nfs_server_enable rpcbind rpcbind_enable +chkdepend NFS nfs_server_enable rpcbind rpcbind_enable +chkdepend NIS nis_server_enable rpcbind rpcbind_enable +chkdepend NIS nis_client_enable rpcbind rpcbind_enable # Enable dumpdev early so that a crash during the boot process can be caught. # ==== //depot/projects/ia64/etc/rc.d/amd#4 (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.5 2002/06/24 19:50:56 jdp Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.6 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: amd @@ -36,7 +36,7 @@ force_depend nfsclient || return 1 fi - if ! checkyesno portmap_enable && \ + if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 then force_depend rpcbind || return 1 ==== //depot/projects/ia64/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # Start keyserv if we are running Secure RPC @@ -16,7 +16,18 @@ name="keyserv" rcvar=`set_rcvar` command="/usr/sbin/${name}" -required_vars="portmap_enable" +start_precmd="keyserv_prestart" + +keyserv_prestart() +{ + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + + return 0 +} load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/mountd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.5 2002/07/07 22:19:08 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.6 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: mountd @@ -11,29 +11,17 @@ . /etc/rc.subr name="mountd" +rcvar=`set_rcvar` command="/usr/sbin/${name}" required_files="/etc/exports" start_precmd="mountd_precmd" extra_commands="reload" -case `${CMD_OSTYPE}` in -FreeBSD) - rcvar=`set_rcvar nfs_server` - ;; -NetBSD) - rcvar=`set_rcvar` - ;; -esac - mountd_precmd() { case `${CMD_OSTYPE}` in FreeBSD) - if ! sysctl vfs.nfsrv >/dev/null 2>&1; then - force_depend nfsserver || return 1 - fi - - if ! checkyesno portmap_enable && \ + if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 then force_depend rpcbind || return 1 ==== //depot/projects/ia64/etc/rc.d/nfsd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.3 2002/07/07 22:19:08 gordon Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.4 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: nfsd @@ -17,7 +17,6 @@ case `${CMD_OSTYPE}` in FreeBSD) command_args="${nfs_server_flags}" - required_vars="portmap_enable" start_precmd="nfsd_precmd" ;; NetBSD) @@ -32,6 +31,18 @@ force_depend nfsserver || return 1 fi + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + + if ! checkyesno mountd_enable && \ + ! /etc/rc.d/mountd forcestatus 1>/dev/null 2>&1 + then + force_depend mountd || return 1 + fi + if checkyesno nfs_reserved_port_only ; then echo -n ' NFS on reserved port only=YES' sysctl vfs.nfsrv.nfs_privport=1 > /dev/null ==== //depot/projects/ia64/etc/rc.d/ntpd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ntpd,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ntpd,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ntpd @@ -11,21 +11,18 @@ . /etc/rc.subr +name=ntpd +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +pidfile="/var/run/${name}.pid" +required_files="/etc/ntp.conf" + case `${CMD_OSTYPE}` in -FreeBSD) - name="xntpd" - ;; NetBSD) - name="ntpd" start_precmd="ntpd_precmd" ;; esac -rcvar=`set_rcvar` -command="/usr/sbin/ntpd" -pidfile="/var/run/ntpd.pid" -required_files="/etc/ntp.conf" - ntpd_precmd() { if [ -z "$ntpd_chrootdir" ]; then ==== //depot/projects/ia64/etc/rc.d/rpcbind#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.4 2002/06/21 19:50:01 dougb Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.5 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: rpcbind @@ -11,25 +11,14 @@ . /etc/rc.subr name="rpcbind" - -# XXX - Executable may be in a different location. The $name variable -# is different from the variable in rc.conf(5) so the -# subroutines in rc.subr won't catch it. -# -load_rc_config $name +rcvar=`set_rcvar` +command="/usr/sbin/${name}" case `${CMD_OSTYPE}` in -FreeBSD) - pidfile= - rcvar="portmap_enable" - command="${portmap_program:-/usr/sbin/${name}}" - eval ${name}_flags=\"${portmap_flags}\" - ;; NetBSD) - rcvar=$name - command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" ;; esac +load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/yppasswdd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: yppasswdd,v 1.6 2002/03/22 04:34:01 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: yppasswdd @@ -18,7 +18,6 @@ case `${CMD_OSTYPE}` in FreeBSD) rcvar="nis_yppasswdd_enable" - required_vars="portmap_enable nis_server_enable" command_args="${nis_yppasswdd_flags}" ;; NetBSD) @@ -29,6 +28,21 @@ yppasswdd_precmd() { + case `${CMD_OSTYPE}` in + FreeBSD) + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + ;; + esac + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypserv#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ypserv,v 1.5 2000/09/19 13:04:39 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ypserv,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypserv,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypserv @@ -17,7 +17,6 @@ case `${CMD_OSTYPE}` in FreeBSD) rcvar="nis_server_enable" - required_vars="portmap_enable" command_args="${nis_server_flags}" ;; NetBSD) @@ -28,6 +27,16 @@ ypserv_precmd() { + case `${CMD_OSTYPE}` in + FreeBSD) + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + ;; + esac + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypset#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypset,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypset,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypset @@ -13,11 +13,21 @@ rcvar="nis_ypset_enable" command="/usr/sbin/${name}" command_args="${nis_ypset_flags}" -required_vars="portmap_enable nis_client_enable" start_precmd="ypset_precmd" ypset_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_client_enable && \ + ! /etc/rc.d/ypbind forcestatus 1>/dev/null 2>&1 + then + force_depend ypbind || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypupdated#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypupdated,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypupdated,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypupdated @@ -12,11 +12,21 @@ name="ypupdated" rcvar="rpc_ypupdated_enable" command="/usr/sbin/rpc.${name}" -required_vars="portmap_enable nis_server_enable" start_precmd="rpc_ypupdated_precmd" rpc_ypupdated_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypxfrd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.1 2002/06/13 22:14:37 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypxfrd @@ -13,11 +13,21 @@ rcvar="nis_ypxfrd_enable" command="/usr/sbin/rpc.${name}" command_args="${nis_ypxfrd_flags}" -required_vars="portmap_enable nis_server_enable" start_precmd="ypxfrd_precmd" ypxfrd_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.network#15 (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.network,v 1.134 2002/04/11 22:06:27 des Exp $ +# $FreeBSD: src/etc/rc.network,v 1.135 2002/08/14 05:44:29 gordon Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -561,9 +561,9 @@ ;; esac - case ${xntpd_enable} in + case ${ntpd_enable} in [Yy][Ee][Ss]) - echo -n ' ntpd'; ${xntpd_program:-ntpd} ${xntpd_flags} + echo -n ' ntpd'; ${ntpd_program:-ntpd} ${ntpd_flags} ;; esac @@ -573,10 +573,10 @@ ;; esac - case ${portmap_enable} in + case ${rpcbind_enable} in [Yy][Ee][Ss]) - echo -n ' rpcbind'; ${portmap_program:-/usr/sbin/rpcbind} \ - ${portmap_flags} + echo -n ' rpcbind'; ${rpcbind_program:-/usr/sbin/rpcbind} \ + ${rpcbind_flags} # Start ypserv if we're an NIS server. # Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server. @@ -645,7 +645,7 @@ network_pass3() { echo -n 'Starting final network daemons:' - case ${portmap_enable} in + case ${rpcbind_enable} in [Yy][Ee][Ss]) case ${nfs_server_enable} in [Yy][Ee][Ss]) ==== //depot/projects/ia64/etc/rc.subr#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.3 2002/06/13 22:19:42 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.4 2002/08/14 05:37:07 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -814,9 +814,23 @@ debug "Sourcing /etc/rc.conf.d/${_command}" . /etc/rc.conf.d/"$_command" fi + + # XXX - Deprecated variable name support + # + case `${CMD_OSTYPE}` in + FreeBSD) + [ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable" + [ -n "$portmap_program" ] && rpcbind_program="$portmap_program" + [ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags" + [ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable" + [ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" + [ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" + [ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + ;; + esac + } - # # rc_usage commands # Print a usage string for $0, with `commands' being a list of ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.14 2002/07/18 09:32:15 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.16 2002/08/14 16:57:14 ru Exp $ .\" .\" %beginstrip% . @@ -55,7 +55,7 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.6 4.6 -.ds doc-operating-system-FreeBSD-4.6.1 4.6.1 +.ds doc-operating-system-FreeBSD-4.6.2 4.6.2 .ds doc-operating-system-FreeBSD-4.7 4.7 .ds doc-operating-system-FreeBSD-4.8 4.8 . ==== //depot/projects/ia64/gnu/usr.bin/ld/ld.1#2 (text+ko) ==== @@ -27,7 +27,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/gnu/usr.bin/ld/ld.1,v 1.29 2001/08/14 10:01:44 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1,v 1.30 2002/08/13 14:10:34 ru Exp $ .\" .Dd October 14, 1993 .Dt LD 1 @@ -93,7 +93,7 @@ (see the .Fl l option) -according to the search rules in effect. If such a file can not be +according to the search rules in effect. If such a file cannot be found a traditional archive is looked for. This options can appear anywhere on the command line and is complementary to ==== //depot/projects/ia64/gnu/usr.bin/ld/ld.1aout#2 (text+ko) ==== @@ -27,7 +27,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/gnu/usr.bin/ld/ld.1aout,v 1.28 2001/08/14 10:01:44 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1aout,v 1.29 2002/08/13 14:10:34 ru Exp $ .\" .Dd October 14, 1993 .Dt LD 1 @@ -93,7 +93,7 @@ (see the .Fl l option) -according to the search rules in effect. If such a file can not be +according to the search rules in effect. If such a file cannot be found a traditional archive is looked for. This options can appear anywhere on the command line and is complementary to ==== //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.21 2001/08/07 15:48:29 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.22 2002/08/13 16:07:25 ru Exp $ .Dd January 12, 1995 .Dt MAKEWHATIS 1 .Os @@ -76,12 +76,12 @@ Use .Ar name instead of -.Pa whatis Ns . +.Pa whatis . .It Fl o , Fl outfile Ar file Write all output to .Ar file instead of -.Pa dirname/whatis Ns . +.Pa dirname/whatis . .It Fl v , Fl verbose Issue more warnings (to stderr). @@ -97,7 +97,7 @@ .Ic makewhatis $MANPATH .Pp Create whatis database for all directories in your -.Pa $MANPATH Ns . +.Pa $MANPATH . .Pp .Ic makewhatis -outfile /tmp/mywhatis /usr/local/man $HOME/man .Pp @@ -106,18 +106,18 @@ Traverse directories .Pa /usr/local/man and -.Pa $HOME/man Ns . +.Pa $HOME/man . Don't create .Pa /usr/local/man/whatis or -.Pa $HOME/man/whatis Ns . +.Pa $HOME/man/whatis . .Pp .Ic makewhatis -name windex $HOME/man .Pp Create whatis database .Pa windex instead of -.Pa whatis Ns . +.Pa whatis . May be useful for Solaris. .Sh FILES .Bl -tag -width /etc/master.passwdxx -compact ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.13 2002/07/03 00:35:09 des Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.14 2002/08/13 10:30:55 blackend Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -209,6 +209,9 @@ .B ports Corrections or enhancements (including new ports) to the ports collection. .TP +.B powerpc +PowerPC processor specific problems. +.TP .B sparc64 SPARC processor specific problems. .TP ==== //depot/projects/ia64/gnu/usr.bin/tar/tar.1#2 (text+ko) ==== @@ -4,7 +4,7 @@ .\" Written by John F. Woods <jfw@jfwhome.funhouse.com> .\" Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de> .\" -.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.40 2001/07/10 10:42:19 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.41 2002/08/13 14:10:35 ru Exp $ .\" .Dd December 23, 2000 .Os @@ -570,4 +570,4 @@ .Nm file format is a semi fixed width field format, and the field for device numbers were designed for 16 bit (8 major, 8 minor) -and can not absorb our 32 bit (8 major, 16+8 minor) numbers. +and cannot absorb our 32 bit (8 major, 16+8 minor) numbers. ==== //depot/projects/ia64/include/arpa/inet.h#8 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ */ #ifndef _ARPA_INET_H_ @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *__restrict, char *__restrict, + socklen_t); +int inet_pton(int, const char *__restrict, void *__restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/ia64/include/search.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ >>> 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?200208142358.g7ENwcIA072022>