CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 28 07:55:08 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: re-updates for xkeyboard-config 2.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 Sun Nov 28 04:58:20 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 28 07:55:07 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -228,6 +228,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -316,6 +318,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -357,11 +361,6 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) - ws007sh * = pc+sharp_vndr/ws007sh(basic) - ws011sh * = pc+sharp_vndr/ws011sh(basic) - ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -445,6 +444,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -516,6 +517,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -600,6 +603,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * ru(chu) = +extras/ru(chu):2 + * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -687,6 +692,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * ru(chu) = +extras/ru(chu):3 + * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -774,6 +781,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * ru(chu) = +extras/ru(chu):4 + * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -833,6 +842,8 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 + * ru chu = +extras/ru(chu):2 + * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us cr
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 28 07:51:03 UTC 2010 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21457 Log Message: secondary import of xkeyboard-config-2.0 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-0 U xsrc/external/mit/xkeyboard-config/dist/install-sh C xsrc/external/mit/xkeyboard-config/dist/configure.in U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/CREDITS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mn U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/il U xsrc/external/mit/xkeyboard-config/dist/symbols/ro U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/me U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/ie U xsrc/external/mit/xkeyboard-config/dist/symbols/be U xsrc/external/mit/xkeyboard-config/dist/symbols/ba U xsrc/external/mit/xkeyboard-config/dist/symbols/ng U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/dk U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/hu U xsrc/external/mit/xkeyboard-config/dist/symbols/kh U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl C xsrc/external/mit/xkeyboard-config/dist/symbols/lk U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/bg U xsrc/external/mit/xkeyboard-config/dist/symbols/sk U xsrc/external/mit/xkeyboard-config/dist/symbols/lt U xsrc/external/mit/xkeyboard-config/dist/symbols/sn U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/gn U xsrc/external/mit/xkeyboard-config/dist/symbols/rs U xsrc/external/mit/xkeyboard-config/dist/symbols/jp U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U xsrc/external/mit/xkeyboard-config/dist/symbols/brai C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir C xsrc/external/mit/xkeyboard-config/dist/symbols/sy U xsrc/external/mit/xkeyboard-config/dist/symbols/level5 U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/latin U xsrc/external/mit/xkeyboard-config/dist/symbols/kr U xsrc/external/mit/xkeyboard-config/dist/symbols/no U xsrc/external/mit/xkeyboard-config/dist/symbols/mv U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/al U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/pc U xsrc/external/mit/xkeyboard-config/dist/symbols/lv U xsr
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Nov 28 07:47:53 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
re-install the phoenixed XKeysymDB, since keyboards don't work without it.
fixes PR #44137.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libX11/Makefile
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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.102 src/distrib/sets/lists/xbase/mi:1.103
--- src/distrib/sets/lists/xbase/mi:1.102 Sun Nov 28 04:58:41 2010
+++ src/distrib/sets/lists/xbase/mi Sun Nov 28 07:47:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.102 2010/11/28 04:58:41 mrg Exp $
+# $NetBSD: mi,v 1.103 2010/11/28 07:47:53 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1523,7 +1523,7 @@
./usr/X11R7/lib base-x11-root xorg
./usr/X11R7/lib/X11 base-x11-root xorg
./usr/X11R7/lib/X11/XErrorDB-unknown- xorg
-./usr/X11R7/lib/X11/XKeysymDB-unknown- obsolete
+./usr/X11R7/lib/X11/XKeysymDB-unknown- xorg
./usr/X11R7/lib/X11/Xcms.txt-unknown- xorg
./usr/X11R7/lib/X11/app-defaults base-x11-root xorg
./usr/X11R7/lib/X11/app-defaults/Beforelight -unknown- xorg
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.9 src/external/mit/xorg/lib/libX11/Makefile:1.10
--- src/external/mit/xorg/lib/libX11/Makefile:1.9 Mon Nov 22 00:12:14 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Sun Nov 28 07:47:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/22 00:12:14 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/11/28 07:47:53 mrg Exp $
.include
@@ -83,7 +83,7 @@
USETBL= yes
-FILES= XErrorDB Xcms.txt
+FILES= XErrorDB XKeysymDB Xcms.txt
FILESDIR= ${X11LIBDIR}
.PATH: ${X11SRCDIR.X11}
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Nov 28 07:34:34 UTC 2010 Added Files: xsrc/external/mit/libX11/dist/src: XKeysymDB Log Message: and as was foretold in the book of why X sucks, the phoenix has arisen! To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libX11/dist/src/XKeysymDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/libX11/dist/src/XKeysymDB diff -u /dev/null xsrc/external/mit/libX11/dist/src/XKeysymDB:1.3 --- /dev/null Sun Nov 28 07:34:34 2010 +++ xsrc/external/mit/libX11/dist/src/XKeysymDB Sun Nov 28 07:34:33 2010 @@ -0,0 +1,380 @@ +! Copyright 1993 Massachusetts Institute of Technology +! +! Permission to use, copy, modify, distribute, and sell this software and +! its documentation for any purpose is hereby granted without fee, provided +! that the above copyright notice appear in all copies and that both that +! copyright notice and this permission notice appear in supporting +! documentation, and that the name of M.I.T. not be used in advertising or +! publicity pertaining to distribution of the software without specific, +! written prior permission. M.I.T. makes no representations about the +! suitability of this software for any purpose. It is provided "as is" +! without express or implied warranty. +! + +hpmute_acute :10A8 +hpmute_grave :10A9 +hpmute_asciicircum :10AA +hpmute_diaeresis :10AB +hpmute_asciitilde :10AC +hplira :10AF +hpguilder :10BE +hpYdiaeresis :10EE +hpIO :10EE +hplongminus :10F6 +hpblock :10FC +apLineDel :1000FF00 +apCharDel :1000FF01 +apCopy :1000FF02 +apCut :1000FF03 +apPaste :1000FF04 +apMove :1000FF05 +apGrow :1000FF06 +apCmd :1000FF07 +apShell :1000FF08 +apLeftBar :1000FF09 +apRightBar :1000FF0A +apLeftBox :1000FF0B +apRightBox :1000FF0C +apUpBox :1000FF0D +apDownBox :1000FF0E +apPop :1000FF0F +apRead :1000FF10 +apEdit :1000FF11 +apSave :1000FF12 +apExit :1000FF13 +apRepeat :1000FF14 +hpModelock1 :1000FF48 +hpModelock2 :1000FF49 +hpReset :1000FF6C +hpSystem :1000FF6D +hpUser :1000FF6E +hpClearLine :1000FF6F +hpInsertLine :1000FF70 +hpDeleteLine :1000FF71 +hpInsertChar :1000FF72 +hpDeleteChar :1000FF73 +hpBackTab :1000FF74 +hpKP_BackTab :1000FF75 +apKP_parenleft :1000FFA8 +apKP_parenright :1000FFA9 + +I2ND_FUNC_L :10004001 +I2ND_FUNC_R :10004002 +IREMOVE :10004003 +IREPEAT :10004004 +IA1 :10004101 +IA2 :10004102 +IA3 :10004103 +IA4 :10004104 +IA5 :10004105 +IA6 :10004106 +IA7 :10004107 +IA8 :10004108 +IA9 :10004109 +IA10 :1000410A +IA11 :1000410B +IA12 :1000410C +IA13 :1000410D +IA14 :1000410E +IA15 :1000410F +IB1 :10004201 +IB2 :10004202 +IB3 :10004203 +IB4 :10004204 +IB5 :10004205 +IB6 :10004206 +IB7 :10004207 +IB8 :10004208 +IB9 :10004209 +IB10 :1000420A +IB11 :1000420B +IB12 :1000420C +IB13 :1000420D +IB14 :1000420E +IB15 :1000420F +IB16 :10004210 + +DRemove :1000FF00 +Dring_accent :1000FEB0 +Dcircumflex_accent :1000FE5E +Dcedilla_accent :1000FE2C +Dacute_accent :1000FE27 +Dgrave_accent :1000FE60 +Dtilde :1000FE7E +Ddiaeresis :1000FE22 + +osfCopy :1004FF02 +osfCut :1004FF03 +osfPaste :1004FF04 +osfBackTab :1004FF07 +osfBackSpace :1004FF08 +osfClear :1004FF0B +osfEscape :1004FF1B +osfAddMode :1004FF31 +osfPrimaryPaste :1004FF32 +osfQuickPaste :1004FF33 +osfPageLeft :1004FF40 +osfPageUp :1004FF41 +osfPageDown :1004FF42 +osfPageRight :1004FF43 +osfActivate :1004FF44 +osfMenuBar :1004FF45 +osfLeft :1004FF51 +osfUp :1004FF52 +osfRight :1004FF53 +osfDown :1004FF54 +osfPrior :1004FF55 +osfNext :1004FF56 +osfEndLine :1004FF57 +osfBeginLine :1004FF58 +osfEndData :1004FF59 +osfBeginData :1004FF5A +osfPrevMenu :1004FF5B +osfNextMenu :1004FF5C +osfPrevField :1004FF5D +osfNextField :1004FF5E +osfSelect :1004FF60 +osfInsert :1004FF63 +osfUndo :1004FF65 +osfMenu :1004FF67 +osfCancel :1004FF69 +osfHelp :1004FF6A +osfSelectAll :1004FF71 +osfDeselectAll :1004FF72 +osfReselect :1004FF73 +osfExtend :1004FF74 +osfRestore :1004FF78 +osfSwitchDirection :1004FF7E +osfPriorMinor :1004FFF5 +osfNextMinor :1004FFF6 +osfRightLine :1004FFF7 +osfLeftLine :1004FFF8 +osfDelete :1004 + +SunFA_Grave :1005FF00 +SunFA_Circum :1005FF01 +SunFA_Tilde :1005FF02 +SunFA_Acute :1005FF03 +SunFA_Diaeresis :1005FF04 +SunFA_Cedilla :1005FF05 +SunF36 :1005FF10 +SunF37 :1005FF11 +SunSys_Req :1005FF60 +SunProps :1005FF70 +SunFront :1005FF71 +SunCopy :1005FF72 +SunOpen :1005FF73 +SunPaste :1005FF74 +SunCut :1005FF75 +SunPowerSwitch :1005FF76 +SunAudioLowerVolume :1005FF77 +SunAudioMute :1005FF78 +SunAudioRaiseVolume :1005FF79 +SunVideoDegauss :1005FF7A +SunVideoLowerBrightness :1005FF7B +SunVideoRaiseBrightness :1005FF7C +SunPowerSwitchShift :1005FF7D + +SunCompose :FF20 +SunPageUp :FF5
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Sun Nov 28 04:58:41 UTC 2010 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: obsolete the xkeyboard-config 2.0 files for now. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/mi 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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.101 src/distrib/sets/lists/xbase/mi:1.102 --- src/distrib/sets/lists/xbase/mi:1.101 Tue Nov 23 10:24:03 2010 +++ src/distrib/sets/lists/xbase/mi Sun Nov 28 04:58:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.101 2010/11/23 10:24:03 mrg Exp $ +# $NetBSD: mi,v 1.102 2010/11/28 04:58:41 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2068,7 +2068,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/apple -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/at -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg @@ -2118,9 +2118,9 @@ ./usr/X11R7/lib/X11/xkb/symbols/et -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/extras base-x11-root xorg ./usr/X11R7/lib/X11/xkb/symbols/extras/apl -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/extras/ir -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/ir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/extras/rs -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/extras/ru -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/ru -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/extras/us -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/eurosign -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/fi -unknown- xorg
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 28 04:58:20 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: revert back to xkeyboard-config 1.9 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.2 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.2 Mon Nov 22 00:27:55 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 28 04:58:20 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - toshiba_s3000 trust trustda \ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -228,8 +228,6 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) - * ru chu = pc+extras/ru(chu) - * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -318,8 +316,6 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * ru(chu) = pc+extras/ru(chu) - * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -361,6 +357,11 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) + sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) + ws003sh * = pc+sharp_vndr/ws003sh(basic) + ws007sh * = pc+sharp_vndr/ws007sh(basic) + ws011sh * = pc+sharp_vndr/ws011sh(basic) + ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -444,8 +445,6 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * ru(chu) = pc+extras/ru(chu) - * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -517,8 +516,6 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) - * ru chu = pc+extras/ru(chu) - * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -603,8 +600,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 - * ru(chu) = +extras/ru(chu):2 - * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -692,8 +687,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 - * ru(chu) = +extras/ru(chu):3 - * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -781,8 +774,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 - * ru(chu) = +extras/ru(chu):4 - * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -842,8 +833,6 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 - * ru chu = +extras/ru(chu):2 - * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us crd
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 28 04:49:11 UTC 2010 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5993 Log Message: second import of xkeyboard-config 1.9. the 2.0 import causes issues i haven't been able to figure out, so, revert back to what was working. Status: Vendor Tag: xorg Release Tags: xkeyboard-config-1-9 U xsrc/external/mit/xkeyboard-config/dist/install-sh C xsrc/external/mit/xkeyboard-config/dist/configure.in U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/CREDITS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mn U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/il U xsrc/external/mit/xkeyboard-config/dist/symbols/ro U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/me U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/ie U xsrc/external/mit/xkeyboard-config/dist/symbols/be U xsrc/external/mit/xkeyboard-config/dist/symbols/ba U xsrc/external/mit/xkeyboard-config/dist/symbols/ng U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/dk U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/hu U xsrc/external/mit/xkeyboard-config/dist/symbols/kh U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/bw U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl C xsrc/external/mit/xkeyboard-config/dist/symbols/lk U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/bg U xsrc/external/mit/xkeyboard-config/dist/symbols/sk U xsrc/external/mit/xkeyboard-config/dist/symbols/lt U xsrc/external/mit/xkeyboard-config/dist/symbols/sn U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/gn U xsrc/external/mit/xkeyboard-config/dist/symbols/rs U xsrc/external/mit/xkeyboard-config/dist/symbols/jp U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U xsrc/external/mit/xkeyboard-config/dist/symbols/brai C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir C xsrc/external/mit/xkeyboard-config/dist/symbols/sy U xsrc/external/mit/xkeyboard-config/dist/symbols/level5 U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/latin U xsrc/external/mit/xkeyboard-config/dist/symbols/kr U xsrc/external/mit/xkeyboard-config/dist/symbols/no U xsrc/external/mit/xkeyboard-config/dist/symbols/mv U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/al U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/exter
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: christos Date: Sun Nov 28 01:58:40 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi Log Message: add ihphy To generate a diff of this commit: cvs rdiff -u -r1.1254 -r1.1255 src/distrib/sets/lists/man/mi 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1254 src/distrib/sets/lists/man/mi:1.1255 --- src/distrib/sets/lists/man/mi:1.1254 Thu Nov 25 03:18:33 2010 +++ src/distrib/sets/lists/man/mi Sat Nov 27 20:58:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1254 2010/11/25 08:18:33 skrll Exp $ +# $NetBSD: mi,v 1.1255 2010/11/28 01:58:39 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1122,6 +1122,7 @@ ./usr/share/man/cat4/igphy.0 man-sys-catman .cat ./usr/share/man/cat4/igsfb.0 man-sys-catman .cat ./usr/share/man/cat4/iha.0 man-sys-catman .cat +./usr/share/man/cat4/ihphy.0 man-sys-catman .cat ./usr/share/man/cat4/iic.0 man-sys-catman .cat ./usr/share/man/cat4/ikphy.0 man-sys-catman .cat ./usr/share/man/cat4/imp.0 man-obsolete obsolete @@ -3794,6 +3795,7 @@ ./usr/share/man/html4/igphy.html man-sys-htmlman html ./usr/share/man/html4/igsfb.html man-sys-htmlman html ./usr/share/man/html4/iha.html man-sys-htmlman html +./usr/share/man/html4/ihphy.html man-sys-htmlman html ./usr/share/man/html4/iic.html man-sys-htmlman html ./usr/share/man/html4/ikphy.html man-sys-htmlman html ./usr/share/man/html4/inet.html man-sys-htmlman html @@ -6306,6 +6308,7 @@ ./usr/share/man/man4/igphy.4 man-sys-man .man ./usr/share/man/man4/igsfb.4 man-sys-man .man ./usr/share/man/man4/iha.4 man-sys-man .man +./usr/share/man/man4/ihphy.4 man-sys-man .man ./usr/share/man/man4/iic.4 man-sys-man .man ./usr/share/man/man4/ikphy.4 man-sys-man .man ./usr/share/man/man4/imp.4 man-obsolete obsolete
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sun Nov 28 01:57:17 UTC 2010 Modified Files: src/share/man/man4: Makefile Added Files: src/share/man/man4: ihphy.4 Log Message: Add ihphy To generate a diff of this commit: cvs rdiff -u -r1.536 -r1.537 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/ihphy.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.536 src/share/man/man4/Makefile:1.537 --- src/share/man/man4/Makefile:1.536 Mon Nov 15 18:10:51 2010 +++ src/share/man/man4/Makefile Sat Nov 27 20:57:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.536 2010/11/15 23:10:51 pooka Exp $ +# $NetBSD: Makefile,v 1.537 2010/11/28 01:57:17 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -29,7 +29,7 @@ glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \ hdaudio.4 hifn.4 hme.4 hpqlb.4 hptide.4 \ ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 ieee80211.4 \ - ifmedia.4 igphy.4 igsfb.4 iha.4 iic.4 inet.4 ikphy.4 inphy.4 \ + ifmedia.4 igphy.4 igsfb.4 iha.4 ihphy.4 iic.4 inet.4 ikphy.4 inphy.4 \ intersil7170.4 \ ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipkdb.4 ipmi.4 ipw.4 \ iso.4 isp.4 isv.4 itesio.4 iteide.4 iwi.4 iwn.4 ixpide.4 \ Added files: Index: src/share/man/man4/ihphy.4 diff -u /dev/null src/share/man/man4/ihphy.4:1.1 --- /dev/null Sat Nov 27 20:57:17 2010 +++ src/share/man/man4/ihphy.4 Sat Nov 27 20:57:17 2010 @@ -0,0 +1,50 @@ +.\" $NetBSD: ihphy.4,v 1.1 2010/11/28 01:57:17 christos Exp $ +.\" +.\" Copyright (c) 2010 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Christos Zoulas +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIHENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd November 27, 2010 +.Dt IHPHY 4 +.Os +.Sh NAME +.Nm ihphy +.Nd Driver for Intel +.Dq Hanksville +i82577 10/100/1000 Ethernet PHYs +.Sh SYNOPSIS +.Cd "ihphy* at mii? phy ?" +.Sh DESCRIPTION +The +.Nm +driver supports the Intel i82577 10/100/1000 Ethernet PHYs. +These PHYs are found on the Lenovo T510 and Thinkpad X201i. +.Sh SEE ALSO +.Xr ifmedia 4 , +.Xr intro 4 , +.Xr mii 4 , +.Xr wm 4 , +.Xr ifconfig 8
CVS commit: src/usr.bin/unvis
Module Name:src Committed By: wiz Date: Sun Nov 28 01:33:37 UTC 2010 Modified Files: src/usr.bin/unvis: unvis.1 Log Message: Make SYNOPSIS match usage. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/unvis/unvis.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/unvis/unvis.1 diff -u src/usr.bin/unvis/unvis.1:1.8 src/usr.bin/unvis/unvis.1:1.9 --- src/usr.bin/unvis/unvis.1:1.8 Sat Nov 27 19:46:25 2010 +++ src/usr.bin/unvis/unvis.1 Sun Nov 28 01:33:37 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: unvis.1,v 1.8 2010/11/27 19:46:25 christos Exp $ +.\" $NetBSD: unvis.1,v 1.9 2010/11/28 01:33:37 wiz Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -38,9 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl e -.Op Fl H -.Op Fl h -.Op Fl m +.Op Fl Hh | Fl m .Op Ar file ... .Sh DESCRIPTION .Nm
CVS commit: src/lib/libpam
Module Name:src Committed By: wiz Date: Sun Nov 28 01:31:26 UTC 2010 Modified Files: src/lib/libpam: Makefile Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libpam/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/Makefile diff -u src/lib/libpam/Makefile:1.4 src/lib/libpam/Makefile:1.5 --- src/lib/libpam/Makefile:1.4 Sun Nov 28 00:50:16 2010 +++ src/lib/libpam/Makefile Sun Nov 28 01:31:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/28 00:50:16 christos Exp $ +# $NetBSD: Makefile,v 1.5 2010/11/28 01:31:26 wiz Exp $ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # @@ -26,7 +26,7 @@ # $FreeBSD: src/lib/libpam/Makefile,v 1.3 2003/03/09 20:06:34 obrien Exp $ # The static modules must be built before libpam, because they are built -# into the static version of libpam. The dynamic modules must be build after +# into the static version of libpam. The dynamic modules must be built after # libpam because they depend on the dynamic version of libpam. SUBDIR= staticmodules .WAIT libpam .WAIT modules
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sun Nov 28 01:28:21 UTC 2010 Modified Files: src/lib/libc/gen: unvis.3 Log Message: Remove superfluous comma. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/unvis.3 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/unvis.3 diff -u src/lib/libc/gen/unvis.3:1.19 src/lib/libc/gen/unvis.3:1.20 --- src/lib/libc/gen/unvis.3:1.19 Sat Nov 27 19:44:21 2010 +++ src/lib/libc/gen/unvis.3 Sun Nov 28 01:28:21 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: unvis.3,v 1.19 2010/11/27 19:44:21 christos Exp $ +.\" $NetBSD: unvis.3,v 1.20 2010/11/28 01:28:21 wiz Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -148,7 +148,7 @@ .Ar flag argument is also used to specify the encoding style of the source. If set to -.Dv VIS_HTTPSTYLE , +.Dv VIS_HTTPSTYLE or .Dv VIS_HTTP1808 , .Fn unvis
CVS commit: src/lib/libpam
Module Name:src Committed By: christos Date: Sun Nov 28 00:50:17 UTC 2010 Modified Files: src/lib/libpam: Makefile Log Message: explain better what's going on here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libpam/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/Makefile diff -u src/lib/libpam/Makefile:1.3 src/lib/libpam/Makefile:1.4 --- src/lib/libpam/Makefile:1.3 Mon May 3 18:12:32 2010 +++ src/lib/libpam/Makefile Sat Nov 27 19:50:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/05/03 22:12:32 christos Exp $ +# $NetBSD: Makefile,v 1.4 2010/11/28 00:50:16 christos Exp $ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # @@ -25,8 +25,9 @@ # # $FreeBSD: src/lib/libpam/Makefile,v 1.3 2003/03/09 20:06:34 obrien Exp $ -# The modules must be built first, because they are built into the -# static version of libpam. +# The static modules must be built before libpam, because they are built +# into the static version of libpam. The dynamic modules must be build after +# libpam because they depend on the dynamic version of libpam. SUBDIR= staticmodules .WAIT libpam .WAIT modules .include
CVS commit: src
Module Name:src
Committed By: jnemeth
Date: Sun Nov 28 00:26:39 UTC 2010
Modified Files:
src/doc: CHANGES
src/lib/libc/sys: modctl.2
src/share/man/man9: module.9
src/sys/kern: kern_module_vfs.c
Log Message:
Rename the autoloaded property list from .prop to .plist
as discussed on tech-kern.
To generate a diff of this commit:
cvs rdiff -u -r1.1463 -r1.1464 src/doc/CHANGES
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/sys/modctl.2
cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/module.9
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/kern_module_vfs.c
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.1463 src/doc/CHANGES:1.1464
--- src/doc/CHANGES:1.1463 Sat Nov 27 11:44:23 2010
+++ src/doc/CHANGES Sun Nov 28 00:26:39 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1463 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1464 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -791,3 +791,4 @@
openssh: Import 5.6. [adam 20101121]
dhcpcd(8): Import dhcpcd-5.2.9. [roy 20101127]
postfix(1): Import version 2.7.2 [tron 20101127]
+ module: Rename .prop to .plist. [jnemeth 20101127]
Index: src/lib/libc/sys/modctl.2
diff -u src/lib/libc/sys/modctl.2:1.5 src/lib/libc/sys/modctl.2:1.6
--- src/lib/libc/sys/modctl.2:1.5 Wed Aug 18 01:55:32 2010
+++ src/lib/libc/sys/modctl.2 Sun Nov 28 00:26:38 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: modctl.2,v 1.5 2010/08/18 01:55:32 pgoyette Exp $
+.\" $NetBSD: modctl.2,v 1.6 2010/11/28 00:26:38 jnemeth Exp $
.\"
.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 26, 2009
+.Dd November 27, 2010
.Dt MODCTL 2
.Os
.Sh NAME
@@ -98,7 +98,7 @@
Zero or more of the following flag values:
.Bl -tag -compact -width "MODCTL_LOAD_FORCE"
.It Dv MODCTL_NO_PROP
-Don't load \*[Lt]module\*[Gt].prop.
+Don't load \*[Lt]module\*[Gt].plist.
.It Dv MODCTL_LOAD_FORCE
Ignore kernel version mismatch.
.El
@@ -221,7 +221,7 @@
is not
.Dv 0 .
The kernel is unable to internalize the plist.
-Or, there is a problem with the module or \*[Lt]module\*[Gt].prop.
+Or, there is a problem with the module or \*[Lt]module\*[Gt].plist.
.It Bq Er EMLINK
The argument
.Fa operation
Index: src/share/man/man9/module.9
diff -u src/share/man/man9/module.9:1.21 src/share/man/man9/module.9:1.22
--- src/share/man/man9/module.9:1.21 Wed Aug 25 06:45:35 2010
+++ src/share/man/man9/module.9 Sun Nov 28 00:26:38 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: module.9,v 1.21 2010/08/25 06:45:35 jnemeth Exp $
+.\" $NetBSD: module.9,v 1.22 2010/11/28 00:26:38 jnemeth Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 25, 2010
+.Dd November 27, 2010
.Dt MODULE 9
.Os
.Sh NAME
@@ -199,7 +199,7 @@
.Dv MODCTL_NO_PROP
flag is not set, the system searches for a file with the same name as the
module file, but with the suffix
-.Dq Pa .prop .
+.Dq Pa .plist .
If this file is found, the prop_dictionary it contains is loaded and
merged with the prop_dictionary from the
.Fa props
Index: src/sys/kern/kern_module_vfs.c
diff -u src/sys/kern/kern_module_vfs.c:1.9 src/sys/kern/kern_module_vfs.c:1.10
--- src/sys/kern/kern_module_vfs.c:1.9 Fri Nov 19 06:44:43 2010
+++ src/sys/kern/kern_module_vfs.c Sun Nov 28 00:26:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module_vfs.c,v 1.9 2010/11/19 06:44:43 dholland Exp $ */
+/* $NetBSD: kern_module_vfs.c,v 1.10 2010/11/28 00:26:38 jnemeth Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module_vfs.c,v 1.9 2010/11/19 06:44:43 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module_vfs.c,v 1.10 2010/11/28 00:26:38 jnemeth Exp $");
#define _MODULE_INTERNAL
#include
@@ -100,7 +100,7 @@
}
/*
- * Load and process .prop if it exists.
+ * Load and process .plist if it exists.
*/
if (((flags & MODCTL_NO_PROP) == 0 && filedictp) || autoload) {
error = module_load_plist_vfs(path, nochroot, &moduledict);
@@ -159,10 +159,10 @@
proppath = PNBUF_GET();
strcpy(proppath, modpath);
pathlen = strlen(proppath);
- if ((pathlen >= 5) && (strcmp(&proppath[pathlen - 5], ".kmod") == 0)) {
- strcpy(&proppath[pathlen - 5], ".prop");
- } else if (pathlen < MAXPATHLEN - 5) {
- strcat(proppath, ".prop");
+ if ((pathlen >= 6) &
CVS commit: src/compat/lib/libterminfo
Module Name:src Committed By: mrg Date: Sat Nov 27 23:08:45 UTC 2010 Removed Files: src/compat/lib/libterminfo: Makefile Log Message: delete a file that never did anything in -current. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/compat/lib/libterminfo/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: mrg Date: Sat Nov 27 22:21:28 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/share/cf: Makefile Added Files: src/external/mit/xorg/share/cf: date.def Log Message: install an empty date.def, like the xorg package does. PR#44158. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/share/cf/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/cf/date.def 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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.119 src/distrib/sets/lists/xcomp/mi:1.120 --- src/distrib/sets/lists/xcomp/mi:1.119 Thu Nov 25 16:28:18 2010 +++ src/distrib/sets/lists/xcomp/mi Sat Nov 27 22:21:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.119 2010/11/25 16:28:18 njoly Exp $ +# $NetBSD: mi,v 1.120 2010/11/27 22:21:27 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6060,7 +6060,7 @@ ./usr/X11R7/lib/X11/config/darwin.cf -unknown- xorg ./usr/X11R7/lib/X11/config/darwinLib.rules -unknown- xorg ./usr/X11R7/lib/X11/config/darwinLib.tmpl -unknown- xorg -./usr/X11R7/lib/X11/config/date.def -unknown- obsolete +./usr/X11R7/lib/X11/config/date.def -unknown- xorg ./usr/X11R7/lib/X11/config/fujitsu.cf -unknown- xorg ./usr/X11R7/lib/X11/config/generic.cf -unknown- xorg ./usr/X11R7/lib/X11/config/gnu.cf -unknown- xorg Index: src/external/mit/xorg/share/cf/Makefile diff -u src/external/mit/xorg/share/cf/Makefile:1.7 src/external/mit/xorg/share/cf/Makefile:1.8 --- src/external/mit/xorg/share/cf/Makefile:1.7 Tue Nov 23 08:44:23 2010 +++ src/external/mit/xorg/share/cf/Makefile Sat Nov 27 22:21:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/11/23 08:44:23 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2010/11/27 22:21:27 mrg Exp $ .include @@ -28,7 +28,7 @@ # Note: acts as '#define InstallEmptyHostDef' # -FILES+= host.def xorgsite.def +FILES+= date.def host.def xorgsite.def # Handle site.def specificly because it is provided in dist # Added files:
CVS commit: src/doc
Module Name:src Committed By: agc Date: Sat Nov 27 21:31:11 UTC 2010 Added Files: src/doc: NetBSD-6 Log Message: Add initial file describing what is expected to be in NetBSD-6 This file is managed by the release engineering team - please contact them if you'd like to see any changes made to this, and keep the core team in the loop, please. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/doc/NetBSD-6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/doc/NetBSD-6 diff -u /dev/null src/doc/NetBSD-6:1.1 --- /dev/null Sat Nov 27 21:31:11 2010 +++ src/doc/NetBSD-6 Sat Nov 27 21:31:11 2010 @@ -0,0 +1,53 @@ +Release plans for NetBSD-6.0 + + +This file is managed by the release engineering team - please get in touch +with them with any feedback. + +May not make 6.0 + ++ XIP ++ gaols ++ sctp ++ devfs + +Will be in 6.0 +-- ++ ZFS - need an update on viability, needs work ++ in-kernel iSCSI initiator, libisns and userland tools ++ 64-bit time_t ++ rump ++ LVM/dmapper and tools ++ workable MIPS for all ++ netpgp - maybe I am a bit biased in this? ++ able to use external compilers and toolchain ++ cleaned up files in repos - joerg ++ support for wide efficient regexps with tre ++ native X11R7 ++ TLS - joerg ++ following on from TLS, modern gdb ++ lua scripting ++ agreement and communication of tiered port system (before release) - pooka ++ other enhancements and new functionality in -current ++ tcp support in libsa? need to merge SoC project ++ sasl - SoC project merged, needs to be hooked into the build ++ namei changes - dholland ++ support for resizing ffs ++ production support for fss - no longer experimental ++ Xen/SMP ++ automated test framework for testing releng autobuilds ++ full functionality for NPF ++ fixed IPSEC NAT-T + +Possibly in 6.0 +--- ++ gcc 4.5+ ++ mobile IPv6 - we have the mods, need application of same to the repo ++ kernel modules need work ++ Xen suspend/resume - jym working on it ++ TNF funding for release engineering + + +Alistair Crooks +On behalf of core and releng teams +Sat Nov 27 12:32:06 PST 2010
CVS commit: src/crypto/external/bsd/sasl_client_lib
Module Name:src Committed By: agc Date: Sat Nov 27 21:24:00 UTC 2010 Update of /cvsroot/src/crypto/external/bsd/sasl_client_lib In directory ivanova.netbsd.org:/tmp/cvs-serv15730 Log Message: Initial import of Mateusz Kociels SASL client library Summer of Code project into the repository. The project was mentored by Christos Zoulas, and written up here: http://netbsd-soc.sourceforge.net/projects/sasl_client_lib/ As discussed with Christos Zoulas. Status: Vendor Tag: KOCIELS Release Tags: sasl-client-lib-base N src/crypto/external/bsd/sasl_client_lib/Makefile N src/crypto/external/bsd/sasl_client_lib/dist/index.html N src/crypto/external/bsd/sasl_client_lib/dist/soc.html N src/crypto/external/bsd/sasl_client_lib/dist/style.css N src/crypto/external/bsd/sasl_client_lib/dist/doc/Doxyfile N src/crypto/external/bsd/sasl_client_lib/dist/doc/library.txt N src/crypto/external/bsd/sasl_client_lib/dist/include/saslc.h N src/crypto/external/bsd/sasl_client_lib/dist/man/libsaslc.3 N src/crypto/external/bsd/sasl_client_lib/dist/ref/rfc2195.txt N src/crypto/external/bsd/sasl_client_lib/dist/ref/rfc.txt N src/crypto/external/bsd/sasl_client_lib/dist/ref/rfc2245.txt N src/crypto/external/bsd/sasl_client_lib/dist/ref/rfc2595.txt N src/crypto/external/bsd/sasl_client_lib/dist/ref/rfc2831.txt N src/crypto/external/bsd/sasl_client_lib/dist/src/Makefile N src/crypto/external/bsd/sasl_client_lib/dist/src/Makefile.bsd N src/crypto/external/bsd/sasl_client_lib/dist/src/crypto.c N src/crypto/external/bsd/sasl_client_lib/dist/src/crypto.h N src/crypto/external/bsd/sasl_client_lib/dist/src/dict.c N src/crypto/external/bsd/sasl_client_lib/dist/src/dict.h N src/crypto/external/bsd/sasl_client_lib/dist/src/error.c N src/crypto/external/bsd/sasl_client_lib/dist/src/error.h N src/crypto/external/bsd/sasl_client_lib/dist/src/mech.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech.h N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_anonymous.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_crammd5.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_digestmd5.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_external.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_gssapi.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_login.c N src/crypto/external/bsd/sasl_client_lib/dist/src/mech_plain.c N src/crypto/external/bsd/sasl_client_lib/dist/src/parser.c N src/crypto/external/bsd/sasl_client_lib/dist/src/parser.h N src/crypto/external/bsd/sasl_client_lib/dist/src/saslc.c N src/crypto/external/bsd/sasl_client_lib/dist/src/saslc_private.h N src/crypto/external/bsd/sasl_client_lib/dist/src/xsess.c N src/crypto/external/bsd/sasl_client_lib/dist/test/Atffile N src/crypto/external/bsd/sasl_client_lib/dist/test/Makefile N src/crypto/external/bsd/sasl_client_lib/dist/test/example_client.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_crypto.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_dict.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_error.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_parser.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_saslc.c N src/crypto/external/bsd/sasl_client_lib/dist/test/t_session.c N src/crypto/external/bsd/sasl_client_lib/dist/test/parser_tests/test1/saslc.conf N src/crypto/external/bsd/sasl_client_lib/dist/test/parser_tests/test2/saslc.conf N src/crypto/external/bsd/sasl_client_lib/dist/test/parser_tests/test3/saslc.conf N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/anonymous/test1.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/anonymous/test1.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/anonymous/test2.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/anonymous/test2.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/cram-md5/test1.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/cram-md5/test1.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/cram-md5/test2.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/cram-md5/test2.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/external/test1.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/external/test1.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/external/test2.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/external/test2.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/login/test1.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/login/test1.out N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/login/test2.in N src/crypto/external/bsd/sasl_client_lib/dist/test/session_tests/login/test2.out N src/crypto/external/bsd/sasl_client_lib/dist/test/sessions/cram-md5-1.in N src/crypto/external/bsd/sasl_client_l
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sat Nov 27 21:22:11 UTC 2010
Modified Files:
src/lib/libc/gen: unvis.c
Log Message:
fix lint warning.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gen/unvis.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/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.31 src/lib/libc/gen/unvis.c:1.32
--- src/lib/libc/gen/unvis.c:1.31 Sat Nov 27 14:44:21 2010
+++ src/lib/libc/gen/unvis.c Sat Nov 27 16:22:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.31 2010/11/27 19:44:21 christos Exp $ */
+/* $NetBSD: unvis.c,v 1.32 2010/11/27 21:22:11 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: unvis.c,v 1.31 2010/11/27 19:44:21 christos Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.32 2010/11/27 21:22:11 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -197,8 +197,8 @@
* Top 8 bits hold the current character in the http 1866 nv string decoding
*/
#define GS(a) ((a) & 0xff)
-#define SS(a, b) (((a) << 24) | (b))
-#define GI(a) ((a) >> 24)
+#define SS(a, b) (((uint32_t)(a) << 24) | (b))
+#define GI(a) ((uint32_t)(a) >> 24)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(astate != NULL);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat Nov 27 21:12:51 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket #1432 backed out. To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.32 src/doc/CHANGES-5.2:1.1.2.33 --- src/doc/CHANGES-5.2:1.1.2.32 Fri Nov 26 17:30:42 2010 +++ src/doc/CHANGES-5.2 Sat Nov 27 21:12:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.32 2010/11/26 17:30:42 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.33 2010/11/27 21:12:50 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -644,11 +644,6 @@ Fix argument handling of the "-b" option on 64bit platforms. [tron, ticket #1429] -gnu/lib/libstdc++-v3_4/Makefile 1.5 - - Explicitly link libstdc++ against libm as found by Arnaud Lacombe. - [joerg, ticket #1432] - usr.bin/make/job.c1.152 via patch PR/43643: David A. Holland: dash prefix broken with make -j
CVS commit: [netbsd-5] src/gnu/lib/libstdc++-v3_4
Module Name:src
Committed By: riz
Date: Sat Nov 27 21:12:23 UTC 2010
Modified Files:
src/gnu/lib/libstdc++-v3_4 [netbsd-5]: Makefile
Log Message:
Roll back previous (pullup-5 ticket #1432) until we can determine
why it causes build problems with sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.3.24.1 -r1.3.24.2 src/gnu/lib/libstdc++-v3_4/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/libstdc++-v3_4/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/Makefile:1.3.24.1 src/gnu/lib/libstdc++-v3_4/Makefile:1.3.24.2
--- src/gnu/lib/libstdc++-v3_4/Makefile:1.3.24.1 Sun Nov 21 18:42:13 2010
+++ src/gnu/lib/libstdc++-v3_4/Makefile Sat Nov 27 21:12:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.24.1 2010/11/21 18:42:13 riz Exp $
+# $NetBSD: Makefile,v 1.3.24.2 2010/11/27 21:12:23 riz Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -6,9 +6,6 @@
.include
LIB= stdc++
-LDADD= -lgcc_s
-
-LIBDPLIBS+= m ${.CURDIR}/../../../lib/libm
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
CVS commit: src/usr.bin/hexdump
Module Name:src
Committed By: christos
Date: Sat Nov 27 20:46:38 UTC 2010
Modified Files:
src/usr.bin/hexdump: hexdump.c hexdump.h hexsyntax.c odsyntax.c
Log Message:
revert and fix the usage to be consistent with other programs.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/hexdump/hexdump.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/hexdump/hexdump.h
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/hexdump/hexsyntax.c
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/hexdump/odsyntax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/hexdump/hexdump.c
diff -u src/usr.bin/hexdump/hexdump.c:1.15 src/usr.bin/hexdump/hexdump.c:1.16
--- src/usr.bin/hexdump/hexdump.c:1.15 Tue Feb 9 09:06:37 2010
+++ src/usr.bin/hexdump/hexdump.c Sat Nov 27 15:46:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hexdump.c,v 1.15 2010/02/09 14:06:37 drochner Exp $ */
+/* $NetBSD: hexdump.c,v 1.16 2010/11/27 20:46:38 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hexdump.c,v 1.15 2010/02/09 14:06:37 drochner Exp $");
+__RCSID("$NetBSD: hexdump.c,v 1.16 2010/11/27 20:46:38 christos Exp $");
#endif
#endif /* not lint */
@@ -58,8 +58,7 @@
int blocksize;/* data block size */
int exitval;/* final exit value */
int length = -1; /* max bytes to read */
-
-int main(int, char **);
+static int isod = 0;
int
main(int argc, char *argv[])
@@ -69,10 +68,11 @@
setlocale(LC_ALL, "");
- if (!(p = strrchr(argv[0], 'o')) || strcmp(p, "od"))
- newsyntax(argc, &argv);
- else
+ isod = (p = strrchr(argv[0], 'o')) == NULL || strcmp(p, "od") == 0;
+ if (isod)
odsyntax(argc, &argv);
+ else
+ hexsyntax(argc, &argv);
/* figure out the data block size */
for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
@@ -88,3 +88,19 @@
display();
exit(exitval);
}
+
+void
+usage(void)
+{
+ const char *pname = getprogname();
+
+ (void)fprintf(stderr, "Usage: %s ", pname);
+ if (isod)
+ (void)fprintf(stderr, "[-aBbcDdeFfHhIiLlOovXx] [-A base] "
+ "[-j skip] [-N length] [-t type_string] [[+]offset[.][Bb]] "
+ "[file ...]\n");
+ else
+ (void)fprintf(stderr, "[-bcCdovx] [-e fmt] [-f fmt_file] "
+ "[-n length] [-s skip] [file ...]\n");
+ exit(1);
+}
Index: src/usr.bin/hexdump/hexdump.h
diff -u src/usr.bin/hexdump/hexdump.h:1.11 src/usr.bin/hexdump/hexdump.h:1.12
--- src/usr.bin/hexdump/hexdump.h:1.11 Tue Feb 9 09:06:37 2010
+++ src/usr.bin/hexdump/hexdump.h Sat Nov 27 15:46:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hexdump.h,v 1.11 2010/02/09 14:06:37 drochner Exp $ */
+/* $NetBSD: hexdump.h,v 1.12 2010/11/27 20:46:38 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -90,12 +90,11 @@
void conv_u(PR *, u_char *);
void display(void);
void doskip(const char *, int);
-/*void err(const char *, ...);*/
void escape(char *);
u_char *get(void);
-void newsyntax(int, char ***);
+void hexsyntax(int, char ***);
int next(char **);
void odsyntax(int, char ***);
void rewrite(FS *);
int size(FS *);
-void usage(void);
+void usage(void) __attribute__((__noreturn__));
Index: src/usr.bin/hexdump/hexsyntax.c
diff -u src/usr.bin/hexdump/hexsyntax.c:1.13 src/usr.bin/hexdump/hexsyntax.c:1.14
--- src/usr.bin/hexdump/hexsyntax.c:1.13 Tue Jan 3 20:30:21 2006
+++ src/usr.bin/hexdump/hexsyntax.c Sat Nov 27 15:46:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hexsyntax.c,v 1.13 2006/01/04 01:30:21 perry Exp $ */
+/* $NetBSD: hexsyntax.c,v 1.14 2010/11/27 20:46:38 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: hexsyntax.c,v 1.13 2006/01/04 01:30:21 perry Exp $");
+__RCSID("$NetBSD: hexsyntax.c,v 1.14 2010/11/27 20:46:38 christos Exp $");
#endif
#endif /* not lint */
@@ -55,7 +55,7 @@
off_t skip;/* bytes to skip */
void
-newsyntax(int argc, char ***argvp)
+hexsyntax(int argc, char ***argvp)
{
int ch;
char *p, **argv;
@@ -127,12 +127,3 @@
*argvp += optind;
}
-
-void
-usage(void)
-{
- (void)fprintf(stderr,
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
- );
- exit(1);
-}
Index: src/usr.bin/hexdump/odsyntax.c
diff -u src/usr.bin/hexdump/odsyntax.c:1.27 src/usr.bin/hexdump/odsyntax.c:1.28
--- src/usr.bin/hexdump/odsyntax.c:1.27 Fri Nov 26 19:42:58 2010
+++ src/usr.bin/hexdump/odsyntax.c Sat Nov 27 15:46:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: odsyntax.c,v 1.27 2010/11/27 00:42:58 dholland Exp $ */
+/* $NetBSD: odsyntax.c,v 1.28 2010/11/27 20:46:38 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: odsyntax.c,v 1.27 2010/11/27 00:42:58 dholland Exp $");
+__RCSID("$NetBSD: odsyntax.c,v 1.28 2010/11/27 20:46:
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Nov 27 20:19:41 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 Log Message: add ihphy To generate a diff of this commit: cvs rdiff -u -r1.292 -r1.293 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/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.292 src/sys/arch/amd64/conf/GENERIC:1.293 --- src/sys/arch/amd64/conf/GENERIC:1.292 Tue Nov 23 06:13:53 2010 +++ src/sys/arch/amd64/conf/GENERIC Sat Nov 27 15:19:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.292 2010/11/23 11:13:53 hannken Exp $ +# $NetBSD: GENERIC,v 1.293 2010/11/27 20:19:41 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.292 $" +#ident "GENERIC-$Revision: 1.293 $" maxusers 64 # estimated number of users @@ -755,6 +755,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.60 src/sys/arch/amd64/conf/XEN3_DOM0:1.61 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.60 Tue Nov 23 06:13:54 2010 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Nov 27 15:19:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.60 2010/11/23 11:13:54 hannken Exp $ +# $NetBSD: XEN3_DOM0,v 1.61 2010/11/27 20:19:41 christos Exp $ include "arch/amd64/conf/std.xen" @@ -386,6 +386,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Sat Nov 27 20:18:47 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL GENERIC INSTALL_FLOPPY XBOX XEN3_DOM0 Log Message: add ihphy To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1000 -r1.1001 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/conf/XBOX cvs rdiff -u -r1.41 -r1.42 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.279 src/sys/arch/i386/conf/ALL:1.280 --- src/sys/arch/i386/conf/ALL:1.279 Tue Nov 23 06:14:00 2010 +++ src/sys/arch/i386/conf/ALL Sat Nov 27 15:18:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.279 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: ALL,v 1.280 2010/11/27 20:18:46 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.279 $" +#ident "ALL-$Revision: 1.280 $" maxusers 64 # estimated number of users @@ -1144,6 +1144,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1000 src/sys/arch/i386/conf/GENERIC:1.1001 --- src/sys/arch/i386/conf/GENERIC:1.1000 Tue Nov 23 06:14:00 2010 +++ src/sys/arch/i386/conf/GENERIC Sat Nov 27 15:18:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1000 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: GENERIC,v 1.1001 2010/11/27 20:18:46 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1000 $" +#ident "GENERIC-$Revision: 1.1001 $" maxusers 64 # estimated number of users @@ -1093,6 +1093,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.10 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.11 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.10 Tue Nov 23 06:14:00 2010 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat Nov 27 15:18:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.10 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.11 2010/11/27 20:18:46 christos Exp $ # # INSTALL - Installation kernel. # @@ -607,6 +607,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs Index: src/sys/arch/i386/conf/XBOX diff -u src/sys/arch/i386/conf/XBOX:1.24 src/sys/arch/i386/conf/XBOX:1.25 --- src/sys/arch/i386/conf/XBOX:1.24 Tue Nov 23 06:14:00 2010 +++ src/sys/arch/i386/conf/XBOX Sat Nov 27 15:18:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XBOX,v 1.24 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: XBOX,v 1.25 2010/11/27 20:18:46 christos Exp $ # # XBOX -- A basic Microsoft XBox kernel config file. # @@ -150,6 +150,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY #icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.41 src/sys/arch/i386/conf/XEN3_DOM0:1.42 --- src/sys/arch/i386/conf/XEN3_DOM0:1.41 Tue Nov 23 06:14:00 2010 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Nov 27 15:18:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.41 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: XEN3_DOM0,v 1.42 2010/11/27 20:18:46 christos Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -370,6 +370,7 @@ gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 +ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: christos
Date: Sat Nov 27 20:15:43 UTC 2010
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/mii/miidevs_data.h
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/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.99 src/sys/dev/mii/miidevs.h:1.100
--- src/sys/dev/mii/miidevs.h:1.99 Sat Nov 27 13:03:33 2010
+++ src/sys/dev/mii/miidevs.h Sat Nov 27 15:15:43 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.99 2010/11/27 18:03:33 jym Exp $ */
+/* $NetBSD: miidevs.h,v 1.100 2010/11/27 20:15:43 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp
+ * NetBSD: miidevs,v 1.97 2010/11/27 20:15:27 christos Exp
*/
/*-
@@ -286,6 +286,8 @@
#define MII_STR_yyINTEL_I82553 "i82553 10/100 media interface"
#define MII_MODEL_yyINTEL_I82566 0x0039
#define MII_STR_yyINTEL_I82566 "i82566 10/100/1000 media interface"
+#define MII_MODEL_INTEL_I82577 0x0005
+#define MII_STR_INTEL_I82577 "i82577 10/100/1000 media interface"
#define MII_MODEL_xxMARVELL_I82563 0x000a
#define MII_STR_xxMARVELL_I82563 "i82563 10/100/1000 media interface"
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.87 src/sys/dev/mii/miidevs_data.h:1.88
--- src/sys/dev/mii/miidevs_data.h:1.87 Sat Nov 27 13:03:33 2010
+++ src/sys/dev/mii/miidevs_data.h Sat Nov 27 15:15:43 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.87 2010/11/27 18:03:33 jym Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.88 2010/11/27 20:15:43 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp
+ * NetBSD: miidevs,v 1.97 2010/11/27 20:15:27 christos Exp
*/
/*-
@@ -109,6 +109,7 @@
{ MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82562ET, MII_STR_yyINTEL_I82562ET },
{ MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82553, MII_STR_yyINTEL_I82553 },
{ MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82566, MII_STR_yyINTEL_I82566 },
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I82577, MII_STR_INTEL_I82577 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_I82563, MII_STR_xxMARVELL_I82563 },
{ MII_OUI_yyINTEL, MII_MODEL_yyINTEL_IGP01E1000, MII_STR_yyINTEL_IGP01E1000 },
{ MII_OUI_JMICRON, MII_MODEL_JMICRON_JMC250, MII_STR_JMICRON_JMC250 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: christos Date: Sat Nov 27 20:15:27 UTC 2010 Modified Files: src/sys/dev/mii: files.mii miidevs Added Files: src/sys/dev/mii: ihphy.c ihphyreg.h Log Message: PR/44080: Grégoire Sutre: Support for the i82577 ethernet PHY To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mii/files.mii cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/ihphy.c src/sys/dev/mii/ihphyreg.h cvs rdiff -u -r1.96 -r1.97 src/sys/dev/mii/miidevs 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/files.mii diff -u src/sys/dev/mii/files.mii:1.46 src/sys/dev/mii/files.mii:1.47 --- src/sys/dev/mii/files.mii:1.46 Fri Nov 12 19:47:24 2010 +++ src/sys/dev/mii/files.mii Sat Nov 27 15:15:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.mii,v 1.46 2010/11/13 00:47:24 jnemeth Exp $ +# $NetBSD: files.mii,v 1.47 2010/11/27 20:15:27 christos Exp $ defflag opt_mii.h MIIVERBOSE @@ -137,6 +137,10 @@ attach atphy at mii file dev/mii/atphy.catphy +device ihphy: mii_phy +attach ihphy at mii +file dev/mii/ihphy.cihphy + device etphy: mii_phy attach etphy at mii filedev/mii/etphy.c etphy Index: src/sys/dev/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.96 src/sys/dev/mii/miidevs:1.97 --- src/sys/dev/mii/miidevs:1.96 Sat Nov 27 13:01:40 2010 +++ src/sys/dev/mii/miidevs Sat Nov 27 15:15:27 2010 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp $ +$NetBSD: miidevs,v 1.97 2010/11/27 20:15:27 christos Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -207,6 +207,7 @@ model yyINTEL I82562ET 0x0033 i82562ET 10/100 media interface model yyINTEL I82553 0x0035 i82553 10/100 media interface model yyINTEL I82566 0x0039 i82566 10/100/1000 media interface +model INTEL I82577 0x0005 i82577 10/100/1000 media interface model xxMARVELL I82563 0x000a i82563 10/100/1000 media interface model yyINTEL IGP01E1000 0x0038 Intel IGP01E1000 Gigabit PHY Added files: Index: src/sys/dev/mii/ihphy.c diff -u /dev/null src/sys/dev/mii/ihphy.c:1.1 --- /dev/null Sat Nov 27 15:15:27 2010 +++ src/sys/dev/mii/ihphy.c Sat Nov 27 15:15:27 2010 @@ -0,0 +1,324 @@ +/* $NetBSD: ihphy.c,v 1.1 2010/11/27 20:15:27 christos Exp $ */ + +/*- + * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center, and by Frank van der Linden. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Copyright (c) 1997 Manuel Bouyer. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUT
CVS commit: src/usr.bin/unvis
Module Name:src
Committed By: christos
Date: Sat Nov 27 19:46:25 UTC 2010
Modified Files:
src/usr.bin/unvis: unvis.1 unvis.c
Log Message:
add -H and -e
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/unvis/unvis.1
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/unvis/unvis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/unvis/unvis.1
diff -u src/usr.bin/unvis/unvis.1:1.7 src/usr.bin/unvis/unvis.1:1.8
--- src/usr.bin/unvis/unvis.1:1.7 Thu Apr 22 02:55:15 2004
+++ src/usr.bin/unvis/unvis.1 Sat Nov 27 14:46:25 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.1,v 1.7 2004/04/22 06:55:15 lukem Exp $
+.\" $NetBSD: unvis.1,v 1.8 2010/11/27 19:46:25 christos Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)unvis.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd April 22, 2004
+.Dd November 27, 2010
.Dt UNVIS 1
.Os
.Sh NAME
@@ -37,7 +37,10 @@
.Nd "revert a visual representation of data back to original form"
.Sh SYNOPSIS
.Nm
+.Op Fl e
+.Op Fl H
.Op Fl h
+.Op Fl m
.Op Ar file ...
.Sh DESCRIPTION
.Nm
@@ -48,10 +51,26 @@
.Pp
The options are as follows:
.Bl -tag -width Ds
+.It Fl e
+Don't decode \e escaped sequences.
+.It Fl H
+Decode using the URI encoding from RFC 1866.
+.Pq Dv VIS_HTTP1866
.It Fl h
Decode using the URI encoding from RFC 1808.
-.Pq Dv VIS_HTTPSTYLE
+.Pq Dv VIS_HTTP1808
+.It Fl m
+Decode using mime style.
+.Pq Dv VIS_MIMESTYLE
.El
+.Pp
+Mixing
+.Fl h
+or
+.Fl H
+with
+.Fl m
+is not supported.
.Sh SEE ALSO
.Xr vis 1 ,
.Xr unvis 3 ,
Index: src/usr.bin/unvis/unvis.c
diff -u src/usr.bin/unvis/unvis.c:1.12 src/usr.bin/unvis/unvis.c:1.13
--- src/usr.bin/unvis/unvis.c:1.12 Tue Feb 10 18:06:31 2009
+++ src/usr.bin/unvis/unvis.c Sat Nov 27 14:46:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.12 2009/02/10 23:06:31 christos Exp $ */
+/* $NetBSD: unvis.c,v 1.13 2010/11/27 19:46:25 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: unvis.c,v 1.12 2009/02/10 23:06:31 christos Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.13 2010/11/27 19:46:25 christos Exp $");
#endif /* not lint */
#include
@@ -48,21 +48,25 @@
#include
#include
-static int eflags;
-
-static void process(FILE *fp, const char *filename);
+static void process(FILE *, const char *, int);
int
main(int argc, char *argv[])
{
FILE *fp;
- int ch;
+ int ch, eflags = 0;
setprogname(argv[0]);
- while ((ch = getopt(argc, argv, "hm")) != -1)
+ while ((ch = getopt(argc, argv, "eHhm")) != -1)
switch((char)ch) {
+ case 'e':
+ eflags |= VIS_NOESCAPE;
+ break;
+ case 'H':
+ eflags |= VIS_HTTP1866;
+ break;
case 'h':
- eflags |= VIS_HTTPSTYLE;
+ eflags |= VIS_HTTP1808;
break;
case 'm':
eflags |= VIS_MIMESTYLE;
@@ -70,31 +74,38 @@
case '?':
default:
(void)fprintf(stderr,
- "Usage: %s [-h|-m] [file...]\n", getprogname());
- return 1;
+ "Usage: %s [-e] [-Hh | -m] [file...]\n",
+ getprogname());
+ return EXIT_FAILURE;
}
argc -= optind;
argv += optind;
- if ((eflags & (VIS_HTTPSTYLE|VIS_MIMESTYLE)) ==
- (VIS_HTTPSTYLE|VIS_MIMESTYLE))
- errx(1, "Can't specify -m and -h at the same time");
+ switch (eflags & (VIS_HTTP1808|VIS_HTTP1866|VIS_MIMESTYLE)) {
+ case VIS_HTTP1808|VIS_MIMESTYLE:
+ case VIS_HTTP1866|VIS_MIMESTYLE:
+ case VIS_HTTP1808|VIS_HTTP1866|VIS_MIMESTYLE:
+ errx(EXIT_FAILURE, "Can't mix -m with -h and/or -H");
+ /*NOTREACHED*/
+ default:
+ break;
+ }
if (*argv)
while (*argv) {
if ((fp = fopen(*argv, "r")) != NULL)
-process(fp, *argv);
+process(fp, *argv, eflags);
else
warn("%s", *argv);
argv++;
}
else
- process(stdin, "");
- return 0;
+ process(stdin, "", eflags);
+ return EXIT_SUCCESS;
}
static void
-process(FILE *fp, const char *filename)
+process(FILE *fp, const char *filename, int eflags)
{
int offset = 0, c, ret;
int state = 0;
CVS commit: src/include
Module Name:src Committed By: christos Date: Sat Nov 27 19:44:54 UTC 2010 Modified Files: src/include: vis.h Log Message: add VIS_NOESCAPE and VIS_HTTP1866 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/include/vis.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/vis.h diff -u src/include/vis.h:1.17 src/include/vis.h:1.18 --- src/include/vis.h:1.17 Tue Feb 10 18:06:31 2009 +++ src/include/vis.h Sat Nov 27 14:44:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vis.h,v 1.17 2009/02/10 23:06:31 christos Exp $ */ +/* $NetBSD: vis.h,v 1.18 2010/11/27 19:44:54 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -56,8 +56,11 @@ * other */ #define VIS_NOSLASH 0x040 /* inhibit printing '\' */ +#define VIS_HTTP1808 0x080 /* http-style escape % hex hex */ #define VIS_HTTPSTYLE 0x080 /* http-style escape % hex hex */ #define VIS_MIMESTYLE 0x100 /* mime-style escape = HEX HEX */ +#define VIS_HTTP1866 0x200 /* http-style &#num; or &string; */ +#define VIS_NOESCAPE 0x400 /* don't decode `\' */ /* * unvis return codes
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sat Nov 27 19:44:21 UTC 2010
Modified Files:
src/lib/libc/gen: unvis.3 unvis.c
Log Message:
Implement VIS_NOESCAPE and VIS_HTTP1866.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/gen/unvis.3
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/unvis.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/unvis.3
diff -u src/lib/libc/gen/unvis.3:1.18 src/lib/libc/gen/unvis.3:1.19
--- src/lib/libc/gen/unvis.3:1.18 Tue Feb 10 18:06:31 2009
+++ src/lib/libc/gen/unvis.3 Sat Nov 27 14:44:21 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.3,v 1.18 2009/02/10 23:06:31 christos Exp $
+.\" $NetBSD: unvis.3,v 1.19 2010/11/27 19:44:21 christos Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)unvis.3 8.2 (Berkeley) 12/11/93
.\"
-.Dd February 10, 2009
+.Dd November 27, 2010
.Dt UNVIS 3
.Os
.Sh NAME
@@ -149,12 +149,22 @@
argument is also used to specify the encoding style of the source.
If set to
.Dv VIS_HTTPSTYLE ,
+or
+.Dv VIS_HTTP1808 ,
.Fn unvis
will decode URI strings as specified in RFC 1808.
If set to
+.Dv VIS_HTTP1866 ,
+.Fn unvis
+will decode URI strings as specified in RFC 1866.
+If set to
.Dv VIS_MIMESTYLE ,
.Fn unvis
will decode MIME Quoted-Printable strings as specified in RFC 2045.
+If set to
+.Dv VIS_NOESCAPE ,
+.Fn unvis
+will not decode \e quoted characters.
.Pp
The following code fragment illustrates a proper use of
.Fn unvis .
Index: src/lib/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.30 src/lib/libc/gen/unvis.c:1.31
--- src/lib/libc/gen/unvis.c:1.30 Wed Feb 11 08:51:59 2009
+++ src/lib/libc/gen/unvis.c Sat Nov 27 14:44:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.30 2009/02/11 13:51:59 christos Exp $ */
+/* $NetBSD: unvis.c,v 1.31 2010/11/27 19:44:21 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: unvis.c,v 1.30 2009/02/11 13:51:59 christos Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.31 2010/11/27 19:44:21 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,45 +66,176 @@
#define S_MIME1 9 /* mime hex digit 1 */
#define S_MIME2 10 /* mime hex digit 2 */
#define S_EATCRNL 11 /* mime eating CRNL */
+#define S_AMP 12 /* seen & */
+#define S_NUMBER 13 /* collecting number */
+#define S_STRING 14 /* collecting string */
#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
#define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
#define XTOD(c) (isdigit(c) ? (c - '0') : ((c - 'A') + 10))
/*
+ * RFC 1866
+ */
+static const struct nv {
+ const char *name;
+ uint8_t value;
+} nv[] = {
+ { "AElig", 198 }, /* capital AE diphthong (ligature) */
+ { "Aacute", 193 }, /* capital A, acute accent */
+ { "Acirc", 194 }, /* capital A, circumflex accent */
+ { "Agrave", 192 }, /* capital A, grave accent */
+ { "Aring", 197 }, /* capital A, ring */
+ { "Atilde", 195 }, /* capital A, tilde */
+ { "Auml", 196 }, /* capital A, dieresis or umlaut mark */
+ { "Ccedil", 199 }, /* capital C, cedilla */
+ { "ETH", 208 }, /* capital Eth, Icelandic */
+ { "Eacute", 201 }, /* capital E, acute accent */
+ { "Ecirc", 202 }, /* capital E, circumflex accent */
+ { "Egrave", 200 }, /* capital E, grave accent */
+ { "Euml", 203 }, /* capital E, dieresis or umlaut mark */
+ { "Iacute", 205 }, /* capital I, acute accent */
+ { "Icirc", 206 }, /* capital I, circumflex accent */
+ { "Igrave", 204 }, /* capital I, grave accent */
+ { "Iuml", 207 }, /* capital I, dieresis or umlaut mark */
+ { "Ntilde", 209 }, /* capital N, tilde */
+ { "Oacute", 211 }, /* capital O, acute accent */
+ { "Ocirc", 212 }, /* capital O, circumflex accent */
+ { "Ograve", 210 }, /* capital O, grave accent */
+ { "Oslash", 216 }, /* capital O, slash */
+ { "Otilde", 213 }, /* capital O, tilde */
+ { "Ouml", 214 }, /* capital O, dieresis or umlaut mark */
+ { "THORN", 222 }, /* capital THORN, Icelandic */
+ { "Uacute", 218 }, /* capital U, acute accent */
+ { "Ucirc", 219 }, /* capital U, circumflex accent */
+ { "Ugrave", 217 }, /* capital U, grave accent */
+ { "Uuml", 220 }, /* capital U, dieresis or umlaut mark */
+ { "Yacute", 221 }, /* capital Y, acute accent */
+ { "aacute", 225 }, /* small a, acute accent */
+ { "acirc", 226 }, /* small a, circumflex accent */
+ { "acute", 180 }, /* acute accent */
+ { "aelig", 230 }, /* small ae diphthong (ligature) */
+ { "agrave", 224 }, /* small a, grave accent */
+ { "amp", 38 }, /* ampersand */
+ { "aring", 229 }, /* small a, ring */
+ { "atilde", 227 }, /* small a, tilde */
+ { "auml", 228 }, /* small a, dieresis or umlaut mark */
+ { "brvbar", 166 }, /* broken (vertical) bar */
+ { "ccedil", 2
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Sat Nov 27 18:33:55 UTC 2010
Modified Files:
src/lib/libc/stdlib: bsearch.c
Log Message:
ansify
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/stdlib/bsearch.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/stdlib/bsearch.c
diff -u src/lib/libc/stdlib/bsearch.c:1.13 src/lib/libc/stdlib/bsearch.c:1.14
--- src/lib/libc/stdlib/bsearch.c:1.13 Mon Nov 28 22:12:00 2005
+++ src/lib/libc/stdlib/bsearch.c Sat Nov 27 13:33:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bsearch.c,v 1.13 2005/11/29 03:12:00 christos Exp $ */
+/* $NetBSD: bsearch.c,v 1.14 2010/11/27 18:33:54 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)bsearch.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bsearch.c,v 1.13 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: bsearch.c,v 1.14 2010/11/27 18:33:54 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,12 +59,8 @@
* look at item 3.
*/
void *
-bsearch(key, base0, nmemb, size, compar)
- const void *key;
- const void *base0;
- size_t nmemb;
- size_t size;
- int (*compar) __P((const void *, const void *));
+bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
+int (*compar)(const void *, const void *))
{
const char *base = base0;
size_t lim;
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Sat Nov 27 18:30:51 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_sp.c
Log Message:
Since we are going to handle syscalls in our threads, limit stacksize.
(unfortunately though, pthread_attr_setstacksize() has no effect on NetBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/librumpuser/rumpuser_sp.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_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.18 src/lib/librumpuser/rumpuser_sp.c:1.19
--- src/lib/librumpuser/rumpuser_sp.c:1.18 Fri Nov 26 18:51:03 2010
+++ src/lib/librumpuser/rumpuser_sp.c Sat Nov 27 18:30:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.18 2010/11/26 18:51:03 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.19 2010/11/27 18:30:51 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.18 2010/11/26 18:51:03 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.19 2010/11/27 18:30:51 pooka Exp $");
#include
#include
@@ -617,6 +617,8 @@
pthread_attr_init(&pattr_detached);
pthread_attr_setdetachstate(&pattr_detached, PTHREAD_CREATE_DETACHED);
+ /* XXX: doesn't stacksize currently work on NetBSD */
+ pthread_attr_setstacksize(&pattr_detached, 32*1024);
DPRINTF(("rump_sp: server mainloop\n"));
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jym Date: Sat Nov 27 18:03:33 UTC 2010 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.86 -r1.87 src/sys/dev/mii/miidevs_data.h 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/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.98 src/sys/dev/mii/miidevs.h:1.99 --- src/sys/dev/mii/miidevs.h:1.98 Sat Nov 27 17:38:49 2010 +++ src/sys/dev/mii/miidevs.h Sat Nov 27 18:03:33 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.98 2010/11/27 17:38:49 jym Exp $ */ +/* $NetBSD: miidevs.h,v 1.99 2010/11/27 18:03:33 jym Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.95 2010/05/02 12:38:06 pgoyette Exp + * NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp */ /*- Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.86 src/sys/dev/mii/miidevs_data.h:1.87 --- src/sys/dev/mii/miidevs_data.h:1.86 Sun May 2 12:43:05 2010 +++ src/sys/dev/mii/miidevs_data.h Sat Nov 27 18:03:33 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.86 2010/05/02 12:43:05 pgoyette Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.87 2010/11/27 18:03:33 jym Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.95 2010/05/02 12:38:06 pgoyette Exp + * NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp */ /*-
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jym Date: Sat Nov 27 18:01:40 UTC 2010 Modified Files: src/sys/dev/mii: miidevs Log Message: Correct string for BCM5709S. (Yup, sorry, fix was supposed to be for miidevs and not miidevs.h) To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/dev/mii/miidevs 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/miidevs diff -u src/sys/dev/mii/miidevs:1.95 src/sys/dev/mii/miidevs:1.96 --- src/sys/dev/mii/miidevs:1.95 Sun May 2 12:38:06 2010 +++ src/sys/dev/mii/miidevs Sat Nov 27 18:01:40 2010 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.95 2010/05/02 12:38:06 pgoyette Exp $ +$NetBSD: miidevs,v 1.96 2010/11/27 18:01:40 jym Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -172,7 +172,7 @@ model BROADCOM2 BCM5784 0x003a BCM5784 10/100/1000baseT PHY model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY -model BROADCOM2 BCM5709S 0x003f BCM5761 10/100/1000baseT PHY +model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface /* Cicada Semiconductor PHYs (now owned by Vitesse?) */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jym
Date: Sat Nov 27 17:48:59 UTC 2010
Modified Files:
src/sys/dev/pci: if_bnx.c
Log Message:
Missing break in switch case. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/if_bnx.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_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.34 src/sys/dev/pci/if_bnx.c:1.35
--- src/sys/dev/pci/if_bnx.c:1.34 Fri Nov 26 21:59:49 2010
+++ src/sys/dev/pci/if_bnx.c Sat Nov 27 17:48:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.34 2010/11/26 21:59:49 dholland Exp $ */
+/* $NetBSD: if_bnx.c,v 1.35 2010/11/27 17:48:58 jym Exp $ */
/* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.34 2010/11/26 21:59:49 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.35 2010/11/27 17:48:58 jym Exp $");
/*
* The following controllers are supported by this driver:
@@ -1975,6 +1975,7 @@
DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for SerDes.\n");
sc->bnx_phy_flags |= BNX_PHY_SERDES_FLAG;
+break;
default:
DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for Copper.\n");
@@ -1987,6 +1988,7 @@
DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for SerDes.\n");
sc->bnx_phy_flags |= BNX_PHY_SERDES_FLAG;
+break;
default:
DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for Copper.\n");
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: jym
Date: Sat Nov 27 17:42:04 UTC 2010
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
Use device_private() instead of casting softc to (void *).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/mii/brgphy.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/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.55 src/sys/dev/mii/brgphy.c:1.56
--- src/sys/dev/mii/brgphy.c:1.55 Sun May 2 13:49:17 2010
+++ src/sys/dev/mii/brgphy.c Sat Nov 27 17:42:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.55 2010/05/02 13:49:17 pgoyette Exp $ */
+/* $NetBSD: brgphy.c,v 1.56 2010/11/27 17:42:04 jym Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.55 2010/05/02 13:49:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.56 2010/11/27 17:42:04 jym Exp $");
#include
#include
@@ -519,7 +519,7 @@
static void
brgphy_reset(struct mii_softc *sc)
{
- struct brgphy_softc *bsc = (void *)sc;
+ struct brgphy_softc *bsc = device_private(sc->mii_dev);
mii_phy_reset(sc);
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jym Date: Sat Nov 27 17:38:49 UTC 2010 Modified Files: src/sys/dev/mii: miidevs.h Log Message: Correct string for BCM6709S. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/dev/mii/miidevs.h 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/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.97 src/sys/dev/mii/miidevs.h:1.98 --- src/sys/dev/mii/miidevs.h:1.97 Sun May 2 12:43:05 2010 +++ src/sys/dev/mii/miidevs.h Sat Nov 27 17:38:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: miidevs.h,v 1.97 2010/05/02 12:43:05 pgoyette Exp $ */ +/* $NetBSD: miidevs.h,v 1.98 2010/11/27 17:38:49 jym Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -228,7 +228,7 @@ #define MII_MODEL_BROADCOM2_BCM5761 0x003d #define MII_STR_BROADCOM2_BCM5761 "BCM5761 10/100/1000baseT PHY" #define MII_MODEL_BROADCOM2_BCM5709S 0x003f -#define MII_STR_BROADCOM2_BCM5709S "BCM5761 10/100/1000baseT PHY" +#define MII_STR_BROADCOM2_BCM5709S "BCM5709S 1000/2500baseSX PHY" #define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004 #define MII_STR_xxBROADCOM_ALT1_BCM5906 "BCM5906 10/100baseTX media interface"
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: elric
Date: Sat Nov 27 17:08:37 UTC 2010
Modified Files:
src/sbin/cgdconfig: cgdconfig.c pkcs5_pbkdf2.c
Log Message:
Remove trailing whitespace (patch provided by: Taylor R Campbell
)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sbin/cgdconfig/cgdconfig.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/cgdconfig/pkcs5_pbkdf2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.28 src/sbin/cgdconfig/cgdconfig.c:1.29
--- src/sbin/cgdconfig/cgdconfig.c:1.28 Tue Sep 8 21:36:35 2009
+++ src/sbin/cgdconfig/cgdconfig.c Sat Nov 27 17:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.28 2009/09/08 21:36:35 pooka Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.29 2010/11/27 17:08:36 elric Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.28 2009/09/08 21:36:35 pooka Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.29 2010/11/27 17:08:36 elric Exp $");
#endif
#include
@@ -393,7 +393,7 @@
}
/*ARGSUSED*/
-/*
+/*
* XXX take, and pass through, a compat flag that indicates whether we
* provide backwards compatibility with a previous bug. The previous
* behaviour is indicated by the keygen method pkcs5_pbkdf2, and a
@@ -795,7 +795,7 @@
ret = 0;
for (kg = p->keygen; kg && !ret; kg = kg->next) {
- if ((kg->kg_method != KEYGEN_PKCS5_PBKDF2_SHA1) &&
+ if ((kg->kg_method != KEYGEN_PKCS5_PBKDF2_SHA1) &&
(kg->kg_method != KEYGEN_PKCS5_PBKDF2_OLD ))
continue;
Index: src/sbin/cgdconfig/pkcs5_pbkdf2.c
diff -u src/sbin/cgdconfig/pkcs5_pbkdf2.c:1.14 src/sbin/cgdconfig/pkcs5_pbkdf2.c:1.15
--- src/sbin/cgdconfig/pkcs5_pbkdf2.c:1.14 Mon Apr 28 20:23:08 2008
+++ src/sbin/cgdconfig/pkcs5_pbkdf2.c Sat Nov 27 17:08:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pkcs5_pbkdf2.c,v 1.14 2008/04/28 20:23:08 martin Exp $ */
+/* $NetBSD: pkcs5_pbkdf2.c,v 1.15 2010/11/27 17:08:37 elric Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pkcs5_pbkdf2.c,v 1.14 2008/04/28 20:23:08 martin Exp $");
+__RCSID("$NetBSD: pkcs5_pbkdf2.c,v 1.15 2010/11/27 17:08:37 elric Exp $");
#endif
#include
@@ -93,7 +93,7 @@
if (first_time) {
(void)memcpy(r, tmp, PRF_BLOCKLEN);
first_time = 0;
- } else
+ } else
memxor(r, tmp, PRF_BLOCKLEN);
(void)memcpy(data, tmp, PRF_BLOCKLEN);
datalen = PRF_BLOCKLEN;
@@ -128,7 +128,7 @@
/* Step 3 */
for (i = 0; i < l; i++)
- prf_iterate(*r + (PRF_BLOCKLEN * i), P, Plen, S, Slen, c,
+ prf_iterate(*r + (PRF_BLOCKLEN * i), P, Plen, S, Slen, c,
(compat?i:i+1));
/* Step 4 and 5
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Sat Nov 27 16:00:09 UTC 2010
Modified Files:
src/usr.bin/make: arch.c
Log Message:
fix typo (thanks simon)
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/make/arch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.61 src/usr.bin/make/arch.c:1.62
--- src/usr.bin/make/arch.c:1.61 Fri Nov 26 10:14:29 2010
+++ src/usr.bin/make/arch.c Sat Nov 27 11:00:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.61 2010/11/26 15:14:29 christos Exp $ */
+/* $NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.61 2010/11/26 15:14:29 christos Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.61 2010/11/26 15:14:29 christos Exp $");
+__RCSID("$NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -1262,7 +1262,7 @@
if (DEBUG(ARCH) || DEBUG(MAKE)) {
fprintf(debug_file, "%s modified %s...", RANLIBMAG, Targ_FmtTime(modTimeTOC));
}
- oodate = (gn->cmgn == NULL || gn->gngm->mtime > modTimeTOC);
+ oodate = (gn->cmgn == NULL || gn->cmgn->mtime > modTimeTOC);
} else {
/*
* A library w/o a table of contents is out-of-date
CVS commit: src/sys/dev/usb
Module Name:src Committed By: bsh Date: Sat Nov 27 13:41:50 UTC 2010 Added Files: src/sys/dev/usb: ulpireg.h Log Message: ULPI register definitions To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/ulpireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/dev/usb/ulpireg.h diff -u /dev/null src/sys/dev/usb/ulpireg.h:1.1 --- /dev/null Sat Nov 27 13:41:50 2010 +++ src/sys/dev/usb/ulpireg.h Sat Nov 27 13:41:49 2010 @@ -0,0 +1,88 @@ +/* $NetBSD: ulpireg.h,v 1.1 2010/11/27 13:41:49 bsh Exp $ */ +/* + * Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved. + * Written by Hashimoto Kenichi for Genetec Corporation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GENETEC CORPORATION + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _DEV_USB_ULPI_ULPIREG_H +#define _DEV_USB_ULPI_ULPIREG_H + +/* commands */ +#define ULPI_CMD_SPECIAL (0x0 << 6) +#define ULPI_CMD_NOOP (ULPI_CMD_SPECIAL | 0x00) +#define ULPI_CMD_TRANSMIT (0x1 << 6) +#define ULPI_CMD_PID(n) (ULPI_CMD_TRANSMIT | (n)) +#define ULPI_CMD_REGWRITE (0x2 << 6) +#define ULPI_CMD_EXTW (ULPI_CMD_REGWRITE | 0x2f) +#define ULPI_CMD_REGREAD (0x3 << 6) +#define ULPI_CMD_EXTR (ULPI_CMD_REGREAD | 0x2f) + +/* registers */ +#define ULPI_VENDOR_ID_LOW 0x00 +#define ULPI_VENDOR_ID_HIGH 0x01 +#define ULPI_PRODUCT_ID_LOW 0x02 +#define ULPI_PRODUCT_ID_HIGH 0x03 +#define ULPI_FUNCTION_CONTROL 0x04 +#define FUNCTION_CONTROL_XCVRSELECT __BITS(0,1) +#define XCVRSELECT_HS 0x0 +#define XCVRSELECT_FS 0x1 +#define XCVRSELECT_LS 0x2 +#define XCVRSELECT_FSLS 0x3 /* FS Xceiver for LS packets */ +#define FUNCTION_CONTROL_TERMSELECT __BIT(2) +#define FUNCTION_CONTROL_OPMODE __BITS(3,4) +#define FUNCTION_CONTROL_RESET __BIT(5) +#define FUNCTION_CONTROL_SUSPENDM __BIT(6) +#define ULPI_INTERFACE_CONTROL 0x07 +#define ULPI_OTG_CONTROL 0x0a +#define OTG_CONTROL_IDPULLUP __BIT(0) /* ID pull up */ +#define OTG_CONTROL_DPPULLDOWN __BIT(1) /* D+ pull down */ +#define OTG_CONTROL_DMPULLDOWN __BIT(2) /* D- pull down */ +#define OTG_CONTROL_DISCHRGVBUS __BIT(3) /* discharge Vbus */ +#define OTG_CONTROL_CHRGVBUS __BIT(4) /* charge Vbus */ +#define OTG_CONTROL_DRVVBUS __BIT(5) /* drive 5V on Vbus */ +#define OTG_CONTROL_DRVVBUSEXT __BIT(6) /* drive Vbus external */ +#define OTG_CONTROL_USEEXTVBUSIND __BIT(7) /* use external Vbus over-current + indecator */ +#define ULPI_USB_INT_RISING_EDGE 0x0d +#define ULPI_USB_INT_FALLING_EDGE 0x10 +#define ULPI_USB_INT_STATUS 0x13 +#define ULPI_USB_INTERRUPT_LATCH 0x14 +#define ULPI_DEBUG 0x15 +#define ULPI_SCRATCH 0x16 +#define ULPI_CARKIT_CONTROL 0x19 +#define ULPI_CARKIT_INTERRUPT_DELAY 0x1c +#define ULPI_CARKIT_INTERRUPT_ENABLE 0x1d +#define ULPI_CARKIT_INTERRUPT_STATUS 0x20 +#define ULPI_CARKIT_INTERRUPT_LATCH 0x21 +#define ULPI_CARKIT_PULSE_CONTROL 0x22 +#define ULPI_TRANSMIT_POSITIVE_WIDTH 0x25 +#define ULPI_TRANSMIT_NEGATIVE_WIDTH 0x26 +#define ULPI_RECEIVE_POLARITY_RECOVERY 0x27 + +#define ULPI_VENDOR_SPECIFIC 0x30 + +#define ULPI_REG_WRITE 0 +#define ULPI_REG_SET 1 +#define ULPI_REG_CLEAR 2 + +#endif /* _DEV_USB_ULPI_ULPIREG_H */
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: bsh
Date: Sat Nov 27 13:37:27 UTC 2010
Modified Files:
src/sys/arch/arm/imx: imx31_uart.c imx51_uart.c imxuart.c imxuartvar.h
Log Message:
use device_t correctly for imxuart.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx31_uart.c \
src/sys/arch/arm/imx/imx51_uart.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imxuart.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imxuartvar.h
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/arm/imx/imx31_uart.c
diff -u src/sys/arch/arm/imx/imx31_uart.c:1.1 src/sys/arch/arm/imx/imx31_uart.c:1.2
--- src/sys/arch/arm/imx/imx31_uart.c:1.1 Sat Nov 13 06:12:17 2010
+++ src/sys/arch/arm/imx/imx31_uart.c Sat Nov 27 13:37:27 2010
@@ -36,7 +36,7 @@
int
-imxuart_match(struct device *parent, struct cfdata *cf, void *aux)
+imxuart_match(device_t parent, struct cfdata *cf, void *aux)
{
struct aips_attach_args * const aipsa = aux;
@@ -53,7 +53,7 @@
}
void
-imxuart_attach(struct device *parent, struct device *self, void *aux)
+imxuart_attach(device_t parent, device_t self, void *aux)
{
struct aips_attach_args * aa = aux;
Index: src/sys/arch/arm/imx/imx51_uart.c
diff -u src/sys/arch/arm/imx/imx51_uart.c:1.1 src/sys/arch/arm/imx/imx51_uart.c:1.2
--- src/sys/arch/arm/imx/imx51_uart.c:1.1 Sat Nov 13 06:12:17 2010
+++ src/sys/arch/arm/imx/imx51_uart.c Sat Nov 27 13:37:27 2010
@@ -36,7 +36,7 @@
int
-imxuart_match(struct device *parent, struct cfdata *cf, void *aux)
+imxuart_match(device_t parent, struct cfdata *cf, void *aux)
{
struct axi_attach_args * const aa = aux;
@@ -51,7 +51,7 @@
}
void
-imxuart_attach(struct device *parent, struct device *self, void *aux)
+imxuart_attach(device_t parent, device_t self, void *aux)
{
struct axi_attach_args * aa = aux;
Index: src/sys/arch/arm/imx/imxuart.c
diff -u src/sys/arch/arm/imx/imxuart.c:1.5 src/sys/arch/arm/imx/imxuart.c:1.6
--- src/sys/arch/arm/imx/imxuart.c:1.5 Sat Nov 13 06:12:17 2010
+++ src/sys/arch/arm/imx/imxuart.c Sat Nov 27 13:37:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuart.c,v 1.5 2010/11/13 06:12:17 bsh Exp $ */
+/* $NetBSD: imxuart.c,v 1.6 2010/11/27 13:37:27 bsh Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.5 2010/11/13 06:12:17 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.6 2010/11/27 13:37:27 bsh Exp $");
#include "opt_imxuart.h"
#include "opt_ddb.h"
@@ -388,7 +388,7 @@
void
-imxuart_attach_common(struct device *parent, struct device *self,
+imxuart_attach_common(device_t parent, device_t self,
bus_space_tag_t iot, paddr_t iobase, size_t size, int intr, int flags)
{
imxuart_softc_t *sc = device_private(self);
Index: src/sys/arch/arm/imx/imxuartvar.h
diff -u src/sys/arch/arm/imx/imxuartvar.h:1.3 src/sys/arch/arm/imx/imxuartvar.h:1.4
--- src/sys/arch/arm/imx/imxuartvar.h:1.3 Sat Nov 13 06:12:17 2010
+++ src/sys/arch/arm/imx/imxuartvar.h Sat Nov 27 13:37:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuartvar.h,v 1.3 2010/11/13 06:12:17 bsh Exp $ */
+/* $NetBSD: imxuartvar.h,v 1.4 2010/11/27 13:37:27 bsh Exp $ */
/*
* driver include for Freescale i.MX31 and i.MX31L UARTs
*/
@@ -36,7 +36,7 @@
#include /* for tcflag_t */
-void imxuart_attach_common(struct device *parent, struct device *self,
+void imxuart_attach_common(device_t parent, device_t self,
bus_space_tag_t, paddr_t, size_t, int, int);
int imxuart_kgdb_attach(bus_space_tag_t, paddr_t, u_int, tcflag_t);
CVS commit: src
Module Name:src
Committed By: roy
Date: Sat Nov 27 12:11:54 UTC 2010
Modified Files:
src/distrib/sets/lists/base: mi
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Install the 02-dump hook for dhcpcd.
To generate a diff of this commit:
cvs rdiff -u -r1.888 -r1.889 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.888 src/distrib/sets/lists/base/mi:1.889
--- src/distrib/sets/lists/base/mi:1.888 Sun Nov 21 19:58:03 2010
+++ src/distrib/sets/lists/base/mi Sat Nov 27 12:11:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.888 2010/11/21 19:58:03 adam Exp $
+# $NetBSD: mi,v 1.889 2010/11/27 12:11:54 roy Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -178,6 +178,7 @@
./libexec base-sys-root
./libexec/dhcpcd-hooksbase-dhcpcd-root
./libexec/dhcpcd-hooks/01-test base-dhcpcd-root
+./libexec/dhcpcd-hooks/02-dump base-dhcpcd-root
./libexec/dhcpcd-hooks/10-mtu base-dhcpcd-root
./libexec/dhcpcd-hooks/10-resolv.conf base-obsolete obsolete
./libexec/dhcpcd-hooks/14-lookup-hostname base-obsolete obsolete
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.8 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.9
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.8 Wed Nov 10 14:12:28 2010
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Sat Nov 27 12:11:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/10 14:12:28 roy Exp $
+# $NetBSD: Makefile,v 1.9 2010/11/27 12:11:54 roy Exp $
#
PROG= dhcpcd
@@ -23,7 +23,7 @@
CONFIGFILES= dhcpcd.conf
FILESDIR_dhcpcd.conf= /etc
-HOOKS= 01-test 10-mtu 20-resolv.conf 29-lookup-hostname \
+HOOKS= 01-test 02-dump 10-mtu 20-resolv.conf 29-lookup-hostname \
30-hostname 50-ntp.conf
FILES= ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,}
CVS commit: src/doc
Module Name:src Committed By: tron Date: Sat Nov 27 11:44:23 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note that Postfix 2.7.2 was imported. To generate a diff of this commit: cvs rdiff -u -r1.788 -r1.789 src/doc/3RDPARTY cvs rdiff -u -r1.1462 -r1.1463 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/3RDPARTY diff -u src/doc/3RDPARTY:1.788 src/doc/3RDPARTY:1.789 --- src/doc/3RDPARTY:1.788 Sat Nov 27 11:35:54 2010 +++ src/doc/3RDPARTY Sat Nov 27 11:44:23 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.788 2010/11/27 11:35:54 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.789 2010/11/27 11:44:23 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -893,7 +893,7 @@ and more. Package: postfix -Version: 2.7.1 +Version: 2.7.2 Current Vers: 2.7.2 Maintainer: Wietse Venema Archive Site: ftp://postfix.cloud9.net/official/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1462 src/doc/CHANGES:1.1463 --- src/doc/CHANGES:1.1462 Sat Nov 27 11:35:54 2010 +++ src/doc/CHANGES Sat Nov 27 11:44:23 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1462 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1463 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -324,7 +324,6 @@ in USB subsystem. [cegger 20090615] drm(4): Update to mesa-drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. [mrg 20090619] - postfix(1): Import version 2.6.2 [tron 20090623] wake(8): New command to send Wake-on-LAN packets to machines on the local Ethernet. [mbalmer 20090625] cpu_reboot(9): tear down stacks of (pseudo-)devices and @@ -396,7 +395,6 @@ genfb(4) display driver. [jmcneill 20090823] tcx(4): imported the xf86-video-suntcx driver and added hardware acceleration [macallan 20090827] - postfix(1): Import version 2.6.5 [tron 20090831] unzip(1): A libarchive-based unzip frontend, emulating most of infozip's command line. [joerg 20090903] rumpcrypto: Add rump component for kernel crypto routines. @@ -792,3 +790,4 @@ noautoload property. [jnemeth 20101118] openssh: Import 5.6. [adam 20101121] dhcpcd(8): Import dhcpcd-5.2.9. [roy 20101127] + postfix(1): Import version 2.7.2 [tron 20101127]
CVS commit: src/doc
Module Name:src Committed By: roy Date: Sat Nov 27 11:35:54 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: dhcpcd-5.2.9 To generate a diff of this commit: cvs rdiff -u -r1.787 -r1.788 src/doc/3RDPARTY cvs rdiff -u -r1.1461 -r1.1462 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/3RDPARTY diff -u src/doc/3RDPARTY:1.787 src/doc/3RDPARTY:1.788 --- src/doc/3RDPARTY:1.787 Wed Nov 24 22:14:35 2010 +++ src/doc/3RDPARTY Sat Nov 27 11:35:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.787 2010/11/24 22:14:35 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.788 2010/11/27 11:35:54 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -268,8 +268,8 @@ top of the current tree. Package: dhcpcd -Version: 5.2.8 -Current Vers: 5.2.8 +Version: 5.2.9 +Current Vers: 5.2.9 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1461 src/doc/CHANGES:1.1462 --- src/doc/CHANGES:1.1461 Sun Nov 21 20:02:35 2010 +++ src/doc/CHANGES Sat Nov 27 11:35:54 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1461 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1462 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -791,3 +791,4 @@ module: Allow disabling autoloading a specific module by setting noautoload property. [jnemeth 20101118] openssh: Import 5.6. [adam 20101121] + dhcpcd(8): Import dhcpcd-5.2.9. [roy 20101127]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Nov 27 11:28:25 UTC 2010 Modified Files: src/external/bsd/dhcpcd/dist: dhcpcd.8.in Log Message: sync To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd.8.in 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/dhcpcd/dist/dhcpcd.8.in diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.6 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.7 --- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.6 Thu Oct 7 14:38:10 2010 +++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Sat Nov 27 11:28:24 2010 @@ -74,13 +74,13 @@ .Li RFC 2131 . .Nm gets the host information -.Po +.Po IP address, routes, etc .Pc from a DHCP server and configures the network .Ar interface of the -machine on which it is running. +machine on which it is running. .Nm then runs the configuration script which writes DNS information to .Xr resolvconf 8 , @@ -143,7 +143,7 @@ .Pp Interfaces are preferred by carrier, DHCP lease/IPv4LL and then lowest metric. For systems that support route metrics, each route will be tagged with the -metric, otherwise +metric, otherwise .Nm changes the routes to use the interface with the same route and the lowest metric. @@ -363,7 +363,7 @@ A setting of 0 seconds causes .Nm to skip the reboot phase and go straight into discover. -.It Fl D , -duid +.It Fl D , -duid Generate an .Li RFC 4361 compliant clientid.
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Nov 27 11:24:17 UTC 2010 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27216 Log Message: Import dhcpcd-5.2.9 with the following changes: * syntax in 50-ypbind hook has been fixed * man page corrections * report hwaddr used by dhcpcd when debug is enabled * Fix detecting inet address for INFORM support * document reason RELEASE in dhcpcd-run-hooks * Support RTM_CHGADDR in the upcoming NetBSD-6 This is used to work out if the hwaddr has changed as the interface does not go down/up unlike other OSes * ntp hook no longer attempts to restart ntpd if 1st attempt failed Status: Vendor Tag: roy Release Tags: dhcpcd-5-2-9 U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/bind.c U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/signals.c U src/external/bsd/dhcpcd/dist/configure.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bind.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/configure.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/signals.h U src/external/bsd/dhcpcd/dist/compat/getline.c U src/external/bsd/dhcpcd/dist/compat/getline.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/ibm-public/postfix/dist
Module Name:src Committed By: tron Date: Sat Nov 27 10:41:18 UTC 2010 Modified Files: src/external/ibm-public/postfix/dist/html: postconf.5.html src/external/ibm-public/postfix/dist/man/man5: postconf.5 src/external/ibm-public/postfix/dist/proto: postconf.proto src/external/ibm-public/postfix/dist/src/global: mail_params.h src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/proto/postconf.proto cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/global/mail_params.h cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.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/ibm-public/postfix/dist/html/postconf.5.html diff -u src/external/ibm-public/postfix/dist/html/postconf.5.html:1.5 src/external/ibm-public/postfix/dist/html/postconf.5.html:1.6 --- src/external/ibm-public/postfix/dist/html/postconf.5.html:1.5 Thu Jun 17 18:18:14 2010 +++ src/external/ibm-public/postfix/dist/html/postconf.5.html Sat Nov 27 10:41:16 2010 @@ -9150,6 +9150,10 @@ but it is best to include all the required certificates directly in $smtp_tls_cert_file. + Specify "tls_append_default_CA = no" to prevent Postfix from +appending the system-supplied default CAs and trusting third-party +certificates. + Example: @@ -9173,6 +9177,10 @@ To use this option in chroot mode, this directory (or a copy) must be inside the chroot jail. + Specify "tls_append_default_CA = no" to prevent Postfix from +appending the system-supplied default CAs and trusting third-party +certificates. + Example: @@ -10824,8 +10832,11 @@ Permit the request when the remote SMTP client certificate is verified successfully. This option must be used only if a special CA issues the certificates and only this CA is listed as trusted -CA, otherwise all clients with a recognized certificate would be -allowed to relay. This feature is available with Postfix version 2.2. +CA. Otherwise, clients with a third-party certificate would also +be allowed to relay. Specify "tls_append_default_CA = no" when the +trusted CA is specified with smtpd_tls_CAfile or smtpd_tls_CApath, +to prevent Postfix from appending the system-supplied default CAs. +This feature is available with Postfix version 2.2. permit_tls_clientcerts @@ -12595,6 +12606,10 @@ but it is best to include all the required certificates directly in the server certificate file. + Specify "tls_append_default_CA = no" to prevent Postfix from +appending the system-supplied default CAs and trusting third-party +certificates. + By default (see smtpd_tls_ask_ccert), client certificates are not requested, and smtpd_tls_CAfile should remain empty. If you do make use of client certificates, the distinguished names (DNs) of the certificate @@ -12626,6 +12641,10 @@ smtpd_tls_CApath in chroot mode, this directory (or a copy) must be inside the chroot jail. + Specify "tls_append_default_CA = no" to prevent Postfix from +appending the system-supplied default CAs and trusting third-party +certificates. + By default (see smtpd_tls_ask_ccert), client certificates are not requested, and smtpd_tls_CApath should remain empty. In contrast to smtpd_tls_CAfile, DNs of certificate authorities installed @@ -13739,6 +13758,23 @@ +tls_append_default_CA +(default: no) + + Append the system-supplied default certificate authority +certificates to the ones specified with *_tls_CApath or *_tls_CAfile. +The default is "no"; this prevents Postfix from trusting third-party +certificates and giving them relay permission with +permit_tls_all_clientcerts. + + This feature is available in Postfix 2.4.15, 2.5.11, 2.6.8, +2.7.2 and later versions. Specify "tls_append_default_CA = yes" for +backwards compatibility, to avoid breaking certificate verification +with sites that don't use permit_tls_all_clientcerts. + + + + tls_daemon_random_bytes (default: 32) Index: src/external/ibm-public/postfix/dist/man/man5/postconf.5 diff -u src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.5 src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.6 --- src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.5 Thu Jun 17 18:18:15 2010 +++ src/external/ibm-public/postfix/dist/man/man5/postconf.5 Sat Nov 27 10:41:17 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: postconf.5,v 1.5 2010/06/17 18:18:15 tron Exp $ +.\" $NetBSD: postconf.5,v 1.6 2010/11/27 10:41:17 tron Exp $ .\" .TH POSTCONF 5 .SH NAME @@ -5241,6 +5241,10 @@ but it is best to include all the required certificate
