Date: Sun, 8 Jun 2003 14:26:52 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32817 for review Message-ID: <200306082126.h58LQq9G001879@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32817 Change 32817 by marcel@marcel_nfs on 2003/06/08 14:26:30 IFC @32816 Affected files ... .. //depot/projects/ia64/Makefile.inc1#65 integrate .. //depot/projects/ia64/bin/cp/cp.1#6 integrate .. //depot/projects/ia64/bin/ed/Makefile#5 integrate .. //depot/projects/ia64/bin/ps/ps.1#15 integrate .. //depot/projects/ia64/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#7 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#33 integrate .. //depot/projects/ia64/etc/network.subr#4 integrate .. //depot/projects/ia64/etc/pccard_ether#7 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#5 integrate .. //depot/projects/ia64/etc/rc.subr#11 integrate .. //depot/projects/ia64/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/popen.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/fflush.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/getfsstat.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/getsockname.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sched_setscheduler.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sigsuspend.2#3 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_post.3#3 integrate .. //depot/projects/ia64/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/ia64/lib/libcrypt/crypt.3#6 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#19 integrate .. //depot/projects/ia64/lib/libftpio/ftpio.3#3 integrate .. //depot/projects/ia64/lib/libipx/ipx.3#2 integrate .. //depot/projects/ia64/lib/libnetgraph/netgraph.3#3 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#19 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#12 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#13 integrate .. //depot/projects/ia64/libexec/getty/gettytab.5#6 integrate .. //depot/projects/ia64/libexec/rexecd/rexecd.8#3 integrate .. //depot/projects/ia64/libexec/rshd/rshd.8#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#97 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#9 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#12 integrate .. //depot/projects/ia64/sbin/badsect/badsect.8#5 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#10 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#5 integrate .. //depot/projects/ia64/sbin/dump/dump.8#16 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#7 integrate .. //depot/projects/ia64/sbin/init/init.8#7 integrate .. //depot/projects/ia64/sbin/restore/restore.8#9 integrate .. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#5 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#10 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#7 integrate .. //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#3 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#8 integrate .. //depot/projects/ia64/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/ia64/share/man/man4/rp.4#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#40 integrate .. //depot/projects/ia64/share/man/man7/environ.7#4 integrate .. //depot/projects/ia64/share/man/man8/yp.8#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#7 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#20 integrate .. //depot/projects/ia64/share/termcap/termcap.5#3 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/ia64/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/ia64/sys/dev/exca/exca.c#7 integrate .. //depot/projects/ia64/sys/dev/exca/excavar.h#5 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#28 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#22 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx.c#10 integrate .. //depot/projects/ia64/sys/geom/geom.h#34 integrate .. //depot/projects/ia64/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#31 integrate .. //depot/projects/ia64/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/ia64/sys/i386/conf/GENERIC#37 integrate .. //depot/projects/ia64/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#31 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#49 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#15 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#32 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#11 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd_cd.c#9 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#37 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#12 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#35 integrate .. //depot/projects/ia64/sys/sparc64/include/db_machdep.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_mem.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#40 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#24 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#26 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#45 integrate .. //depot/projects/ia64/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/ia64/tools/debugscripts/gdbinit.i386#2 integrate .. //depot/projects/ia64/tools/debugscripts/gdbinit.kernel#2 integrate .. //depot/projects/ia64/usr.bin/apply/apply.c#5 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#29 integrate .. //depot/projects/ia64/usr.bin/ctags/ctags.1#6 integrate .. //depot/projects/ia64/usr.bin/locate/locate/locate.1#3 integrate .. //depot/projects/ia64/usr.bin/m4/m4.1#8 integrate .. //depot/projects/ia64/usr.bin/rs/rs.1#3 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/ia64/usr.bin/su/su.1#6 integrate .. //depot/projects/ia64/usr.bin/symorder/symorder.1#4 integrate .. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#5 integrate .. //depot/projects/ia64/usr.bin/tput/tput.1#3 integrate .. //depot/projects/ia64/usr.bin/tset/tset.1#4 integrate .. //depot/projects/ia64/usr.bin/ul/ul.1#3 integrate .. //depot/projects/ia64/usr.bin/vgrind/vgrind.1#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/cgram.y#6 integrate .. //depot/projects/ia64/usr.sbin/IPXrouted/IPXrouted.8#4 integrate .. //depot/projects/ia64/usr.sbin/asf/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/asf/asf.8#1 branch .. //depot/projects/ia64/usr.sbin/asf/asf.c#1 branch .. //depot/projects/ia64/usr.sbin/chroot/chroot.8#5 integrate .. //depot/projects/ia64/usr.sbin/chroot/chroot.c#6 integrate .. //depot/projects/ia64/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnd/exec.c#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdndecode/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntel/files.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntel/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntrace/trace.c#2 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.8#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.8#6 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.8#5 integrate .. //depot/projects/ia64/usr.sbin/mptable/mptable.c#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/sign/pkg_sign.1#3 integrate .. //depot/projects/ia64/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/ia64/usr.sbin/rmt/rmt.8#3 integrate .. //depot/projects/ia64/usr.sbin/sliplogin/sliplogin.8#3 integrate .. //depot/projects/ia64/usr.sbin/timed/timedc/timedc.8#3 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypset/ypset.c#5 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#65 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.363 2003/05/31 21:29:38 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.365 2003/06/08 04:15:05 imp Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -202,6 +202,9 @@ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" +.if ${BOOTSTRAPPING} < 501100 +BMAKEENV+= CSTD= +.endif BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ @@ -781,8 +784,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= - +_prebuild_libs+= lib/libc _generic_libs= gnu/lib .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ ==== //depot/projects/ia64/bin/cp/cp.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.26 2003/04/07 11:00:56 mdodd Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.27 2003/06/07 06:35:36 ru Exp $ .\" .Dd July 23, 2002 .Dt CP 1 @@ -153,21 +153,22 @@ .It Fl p Cause .Nm -to preserve in the copy as many of the modification time, access time, -file flags, file mode, user ID, and group ID as allowed by permissions. +to preserve the following attributes of each source +file in the copy: modification time, access time, +file flags, file mode, user ID, and group ID, as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. .Pp -If the source file has its set user ID bit on and the user ID cannot -be preserved, the set user ID bit is not preserved +If the source file has its set-user-ID bit on and the user ID cannot +be preserved, the set-user-ID bit is not preserved in the copy's permissions. -If the source file has its set group ID bit on and the group ID cannot -be preserved, the set group ID bit is not preserved +If the source file has its set-group-ID bit on and the group ID cannot +be preserved, the set-group-ID bit is not preserved in the copy's permissions. -If the source file has both its set user ID and set group ID bits on, +If the source file has both its set-user-ID and set-group-ID bits on, and either the user ID or group ID cannot be preserved, neither -the set user ID nor set group ID bits are preserved in the copy's +the set-user-ID nor set-group-ID bits are preserved in the copy's permissions. .It Fl v Cause @@ -194,13 +195,13 @@ .Pf ( Ic umask , see .Xr csh 1 ) . -If the source file has its set user ID bit on, that bit is removed +If the source file has its set-user-ID bit on, that bit is removed unless both the source file and the destination file are owned by the same user. -If the source file has its set group ID bit on, that bit is removed +If the source file has its set-group-ID bit on, that bit is removed unless both the source file and the destination file are in the same group and the user is a member of that group. -If both the set user ID and set group ID bits are set, all of the above +If both the set-user-ID and set-group-ID bits are set, all of the above conditions must be fulfilled or both bits are removed. .Pp Appropriate permissions are required for file creation or overwriting. ==== //depot/projects/ia64/bin/ed/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.24 2003/06/08 08:24:07 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCRYPTO} ==== //depot/projects/ia64/bin/ps/ps.1#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.62 2003/06/08 09:48:39 charnier Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -325,7 +325,7 @@ The process is a session leader. .It V The process is suspended during a -.Xr vfork . +.Xr vfork 2 . .It W The process is swapped out. .It X ==== //depot/projects/ia64/contrib/groff/tmac/X.tmac#4 (text+ko) ==== @@ -18,7 +18,7 @@ .char ~ \v'-.55m'\s[\En(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m' .char ^ \v'-.55m'\s[\En(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m' .fchar \[va] \o'\[ua]\[da]' -.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0' +.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'\h'0.05m'\v'.25m' .fchar \[en] \- .fchar \[fi] fi .fchar \[fl] fl ==== //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#7 (text+ko) ==== @@ -3925,14 +3925,15 @@ device like .Sq latin1 or -.Sq unicode +.Sq unicode , to make the manual more efficient for viewing on-line. This behaviour can be changed (e.g.\& to create a hardcopy of the .Tn TTY output) by setting the register .Ql cR to zero while calling -.Xr groff : +.Xr groff 1 , +resulting in multiple pages instead of a single, very long page: .Pp .Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt .Pp ==== //depot/projects/ia64/etc/defaults/rc.conf#33 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.177 2003/06/01 01:43:37 gordon Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.178 2003/06/07 10:31:17 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -55,8 +55,8 @@ ### Basic network and firewall/security options: ### hostname="" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). -dhcp_program="/sbin/dhclient" # Path to dhcp client program. -dhcp_flags="" # Additional flags to pass to dhcp client. +dhclient_program="/sbin/dhclient" # Path to dhcp client program. +dhclient_flags="" # Additional flags to pass to dhcp client. firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) ==== //depot/projects/ia64/etc/network.subr#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.147 2003/05/12 11:36:49 ume Exp $ +# $FreeBSD: src/etc/network.subr,v 1.149 2003/06/08 11:49:30 mtm Exp $ # # @@ -46,6 +46,37 @@ return 1 } +# ifconfig_down if +# Remove all inet entries from the $if interface. It returns +# 0 if inet entries were found and removed. It returns 1 if +# no entries were found or the could not be removed. +# +ifconfig_down() +{ + [ -z "$1" ] && return 1 + _ifs="^" + _ret=1 + + inetList="`ifconfig $1 | grep 'inet ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet in $inetList ; do + # get rid of extraneous line + [ -z "$_inet" ] && break + + _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` + + IFS="$oldifs" + ifconfig $1 ${_inet} delete + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + return $_ret +} + # ifalias_up if # Configure aliases for network interface $if. # It returns 0 if at least one alias was configured or @@ -68,6 +99,28 @@ return $_ret } +#ifalias_down if +# Remove aliases for network interface $if. +# It returns 0 if at least one alias was removed or +# 1 if there were none. +# +ifalias_down() +{ + _ret=1 + alias=0 + while : ; do + eval ifconfig_args=\$ifconfig_$1_alias${alias} + if [ -n "${ifconfig_args}" ]; then + ifconfig $1 ${ifconfig_args} -alias + alias=$((${alias} + 1)) + _ret=0 + else + break + fi + done + return $_ret +} + # ifscript_up if # Evaluate a startup script for the $if interface. # It returns 0 if a script was found and processed or @@ -82,6 +135,20 @@ return 1 } +# ifscript_down if +# Evaluate a shutdown script for the $if interface. +# It returns 0 if a script was found and processed or +# 1 if no script was found. +# +ifscript_down() +{ + if [ -r /etc/stop_if.$1 ]; then + . /etc/stop_if.$1 + return 0 + fi + return 1 +} + # Create cloneable interfaces. # clone_up() @@ -153,6 +220,16 @@ return 1 } +# ipx_down ifn +# Remove IPX addresses for interface $ifn. Returns 0 if IPX +# addresses were found and unconfigured. It returns 1, otherwise. +# +ipx_down() +{ + # XXX - So, who's an IPX expert ? + return 1 +} + # # list_net_interfaces type # List all network interfaces. The type of interface returned ==== //depot/projects/ia64/etc/pccard_ether#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.30 2003/05/12 11:36:49 ume Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.31 2003/06/07 19:40:54 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -28,14 +28,16 @@ sleep ${pccard_ether_delay} ;; esac - if [ -x "${dhcp_program}" ]; then - if [ `basename ${dhcp_program}` = "dhclient" ]; then + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" + [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" + if [ -x "${dhclient_program}" ]; then + if [ `basename ${dhclient_program}` = "dhclient" ]; then pidfile="/var/run/dhclient.${interface}.pid" - dhcp_flags="${dhcp_flags} -pf ${pidfile}" + dhclient_flags="${dhclient_flags} -pf ${pidfile}" fi - ${dhcp_program} ${dhcp_flags} ${interface} + ${dhclient_program} ${dhclient_flags} ${interface} else - echo "${dhcp_program}: DHCP client software not available" + echo "${dhclient_program}: DHCP client software not available" fi } ==== //depot/projects/ia64/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.4 2003/04/20 19:14:16 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.5 2003/06/07 10:31:17 mtm Exp $ # # PROVIDE: dhclient @@ -17,7 +17,6 @@ . /etc/network.subr name="dhclient" -command="/sbin/${name}" pidfile="/var/run/${name}.pid" case "${OSTYPE}" in FreeBSD) @@ -27,6 +26,7 @@ ;; NetBSD) rcvar=$name + command="/sbin/${name}" ;; esac @@ -41,7 +41,7 @@ ifscript_up ${ifn} done - rc_flags="${rc_flags} ${dhcp_flags} ${dhcp_list}" + rc_flags="${rc_flags} ${dhcp_list}" return 0 } ==== //depot/projects/ia64/etc/rc.subr#11 (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.11 2003/04/30 03:03:47 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.12 2003/06/07 10:31:17 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -837,6 +837,8 @@ [ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" [ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" [ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" + [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" ;; esac ==== //depot/projects/ia64/gnu/lib/libdialog/dialog.3#2 (text+ko) ==== @@ -11,7 +11,7 @@ .\" nor does the author assume any responsibility for damages incurred with .\" its use. .\" -.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.21 2001/10/03 04:01:51 bde Exp $ +.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.22 2003/06/08 09:51:24 charnier Exp $ .\" .Dd January 1, 2000 .Dt DIALOG 3 @@ -232,16 +232,18 @@ .Pp Below is a short description of the various functions: .Pp +The .Fn draw_shadow -draws a shadow in curses window +function draws a shadow in curses window .Va win using the dimensions of .Va x , y , width and .Va height . .Pp +The .Fn draw_box -draws a bordered box using the dimensions of +function draws a bordered box using the dimensions of .Va x , y , width and .Va height . @@ -252,8 +254,9 @@ are used, if specified, while painting the box and border regions of the object. .Pp +The .Fn line_edit -invoke a simple line editor with an edit box of dimensions +function invokes a simple line editor with an edit box of dimensions .Va box_x , box_y and .Va box_width . @@ -268,23 +271,27 @@ .Va result . Returns 0 on success, 1 on Cancel, and -1 on failure or ESC. .Pp +The .Fn strheight -returns the height of string in +function returns the height of string in .Va p , counting newlines. .Pp +The .Fn strwidth -returns the width of string in +function returns the width of string in .Va p , counting newlines. .Pp +The .Fn dialog_create_rc -dump dialog library settings into +function dumps dialog library settings into .Pa filename for later retrieval as defaults. Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_yesno -display a text box using +function displays a text box using .Va title and .Va prompt @@ -305,14 +312,16 @@ .Em \&No , return TRUE. .Pp +The .Fn dialog_noyes -is the same as +function is the same as .Fn dialog_yesno , except the default selection is .Em \&No . .Pp +The .Fn dialog_prgbox -display a text box of dimensions +function displays a text box of dimensions .Va height and .Va width @@ -331,16 +340,18 @@ is TRUE, a final confirmation requestor will be put up when execution terminates. Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_textbox -display a text box containing the contents of +function displays a text box containing the contents of .Va file with dimensions of .Va height and .Va width . .Pp +The .Fn dialog_menu -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -402,8 +413,9 @@ values may be passed in to preserve current item selection and scroll position values across calls. .Pp +The .Fn dialog_checklist -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -485,8 +497,9 @@ .Pp Returns 0 on success, 1 on Cancel, and -1 on failure or ESC. .Pp +The .Fn dialog_radiolist -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -567,8 +580,9 @@ .Pp Returns 0 on success, 1 on Cancel and -1 on failure or ESC. .Pp +The .Fn dialog_inputbox -displays a single-line text input field in a box displaying +function displays a single-line text input field in a box displaying .Va title and .Va prompt @@ -581,8 +595,9 @@ .Pp Returns 0 on success, -1 on failure or ESC. .Pp +The .Fn dialog_fselect -brings up a file selector dialog starting at +function brings up a file selector dialog starting at .Va dir and showing only those file names matching @@ -590,8 +605,9 @@ .Pp Returns filename selected or NULL. .Pp +The .Fn dialog_dselect -brings up a directory selector dialog starting at +function brings up a directory selector dialog starting at .Va dir and showing only those directory names matching @@ -599,12 +615,14 @@ .Pp Returns directory name selected or NULL. .Pp +The .Fn dialog_notify -brings up a generic "hey, you!" notifier dialog containing +function brings up a generic "hey, you!" notifier dialog containing .Va msg . .Pp +The .Fn dialog_mesgbox -like a notifier dialog, but with more control over +function displays a notifier dialog, but with more control over .Va title , .Va prompt , .Va width @@ -615,8 +633,9 @@ .Pp Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_gauge -displays a horizontal bar-graph style gauge. A value of +function displays a horizontal bar-graph style gauge. A value of .Em 100 for .Em perc @@ -624,37 +643,47 @@ .Em 0 an empty one. .Pp +The .Fn use_helpfile -for any menu supporting context sensitive help, invoke the text box +function for any menu supporting context sensitive help, invokes the text box object on this file whenever the .Em F1 key is pressed. .Pp +The .Fn use_helpline -displays this line of helpful text below any menu being displayed. +function displays this line of helpful text below any menu being displayed. .Pp +The .Fn get_helpline -get the current value of the helpful text line. +function gets the current value of the helpful text line. .Pp +The .Fn dialog_clear_norefresh -clear the screen back to the dialog background color, but don't refresh the -contents just yet. +function clears the screen back to the dialog background color, but don't +refresh the contents just yet. .Pp +The .Fn dialog_clear -clear the screen back to the dialog background color immediately. +function clears the screen back to the dialog background color immediately. .Pp +The .Fn dialog_update -do any pending screen refreshes now. +function does any pending screen refreshes now. .Pp +The .Fn init_dialog -initialize the dialog library (call this routine before any other dialog -API calls). +function initializes the dialog library (call this routine before any other +dialog API calls). .Pp +The .Fn end_dialog -shut down the dialog library (call this if you need to get back to sanity). +function shuts down the dialog library (call this if you need to get back to +sanity). .Pp +The .Fn dialog_ftree -shows a tree described by the data from the file +function shows a tree described by the data from the file .Pa filename . The data in the file should look like .Xr find 1 @@ -728,6 +757,7 @@ .Fn dialog_ftree on ESC, the function returns -1. .Pp +The .Fn dialog_tree function returns the same results as .Fn dialog_ftree . ==== //depot/projects/ia64/lib/libalias/libalias.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.43 2003/06/01 23:15:00 ru Exp $ +.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.44 2003/06/08 09:53:08 charnier Exp $ .\" .Dd April 13, 2000 .Dt LIBALIAS 3 @@ -98,9 +98,10 @@ .Pp This function will always return the packet aliasing engine to the same initial state. +The .Fn PacketAliasSetAddress -is normally called afterwards, and any desired changes from the default mode -bits listed above require a call to +function is normally called afterwards, and any desired changes from the +default mode bits listed above require a call to .Fn PacketAliasSetMode . .Pp It is mandatory that this function be called at the beginning of a program @@ -781,9 +782,10 @@ Once a fragment pointer is retrieved, it becomes the calling program's responsibility to free the dynamically allocated memory for the fragment. .Pp +The .Fn PacketAliasGetFragment -can be called sequentially until there are no more fragments available, -at which time it returns +function can be called sequentially until there are no more fragments +available, at which time it returns .Dv NULL . .Ed .Pp ==== //depot/projects/ia64/lib/libc/gen/getpwent.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getpwent.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.23 2003/05/22 13:02:26 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.24 2003/06/08 10:01:51 charnier Exp $ .\" .Dd April 16, 2003 .Dt GETPWENT 3 @@ -213,7 +213,7 @@ .Sh ERRORS These routines may fail for any of the errors specified in .Xr open 2 , -.Xr dbopen 2 , +.Xr dbopen 3 , .Xr socket 2 , and .Xr connect 2 , ==== //depot/projects/ia64/lib/libc/gen/popen.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)popen.3 8.2 (Berkeley) 5/3/95 -.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.15 2003/01/03 05:21:59 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.16 2003/06/08 10:01:51 charnier Exp $ .\" .Dd May 3, 1995 .Dt POPEN 3 @@ -122,7 +122,7 @@ function waits for the associated process to terminate and returns the exit status of the command as returned by -.Fn wait4 . +.Xr wait4 2 . .Sh RETURN VALUES The .Fn popen @@ -147,7 +147,7 @@ already .Dq pclosed , or if -.Xr wait4 +.Xr wait4 2 returns an error. .Sh ERRORS The ==== //depot/projects/ia64/lib/libc/gen/statvfs.3#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.6 2002/12/12 17:25:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.7 2003/06/08 10:01:51 charnier Exp $ .\" .Dd July 13, 2002 .Dt STATVFS 3 @@ -63,7 +63,7 @@ .It Va f_namemax The maximum length in bytes of a file name on this file system. Applications should use -.Xr pathconf 3 +.Xr pathconf 2 instead. .It Va f_fsid Not meaningful in this implementation. @@ -141,9 +141,9 @@ or .Xr fstatfs 2 and -.Xr pathconf 3 +.Xr pathconf 2 or -.Xr fpathconf 3 , +.Xr fpathconf 2 , respectively. In addition, .Fn statvfs @@ -157,8 +157,8 @@ .Vt "struct statvfs" . .El .Sh SEE ALSO -.Xr statfs 2 , -.Xr pathconf 3 +.Xr pathconf 2 , +.Xr statfs 2 .Sh STANDARDS The .Fn statvfs ==== //depot/projects/ia64/lib/libc/gen/tzset.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tzset.3 8.2 (Berkeley) 11/17/93 -.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.12 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.13 2003/06/08 10:01:51 charnier Exp $ .\" .Dd November 17, 1993 .Dt TZSET 3 @@ -108,7 +108,7 @@ .Fn tzsetwall function sets things up so that -.Xr localtime +.Xr localtime 3 returns the best available approximation of local wall clock time. .Sh SPECIFICATION FORMAT When ==== //depot/projects/ia64/lib/libc/net/gethostbyname.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.29 2003/02/06 11:04:46 charnier Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.30 2003/06/08 10:07:14 charnier Exp $ .\" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306082126.h58LQq9G001879>