Re: CVS commit: src/sys/compat/netbsd32
On Fri, Jun 13, 2014 at 10:42:26AM +, Joerg Sonnenberger wrote: Module Name: src Committed By: joerg Date: Fri Jun 13 10:42:26 UTC 2014 Modified Files: src/sys/compat/netbsd32: netbsd32_sysctl.c Log Message: Rename stack gap arguments. stack gap ? that was expunged years ago... David -- David Laight: da...@l8s.co.uk
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 07:08:06 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add SORT and SED variables, in case a host environment needs them. To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.166 src/usr.sbin/postinstall/postinstall:1.167 --- src/usr.sbin/postinstall/postinstall:1.166 Fri Apr 25 00:23:26 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 07:08:06 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.166 2014/04/25 00:23:26 mrg Exp $ +# $NetBSD: postinstall,v 1.167 2014/06/16 07:08:06 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -58,6 +58,8 @@ : ${HOST_SH:=sh} : ${MAKE:=make} : ${PWD_MKDB:=/usr/sbin/pwd_mkdb} +: ${SED:=sed} +: ${SORT:=sort} : ${STAT:=stat} # @@ -121,7 +123,7 @@ shell_quote() # then insert ' at the beginning of the first line, # and append ' at the end of the last line. result=${result}$(printf %s\n $arg | \ - sed -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/) + ${SED} -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/) done printf %s\n $result } @@ -718,9 +720,9 @@ do_ddbonpanic() result=1 else echo ${DEST_DIR}/etc/sysctl.conf - sed ${SRC_DIR}/etc/sysctl.conf \ + ${SED} ${SRC_DIR}/etc/sysctl.conf \ -e '/^ddb\.onpanic/q' | \ - sed -e '1,/^$/d' \ + ${SED} -e '1,/^$/d' \ ${DEST_DIR}/etc/sysctl.conf result=$? fi @@ -1036,8 +1038,8 @@ do_motd() then tmp1=$(mktemp /tmp/postinstall.motd.) tmp2=$(mktemp /tmp/postinstall.motd.) - sed '1,2d' ${SRC_DIR}/etc/motd ${tmp1} - sed '1,2d' ${DEST_DIR}/etc/motd ${tmp2} + ${SED} '1,2d' ${SRC_DIR}/etc/motd ${tmp1} + ${SED} '1,2d' ${DEST_DIR}/etc/motd ${tmp2} if [ $1 = check ]; then cmp -s ${tmp1} ${tmp2} @@ -1048,7 +1050,7 @@ do_motd() fi else head -n 2 ${DEST_DIR}/etc/motd ${tmp1} - sed '1,2d' ${SRC_DIR}/etc/motd ${tmp1} + ${SED} '1,2d' ${SRC_DIR}/etc/motd ${tmp1} cp ${tmp1} ${DEST_DIR}/etc/motd result=0 fi @@ -1258,7 +1260,7 @@ do_rc() # generate scripts mkdir ${SCRATCHDIR}/rc for f in ${generated_scripts}; do - sed -e s,@X11ROOTDIR@,${X11ROOTDIR},g \ + ${SED} -e s,@X11ROOTDIR@,${X11ROOTDIR},g \ ${SRC_DIR}/etc/rc.d/${f}.in \ ${SCRATCHDIR}/rc/${f} done @@ -1570,7 +1572,7 @@ ${pcpath} was a directory, should be a f # itself. If the directory contains unexpected extra files # then it will not be deleted. ( [ -f ${DEST_DIR}/var/db/obsolete/xbase ] \ - sort -ru ${DEST_DIR}/var/db/obsolete/xbase \ + ${SORT} -ru ${DEST_DIR}/var/db/obsolete/xbase \ | ${GREP} -E ^\\.?${pcpath}/ ; echo ${pcpath} ) \ | obsolete_paths ${op} @@ -1697,7 +1699,7 @@ handle_atf_user() if grep '[^#]*unprivileged-user[ \t]*=.*_atf' ${conf} /dev/null then if [ $1 = fix ]; then - sed -e \ + ${SED} -e \ /[^#]*unprivileged-user[\ t]*=/s/_atf/_tests/ \ ${conf} ${conf}.new failed=$(( ${failed} + $? )) @@ -1905,7 +1907,7 @@ do_obsolete() op=$1 failed=0 - sort -ru ${DEST_DIR}/var/db/obsolete/* | obsolete_paths ${op} + ${SORT} -ru ${DEST_DIR}/var/db/obsolete/* | obsolete_paths ${op} failed=$(( ${failed} + $? )) (
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 07:11:52 UTC 2014 Modified Files: src: Makefile Log Message: Pass SED=${TOOL_SED:Q} to postinstall. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/Makefile diff -u src/Makefile:1.306 src/Makefile:1.307 --- src/Makefile:1.306 Fri Jun 13 01:17:45 2014 +++ src/Makefile Mon Jun 16 07:11:52 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.306 2014/06/13 01:17:45 mrg Exp $ +# $NetBSD: Makefile,v 1.307 2014/06/16 07:11:52 apb Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -177,6 +177,7 @@ _POSTINSTALL_ENV= \ HOST_SH=${HOST_SH:Q} \ MAKE=${MAKE:Q} \ PWD_MKDB=${TOOL_PWD_MKDB:Q} \ + SED=${TOOL_SED:Q} \ STAT=${TOOL_STAT:Q} postinstall-check: .PHONY
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:21:21 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add bre_quote (copied from etcupdate), and unprefix functions. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.167 src/usr.sbin/postinstall/postinstall:1.168 --- src/usr.sbin/postinstall/postinstall:1.167 Mon Jun 16 07:08:06 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 08:21:20 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.167 2014/06/16 07:08:06 apb Exp $ +# $NetBSD: postinstall,v 1.168 2014/06/16 08:21:20 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -128,6 +128,33 @@ shell_quote() printf %s\n $result } +# Convert arg $1 to a basic regular expression (as in sed) +# that will match the arg. This works by inserting backslashes +# before characters that are special in basic regular expressions. +# It also inserts backslashes before the extra characters specified +# in $2 (which defaults to /,). +# XXX: Does not handle embedded newlines. +# Usage: regex=$(bre_quote ${string}) +bre_quote() +{ + local arg=$1 + local extra=$2:/, + printf %s\n ${arg} | ${SED} -e 's/[][^$.*\\'${extra}']/\\/g' +} + +# unprefix dir +# Remove any dir prefix from a list of paths on stdin, +# and write the result to stdout. Useful for converting +# from ${DEST_DIR}/path to /path. +# +unprefix() +{ + [ $# -eq 1 ] || err 3 USAGE: unprefix dir + local prefix=${1#/} + prefix=$(bre_quote ${prefix}) + + ${SED} -e s,^${prefix}/,/, +} # additem item description # Add item to list of supported items to check/fix,
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:28:08 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Clarify wording in a comment for obsolete_paths. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.168 src/usr.sbin/postinstall/postinstall:1.169 --- src/usr.sbin/postinstall/postinstall:1.168 Mon Jun 16 08:21:20 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 08:28:08 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.168 2014/06/16 08:21:20 apb Exp $ +# $NetBSD: postinstall,v 1.169 2014/06/16 08:28:08 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -477,8 +477,8 @@ file_exists_exact() # obsolete_paths op # Obsolete the list of paths provided on stdin. -# Each path is relative to ${DEST_DIR}, and should -# be an absolute path or start with `./'. +# Each path should start with '/' or './', and +# will be interpreted relative to ${DEST_DIR}. # obsolete_paths() {
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:29:18 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: In do_sendmail, use unprefix to fix up paths that will be processed by obsolete_paths. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.169 src/usr.sbin/postinstall/postinstall:1.170 --- src/usr.sbin/postinstall/postinstall:1.169 Mon Jun 16 08:28:08 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 08:29:18 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.169 2014/06/16 08:28:08 apb Exp $ +# $NetBSD: postinstall,v 1.170 2014/06/16 08:29:18 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1346,11 +1346,13 @@ do_sendmail() for f in /etc/mail/helpfile /etc/mail/local-host-names \ /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/rc.d/sendmail \ /etc/rc.d/smmsp /usr/share/misc/sendmail.hf \ - $(find ${DEST_DIR}/usr/share/sendmail -type f) \ - $(find ${DEST_DIR}/usr/share/sendmail -type d) \ - ${DEST_DIR}/var/log/sendmail.st \ - ${DEST_DIR}/var/spool/clientmqueue \ - ${DEST_DIR}/var/spool/mqueue; do + $( ( find ${DEST_DIR}/usr/share/sendmail -type f ; \ + find ${DEST_DIR}/usr/share/sendmail -type d \ + ) | unprefix ${DEST_DIR} ) \ + /var/log/sendmail.st \ + /var/spool/clientmqueue \ + /var/spool/mqueue + do [ -e ${DEST_DIR}${f} ] echo ${f} done | obsolete_paths ${op} failed=$(( ${failed} + $? ))
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:39:56 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Remove stray quotation mark To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.170 src/usr.sbin/postinstall/postinstall:1.171 --- src/usr.sbin/postinstall/postinstall:1.170 Mon Jun 16 08:29:18 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 08:39:56 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.170 2014/06/16 08:29:18 apb Exp $ +# $NetBSD: postinstall,v 1.171 2014/06/16 08:39:56 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1349,7 +1349,7 @@ do_sendmail() $( ( find ${DEST_DIR}/usr/share/sendmail -type f ; \ find ${DEST_DIR}/usr/share/sendmail -type d \ ) | unprefix ${DEST_DIR} ) \ - /var/log/sendmail.st \ + /var/log/sendmail.st \ /var/spool/clientmqueue \ /var/spool/mqueue do
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:59:13 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add a new obsolete_stand target, disabled by default, to delete old files and subdirectories under /stand/${MACHINE}. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.171 src/usr.sbin/postinstall/postinstall:1.172 --- src/usr.sbin/postinstall/postinstall:1.171 Mon Jun 16 08:39:56 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 08:59:13 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.171 2014/06/16 08:39:56 apb Exp $ +# $NetBSD: postinstall,v 1.172 2014/06/16 08:59:13 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -590,6 +590,37 @@ function checklib(results, line, regex) ) } +# obsolete_stand dir +# Prints the names of all obsolete files and subdirs below the +# provided dir. dir should be something like /stand/${MACHINE}. +# The input dir and all output paths are interpreted +# relative to ${DEST_DIR}. +# +# Assumes that the numerically largest subdir is current, and all +# others are obsolete. +# +obsolete_stand() +{ + [ $# -eq 1 ] || err 3 USAGE: obsolete_stand dir + local dir=$1 + local subdir + + if ! [ -d ${DEST_DIR}/${dir} ]; then + msg ${DEST_DIR}${dir} doesn't exist; can't check for obsolete files + return 1 + fi + + ( cd ${DEST_DIR}${dir} ls -1d [0-9]*[0-9]/. ) \ + | ${GREP} -v '[^0-9./]' \ + | sort -t. -r -k1n -k2n -k3n \ + | tail -n +2 \ + | while read subdir ; do + subdir=${subdir%/.} + find ${DEST_DIR}/${dir#/}/${subdir} -depth -print + done \ + | unprefix ${DEST_DIR} +} + # modify_file op srcfile scratchfile awkprog # Apply awkprog to srcfile sending output to scratchfile, and # if appropriate replace srcfile with scratchfile. @@ -1924,6 +1955,21 @@ do_varshm() return ${failed} } +# +# obsolete_stand +# +adddisableditem obsolete_stand remove obsolete files from /stand +do_obsolete_stand() +{ + [ -n $1 ] || err 3 USAGE: do_obsolete_stnd fix|check + op=$1 + failed=0 + + obsolete_stand /stand/${MACHINE} | obsolete_paths ${op} + failed=$(( ${failed} + $? )) + + return ${failed} +} # # obsolete
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 09:04:43 UTC 2014 Modified Files: src: Makefile Log Message: Pass -m MACHINE -a MACHINE_ARCH to postinstall To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/Makefile diff -u src/Makefile:1.307 src/Makefile:1.308 --- src/Makefile:1.307 Mon Jun 16 07:11:52 2014 +++ src/Makefile Mon Jun 16 09:04:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.307 2014/06/16 07:11:52 apb Exp $ +# $NetBSD: Makefile,v 1.308 2014/06/16 09:04:43 apb Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -170,7 +170,8 @@ afterinstall: .PHONY .MAKE ${MAKEDIRTARGET} . postinstall-check .endif -_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall +_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall \ + -m ${MACHINE} -a ${MACHINE_ARCH} _POSTINSTALL_ENV= \ AWK=${TOOL_AWK:Q} \ DB=${TOOL_DB:Q} \
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 09:06:26 UTC 2014 Modified Files: src: Makefile Log Message: Run postinstall fix obsolete_stand just before checkflist, if we are building with DESTDIR != / To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/Makefile diff -u src/Makefile:1.308 src/Makefile:1.309 --- src/Makefile:1.308 Mon Jun 16 09:04:43 2014 +++ src/Makefile Mon Jun 16 09:06:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.308 2014/06/16 09:04:43 apb Exp $ +# $NetBSD: Makefile,v 1.309 2014/06/16 09:06:26 apb Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -196,6 +196,11 @@ postinstall-fix-obsolete: .NOTMAIN .PHON ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete @echo=== +postinstall-fix-obsolete_stand: .NOTMAIN .PHONY + @echo=== Removing obsolete files === + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand + @echo=== + # # Targets (in order!) called by make build. @@ -308,6 +313,7 @@ distribution buildworld: .PHONY .MAKE ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1 .if defined(DESTDIR) ${DESTDIR} != ${DESTDIR} != / ${MAKEDIRTARGET} . postinstall-fix-obsolete + ${MAKEDIRTARGET} . postinstall-fix-obsolete_stand ${MAKEDIRTARGET} distrib/sets checkflist .endif @echo make ${.TARGET} started at: ${START_TIME}
CVS commit: src/doc
Module Name:src Committed By: apb Date: Mon Jun 16 09:12:30 UTC 2014 Modified Files: src/doc: CHANGES Log Message: pigz(1): Update to pigz-2.3.1 [tls 20140615] To generate a diff of this commit: cvs rdiff -u -r1.1937 -r1.1938 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1937 src/doc/CHANGES:1.1938 --- src/doc/CHANGES:1.1937 Sat Jun 14 21:01:39 2014 +++ src/doc/CHANGES Mon Jun 16 09:12:30 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1937 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1938 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -432,3 +432,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: zoneinfo: Import tzdata2014e. [apb 20140613] libc: Update to tzcode2014e. [christos 20140614] dhcpcd(8): Import dhcpcd-6.4.0 [roy 20140614] + pigz(1): Update to pigz-2.3.1 [tls 20140615]
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: hannken Date: Mon Jun 16 09:55:49 UTC 2014 Modified Files: src/sys/fs/cd9660: cd9660_lookup.c cd9660_node.c cd9660_node.h cd9660_vfsops.c Log Message: Change cd9660 from hashlist to vcache. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.32 -r1.33 src/sys/fs/cd9660/cd9660_node.c cvs rdiff -u -r1.15 -r1.16 src/sys/fs/cd9660/cd9660_node.h cvs rdiff -u -r1.86 -r1.87 src/sys/fs/cd9660/cd9660_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/cd9660/cd9660_lookup.c diff -u src/sys/fs/cd9660/cd9660_lookup.c:1.28 src/sys/fs/cd9660/cd9660_lookup.c:1.29 --- src/sys/fs/cd9660/cd9660_lookup.c:1.28 Sat Jun 14 07:39:28 2014 +++ src/sys/fs/cd9660/cd9660_lookup.c Mon Jun 16 09:55:49 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_lookup.c,v 1.28 2014/06/14 07:39:28 hannken Exp $ */ +/* $NetBSD: cd9660_lookup.c,v 1.29 2014/06/16 09:55:49 hannken Exp $ */ /*- * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_lookup.c,v 1.28 2014/06/14 07:39:28 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_lookup.c,v 1.29 2014/06/16 09:55:49 hannken Exp $); #include sys/param.h #include sys/namei.h @@ -107,8 +107,7 @@ cd9660_lookup(void *v) int saveoffset = -1; /* offset of last directory entry in dir */ int numdirpasses; /* strategy for directory search */ doff_t endsearch; /* offset to end directory search */ - struct vnode *pdp; /* saved dp during symlink work */ - struct vnode *tdp; /* returned by cd9660_vget_internal */ + struct vnode *tdp; /* returned by vcache_get */ u_long bmask; /* block offset mask */ int error; ino_t ino = 0; @@ -342,6 +341,7 @@ notfound: found: if (numdirpasses == 2) namecache_count_pass2(); + brelse(bp, 0); /* * Found component in pathname. @@ -351,44 +351,12 @@ found: if ((flags ISLASTCN) nameiop == LOOKUP) dp-i_diroff = dp-i_offset; - /* - * Step through the translation in the name. We do not `iput' the - * directory because we may need it again if a symbolic link - * is relative to the current directory. Instead we save it - * unlocked as pdp. We must get the target inode before unlocking - * the directory to insure that the inode will not be removed - * before we get it. We prevent deadlock by always fetching - * inodes from the root, moving down the directory tree. Thus - * when following backward pointers .. we must unlock the - * parent directory before getting the requested directory. - * There is a potential race condition here if both the current - * and parent directories are removed before the `iget' for the - * inode associated with .. returns. We hope that this occurs - * infrequently since we cannot avoid this race condition without - * implementing a sophisticated deadlock detection algorithm. - * Note also that this simple deadlock detection scheme will not - * work if the file system has any hard links other than .. - * that point backwards in the directory structure. - */ - pdp = vdp; - - /* - * If ino is different from dp-i_ino, - * it's a relocated directory. - */ - brelse(bp, 0); - if (flags ISDOTDOT) { - VOP_UNLOCK(pdp); /* race to get the inode */ - error = cd9660_vget_internal(vdp-v_mount, dp-i_ino, tdp); - vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY); - if (error) - return error; - *vpp = tdp; - } else if (dp-i_number == dp-i_ino) { + if (dp-i_number == dp-i_ino) { vref(vdp); /* we want ourself, ie . */ *vpp = vdp; } else { - error = cd9660_vget_internal(vdp-v_mount, dp-i_ino, tdp); + error = vcache_get(vdp-v_mount, + dp-i_ino, sizeof(dp-i_ino), tdp); if (error) return (error); *vpp = tdp; @@ -399,8 +367,6 @@ found: */ cache_enter(vdp, *vpp, cnp-cn_nameptr, cnp-cn_namelen, cnp-cn_flags); - if (*vpp != vdp) - VOP_UNLOCK(*vpp); return 0; } Index: src/sys/fs/cd9660/cd9660_node.c diff -u src/sys/fs/cd9660/cd9660_node.c:1.32 src/sys/fs/cd9660/cd9660_node.c:1.33 --- src/sys/fs/cd9660/cd9660_node.c:1.32 Sat Jun 14 07:39:28 2014 +++ src/sys/fs/cd9660/cd9660_node.c Mon Jun 16 09:55:49 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_node.c,v 1.32 2014/06/14 07:39:28 hannken Exp $ */ +/* $NetBSD: cd9660_node.c,v 1.33 2014/06/16 09:55:49 hannken Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1994 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_node.c,v 1.32 2014/06/14 07:39:28 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_node.c,v 1.33 2014/06/16 09:55:49 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -58,15 +58,6 @@ __KERNEL_RCSID(0, $NetBSD: cd9660_node. #include fs/cd9660/cd9660_mount.h #include fs/cd9660/iso_rrip.h -/* - * Structures associated with iso_node caching. - */ -LIST_HEAD(ihashhead, iso_node) *isohashtbl;
CVS commit: src/sys/kern
Module Name:src Committed By: joerg Date: Mon Jun 16 12:28:10 UTC 2014 Modified Files: src/sys/kern: vfs_cache.c Log Message: Require the actual namecache_look around cache_lookup_entry. Add one last case of missing stat locking. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/kern/vfs_cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_cache.c diff -u src/sys/kern/vfs_cache.c:1.98 src/sys/kern/vfs_cache.c:1.99 --- src/sys/kern/vfs_cache.c:1.98 Sat Jun 14 16:12:34 2014 +++ src/sys/kern/vfs_cache.c Mon Jun 16 12:28:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_cache.c,v 1.98 2014/06/14 16:12:34 joerg Exp $ */ +/* $NetBSD: vfs_cache.c,v 1.99 2014/06/16 12:28:10 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_cache.c,v 1.98 2014/06/14 16:12:34 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_cache.c,v 1.99 2014/06/16 12:28:10 joerg Exp $); #include opt_ddb.h #include opt_revcache.h @@ -286,8 +286,7 @@ cache_unlock_cpus(void) } /* - * Find a single cache entry and return it locked. 'namecache_lock' or - * at least one of the per-CPU locks must be held. + * Find a single cache entry and return it locked. */ static struct namecache * cache_lookup_entry(const struct vnode *dvp, const char *name, size_t namelen) @@ -297,6 +296,7 @@ cache_lookup_entry(const struct vnode *d nchash_t hash; KASSERT(dvp != NULL); + KASSERT(mutex_owned(namecache_lock)); hash = cache_hash(name, namelen); ncpp = nchashtbl[NCHASH2(hash, dvp)]; @@ -395,7 +395,9 @@ cache_lookup(struct vnode *dvp, const ch /* found nothing */ return 0; } + mutex_enter(namecache_lock); ncp = cache_lookup_entry(dvp, name, namelen); + mutex_exit(namecache_lock); if (__predict_false(ncp == NULL)) { mutex_enter(cpup-cpu_lock); COUNT(cpup-cpu_stats, ncs_miss); @@ -517,7 +519,9 @@ cache_lookup_raw(struct vnode *dvp, cons /* found nothing */ return 0; } + mutex_enter(namecache_lock); ncp = cache_lookup_entry(dvp, name, namelen); + mutex_exit(namecache_lock); if (__predict_false(ncp == NULL)) { mutex_enter(cpup-cpu_lock); COUNT(cpup-cpu_stats, ncs_miss); @@ -559,7 +563,9 @@ cache_lookup_raw(struct vnode *dvp, cons } /* Unlocked, but only for stats. */ + mutex_enter(cpup-cpu_lock); COUNT(cpup-cpu_stats, ncs_goodhits); /* XXX can be badhits */ + mutex_exit(cpup-cpu_lock); /* found it */ *vn_ret = vp;
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Jun 16 12:36:41 UTC 2014 Modified Files: src/sys/dev/mii: atphy.c Log Message: Fix a bug that atphy doesn't set the capability of pause function correctly. This bug was added in mii.h rev. 1.17. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/atphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/atphy.c diff -u src/sys/dev/mii/atphy.c:1.15 src/sys/dev/mii/atphy.c:1.16 --- src/sys/dev/mii/atphy.c:1.15 Sun Jun 16 06:29:08 2013 +++ src/sys/dev/mii/atphy.c Mon Jun 16 12:36:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atphy.c,v 1.15 2013/06/16 06:29:08 msaitoh Exp $ */ +/* $NetBSD: atphy.c,v 1.16 2014/06/16 12:36:41 msaitoh Exp $ */ /* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */ /*- @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.15 2013/06/16 06:29:08 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.16 2014/06/16 12:36:41 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -408,7 +408,7 @@ atphy_mii_phy_auto(struct mii_softc *sc) sc-mii_ticks = 0; anar = BMSR_MEDIA_TO_ANAR(sc-mii_capabilities) | ANAR_CSMA; if (sc-mii_flags MIIF_DOPAUSE) - anar |= ANAR_X_PAUSE_TOWARDS; + anar |= ANAR_PAUSE_TOWARDS; PHY_WRITE(sc, MII_ANAR, anar); if (sc-mii_extcapabilities (EXTSR_1000TFDX | EXTSR_1000THDX)) PHY_WRITE(sc, MII_100T2CR, GTCR_ADV_1000TFDX |
CVS commit: src/external/bsd/ipf/dist/tools
Module Name:src Committed By: christos Date: Mon Jun 16 12:37:58 UTC 2014 Modified Files: src/external/bsd/ipf/dist/tools: ipfstat.c Log Message: From Darren Reed: #548 ipfstat hits a bus error on netbsd/sparc64 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/tools/ipfstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/tools/ipfstat.c diff -u src/external/bsd/ipf/dist/tools/ipfstat.c:1.4 src/external/bsd/ipf/dist/tools/ipfstat.c:1.5 --- src/external/bsd/ipf/dist/tools/ipfstat.c:1.4 Thu Jun 12 13:23:06 2014 +++ src/external/bsd/ipf/dist/tools/ipfstat.c Mon Jun 16 08:37:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ipfstat.c,v 1.4 2014/06/12 17:23:06 christos Exp $ */ +/* $NetBSD: ipfstat.c,v 1.5 2014/06/16 12:37:58 christos Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -856,8 +856,13 @@ printlivelist(fiop, out, set, fp, group, if (fp-fr_family != 0 fp-fr_family != AF_INET) continue; } - if (fp-fr_data != NULL) - fp-fr_data = (char *)fp + fp-fr_size; + if (fp-fr_data != NULL) { + fp-fr_data = calloc(1, fp-fr_dsize); + if (fp-fr_data != NULL) { +memcpy(fp-fr_data, (char *)fp + fp-fr_size, +fp-fr_dsize); + } + } rules++;
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: christos Date: Mon Jun 16 12:38:32 UTC 2014 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c Log Message: Darren Reed: #550 filter rule list corrupted with inserted rules To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/ipf/netinet/fil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/ipf/netinet/fil.c diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.14 src/sys/external/bsd/ipf/netinet/fil.c:1.15 --- src/sys/external/bsd/ipf/netinet/fil.c:1.14 Thu Mar 20 16:43:12 2014 +++ src/sys/external/bsd/ipf/netinet/fil.c Mon Jun 16 08:38:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fil.c,v 1.14 2014/03/20 20:43:12 christos Exp $ */ +/* $NetBSD: fil.c,v 1.15 2014/06/16 12:38:32 christos Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch; #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.14 2014/03/20 20:43:12 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.15 2014/06/16 12:38:32 christos Exp $); #else static const char sccsid[] = @(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $; @@ -3787,6 +3787,8 @@ memstr(const char *src, char *dst, size_ } return s; } + + /* */ /* Function:ipf_fixskip */ /* Returns: Nil */ @@ -4357,7 +4359,15 @@ frrequest(ipf_main_softc_t *softc, int u fp = f; f = NULL; + fp-fr_next = NULL; fp-fr_dnext = NULL; + fp-fr_pnext = NULL; + fp-fr_pdnext = NULL; + fp-fr_grp = NULL; + fp-fr_grphead = NULL; + fp-fr_icmpgrp = NULL; + fp-fr_isc = (void *)-1; + fp-fr_ptr = NULL; fp-fr_ref = 0; fp-fr_flags |= FR_COPIED; } else { @@ -4860,7 +4870,9 @@ frrequest(ipf_main_softc_t *softc, int u if (f-fr_collect fp-fr_collect) break; ftail = f-fr_next; +fprev = ftail; } + ftail = fprev; f = NULL; ptr = NULL; } else if (req == (ioctlcmd_t)SIOCINAFR || @@ -4951,6 +4963,8 @@ frrequest(ipf_main_softc_t *softc, int u fp-fr_ref = 1; fp-fr_pnext = ftail; fp-fr_next = *ftail; + if (fp-fr_next != NULL) + fp-fr_next-fr_pnext = fp-fr_next; *ftail = fp; if (addrem == 0) ipf_fixskip(ftail, fp, 1);
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Jun 16 12:54:43 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/lib/libm: Makefile src/lib/libm/src: namespace.h s_modf.c src/tests/lib/libm: Makefile Added Files: src/lib/libm/src: s_modfl.c src/tests/lib/libm: t_modf.c Log Message: Add modfl(3). From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.1894 -r1.1895 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.571 -r1.572 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.159 -r1.160 src/lib/libm/Makefile cvs rdiff -u -r1.10 -r1.11 src/lib/libm/src/namespace.h cvs rdiff -u -r1.14 -r1.15 src/lib/libm/src/s_modf.c cvs rdiff -u -r0 -r1.1 src/lib/libm/src/s_modfl.c cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libm/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_modf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1894 src/distrib/sets/lists/comp/mi:1.1895 --- src/distrib/sets/lists/comp/mi:1.1894 Wed May 28 11:32:50 2014 +++ src/distrib/sets/lists/comp/mi Mon Jun 16 12:54:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1894 2014/05/28 11:32:50 tron Exp $ +# $NetBSD: mi,v 1.1895 2014/06/16 12:54:42 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7960,6 +7960,8 @@ ./usr/share/man/cat3/mktime.0 comp-c-catman .cat ./usr/share/man/cat3/mktime_z.0 comp-c-catman .cat ./usr/share/man/cat3/modf.0 comp-c-catman .cat +./usr/share/man/cat3/modff.0 comp-c-catman .cat +./usr/share/man/cat3/modfl.0 comp-c-catman .cat ./usr/share/man/cat3/moncontrol.0 comp-c-catman .cat ./usr/share/man/cat3/monstartup.0 comp-c-catman .cat ./usr/share/man/cat3/move.0 comp-c-catman .cat @@ -14745,6 +14747,8 @@ ./usr/share/man/html3/mktime.html comp-c-htmlman html ./usr/share/man/html3/mktime_z.html comp-c-htmlman html ./usr/share/man/html3/modf.html comp-c-htmlman html +./usr/share/man/html3/modff.html comp-c-htmlman html +./usr/share/man/html3/modfl.html comp-c-htmlman html ./usr/share/man/html3/moncontrol.html comp-c-htmlman html ./usr/share/man/html3/monstartup.html comp-c-htmlman html ./usr/share/man/html3/move.html comp-c-htmlman html @@ -21516,6 +21520,8 @@ ./usr/share/man/man3/mktime.3 comp-c-man .man ./usr/share/man/man3/mktime_z.3 comp-c-man .man ./usr/share/man/man3/modf.3 comp-c-man .man +./usr/share/man/man3/modff.3 comp-c-man .man +./usr/share/man/man3/modfl.3 comp-c-man .man ./usr/share/man/man3/moncontrol.3 comp-c-man .man ./usr/share/man/man3/monstartup.3 comp-c-man .man ./usr/share/man/man3/move.3 comp-c-man .man Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.60 src/distrib/sets/lists/debug/mi:1.61 --- src/distrib/sets/lists/debug/mi:1.60 Tue Apr 29 06:29:02 2014 +++ src/distrib/sets/lists/debug/mi Mon Jun 16 12:54:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.60 2014/04/29 06:29:02 uebayasi Exp $ +# $NetBSD: mi,v 1.61 2014/06/16 12:54:42 joerg Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -2043,6 +2043,7 @@ ./usr/libdata/debug/usr/tests/lib/libm/t_infinity.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_ldexp.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_libm.debug tests-obsolete obsolete +./usr/libdata/debug/usr/tests/lib/libm/t_modf.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_log.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_pow.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_precision.debug tests-lib-debug debug,atf Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.571 src/distrib/sets/lists/tests/mi:1.572 --- src/distrib/sets/lists/tests/mi:1.571 Sat May 31 20:26:51 2014 +++ src/distrib/sets/lists/tests/mi Mon Jun 16 12:54:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.571 2014/05/31 20:26:51 christos Exp $ +# $NetBSD: mi,v 1.572 2014/06/16 12:54:43 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2841,6 +2841,7 @@ ./usr/tests/lib/libm/t_ldexp tests-lib-tests atf ./usr/tests/lib/libm/t_libm tests-obsolete obsolete ./usr/tests/lib/libm/t_log tests-lib-tests atf +./usr/tests/lib/libm/t_modf tests-lib-tests atf ./usr/tests/lib/libm/t_pow tests-lib-tests atf ./usr/tests/lib/libm/t_precision tests-lib-tests atf ./usr/tests/lib/libm/t_round tests-lib-tests atf Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.159 src/lib/libm/Makefile:1.160 ---
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Jun 16 14:43:22 UTC 2014 Modified Files: src/sys/dev/mii: bmtphy.c brgphyreg.h ciphyreg.h gentbi.c mii.h nsphy.c rlphy.c ukphy_subr.c Log Message: No functional change: - Fix typo. - Remove trailing white spaces. - Capitalize comments. - Tabify. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/bmtphy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/brgphyreg.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/ciphyreg.h cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/gentbi.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mii/mii.h cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/nsphy.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/rlphy.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/mii/ukphy_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/bmtphy.c diff -u src/sys/dev/mii/bmtphy.c:1.30 src/sys/dev/mii/bmtphy.c:1.31 --- src/sys/dev/mii/bmtphy.c:1.30 Mon Oct 19 18:41:13 2009 +++ src/sys/dev/mii/bmtphy.c Mon Jun 16 14:43:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bmtphy.c,v 1.30 2009/10/19 18:41:13 bouyer Exp $ */ +/* $NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bmtphy.c,v 1.30 2009/10/19 18:41:13 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -247,7 +247,7 @@ bmtphy_status(struct mii_softc *sc) if (bmcr BMCR_AUTOEN) { /* - * The media status bits are only valid of autonegotiation + * The media status bits are only valid if autonegotiation * has completed (or it's disabled). */ if ((bmsr BMSR_ACOMP) == 0) { @@ -272,7 +272,7 @@ bmtphy_status(struct mii_softc *sc) mii-mii_media_active = ife-ifm_media; } -static void +static void bmtphy_reset(struct mii_softc *sc) { u_int16_t data; @@ -288,8 +288,7 @@ bmtphy_reset(struct mii_softc *sc) data = PHY_READ(sc, MII_BMTPHY_AUX2); PHY_WRITE(sc, MII_BMTPHY_AUX2, data | 0x0020); - /* Enable clocks across APD for - * Auto-MDIX functionality */ + /* Enable clocks across APD for Auto-MDIX functionality */ data = PHY_READ(sc, MII_BMTPHY_INTR); PHY_WRITE(sc, MII_BMTPHY_INTR, data | 0x0004); @@ -297,4 +296,4 @@ bmtphy_reset(struct mii_softc *sc) data = PHY_READ(sc, 0x1f); PHY_WRITE(sc, 0x1f, data ~0x0080); } -} +} Index: src/sys/dev/mii/brgphyreg.h diff -u src/sys/dev/mii/brgphyreg.h:1.7 src/sys/dev/mii/brgphyreg.h:1.8 --- src/sys/dev/mii/brgphyreg.h:1.7 Thu Jun 12 12:09:47 2014 +++ src/sys/dev/mii/brgphyreg.h Mon Jun 16 14:43:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: brgphyreg.h,v 1.7 2014/06/12 12:09:47 msaitoh Exp $ */ +/* $NetBSD: brgphyreg.h,v 1.8 2014/06/16 14:43:22 msaitoh Exp $ */ /* * Copyright (c) 2000 @@ -52,7 +52,7 @@ #define BRGPHY_MII_PHY_EXTCTL 0x10 /* PHY extended control */ #define BRGPHY_PHY_EXTCTL_MAC_PHY 0x8000 /* 10BIT/GMI-interface */ #define BRGPHY_PHY_EXTCTL_DIS_CROSS 0x4000 /* Disable MDI crossover */ -#define BRGPHY_PHY_EXTCTL_TX_DIS 0x2000 /* Tx output disable d*/ +#define BRGPHY_PHY_EXTCTL_TX_DIS 0x2000 /* Tx output disabled */ #define BRGPHY_PHY_EXTCTL_INT_DIS 0x1000 /* Interrupts disabled */ #define BRGPHY_PHY_EXTCTL_F_INT 0x0800 /* Force interrupt */ #define BRGPHY_PHY_EXTCTL_BY_45 0x0400 /* Bypass 4B5B-Decoder */ @@ -85,7 +85,7 @@ #define BRGPHY_MII_RXERRCNT 0x12 /* RX error counter */ -#define BRGPHY_MII_FCERRCNT 0x13 /* false carrier sense counter */ +#define BRGPHY_MII_FCERRCNT 0x13 /* False carrier sense counter */ #define BGRPHY_FCERRCNT 0x00FF /* False carrier counter */ #define BRGPHY_MII_RXNOCNT 0x14 /* RX not OK counter */ @@ -140,14 +140,14 @@ #define BRGPHY_AUXCTL_DIAG_MODE 0x0004 /* Diagnostic mode */ #define BRGPHY_MII_AUXSTS 0x19 /* AUX status */ -#define BRGPHY_AUXSTS_ACOMP 0x8000 /* autoneg complete */ -#define BRGPHY_AUXSTS_AN_ACK 0x4000 /* autoneg complete ack */ -#define BRGPHY_AUXSTS_AN_ACK_D 0x2000 /* autoneg complete ack detect */ -#define BRGPHY_AUXSTS_AN_NPW 0x1000 /* autoneg next page wait */ -#define BRGPHY_AUXSTS_AN_RES 0x0700 /* AN HDC */ +#define BRGPHY_AUXSTS_ACOMP 0x8000 /* Autoneg complete */ +#define BRGPHY_AUXSTS_AN_ACK 0x4000 /* Autoneg complete ack */ +#define BRGPHY_AUXSTS_AN_ACK_D 0x2000 /* Autoneg complete ack detect */ +#define BRGPHY_AUXSTS_AN_NPW 0x1000 /* Autoneg next page wait */ +#define BRGPHY_AUXSTS_AN_RES 0x0700 /* Autoneg HCD */ #define BRGPHY_AUXSTS_PDF 0x0080 /* Parallel detect. fault */ -#define BRGPHY_AUXSTS_RF 0x0040 /* remote fault */ -#define BRGPHY_AUXSTS_ANP_R 0x0020 /* AN page received */ +#define BRGPHY_AUXSTS_RF 0x0040 /* Remote fault */ +#define BRGPHY_AUXSTS_ANP_R 0x0020 /* Autoneg page received */ #define BRGPHY_AUXSTS_LP_ANAB 0x0010 /* LP AN
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Mon Jun 16 16:29:30 UTC 2014 Modified Files: src/lib/libc/gen: getpass.c Log Message: Recognize CR as end of line too. the telnet client passes that to us instead of linefeed. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/getpass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/getpass.c diff -u src/lib/libc/gen/getpass.c:1.27 src/lib/libc/gen/getpass.c:1.28 --- src/lib/libc/gen/getpass.c:1.27 Sat May 26 15:34:16 2012 +++ src/lib/libc/gen/getpass.c Mon Jun 16 12:29:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: getpass.c,v 1.27 2012/05/26 19:34:16 christos Exp $ */ +/* $NetBSD: getpass.c,v 1.28 2014/06/16 16:29:30 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: getpass.c,v 1.27 2012/05/26 19:34:16 christos Exp $); +__RCSID($NetBSD: getpass.c,v 1.28 2014/06/16 16:29:30 christos Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -245,7 +245,7 @@ getpassfd(const char *prompt, char *buf, } /* End of line */ - if (c == C(VEOL, CTRL('j')) || c == C(VEOL2, CTRL('l'))) + if (c == C(VEOL, CTRL('j')) || c == C(VEOL2, CTRL('m'))) c = '\0'; add: if (l = len) {
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Jun 16 16:48:16 UTC 2014 Modified Files: src/sys/arch/mips/adm5120/dev: if_admsw.c src/sys/dev/ic: rtl80x9.c src/sys/dev/mii: acphy.c amhphy.c brgphy.c ciphy.c dmphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c inphy.c iophy.c lxtphy.c makphy.c mvphy.c nsphy.c nsphyter.c qsphy.c rlphy.c sqphy.c tlphy.c tqphy.c ukphy_subr.c urlphy.c src/sys/dev/pci: if_kse.c if_txp.c if_wm.c Log Message: IFM_FDX and IFM_HDX use different bit, so set IFM_HDX bit if it's not full duplex. For many drivers, it recognize half duplex if IFM_FDX isn't set, but not for others. Same as {Free|Open}BSD. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/rtl80x9.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/mii/acphy.c src/sys/dev/mii/glxtphy.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/mii/amhphy.c cvs rdiff -u -r1.69 -r1.70 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/dmphy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/gentbi.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/gphyter.c src/sys/dev/mii/rlphy.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mii/icsphy.c src/sys/dev/mii/lxtphy.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/mii/ikphy.c src/sys/dev/mii/mvphy.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/inphy.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/mii/iophy.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/nsphy.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/nsphyter.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/mii/qsphy.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/mii/sqphy.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/mii/tqphy.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/ukphy_subr.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mii/urlphy.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_kse.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_txp.c cvs rdiff -u -r1.269 -r1.270 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/adm5120/dev/if_admsw.c diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.11 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.12 --- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.11 Sat Oct 27 17:18:01 2012 +++ src/sys/arch/mips/adm5120/dev/if_admsw.c Mon Jun 16 16:48:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_admsw.c,v 1.11 2012/10/27 17:18:01 chs Exp $ */ +/* $NetBSD: if_admsw.c,v 1.12 2014/06/16 16:48:16 msaitoh Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_admsw.c,v 1.11 2012/10/27 17:18:01 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: if_admsw.c,v 1.12 2014/06/16 16:48:16 msaitoh Exp $); #include sys/param.h @@ -1277,4 +1277,6 @@ admsw_mediastatus(struct ifnet *ifp, str ifmr-ifm_active |= (status PHY_ST_100M) ? IFM_100_TX : IFM_10_T; if (status PHY_ST_FDX) ifmr-ifm_active |= IFM_FDX; + else + ifmr-ifm_active |= IFM_HDX; } Index: src/sys/dev/ic/rtl80x9.c diff -u src/sys/dev/ic/rtl80x9.c:1.15 src/sys/dev/ic/rtl80x9.c:1.16 --- src/sys/dev/ic/rtl80x9.c:1.15 Sat Mar 14 15:36:17 2009 +++ src/sys/dev/ic/rtl80x9.c Mon Jun 16 16:48:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl80x9.c,v 1.15 2009/03/14 15:36:17 dsl Exp $ */ +/* $NetBSD: rtl80x9.c,v 1.16 2014/06/16 16:48:16 msaitoh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtl80x9.c,v 1.15 2009/03/14 15:36:17 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: rtl80x9.c,v 1.16 2014/06/16 16:48:16 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -92,6 +92,8 @@ rtl80x9_mediastatus(struct dp8390_softc if (NIC_GET(sc-sc_regt, sc-sc_regh, NERTL_RTL3_CONFIG3) RTL3_CONFIG3_FUDUP) ifmr-ifm_active |= IFM_FDX; + else + ifmr-ifm_active |= IFM_HDX; } /* Set NIC to page 0 registers. */ Index: src/sys/dev/mii/acphy.c diff -u src/sys/dev/mii/acphy.c:1.23 src/sys/dev/mii/acphy.c:1.24 --- src/sys/dev/mii/acphy.c:1.23 Mon Nov 17 03:04:27 2008 +++ src/sys/dev/mii/acphy.c Mon Jun 16 16:48:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: acphy.c,v 1.23 2008/11/17 03:04:27 dyoung Exp $ */ +/* $NetBSD: acphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acphy.c,v 1.23 2008/11/17 03:04:27 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: acphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -248,8 +248,11 @@
CVS commit: src/sys/arch
Module Name:src Committed By: dsl Date: Mon Jun 16 19:08:18 UTC 2014 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: GENERIC XEN3_DOM0 Log Message: Comment out the xhci entries. The driver really doesn't work well enough to be generally useful. To generate a diff of this commit: cvs rdiff -u -r1.390 -r1.391 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.1105 -r1.1106 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.390 src/sys/arch/amd64/conf/GENERIC:1.391 --- src/sys/arch/amd64/conf/GENERIC:1.390 Thu Jun 12 20:22:04 2014 +++ src/sys/arch/amd64/conf/GENERIC Mon Jun 16 19:08:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.390 2014/06/12 20:22:04 alnsn Exp $ +# $NetBSD: GENERIC,v 1.391 2014/06/16 19:08:17 dsl Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.390 $ +#ident GENERIC-$Revision: 1.391 $ maxusers 64 # estimated number of users @@ -818,7 +818,8 @@ urlphy* at mii? phy ? # Realtek RTL815 # USB Controller and Devices # PCI USB controllers -xhci* at pci? dev ? function ? # eXtensible Host Controller +# xhci* at pci? dev ? function ? # eXtensible Host Controller + # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) @@ -835,7 +836,7 @@ uhci* at cardbus? function ? # Universa slhci* at pcmcia? function ? # ScanLogic SL811HS # USB bus support -usb* at xhci? +# usb* at xhci? usb* at ehci? usb* at ohci? usb* at uhci? Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.101 src/sys/arch/amd64/conf/XEN3_DOM0:1.102 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.101 Mon Mar 24 14:15:37 2014 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Jun 16 19:08:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.101 2014/03/24 14:15:37 szptvlfn Exp $ +# $NetBSD: XEN3_DOM0,v 1.102 2014/06/16 19:08:17 dsl Exp $ include arch/amd64/conf/std.xen @@ -544,13 +544,14 @@ wsmouse* at pms? mux 0 # USB Controller and Devices # PCI USB controllers -xhci* at pci? dev ? function ? # eXtensible Host Controller +# xhci* at pci? dev ? function ? # eXtensible Host Controller + # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) # USB bus support -usb* at xhci? +# usb* at xhci? usb* at ehci? usb* at ohci? usb* at uhci? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1105 src/sys/arch/i386/conf/GENERIC:1.1106 --- src/sys/arch/i386/conf/GENERIC:1.1105 Tue Jun 10 01:42:39 2014 +++ src/sys/arch/i386/conf/GENERIC Mon Jun 16 19:08:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1105 2014/06/10 01:42:39 hikaru Exp $ +# $NetBSD: GENERIC,v 1.1106 2014/06/16 19:08:17 dsl Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1105 $ +#ident GENERIC-$Revision: 1.1106 $ maxusers 64 # estimated number of users @@ -1123,7 +1123,8 @@ urlphy* at mii? phy ? # Realtek RTL815 # USB Controller and Devices # PCI USB controllers -xhci* at pci? dev ? function ? # eXtensible Host Controller +# xhci* at pci? dev ? function ? # eXtensible Host Controller + # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) ohci* at pci? dev ? function ? # Open Host Controller @@ -1141,7 +1142,7 @@ uhci* at cardbus? function ? # Universa slhci* at pcmcia? function ? # ScanLogic SL811HS # USB bus support -usb* at xhci? +# usb* at xhci? usb* at ehci? usb* at gcscehci? usb* at ohci? Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.83 src/sys/arch/i386/conf/XEN3_DOM0:1.84 --- src/sys/arch/i386/conf/XEN3_DOM0:1.83 Mon Mar 24 14:15:38 2014 +++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Jun 16 19:08:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.83 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: XEN3_DOM0,v 1.84 2014/06/16 19:08:17 dsl Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -521,13 +521,14 @@ wsmouse* at pms? mux 0 # USB Controller and Devices # PCI USB controllers -xhci* at pci? dev ? function ? # eXtensible Host Controller
CVS commit: src/lib/librumpuser
Module Name:src Committed By: alnsn Date: Mon Jun 16 21:07:28 UTC 2014 Modified Files: src/lib/librumpuser: rumpuser_bio.c Log Message: Add __RCSID. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/librumpuser/rumpuser_bio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_bio.c diff -u src/lib/librumpuser/rumpuser_bio.c:1.7 src/lib/librumpuser/rumpuser_bio.c:1.8 --- src/lib/librumpuser/rumpuser_bio.c:1.7 Wed May 15 14:58:24 2013 +++ src/lib/librumpuser/rumpuser_bio.c Mon Jun 16 21:07:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_bio.c,v 1.7 2013/05/15 14:58:24 pooka Exp $ */ +/* $NetBSD: rumpuser_bio.c,v 1.8 2014/06/16 21:07:28 alnsn Exp $ */ /*- * Copyright (c) 2013 Antti Kantee. All Rights Reserved. @@ -27,6 +27,10 @@ #include rumpuser_port.h +#if !defined(lint) +__RCSID($NetBSD: rumpuser_bio.c,v 1.8 2014/06/16 21:07:28 alnsn Exp $); +#endif /* !lint */ + #include sys/types.h #include assert.h
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 22:04:39 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Delete trailing slash with ${1%/}, not ${1#/}. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.172 src/usr.sbin/postinstall/postinstall:1.173 --- src/usr.sbin/postinstall/postinstall:1.172 Mon Jun 16 08:59:13 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 22:04:39 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.172 2014/06/16 08:59:13 apb Exp $ +# $NetBSD: postinstall,v 1.173 2014/06/16 22:04:39 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -150,7 +150,7 @@ bre_quote() unprefix() { [ $# -eq 1 ] || err 3 USAGE: unprefix dir - local prefix=${1#/} + local prefix=${1%/} prefix=$(bre_quote ${prefix}) ${SED} -e s,^${prefix}/,/,
CVS commit: src/usr.sbin
Module Name:src Committed By: apb Date: Mon Jun 16 22:12:30 UTC 2014 Modified Files: src/usr.sbin/etcupdate: etcupdate src/usr.sbin/postinstall: postinstall Log Message: Use extra=${2-/,} to use $2 if defined, else default to /,. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/etcupdate/etcupdate cvs rdiff -u -r1.173 -r1.174 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/etcupdate/etcupdate diff -u src/usr.sbin/etcupdate/etcupdate:1.56 src/usr.sbin/etcupdate/etcupdate:1.57 --- src/usr.sbin/etcupdate/etcupdate:1.56 Thu Jun 12 13:56:32 2014 +++ src/usr.sbin/etcupdate/etcupdate Mon Jun 16 22:12:30 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: etcupdate,v 1.56 2014/06/12 13:56:32 apb Exp $ +# $NetBSD: etcupdate,v 1.57 2014/06/16 22:12:30 apb Exp $ # # Copyright (c) 2001-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -164,7 +164,7 @@ shell_quote() bre_quote() { local arg=$1 - local extra=$2:/, + local extra=${2-/,} printf %s\n ${arg} | sed -e 's/[][^$.*\\'${extra}']/\\/g' } Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.173 src/usr.sbin/postinstall/postinstall:1.174 --- src/usr.sbin/postinstall/postinstall:1.173 Mon Jun 16 22:04:39 2014 +++ src/usr.sbin/postinstall/postinstall Mon Jun 16 22:12:30 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.173 2014/06/16 22:04:39 apb Exp $ +# $NetBSD: postinstall,v 1.174 2014/06/16 22:12:30 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -138,7 +138,7 @@ shell_quote() bre_quote() { local arg=$1 - local extra=$2:/, + local extra=${2-/,} printf %s\n ${arg} | ${SED} -e 's/[][^$.*\\'${extra}']/\\/g' }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Mon Jun 16 22:38:27 UTC 2014 Modified Files: src/sys/dev/pci: if_wpi.c Log Message: wpi(4): mostly cosmetic changes to source, also a little bit of diff reduction relative to OpenBSD as of late 2007. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_wpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wpi.c diff -u src/sys/dev/pci/if_wpi.c:1.58 src/sys/dev/pci/if_wpi.c:1.59 --- src/sys/dev/pci/if_wpi.c:1.58 Sat Mar 29 19:28:25 2014 +++ src/sys/dev/pci/if_wpi.c Mon Jun 16 22:38:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.58 2014/03/29 19:28:25 christos Exp $*/ +/* $NetBSD: if_wpi.c,v 1.59 2014/06/16 22:38:27 jakllsch Exp $*/ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.58 2014/03/29 19:28:25 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.59 2014/06/16 22:38:27 jakllsch Exp $); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -79,18 +79,6 @@ int wpi_debug = 1; #define DPRINTFN(n, x) #endif -/* - * Supported rates for 802.11a/b/g modes (in 500Kbps unit). - */ -static const struct ieee80211_rateset wpi_rateset_11a = - { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } }; - -static const struct ieee80211_rateset wpi_rateset_11b = - { 4, { 2, 4, 11, 22 } }; - -static const struct ieee80211_rateset wpi_rateset_11g = - { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; - static const char wpi_firmware_name[] = iwlwifi-3945.ucode; static once_t wpi_firmware_init; static kmutex_t wpi_firmware_mutex; @@ -129,7 +117,7 @@ static void wpi_mem_unlock(struct wpi_so static uint32_t wpi_mem_read(struct wpi_softc *, uint16_t); static void wpi_mem_write(struct wpi_softc *, uint16_t, uint32_t); static void wpi_mem_write_region_4(struct wpi_softc *, uint16_t, - const uint32_t *, int); + const uint32_t *, int); static int wpi_read_prom_data(struct wpi_softc *, uint32_t, void *, int); static int wpi_load_microcode(struct wpi_softc *, const uint8_t *, int); static int wpi_cache_firmware(struct wpi_softc *); @@ -239,7 +227,7 @@ wpi_attach(device_t parent __unused, dev /* map the register window */ error = pci_mapreg_map(pa, WPI_PCI_BAR0, PCI_MAPREG_TYPE_MEM | - PCI_MAPREG_MEM_TYPE_32BIT, 0, memt, memh, NULL, sc-sc_sz); + PCI_MAPREG_MEM_TYPE_32BIT, 0, memt, memh, NULL, sc-sc_sz); if (error != 0) { aprint_error_dev(self, could not map memory space\n); return; @@ -270,7 +258,7 @@ wpi_attach(device_t parent __unused, dev return; } - /* + /* * Allocate DMA memory for firmware transfers. */ if ((error = wpi_alloc_fwmem(sc)) != 0) @@ -315,24 +303,22 @@ wpi_attach(device_t parent __unused, dev /* set device capabilities */ ic-ic_caps = -#ifdef netyet - IEEE80211_C_IBSS | /* IBSS mode support */ -#endif - IEEE80211_C_WPA |/* 802.11i */ - IEEE80211_C_MONITOR |/* monitor mode supported */ - IEEE80211_C_TXPMGT | /* tx power management */ - IEEE80211_C_SHSLOT | /* short slot time supported */ - IEEE80211_C_SHPREAMBLE | /* short preamble supported */ - IEEE80211_C_WME; /* 802.11e */ + IEEE80211_C_WPA | /* 802.11i */ + IEEE80211_C_MONITOR | /* monitor mode supported */ + IEEE80211_C_TXPMGT | /* tx power management */ + IEEE80211_C_SHSLOT | /* short slot time supported */ + IEEE80211_C_SHPREAMBLE | /* short preamble supported */ + IEEE80211_C_WME; /* 802.11e */ /* read supported channels and MAC address from EEPROM */ wpi_read_eeprom(sc); - /* set supported .11a, .11b, .11g rates */ - ic-ic_sup_rates[IEEE80211_MODE_11A] = wpi_rateset_11a; - ic-ic_sup_rates[IEEE80211_MODE_11B] = wpi_rateset_11b; - ic-ic_sup_rates[IEEE80211_MODE_11G] = wpi_rateset_11g; + /* set supported .11a, .11b and .11g rates */ + ic-ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a; + ic-ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b; + ic-ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g; + /* IBSS channel undefined for now */ ic-ic_ibss_chan = ic-ic_channels[0]; ifp-if_softc = sc; @@ -357,7 +343,7 @@ wpi_attach(device_t parent __unused, dev ic-ic_newstate = wpi_newstate; ieee80211_media_init(ic, wpi_media_change, ieee80211_media_status); - sc-amrr.amrr_min_success_threshold = 1; + sc-amrr.amrr_min_success_threshold = 1; sc-amrr.amrr_max_success_threshold = 15; wpi_sysctlattach(sc); @@ -580,8 +566,7 @@ wpi_alloc_rpool(struct wpi_softc *sc) error = wpi_dma_contig_alloc(sc-sc_dmat, ring-buf_dma, NULL, WPI_RBUF_COUNT * WPI_RBUF_SIZE, WPI_BUF_ALIGN, BUS_DMA_NOWAIT); if (error != 0) { - aprint_normal_dev(sc-sc_dev, - could not allocate Rx buffers DMA memory\n); + aprint_normal_dev(sc-sc_dev, could not allocate Rx buffers DMA
CVS commit: xsrc/external/mit/xtrap/dist
Module Name:xsrc Committed By: christos Date: Tue Jun 17 03:46:27 UTC 2014 Modified Files: xsrc/external/mit/xtrap/dist: xtrapin.c xtrapinfo.c xtrapout.c xtrapproto.c xtrapreset.c xtrapstats.c Log Message: Fix cast from pointer to integer of different size. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xtrap/dist/xtrapin.c \ xsrc/external/mit/xtrap/dist/xtrapinfo.c \ xsrc/external/mit/xtrap/dist/xtrapproto.c \ xsrc/external/mit/xtrap/dist/xtrapreset.c \ xsrc/external/mit/xtrap/dist/xtrapstats.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xtrap/dist/xtrapout.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xtrap/dist/xtrapin.c diff -u xsrc/external/mit/xtrap/dist/xtrapin.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapin.c:1.2 --- xsrc/external/mit/xtrap/dist/xtrapin.c:1.1.1.1 Wed Jul 30 00:39:38 2008 +++ xsrc/external/mit/xtrap/dist/xtrapin.c Mon Jun 16 23:46:27 2014 @@ -173,7 +173,7 @@ main(int argc, char *argv[]) appW = XtAppInitialize(app,XTrap,optionTable,(Cardinal)1L, (int *)argc, (String *)argv, (String *)NULL,(ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); #ifdef DEBUG Index: xsrc/external/mit/xtrap/dist/xtrapinfo.c diff -u xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.2 --- xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.1.1.1 Wed Jul 30 00:39:38 2008 +++ xsrc/external/mit/xtrap/dist/xtrapinfo.c Mon Jun 16 23:46:27 2014 @@ -68,7 +68,7 @@ main(int argc, char *argv[]) /* Connect to Server */ appW = XtAppInitialize(app,XTrap,NULL,(Cardinal)0L, (int *)argc, (String *)argv, (String *)NULL, (ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); #ifdef DEBUG XSynchronize(dpy, True); Index: xsrc/external/mit/xtrap/dist/xtrapproto.c diff -u xsrc/external/mit/xtrap/dist/xtrapproto.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapproto.c:1.2 --- xsrc/external/mit/xtrap/dist/xtrapproto.c:1.1.1.1 Wed Jul 30 00:39:38 2008 +++ xsrc/external/mit/xtrap/dist/xtrapproto.c Mon Jun 16 23:46:27 2014 @@ -72,7 +72,7 @@ main(int argc, char *argv[]) /* Connect to Server */ appW = XtAppInitialize(app,XTrap,NULL,(Cardinal)0L, (int *)argc, (String *)argv, (String *)NULL,(ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); printf(Display: %s \n, DisplayString(dpy)); if ((tc = XECreateTC(dpy,0L, NULL)) == False) Index: xsrc/external/mit/xtrap/dist/xtrapreset.c diff -u xsrc/external/mit/xtrap/dist/xtrapreset.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapreset.c:1.2 --- xsrc/external/mit/xtrap/dist/xtrapreset.c:1.1.1.1 Wed Jul 30 00:39:38 2008 +++ xsrc/external/mit/xtrap/dist/xtrapreset.c Mon Jun 16 23:46:27 2014 @@ -67,7 +67,7 @@ main(int argc, char *argv[]) /* Connect to Server */ appW = XtAppInitialize(app,XTrap,NULL,(Cardinal)0L, (int *)argc, (String *)argv, (String *)NULL,(ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); #ifdef DEBUG XSynchronize(dpy, True); Index: xsrc/external/mit/xtrap/dist/xtrapstats.c diff -u xsrc/external/mit/xtrap/dist/xtrapstats.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapstats.c:1.2 --- xsrc/external/mit/xtrap/dist/xtrapstats.c:1.1.1.1 Wed Jul 30 00:39:39 2008 +++ xsrc/external/mit/xtrap/dist/xtrapstats.c Mon Jun 16 23:46:27 2014 @@ -75,7 +75,7 @@ main(int argc, char *argv[]) /* Connect to Server */ appW = XtAppInitialize(app,XTrap,NULL,(Cardinal)0L, (int *)argc, (String *)argv, (String *)NULL,(ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); #ifdef DEBUG XSynchronize(dpy, True); Index: xsrc/external/mit/xtrap/dist/xtrapout.c diff -u xsrc/external/mit/xtrap/dist/xtrapout.c:1.2 xsrc/external/mit/xtrap/dist/xtrapout.c:1.3 --- xsrc/external/mit/xtrap/dist/xtrapout.c:1.2 Wed Mar 5 16:29:31 2014 +++ xsrc/external/mit/xtrap/dist/xtrapout.c Mon Jun 16 23:46:27 2014 @@ -225,7 +225,7 @@ main(int argc, char *argv[]) appW = XtAppInitialize(app,XTrap,optionTable,(Cardinal)2L, (int *)argc, (String *)argv, (String *)NULL,(ArgList)tmp, -(Cardinal)NULL); +(Cardinal)0); dpy = XtDisplay(appW); #ifdef DEBUG
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 07:08:06 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add SORT and SED variables, in case a host environment needs them. To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 07:11:52 UTC 2014 Modified Files: src: Makefile Log Message: Pass SED=${TOOL_SED:Q} to postinstall. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:21:21 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add bre_quote (copied from etcupdate), and unprefix functions. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:28:08 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Clarify wording in a comment for obsolete_paths. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:29:18 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: In do_sendmail, use unprefix to fix up paths that will be processed by obsolete_paths. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:39:56 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Remove stray quotation mark To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 08:59:13 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add a new obsolete_stand target, disabled by default, to delete old files and subdirectories under /stand/${MACHINE}. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 09:04:43 UTC 2014 Modified Files: src: Makefile Log Message: Pass -m MACHINE -a MACHINE_ARCH to postinstall To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jun 16 09:06:26 UTC 2014 Modified Files: src: Makefile Log Message: Run postinstall fix obsolete_stand just before checkflist, if we are building with DESTDIR != / To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Mon Jun 16 09:12:30 UTC 2014 Modified Files: src/doc: CHANGES Log Message: pigz(1): Update to pigz-2.3.1 [tls 20140615] To generate a diff of this commit: cvs rdiff -u -r1.1937 -r1.1938 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: hannken Date: Mon Jun 16 09:55:49 UTC 2014 Modified Files: src/sys/fs/cd9660: cd9660_lookup.c cd9660_node.c cd9660_node.h cd9660_vfsops.c Log Message: Change cd9660 from hashlist to vcache. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.32 -r1.33 src/sys/fs/cd9660/cd9660_node.c cvs rdiff -u -r1.15 -r1.16 src/sys/fs/cd9660/cd9660_node.h cvs rdiff -u -r1.86 -r1.87 src/sys/fs/cd9660/cd9660_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: joerg Date: Mon Jun 16 12:28:10 UTC 2014 Modified Files: src/sys/kern: vfs_cache.c Log Message: Require the actual namecache_look around cache_lookup_entry. Add one last case of missing stat locking. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/kern/vfs_cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Jun 16 12:36:41 UTC 2014 Modified Files: src/sys/dev/mii: atphy.c Log Message: Fix a bug that atphy doesn't set the capability of pause function correctly. This bug was added in mii.h rev. 1.17. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/atphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ipf/dist/tools
Module Name:src Committed By: christos Date: Mon Jun 16 12:37:58 UTC 2014 Modified Files: src/external/bsd/ipf/dist/tools: ipfstat.c Log Message: From Darren Reed: #548 ipfstat hits a bus error on netbsd/sparc64 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/tools/ipfstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: christos Date: Mon Jun 16 12:38:32 UTC 2014 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c Log Message: Darren Reed: #550 filter rule list corrupted with inserted rules To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/ipf/netinet/fil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Jun 16 12:54:43 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/lib/libm: Makefile src/lib/libm/src: namespace.h s_modf.c src/tests/lib/libm: Makefile Added Files: src/lib/libm/src: s_modfl.c src/tests/lib/libm: t_modf.c Log Message: Add modfl(3). From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.1894 -r1.1895 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.571 -r1.572 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.159 -r1.160 src/lib/libm/Makefile cvs rdiff -u -r1.10 -r1.11 src/lib/libm/src/namespace.h cvs rdiff -u -r1.14 -r1.15 src/lib/libm/src/s_modf.c cvs rdiff -u -r0 -r1.1 src/lib/libm/src/s_modfl.c cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libm/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_modf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Jun 16 14:43:22 UTC 2014 Modified Files: src/sys/dev/mii: bmtphy.c brgphyreg.h ciphyreg.h gentbi.c mii.h nsphy.c rlphy.c ukphy_subr.c Log Message: No functional change: - Fix typo. - Remove trailing white spaces. - Capitalize comments. - Tabify. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/bmtphy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/brgphyreg.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/ciphyreg.h cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/gentbi.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mii/mii.h cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/nsphy.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/rlphy.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/mii/ukphy_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Mon Jun 16 16:29:30 UTC 2014 Modified Files: src/lib/libc/gen: getpass.c Log Message: Recognize CR as end of line too. the telnet client passes that to us instead of linefeed. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/getpass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Jun 16 16:48:16 UTC 2014 Modified Files: src/sys/arch/mips/adm5120/dev: if_admsw.c src/sys/dev/ic: rtl80x9.c src/sys/dev/mii: acphy.c amhphy.c brgphy.c ciphy.c dmphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c inphy.c iophy.c lxtphy.c makphy.c mvphy.c nsphy.c nsphyter.c qsphy.c rlphy.c sqphy.c tlphy.c tqphy.c ukphy_subr.c urlphy.c src/sys/dev/pci: if_kse.c if_txp.c if_wm.c Log Message: IFM_FDX and IFM_HDX use different bit, so set IFM_HDX bit if it's not full duplex. For many drivers, it recognize half duplex if IFM_FDX isn't set, but not for others. Same as {Free|Open}BSD. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/rtl80x9.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/mii/acphy.c src/sys/dev/mii/glxtphy.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/mii/amhphy.c cvs rdiff -u -r1.69 -r1.70 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/dmphy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/gentbi.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/gphyter.c src/sys/dev/mii/rlphy.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mii/icsphy.c src/sys/dev/mii/lxtphy.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/mii/ikphy.c src/sys/dev/mii/mvphy.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/inphy.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/mii/iophy.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/nsphy.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/nsphyter.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/mii/qsphy.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/mii/sqphy.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/mii/tqphy.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/ukphy_subr.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mii/urlphy.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_kse.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_txp.c cvs rdiff -u -r1.269 -r1.270 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: dsl Date: Mon Jun 16 19:08:18 UTC 2014 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: GENERIC XEN3_DOM0 Log Message: Comment out the xhci entries. The driver really doesn't work well enough to be generally useful. To generate a diff of this commit: cvs rdiff -u -r1.390 -r1.391 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.1105 -r1.1106 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: alnsn Date: Mon Jun 16 21:07:28 UTC 2014 Modified Files: src/lib/librumpuser: rumpuser_bio.c Log Message: Add __RCSID. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/librumpuser/rumpuser_bio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Mon Jun 16 22:04:39 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Delete trailing slash with ${1%/}, not ${1#/}. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin
Module Name:src Committed By: apb Date: Mon Jun 16 22:12:30 UTC 2014 Modified Files: src/usr.sbin/etcupdate: etcupdate src/usr.sbin/postinstall: postinstall Log Message: Use extra=${2-/,} to use $2 if defined, else default to /,. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/etcupdate/etcupdate cvs rdiff -u -r1.173 -r1.174 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Mon Jun 16 22:38:27 UTC 2014 Modified Files: src/sys/dev/pci: if_wpi.c Log Message: wpi(4): mostly cosmetic changes to source, also a little bit of diff reduction relative to OpenBSD as of late 2007. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_wpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.