From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:28:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E52F116A4D0; Thu, 13 Jan 2005 21:28:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAB3116A4CE for ; Thu, 13 Jan 2005 21:28:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 326FE43D31 for ; Thu, 13 Jan 2005 21:28:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0DLSWrk011680 for ; Thu, 13 Jan 2005 21:28:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DLSVHH011677 for perforce@freebsd.org; Thu, 13 Jan 2005 21:28:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Jan 2005 21:28:31 GMT Message-Id: <200501132128.j0DLSVHH011677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 68941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2005 21:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68941 Change 68941 by sam@sam_ebb on 2005/01/13 21:28:00 IFC @ 68940 Affected files ... .. //depot/projects/wifi/bin/chio/chio.1#3 integrate .. //depot/projects/wifi/bin/expr/expr.1#3 integrate .. //depot/projects/wifi/bin/pax/ar_subs.c#2 integrate .. //depot/projects/wifi/bin/pax/extern.h#2 integrate .. //depot/projects/wifi/bin/pax/ftree.c#2 integrate .. //depot/projects/wifi/etc/periodic/daily/460.status-mail-rejects#3 integrate .. //depot/projects/wifi/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/wifi/etc/rc.d/cleartmp#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/wifi/include/Makefile#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/wifi/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#3 integrate .. //depot/projects/wifi/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#3 integrate .. //depot/projects/wifi/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/wifi/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/wifi/lib/libc/sys/intro.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/kse.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/recv.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/stat.2#3 integrate .. //depot/projects/wifi/lib/libutil/fparseln.3#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#2 integrate .. //depot/projects/wifi/lib/msun/amd64/fenv.h#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_atan2f.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_log10f.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_logf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_remainderf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_scalbf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_sqrtf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_ceilf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_copysignf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_cosf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_floorf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_llrint.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_log1p.S#2 delete .. //depot/projects/wifi/lib/msun/i387/s_logbf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_lrint.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_rintf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_scalbnf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_significandf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_sinf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_tanf.S#1 branch .. //depot/projects/wifi/lib/msun/man/ceil.3#2 integrate .. //depot/projects/wifi/lib/msun/man/cimag.3#2 integrate .. //depot/projects/wifi/lib/msun/man/feclearexcept.3#2 integrate .. //depot/projects/wifi/lib/msun/man/fenv.3#2 integrate .. //depot/projects/wifi/lib/msun/man/floor.3#2 integrate .. //depot/projects/wifi/lib/msun/man/lrint.3#1 branch .. //depot/projects/wifi/lib/msun/man/lround.3#1 branch .. //depot/projects/wifi/lib/msun/man/math.3#2 integrate .. //depot/projects/wifi/lib/msun/man/rint.3#2 integrate .. //depot/projects/wifi/lib/msun/man/round.3#2 integrate .. //depot/projects/wifi/lib/msun/src/math.h#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ceill.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_floorl.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llrint.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llrintf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llround.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llroundf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lrint.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lrintf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lround.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lroundf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_round.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_roundf.c#2 integrate .. //depot/projects/wifi/release/Makefile#4 integrate .. //depot/projects/wifi/share/examples/Makefile#5 integrate .. //depot/projects/wifi/share/examples/mdoc/example.1#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.3#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.4#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.9#1 branch .. //depot/projects/wifi/share/man/man3/tgmath.3#2 integrate .. //depot/projects/wifi/share/man/man4/axe.4#2 integrate .. //depot/projects/wifi/share/man/man4/ciss.4#2 integrate .. //depot/projects/wifi/share/man/man4/cm.4#2 integrate .. //depot/projects/wifi/share/man/man4/cnw.4#2 integrate .. //depot/projects/wifi/share/man/man4/dc.4#3 integrate .. //depot/projects/wifi/share/man/man4/divert.4#3 integrate .. //depot/projects/wifi/share/man/man4/hptmv.4#2 integrate .. //depot/projects/wifi/share/man/man4/ida.4#2 integrate .. //depot/projects/wifi/share/man/man4/inet.4#2 integrate .. //depot/projects/wifi/share/man/man4/ipsec.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/wifi/share/man/man4/mem.4#3 integrate .. //depot/projects/wifi/share/man/man4/mpt.4#3 integrate .. //depot/projects/wifi/share/man/man4/netgraph.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_device.4#2 integrate .. //depot/projects/wifi/share/man/man4/ngatmbase.4#3 integrate .. //depot/projects/wifi/share/man/man4/psm.4#2 integrate .. //depot/projects/wifi/share/man/man4/uplcom.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan.4#4 integrate .. //depot/projects/wifi/share/man/man4/wlan_acl.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_ccmp.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_wep.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_xauth.4#3 integrate .. //depot/projects/wifi/share/man/man4/xl.4#4 integrate .. //depot/projects/wifi/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/wifi/share/man/man7/firewall.7#2 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_GEOM_CLASS.9#3 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_MODULE.9#3 integrate .. //depot/projects/wifi/share/man/man9/MODULE_DEPEND.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_START.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_VGET.9#3 integrate .. //depot/projects/wifi/share/man/man9/bpf.9#3 integrate .. //depot/projects/wifi/share/man/man9/ifnet.9#3 integrate .. //depot/projects/wifi/share/man/man9/mbuf_tags.9#3 integrate .. //depot/projects/wifi/share/man/man9/microtime.9#2 integrate .. //depot/projects/wifi/share/man/man9/microuptime.9#2 integrate .. //depot/projects/wifi/share/man/man9/module.9#2 integrate .. //depot/projects/wifi/share/man/man9/pfil.9#2 integrate .. //depot/projects/wifi/share/man/man9/physio.9#3 integrate .. //depot/projects/wifi/share/man/man9/printf.9#2 integrate .. //depot/projects/wifi/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/wifi/share/man/man9/style.9#4 integrate .. //depot/projects/wifi/share/man/man9/suser.9#3 integrate .. //depot/projects/wifi/share/man/man9/sx.9#3 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/wifi/share/man/man9/time.9#2 integrate .. //depot/projects/wifi/share/man/man9/vflush.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map.9#2 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/wifi/sys/conf/NOTES#10 integrate .. //depot/projects/wifi/sys/conf/files#14 integrate .. //depot/projects/wifi/sys/conf/newvers.sh#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.h#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbreg.h#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#9 integrate .. //depot/projects/wifi/sys/kern/vfs_init.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/wifi/sys/sys/umtx.h#6 integrate .. //depot/projects/wifi/sys/sys/vnode.h#11 integrate .. //depot/projects/wifi/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/wifi/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/lib/msun/test-lrint.c#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lrint.t#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lround.c#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lround.t#1 branch .. //depot/projects/wifi/tools/regression/sockets/reconnect/Makefile#1 branch .. //depot/projects/wifi/tools/regression/sockets/reconnect/reconnect.c#1 branch .. //depot/projects/wifi/usr.bin/fstat/fstat.c#3 integrate .. //depot/projects/wifi/usr.bin/tail/forward.c#4 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/parser.y#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/decode.c#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/vidcontrol.c#2 integrate Differences ... ==== //depot/projects/wifi/bin/chio/chio.1#3 (text+ko) ==== @@ -1,5 +1,4 @@ .\" $NetBSD: chio.1,v 1.4 1997/10/02 00:41:25 hubertf Exp $ - .\"- .\" Copyright (c) 1996 Jason R. Thorpe .\" All rights reserved. @@ -31,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.25 2005/01/10 08:39:20 imp Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.26 2005/01/13 08:46:19 ru Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 ==== //depot/projects/wifi/bin/expr/expr.1#3 (text+ko) ==== @@ -1,5 +1,4 @@ .\" -*- nroff -*- - .\"- .\" Copyright (c) 1993 Winning Strategies, Inc. .\" All rights reserved. @@ -29,7 +28,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/bin/expr/expr.1,v 1.26 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.27 2005/01/13 08:46:19 ru Exp $ .\" .Dd July 12, 2004 .Dt EXPR 1 ==== //depot/projects/wifi/bin/pax/ar_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -400,8 +400,10 @@ /* * check if this file meets user specified options match. */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } fd = -1; if (uflag) { /* @@ -785,8 +787,10 @@ /* * check if this file meets user specified options */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } /* * if there is already a file in the destination directory with ==== //depot/projects/wifi/bin/pax/extern.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD: src/bin/pax/extern.h,v 1.15 2004/04/06 20:06:48 markm Exp $ + * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $ */ /* @@ -155,6 +155,7 @@ int ftree_start(void); int ftree_add(char *, int); void ftree_sel(ARCHD *); +void ftree_notsel(void); void ftree_chk(void); int next_file(ARCHD *); ==== //depot/projects/wifi/bin/pax/ftree.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -214,6 +214,18 @@ } /* + * ftree_notsel() + * this entry has not been selected by pax. + */ + +void +ftree_notsel() +{ + if (ftent != NULL) + (void)fts_set(ftsp, ftent, FTS_SKIP); +} + +/* * ftree_chk() * called at end on pax execution. Prints all those file args that did not * have a selected member (reference count still 0) ==== //depot/projects/wifi/etc/periodic/daily/460.status-mail-rejects#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.19 2005/01/11 10:54:38 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -51,7 +51,7 @@ done cat /var/log/maillog } | - sed -n -E "s/^$start"'.*ruleset=check_[^ \t]+,[ \t]+arg1=,]+).*reject=([^ \t]*)[ \t].*[ \t]([a-zA-Z0-9_.]+)$/\2 (\3... \4)/p' | + sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) [ $rc -gt 0 ] && rc=1 fi;; ==== //depot/projects/wifi/etc/periodic/security/100.chksetuid#2 (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/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $ # # If there is a global system configuration file, suck it in. @@ -44,7 +44,7 @@ echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort` + MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` if [ -n "${MP}" ] then set ${MP} ==== //depot/projects/wifi/etc/rc.d/cleartmp#2 (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.11 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $ # # PROVIDE: cleartmp @@ -14,6 +14,7 @@ rcvar=`set_rcvar clear_tmp` start_cmd="cleartmp_start" stop_cmd=":" +x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix" cleartmp_start() { @@ -31,9 +32,9 @@ load_rc_config $name run_rc_command "$1" -# Remove X lock files, since they will prevent you from -# restarting X -# +# Remove X lock files, since they will prevent you from restarting X. rm -f /tmp/.X[0-9]-lock -rm -fr /tmp/.X11-unix -mkdir -m 1777 /tmp/.X11-unix + +# Create socket directories with correct permissions to avoid security problem. +rm -fr ${x11_socket_dirs} +mkdir -m 1777 ${x11_socket_dirs} ==== //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#3 (text+ko) ==== @@ -22,13 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.5 2005/01/13 10:07:51 ru Exp $ .Dd August 1, 2004 .Os .Dt KGDB 1 .Sh NAME .Nm kgdb -.Nd The kernel debugger +.Nd "kernel debugger" .Sh SYNOPSIS .Nm .Op Fl a @@ -83,8 +83,7 @@ .El .Pp The -.Fl c , -.Fl n , +.Fl c , n , and .Fl r options are mutually exclusive. @@ -101,7 +100,7 @@ will be opened to allow debugging the currenlty running kernel. .Sh FILES -.Bl -tag -width "Pa /var/crash" +.Bl -tag -width ".Pa /var/crash" .It Pa /dev/mem Default memory image to open if no core dump file has been specified. ==== //depot/projects/wifi/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.229 2004/11/17 23:48:17 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.230 2005/01/11 21:15:18 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -39,7 +39,7 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ - geom/stripe \ + geom/shsec geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/mac_biba security/mac_bsdextended security/mac_lomac \ ==== //depot/projects/wifi/lib/libarchive/archive_read.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.14 2005/01/10 05:11:15 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.16 2005/01/12 05:56:49 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_read 3 @@ -50,7 +50,7 @@ .Nm archive_read_data_into_fd , .Nm archive_read_extract , .Nm archive_read_extract_set_progress_callback , -.Nm archive_read_close +.Nm archive_read_close , .Nm archive_read_finish .Nd functions for reading streaming archives .Sh SYNOPSIS @@ -80,9 +80,9 @@ .Ft int .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *" .Ft int -.Fn archive_read_open_fd "struct archive *" "int fd" +.Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_file "struct archive *" "const char *filename" +.Fn archive_read_open_file "struct archive *" "const char *filename" "size_t block_size" .Ft int .Fn archive_read_next_header "struct archive *" "struct archive_entry **" .Ft ssize_t @@ -96,7 +96,7 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "int flags" +.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" .Ft void .Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" .Ft int @@ -146,7 +146,12 @@ Freeze the settings, open the archive, and prepare for reading entries. This is the most generic version of this call, which accepts three callback functions. -The library invokes these client-provided functions to obtain +Most clients will want to use +.Fn archive_read_open_file +or +.Fn archive_read_open_fd +instead. +The library invokes the client-provided functions to obtain raw bytes from the archive. Note: The API permits a decompression method to fork and invoke the callbacks from another process. @@ -159,14 +164,14 @@ .It Fn archive_read_open_fd Like .Fn archive_read_open , -except that it accepts a file descriptor rather than +except that it accepts a file descriptor and block size rather than a trio of function pointers. Note that the file descriptor will not be automatically closed at end-of-archive. .It Fn archive_read_open_file Like .Fn archive_read_open , -except that it accepts a simple filename. +except that it accepts a simple filename and a block size. A NULL filename represents standard input. .It Fn archive_read_next_header Read the header for the next entry and return a pointer to @@ -188,6 +193,9 @@ sparse files, as supported by some archive formats. The library gaurantees that offsets will increase and that blocks will not overlap. +Note that the blocks returned from this function can be much larger +than the block size read from disk, due to compression +and internal buffer optimizations. .It Fn archive_read_data_skip A convenience function that repeatedly calls .Fn archive_read_data_block @@ -204,6 +212,10 @@ .It Fn archive_read_extract A convenience function that recreates the specified object on disk and reads the entry data into that object. +The filename, permissions, and other critical information +are taken from the provided +.Va archive_entry +object. The .Va flags argument modifies how the object is recreated. @@ -227,7 +239,20 @@ By default, existing files are truncated and rewritten, but the file is not recreated. In particular, the default behavior does not break existing hard links. +.It Cm ARCHIVE_EXTRACT_ACL +Attempt to restore ACLs. +By default, extended ACLs are ignored. +.It Cm ARCHIVE_EXTRACT_FFLAGS +Attempt to restore extended file flags. +By default, file flags are ignored. .El +Note that not all attributes are set immediately; +some attributes are cached in memory and written to disk only +when the archive is closed. +(For example, read-only directories are initially created +writable so that files within those directories can be +restored. +The final permissions are set when the archive is closed.) .It Fn archive_read_extract_set_progress_callback Sets a pointer to a user-defined callback that can be used for updating progress displays during extraction. ==== //depot/projects/wifi/lib/libbluetooth/bluetooth.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.4 2005/01/04 20:00:27 emax Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.5 2005/01/13 08:49:45 ru Exp $ .\" .Dd May 7, 2003 .Dt BLUETOOTH 3 @@ -87,7 +87,7 @@ argument passed to .Fn bt_gethostbyname should point to a -.Dv NULL Ns -terminated +.Dv NUL Ns -terminated hostname. The .Fa addr @@ -142,7 +142,7 @@ argument passed to .Fn bt_getprotobyname should point to a -.Dv NULL Ns -terminated +.Dv NUL Ns -terminated Bluetooth Protocol Service Multiplexor name. The .Fa proto ==== //depot/projects/wifi/lib/libc/gen/getnetgrent.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.32 2004/11/13 20:40:28 bz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $"); #include #include @@ -273,6 +273,7 @@ free((char *)ogp); } grouphead.gr = (struct netgrp *)0; + nextgrp = (struct netgrp *)0; #ifdef YP _netgr_yp_enabled = 0; #endif ==== //depot/projects/wifi/lib/libc/locale/mbsrtowcs.3#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/lib/libc/locale/mbsrtowcs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.6 2005/01/11 20:50:49 ru Exp $ .Dd July 21, 2004 .Dt MBSRTOWCS 3 .Os @@ -95,7 +95,7 @@ .Fn mbsrtowcs , except that conversion stops after reading at most .Fa nms -bytes from the buffer pointed to by +bytes from the buffer pointed to by .Fa src . .Sh RETURN VALUES The ==== //depot/projects/wifi/lib/libc/net/addr2ascii.3#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" $ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $ -.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.17 2004/10/09 17:13:58 maxim Exp $ +.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.18 2005/01/11 20:50:49 ru Exp $ .\" .Dd June 13, 1996 .Dt ADDR2ASCII 3 @@ -107,21 +107,24 @@ .Pp .Bl -tag -width AF_INETxxxx -compact .It Dv AF_INET -.Li struct in_addr +.Vt "struct in_addr" (in .In arpa/inet.h ) .It Dv AF_LINK -.Li struct sockaddr_dl +.Vt "struct sockaddr_dl" (in .In net/if_dl.h ) .\" .It Dv AF_INET6 -.\" .Li struct in6_addr +.\" .Vt "struct in6_addr" .\" (in .\" .In netinet6/in6.h ) .El .Pp -.Dv AF_INET and AF_LINK constants are defined in -.In sys/socket.h +.Dv AF_INET +and +.Dv AF_LINK +constants are defined in +.In sys/socket.h . .Sh RETURN VALUES The .Fn addr2ascii @@ -167,7 +170,7 @@ functions, rather than the other way around. .Sh ERRORS When a failure is returned, -.Li errno +.Va errno is set to one of the following values: .Bl -tag -width Er .It Bq Er ENAMETOOLONG @@ -222,7 +225,7 @@ generic interface would provide a means for determining the length of the buffer to be used so that it could be dynamically allocated, and would always require a -.Dq Li "struct sockaddr" +.Vt "struct sockaddr" to hold the binary address. Unfortunately, this is incompatible with existing practice. ==== //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.5 2004/11/18 15:24:47 csjp Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.6 2005/01/11 20:50:50 ru Exp $ .\" .Dd April 19, 2003 .Dt MAC.CONF 5 @@ -46,7 +46,8 @@ symbol. .Pp Currently, the implementation supports two syntax styles for label -element declaration. The old (deprecated) syntax consists of a +element declaration. +The old (deprecated) syntax consists of a single line with two fields separated by white space: the object class name, and a list of label elements as used by the .Xr mac_prepare 3 ==== //depot/projects/wifi/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.15 2004/08/24 21:48:21 alfred Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.16 2005/01/11 20:50:50 ru Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -117,7 +117,9 @@ this buffer will be used instead of the current buffer. If .Fa buf -is not NULL, it is the caller's responsibility to +is not +.Dv NULL , +it is the caller's responsibility to .Xr free 3 this buffer after closing the stream. (If the ==== //depot/projects/wifi/lib/libc/stdlib/merge.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.6 2002/03/21 22:48:42 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.7 2005/01/12 03:39:34 brian Exp $"); /* * Hybrid exponential search/linear search merge sort with hybrid @@ -60,8 +60,10 @@ #include #include -static void setup(u_char *, u_char *, size_t, size_t, int (*)()); -static void insertionsort(u_char *, size_t, size_t, int (*)()); +static void setup(u_char *, u_char *, size_t, size_t, + int (*)(const void *, const void *)); +static void insertionsort(u_char *, size_t, size_t, + int (*)(const void *, const void *)); #define ISIZE sizeof(int) #define PSIZE sizeof(u_char *) @@ -103,7 +105,8 @@ size_t size; int (*cmp)(const void *, const void *); { - int i, sense; + size_t i; + int sense; int big, iflag; u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *list2, *list1, *p2, *p, *last, **p1; ==== //depot/projects/wifi/lib/libc/stdtime/strftime.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.35 2004/11/04 08:34:57 delphij Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.36 2005/01/11 20:50:50 ru Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -106,7 +106,7 @@ .Dq Li %m/%d/%y . .It Cm %d is replaced by the day of the month as a decimal number (01-31). -.It Cm \&%E* Cm \&%O* +.It Cm %E* %O* POSIX locale extensions. The sequences %Ec %EC %Ex %EX %Ey %EY @@ -135,7 +135,8 @@ .It Cm \&%H is replaced by the hour (24-hour clock) as a decimal number (00-23). .It Cm %h -the same as %b. +the same as +.Cm %b . .It Cm \&%I is replaced by the hour (12-hour clock) as a decimal number (01-12). .It Cm %j @@ -152,8 +153,9 @@ is replaced by the month as a decimal number (01-12). .It Cm %n is replaced by a newline. -.It Cm \&%O* -the same as %E*. +.It Cm %O* +the same as +.Cm %E* . .It Cm %p is replaced by national representation of either "ante meridiem" @@ -207,7 +209,7 @@ is replaced by the year without century as a decimal number (00-99). .It Cm \&%Z is replaced by the time zone name. -.It Cm \&%z +.It Cm %z is replaced by the time zone offset from UTC; a leading plus sign stands for east of UTC, a minus sign for west of UTC, hours and minutes follow with two digits each and no delimiter between them (common form for @@ -216,13 +218,13 @@ is replaced by national representation of the date and time (the format is similar to that produced by .Xr date 1 ) . -.It Cm \&%-* +.It Cm %-* GNU libc extension. Do not do any padding when performing numerical outputs. -.It Cm \&%_* +.It Cm %_* GNU libc extension. Explicitly specify space for padding. -.It Cm \&%0* +.It Cm %0* GNU libc extension. Explicitly specify zero for padding. .It Cm %% ==== //depot/projects/wifi/lib/libc/sys/intro.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.42 2004/07/08 20:27:38 wollman Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.43 2005/01/11 20:50:50 ru Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -605,12 +605,12 @@ an ordinary file, special file, or directory. .Pp These characters may be arbitrary eight-bit values, -excluding NUL -.Po Tn ASCII -.No 0 Pc -and the +excluding +.Dv NUL +.Tn ( ASCII +0) and the .Ql \&/ -character (slash, +character (slash, .Tn ASCII 47). .Pp @@ -625,7 +625,7 @@ by the shell. .It Path Name A path name is a -.Tn NUL Ns -terminated +.Dv NUL Ns -terminated character string starting with an optional slash .Ql \&/ , ==== //depot/projects/wifi/lib/libc/sys/kse.2#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.14 2004/10/08 20:40:30 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.15 2005/01/11 20:50:50 ru Exp $ .\" .Dd September 10, 2002 .Dt KSE 2 @@ -332,43 +332,62 @@ .\" .Ss Signals .\" -.Pp -The current implementation creates a special a signal thread. +The current implementation creates a special signal thread. Kernel threads (KSEs) in a process mask all signals, and only the signal thread waits for signals to be delivered to the process, the signal thread is responsible for dispatching signals to user threads. .Pp A downside of this is that if a multiplexed thread -calls the execve() syscall, its signal mask and pending signals may not be -available in the kernel. They are stored -in userland and the kernel does not know where to get them, however POSIX +calls the +.Fn execve +syscall, its signal mask and pending signals may not be +available in the kernel. +They are stored +in userland and the kernel does not know where to get them, however +.Tn POSIX requires them to be restored and passed them to new process. -Just setting the mask for the thread before calling execve is only a +Just setting the mask for the thread before calling +.Fn execve +is only a close approximation to the problem as it does not re-deliver back to the kernel -any pending signals that the old process may have blocked, and it allows a -window in which new signals may be delivered to the process between the setting of the mask and the execve(). +any pending signals that the old process may have blocked, and it allows a +window in which new signals may be delivered to the process between the setting +of the mask and the +.Fn execve . .Pp For now this problem has been solved by adding a special combined -kse_thr_interrupt()/execve() mode to the +.Fn kse_thr_interrupt Ns / Ns Fn execve +mode to the .Fn kse_thr_interrupt syscall. -The +The .Fn kse_thr_interrupt -syscall has a sub command KSE_INTR_EXECVE, that allows it to accept a -.Va kse_execv_args +syscall has a sub command +.Dv KSE_INTR_EXECVE , +that allows it to accept a +.Vt kse_execv_args structure, and allowing it to adjust the signals and then atomically -convert into an execve() call. +convert into an +.Fn execve +call. Additional pending signals and the correct signal mask can be passed -to the kernel in this way. The thread library overrides the execve syscall -and translates it into kse_intr_interrupt call, allowing a multiplexed thread -to restore pending signals and the correct signal mask before doing the exec. +to the kernel in this way. +The thread library overrides the +.Fn execve +syscall +and translates it into +.Fn kse_intr_interrupt +call, allowing a multiplexed thread +to restore pending signals and the correct signal mask before doing the +.Fn exec . This solution to the problem may change. .\" .Ss KSE Mailboxes .\" -Each KSE has a unique mailbox for user-kernel communication defined in -sys/kse.h. Some of the fields there are: +Each KSE has a unique mailbox for user-kernel communication defined in +.In sys/kse.h . +Some of the fields there are: .Pp .Va km_version describes the version of this structure and must be equal to @@ -466,20 +485,18 @@ .Va km_flags may contain any of the following bits OR'ed together: .Bl -tag -width indent -.It \& -KMF_NOUPCALL -block upcalls from happening. The thread is in some critical section. -.It \& -KMF_NOCOMPLETED -.It \& -KMF_DONE -.It \& >>> TRUNCATED FOR MAIL (1000 lines) <<<