Date: Wed, 23 Mar 2005 14:15:29 GMT From: David Xu <davidxu@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 73706 for review Message-ID: <200503231415.j2NEFTiq049399@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=73706 Change 73706 by davidxu@davidxu_alona on 2005/03/23 14:15:27 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.x11-4.dist#3 integrate .. //depot/projects/davidxu_thread/src/include/unistd.h#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount/mount.8#4 integrate .. //depot/projects/davidxu_thread/src/sbin/reboot/reboot.c#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ata.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/carp.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/cdce.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/ip.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_cdce.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/modules/cdce/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/sys/exec.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/arch.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/dir.h#6 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/globals.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/var_modify.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/flowctl/flowctl.8#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/flowctl/flowctl.c#3 integrate Differences ... ==== //depot/projects/davidxu_thread/src/etc/mtree/BSD.local.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.113 2004/12/04 23:30:36 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.114 2005/03/22 18:29:41 krion Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -437,6 +437,10 @@ LC_MESSAGES .. .. + mt + LC_MESSAGES + .. + .. nb LC_MESSAGES .. ==== //depot/projects/davidxu_thread/src/etc/mtree/BSD.x11-4.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.25 2004/12/04 23:30:36 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.26 2005/03/22 18:29:41 krion Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -661,6 +661,10 @@ LC_MESSAGES .. .. + mt + LC_MESSAGES + .. + .. nb LC_MESSAGES .. ==== //depot/projects/davidxu_thread/src/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ + * $FreeBSD: src/include/unistd.h,v 1.76 2005/03/22 01:19:17 das Exp $ */ #ifndef _UNISTD_H_ @@ -489,7 +489,10 @@ int iruserok_sa(const void *, int, int, const char *, const char *); int issetugid(void); char *mkdtemp(char *); +#ifndef _MKNOD_DECLARED int mknod(const char *, mode_t, dev_t); +#define _MKNOD_DECLARED +#endif #ifndef _MKSTEMP_DECLARED int mkstemp(char *); #define _MKSTEMP_DECLARED ==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Simplified Chinese Project - Original Revision: 1.227.2.14 + Original Revision: 1.276 --> <!-- @@ -35,7 +35,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.2 2005/03/22 19:19:04 delphij Exp $</pubdate> </sect1info> <title>Ö§³ÖµÄÓ²¼þ</title> @@ -175,8 +175,7 @@ &hwlist.nsp; - <para arch="i386">Adaptec AIC-7110 ²¢¿Úת SCSI ½Ó¿Ú (&man.vpo.4; Çý¶¯³ÌÐò) - </para> + &hwlist.vpo; &hwlist.ida; @@ -184,9 +183,9 @@ &hwlist.iir; - <para arch="i386">Promise SuperTrak ATA RAID ¿ØÖÆÆ÷ (&man.pst.4; - Çý¶¯³ÌÐò) - </para> + &hwlist.pst; + + &hwlist.hptmv; &hwlist.ips; @@ -247,7 +246,7 @@ &hwlist.pcn; &hwlist.lnc; - + <para arch="i386,pc98,amd64">»ùÓÚ SMC 83c17x (EPIC) µÄÒÔÌ«Íø NIC (&man.tx.4; Çý¶¯³ÌÐò) </para> @@ -319,8 +318,6 @@ &hwlist.em; - &hwlist.gx; - &hwlist.hme; &hwlist.gem; @@ -334,8 +331,17 @@ &hwlist.ixgb; + &hwlist.vge; + </sect2> + <sect2 id="tokenring"> + <title>Token Ring Interfaces</title> + + &hwlist.oltr; + + </sect2> + <sect2 id="fddi"> <title>FDDI ½Ó¿Ú</title> <para arch="i386,pc98,alpha">DEC DEFPA PCI (&man.fpa.4; Çý¶¯³ÌÐò)</para> @@ -627,17 +633,9 @@ </itemizedlist> </para> - <para arch="i386">SDL Communication ´®¿Ú°å - <itemizedlist> - <listitem> - <para>SDL Communications Riscom/8 ´®¿Ú°å (rc Çý¶¯³ÌÐò)</para> - </listitem> - <listitem> - <para>SDL Communications RISCom/N2 ºÍ N2pci ¸ßËÙͬ²½´®¿Ú°å - (&man.sr.4; Çý¶¯³ÌÐò)</para> - </listitem> - </itemizedlist> - </para> + &hwlist.rc; + + &hwlist.sr; <para arch="i386,amd64">Specialix SI/XIO/SX ¶à¿Ú´®¿Ú¿¨, ͬʱ°üÀ¨½Ï¾ÉµÄ SIHOST2.x ºÍÐÂʽµÄ <quote>ÔöÇ¿ÐÍ</quote> (»ùÓÚ transputer µÄ£¬ @@ -700,131 +698,50 @@ <sect2 id="audio"> <title>Audio Devices</title> - <para arch="i386,amd64">Advance (&man.sbc.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>Asound 100 ºÍ 110</para> - </listitem> - <listitem> - <para>Logic ALS120 ºÍ ALS4000</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.ad1816; + &hwlist.snd.cs4281; + &hwlist.snd.solo; + + &hwlist.snd.sbc; - <para arch="i386,amd64">CMedia ÒôЧоƬ - <itemizedlist> - <listitem> - <para>CMI8338/CMI8738</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.cmi; - <para arch="i386,amd64">Crystal Semiconductor (&man.csa.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>CS461x/462x ÉùÒô¼ÓËÙÆ÷</para> - </listitem> - <listitem> - <para>CS428x ÉùÒô¿ØÖÆÆ÷</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.csa; - <para arch="i386,amd64">ENSONIQ (&man.pcm.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>AudioPCI ES1370/1371</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.es137x; &hwlist.snd.ess; - <para arch="i386,alpha,amd64">ESS - <itemizedlist> - <listitem> - <para>ES1868, ES1869, ES1879 ºÍ ES1888 (&man.sbc.4; Çý¶¯³ÌÐò)</para> - </listitem> - <listitem> - <para>Maestro-1, Maestro-2, ºÍ Maestro-2E</para> - </listitem> - <listitem> - <para>Maestro-3/Allegro</para> - <note> - <para>ÓÉÓÚÊÚȨµÄÏÞÖÆ£¬ Maestro-3/Allegro ²»ÄܱàÒë½ø - &os; Äںˡ£ ҪʹÓÃÕâ¸öÇý¶¯£¬ ½«ÏÂÃæµÄÐÐÌí¼Óµ½ - <filename>/boot/loader.conf</filename>£º</para> + &hwlist.snd.maestro; - <screen><userinput>snd_maestro3_load="YES"</userinput></screen> - </note> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.maestro3; <para arch="i386,amd64">ForteMedia fm801</para> - <para arch="i386,amd64">Gravis (&man.gusc.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>UltraSound MAX</para> - </listitem> - <listitem> - <para>UltraSound PnP</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.gusc; <para arch="i386,amd64">Intel 443MX, 810, 815, ºÍ 815E ¼¯³ÉÉùÒôÉ豸 (&man.pcm.4; Çý¶¯³ÌÐò)</para> <para arch="i386,alpha,amd64">MSS/WSS ¼æÈÝµÄ DSP (&man.pcm.4; Çý¶¯³ÌÐò)</para> - <para arch="i386,amd64">NeoMagic 256AV/ZX (&man.pcm.4; Çý¶¯³ÌÐò)</para> + &hwlist.snd.neomagic; <para arch="i386,amd64">OPTi 931/82C931 (&man.pcm.4; Çý¶¯³ÌÐò)</para> - <para arch="i386,amd64">S3 Sonicvibes</para> + &hwlist.snd.vibes; + + &hwlist.snd.emu10k1; - <para arch="i386,alpha,amd64">Creative Technologies SoundBlaster ϵÁÐ (&man.sbc.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>SoundBlaster</para> - </listitem> - <listitem> - <para>SoundBlaster Pro</para> - </listitem> - <listitem> - <para>SoundBlaster AWE-32</para> - </listitem> - <listitem> - <para>SoundBlaster AWE-64</para> - </listitem> - <listitem> - <para>SoundBlaster AWE-64 GOLD</para> - </listitem> - <listitem> - <para>SoundBlaster ViBRA-16</para> - </listitem> - </itemizedlist> - </para> + <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; driver)</para> - <para arch="i386,amd64">Creative Technologies Sound Blaster Live! ϵÁÐ - (emu10k1 Çý¶¯³ÌÐò)</para> + &hwlist.snd.via82c686; - <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; Çý¶¯³ÌÐò)</para> + &hwlist.snd.ds1; - <para arch="i386,amd64">VIA Technologies VT82C686A</para> + &hwlist.snd.ich; - <para arch="i386,amd64">Yamaha - <itemizedlist> - <listitem> - <para>DS1</para> - </listitem> - <listitem> - <para>DS1e</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.audiocs; <para arch="pc98">NEC PC-9801-73, 86 ¼°¼æÈÝ (nss Çý¶¯³ÌÐò) <itemizedlist> @@ -855,9 +772,9 @@ <sect2 id="camera"> <title>ÕÕÏà»úºÍÊÓƵ²¶×½É豸</title> - <para arch="i386,pc98">»ùÓÚ Brooktree Bt848/849/878/879 ֡ץȡÆ÷ (&man.bktr.4; - Çý¶¯³ÌÐò) - </para> + + &hwlist.bktr; + <para arch="i386">Connectix QuickCam</para> </sect2> @@ -931,106 +848,7 @@ &hwlist.uscanner; - <para arch="i386,pc98,alpha,amd64">´æ´¢Æ÷ (&man.umass.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>ADTEC Stick Drive AD-UST32M, 64M, 128M, 256M</para> - </listitem> - <listitem> - <para>Denno »ðÏß/USB2 Removable - 2.5-inch HDD Case MIFU-25CB20</para> - </listitem> - <listitem> - <para>FujiFilm Zip USB Drive ZDR100 USB A</para> - </listitem> - <listitem> - <para>GREEN HOUSE USB Flash Memory <quote>PicoDrive</quote> - GH-UFD32M, 64M, 128M</para> - </listitem> - <listitem> - <para>IBM 32MB USB Memory Key (P/N 22P5296)</para> - </listitem> - <listitem> - <para>IBM ThinkPad USB ±ãЯʽ CD-ROM Çý¶¯Æ÷ (P/N 33L5151)</para> - </listitem> - <listitem> - <para>I-O DATA USB x6 CD-RW Drive CDRW-i64/USB (½öÏÞ CDROM)</para> - </listitem> - <listitem> - <para>I-O DATA USB CD/CD-R/CD-RW/DVD-R/DVD-RW/DVD-RAM/DVD-ROM Drive DVR-iUH2 - (½öÏÞ CDROM, DVD-RAM)</para> - </listitem> - <listitem arch="i386,pc98"> - <para>Iomega USB Zip 100Mb (Ä¿Ç°Ö»Êdzõ²½µÄÖ§³Ö)</para> - </listitem> - <listitem> - <para>Iomega Zip750 USB2.0 Çý¶¯Æ÷</para> - </listitem> - <listitem> - <para>Keian USB1.1/2.0 3.5-Ó¢´ç HDD Case KU350A</para> - </listitem> - <listitem> - <para>Kurouto Shikou USB 2.5-Ó¢´ç HDD Case GAWAP2.5PS-USB2.0</para> - </listitem> - <listitem> - <para>Logitec USB1.1/2.0 HDD Unit SHD-E60U2</para> - </listitem> - <listitem> - <para>Logitec Mobile USB Memory LMC-256UD</para> - </listitem> - <listitem> - <para>Logitec USB ±¶ËÙÈíÇý LFD-31U2</para> - </listitem> - <listitem> - <para>Logitec USB/IEEE1394 DVD-RAM/R/RW Unit LDR-N21FU2 (½ö CDROM)</para> - </listitem> - <listitem> - <para>Matshita CF-VFDU03 ÈíÇý</para> - </listitem> - <listitem> - <para>MELCO USB2.0 MO Drive MO-CH640U2</para> - </listitem> - <listitem> - <para>I-O DATA USB/IEEE1394 ±ãЯʽ HD Drive HDP-i30P/CI, HDP-i40P/CI</para> - </listitem> - <listitem> - <para>MELCO USB Flash Disk <quote>PetitDrive</quote>, - RUF-32M, -64M, -128M, -256M</para> - </listitem> - <listitem> - <para>MELCO USB2.0 Flash Disk <quote>PetitDrive2</quote>, - RUF-256M/U2, -512M/U2</para> - </listitem> - <listitem> - <para>MELCO USB Flash Disk <quote>ClipDrive</quote>, - RUF-C32M, -C64M, -C128M, -C256M, -C512M</para> - </listitem> - <listitem> - <para>Microtech USB-SCSI-HD 50 USB to SCSI cable</para> - </listitem> - <listitem> - <para>NOVAC USB2.0 2.5/3.5-inch HDD Case NV-HD351U</para> - </listitem> - <listitem> - <para>Panasonic ÈíÇý</para> - </listitem> - <listitem> - <para>Panasonic USB2.0 ±ãЯʽ CD-RW Drive KXL-RW40AN (½öÏÞÓÚ CDROM)</para> - </listitem> - <listitem> - <para>RATOC Systems USB2.0 Removable HDD Case U2-MDK1, U2-MDK1B</para> - </listitem> - <listitem> - <para>Sony ±ãЯʽ CD-R/RW Drive CRX10U (½öÏÞÓÚ CDROM)</para> - </listitem> - <listitem> - <para>TEAC ±ãЯʽ USB CD-ROM Unit CD-110PU/210PU</para> - </listitem> - <listitem> - <para>Y-E Data ÈíÇý (720/1.44/2.88Mb)</para> - </listitem> - </itemizedlist> - </para> + &hwlist.umass; <para arch="i386,pc98,amd64">ÉùÒôÉ豸 (&man.uaudio.4; Çý¶¯³ÌÐò) </para> @@ -1052,13 +870,7 @@ <sect2 id="bluetooth"> <title>À¶ÑÀÉ豸</title> - <para arch="i386,pc98,amd64">PCCARD Ö÷¿ØÖÆÆ÷ (&man.ng.bt3c.4; Çý¶¯³ÌÐò) - <itemizedlist> - <listitem> - <para>3Com/HP 3CRWB6096-A PCCARD ÊÊÅäÆ÷</para> - </listitem> - </itemizedlist> - </para> + &hwlist.ng.bt3c; &hwlist.ng.ubt; @@ -1094,9 +906,9 @@ (&man.vga.4; Çý¶¯³ÌÐò) <note> - <para>Ìض¨Íø¿¨Óë <application>XFree86</application> µÄ¼æÈÝÐÅÏ¢£¬ + <para>¹ØÓÚÌض¨ÏÔ¿¨Óë <application>Xorg</application> µÄ¼æÈÝÐÅÏ¢£¬ ¿ÉÒÔÔÚ <ulink - url="http://www.xfree86.org/"></ulink>; ÕÒµ½¡£</para> + url="http://www.x.org/"></ulink>; ÕÒµ½¡£</para> </note> </para> @@ -1137,8 +949,8 @@ <note> <para>&man.moused.8; ÌṩÁËÈçºÎÔÚ &os; ÖÐʹÓö¨µãÉ豸µÄ½øÒ»²½ÐÅÏ¢¡£ - ¹ØÓÚÈçºÎÔÚ <application>XFree86</application> ÖÐʹÓÃÊó±êµÄÐÅÏ¢¿ÉÒÔÔÚ - <ulink url="http://www.xfree86.org/"></ulink>; ÕÒµ½¡£</para> + ¹ØÓÚÈçºÎÔÚ <application>Xorg</application> ÖÐʹÓÃÕâÀàÉ豸µÄÐÅÏ¢£¬ ¿ÉÒÔÔÚ + <ulink url="http://www.x.org/"></ulink>; ÕÒµ½¡£</para> </note> </para> ==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ <!-- The FreeBSD Simplified Chinese Project - Original Revision: 1.13 - $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $ + Original Revision: 1.14 + $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.2 2005/03/22 19:20:19 delphij Exp $ --> <sect1 id="proc"> <title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title> @@ -12,11 +12,11 @@ ²»¿ÉÄÜÏ꾡µØÁо٠&os; ËùÖ§³ÖµÄËùÓÐÉ豸×éºÏ¡£ ²»¹ý£¬ ÕâÀï¸ø³öÁËһЩһ°ãµÄÖ¸µ¼ÔÔò¡£</para> - <para>¼¸ºõËùÓÐµÄ i386-¼æÈÝ ´¦ÀíÆ÷¶¼Äܱ»ºÜºÃµØÖ§³Ö¡£ &os; Ö§³Ö´Ó 80386 ¿ªÊ¼µÄËùÓÐ - Intel ´¦ÀíÆ÷£¬ °üÀ¨ 80386, 80486, Pentium, Pentium Pro, Pentium II, Pentium III, + <para>¼¸ºõËùÓеİüº¬¸¡µãÔËËãµ¥ÔªµÄ i386-¼æÈÝ ´¦ÀíÆ÷¶¼Äܱ»ºÜºÃµØÖ§³Ö¡£ + &os; Ö§³Ö´Ó 80486 ¿ªÊ¼µÄËùÓÐ Intel ´¦ÀíÆ÷£¬ + ÆäÖаüÀ¨ 80486, Pentium, Pentium Pro, Pentium II, Pentium III, Pentium 4, ÒÔ¼°ËüÃǵÄһЩ±äÌ壬 ÀýÈç Xeon (ÖÁÇ¿) ºÍ Celeron (ÈüÑï) - ´¦ÀíÆ÷¡£ (²»¹ý£¬ &os; 5.2-RELEASE ºÍÖ®ºóµÄ°æ±¾²»ÔÙÖ§³Ö - 80386SX ´¦ÀíÆ÷¡£) ËùÓÐ i386-¼æÈÝ µÄ AMD ´¦ÀíÆ÷Ò²±»Ö§³Ö£¬ Õâ°üÀ¨ + ´¦ÀíÆ÷¡£ ËùÓÐ i386-¼æÈÝ µÄ AMD ´¦ÀíÆ÷Ò²±»Ö§³Ö£¬ Õâ°üÀ¨ Am486, Am5x86, K5, K6 (¼°Æä±äÌå), Athlon (°üÀ¨ Athlon-MP, Athlon-XP, Athlon-4, ÒÔ¼° Athlon Thunderbird), »¹ÓÐ Duron ´¦ÀíÆ÷¡£ AMD ==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Simplified Chinese Project -Original Revision: 1.27 -$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $ +Original Revision: 1.30 +$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.2 2005/03/22 19:21:31 delphij Exp $ install.sgml @@ -15,13 +15,13 @@ <sect1 id="install"> <title>°²×° &os;</title> - <para>ÕâÒ»Õ½ڼÇÊöÁË°²×°Ò»¸öÐ嵀 &os; ·¢Ðа汾µÄ¹ý³Ì¡£ + <para>ÕâÒ»Õ½ڽéÉÜÁË°²×°Ò»¸öÐ嵀 &os; ·¢Ðа汾µÄ¹ý³Ì¡£ ÕâЩ˵Ã÷ÖصãÇ¿µ÷ÁË»ñÈ¡ &os; &release.current; ·¢Ðа汾²¢¿ªÊ¼°²×°µÄ¹ý³Ì¡£<ulink - url="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/">FreeBSD + url="&url.books.handbook;/install.html">&os; ʹÓÃÊÖ²á</ulink>µÄ<ulink - url="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/install.html"><quote>°²×° - FreeBSD</quote></ulink>Ò»ÕÂÌṩÁËÓйذ²×°³ÌÐò±¾Éí¸üÉî²ã´ÎµÄÐÅÏ¢£¬ + url="&url.books.handbook;/"><quote>°²×° + &os;</quote></ulink>Ò»ÕÂÌṩÁËÓйذ²×°³ÌÐò±¾Éí¸üÉî²ã´ÎµÄÐÅÏ¢£¬ °üÀ¨Ò»¸öÈ«³Ì½ØͼµÄÖ¸ÄÏ¡£</para> <para>Èç¹ûÄúÕýÔÚ´Ó &os; µÄÇ°Ò»¸ö·¢Ðа汾Éý¼¶£¬Çë²é¿´ @@ -37,11 +37,11 @@ ´ó²¿·ÖÎĵµ£¬±ÈÈç·¢ÐÐ×¢¼ÇºÍÓ²¼þ¼æÈÝÐÔÁбíÒ²¿ÉÒÔÔÚ°²×°³ÌÐòµÄ Documentation ²Ëµ¥Öв鿴¡£</para> - <para>×¢Òâ &os; <ulink - url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink>; ºÍ<ulink - url="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/">ʹÓÃÊÖ²á</ulink>; - µÄÔÚÏß°æ±¾Ò²¿ÉÒÔÔÚ <ulink url="http://www.FreeBSD.org/">FreeBSD - ÏîÄ¿ Web Õ¾µã</ulink>ÉÏÕÒµ½£¬Ö»ÒªÄúÓµÓÐÒ»Ìõ Internet Á¬½Ó¡£</para> + <para>×¢ÒâÈç¹ûÄúÄܽÓÈë Internet µÄ»°£¬ &os; <ulink + url="&url.books.faq;/">FAQ</ulink> ºÍ <ulink + url="&url.books.handbook;/">ʹÓÃÊÖ²á</ulink> + µÄÔÚÏß°æ±¾Ò²¿ÉÒÔÔÚ <ulink url="&url.base;/">&os; + ÏîÄ¿ Web Õ¾µã</ulink>ÉÏÕÒµ½¡£</para> <para>Õâ·ÝÎĵµ¼¯ºÏ¿ÉÄÜ¿´ÆðÀ´ºÜÏÅÈË£¬µ«ÊÇÔĶÁËüÃÇËù»¨·ÑµÄʱ¼äºÜ¿ÉÄÜ»á½ÚÊ¡¸ü¶àµÄʱ¼ä¡£ ÊìϤ¿ÉÓõÄ×ÊÔ´Ò²ÓÐÖúÓÚ´¦Àí°²×°¹ý³ÌÖеÄÎÊÌâ¡£</para> @@ -66,11 +66,10 @@ <!-- i386/pc98 text starts here --> - <para arch="i386,pc98">&arch.print; ÌåϵµÄ &os; ÐèÒª 486 »òÕ߸ü¸ßµÄ´¦ÀíÆ÷À´°²×°ÔËÐÐ - (ËäÈ» &os; ¿ÉÒÔÓö¨ÖƵÄÄÚºËÔËÐÐÔÚ 386 ´¦ÀíÆ÷ÉÏ)£¬ - ÖÁÉÙ 8 Õ×ÄÚ´æÀ´°²×°¡¢7 Õ×ÄÚ´æÀ´ÔËÐС£ - ×îС°²×°ÄúÐèÒªÓÐÖÁÉÙ 150MB µÄÊ£Óà´ÅÅ̿ռ䡣¼ÌÐøÔĶÁ²éÕÒѹËõ´æÔÚµÄ - DOS ·ÖÇøÓÃÀ´°²×° &os; µÄ·½·¨¡£</para> + <para arch="i386,pc98">&os; ÔÚ &arch.print; ϵͳÉÏÐèÒª 486 + »ò¸ü¸ßµÄ´¦ÀíÆ÷£¬ ÒÔ¼°ÖÁÉÙ 24 MB µÄ RAM¡£ + ×îС°²×°ÐèÒªÖÁÉÙ 150MB µÄÊ£ÓàÓ²Å̿ռ䡣 ÇëÔĶÁÏÂÃæµÄ²¿·Ö£¬ + À´Á˽âÈçºÎËõСÏÖÓÐµÄ DOS ·ÖÇøÒԱ㰲װ &os; µÄ·½·¨¡£</para> <!-- alpha text starts here --> @@ -136,7 +135,7 @@ <para arch="i386,alpha,pc98">ͨ¹ýÍøÂç»ñÈ¡ÕâЩӳÏñºÜÈÝÒס£Ö»ÐèÒª´Ó <ulink url="&release.url;"></ulink> »òÕßÁÐÔÚʹÓÃÊÖ²áµÄ <ulink - url="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html">FTP + url="&url.books.handbook;/mirrors-ftp.html">FTP Õ¾µã</ulink>Ò»½Ú»ò <ulink url="http://mirrorlist.FreeBSD.org/"></ulink>; Web Ò³ÃæÖеÄÖڶྵÏñÕ¾µãÖÐÏÂÔØ <replaceable>release</replaceable><filename>/floppies/boot.flp</filename> ==== //depot/projects/davidxu_thread/src/sbin/mount/mount.8#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.71 2005/01/18 10:09:35 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.72 2005/03/23 04:17:48 cperciva Exp $ .\" .Dd November 26, 2004 .Dt MOUNT 8 @@ -181,6 +181,11 @@ Do not allow execution of any binaries on the mounted file system. This option is useful for a server that has file systems containing binaries for architectures other than its own. +Note: This option was not designed as a security feature and no +guarantee is made that it will prevent malicious code execution; for +example, it is still possible to execute scripts which reside on a +.Cm noexec +mounted partition. .It Cm nosuid Do not allow set-user-identifier or set-group-identifier bits to take effect. Note: this option is worthless if a public available suid or sgid ==== //depot/projects/davidxu_thread/src/sbin/reboot/reboot.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.23 2005/02/10 09:19:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.24 2005/03/21 23:44:04 pjd Exp $"); #include <sys/reboot.h> #include <sys/types.h> @@ -117,7 +117,8 @@ } if (kernel != NULL) { - fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT, 0444); + fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT | O_TRUNC, + 0444); if (fd > -1) { (void)write(fd, "nextboot_enable=\"YES\"\n", 22); (void)write(fd, "kernel=\"", 8L); ==== //depot/projects/davidxu_thread/src/share/man/man4/ata.4#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ata.4,v 1.49 2005/02/10 10:31:32 jkoshy Exp $ +.\" $FreeBSD: src/share/man/man4/ata.4,v 1.50 2005/03/23 08:58:51 brueffer Exp $ .\" -.Dd November 4, 2003 +.Dd March 23, 2005 .Dt ATA 4 .Os .Sh NAME @@ -118,6 +118,8 @@ HPT302, HPT366, HPT366, HPT368, HPT370, HPT371, HPT372, HPT374. .It Intel: PIIX, PIIX3, PIIX4, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6. +.It ITE: +IT8212F. .It National: SC1100. .It nVidia: ==== //depot/projects/davidxu_thread/src/share/man/man4/carp.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/carp.4,v 1.3 2005/02/25 10:38:43 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/carp.4,v 1.4 2005/03/23 08:06:38 rse Exp $ .\" -.Dd February 25, 2005 +.Dd March 23, 2005 .Dt CARP 4 .Os .Sh NAME @@ -48,7 +48,10 @@ .Nm interface can be created at runtime using the .Nm ifconfig Li carp Ns Ar N Cm create -command or by setting up configuration in +command or by configuring +it via +.Va cloned_interfaces +in the .Pa /etc/rc.conf file. .Pp @@ -67,15 +70,6 @@ which is used to authenticate .Nm advertisements. -Finally -.Cm carpdev -is used to specify which interface the -.Nm -device attaches to. -If unspecified, the kernel attempts to set -.Cm carpdev -by looking for -another interface with the same subnet. These configurations can be done using .Xr ifconfig 8 , or through the ==== //depot/projects/davidxu_thread/src/share/man/man4/ip.4#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.42 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.43 2005/03/23 09:26:38 maxim Exp $ .\" -.Dd June 14, 2004 +.Dd March 23, 2005 .Dt IP 4 .Os .Sh NAME @@ -331,6 +331,21 @@ In these cases, .Va net.inet.ip.portrange.randomized can be used to toggle randomization off. +If more than +.Va net.inet.ip.portrange.randomcps +ports have been allocated in the last second, then return to sequential +port allocation. +Return to random allocation only once the current port allocation rate +drops below +.Va net.inet.ip.portrange.randomcps +for at least +.Va net.inet.ip.portrange.randomtime +seconds. +The default values for +.Va net.inet.ip.portrange.randomcps +and +.Va net.inet.ip.portrange.randomtime +are 10 port allocations per second and 45 seconds correspondingly. .Ss "Multicast Options" .Pp .Tn IP ==== //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004 Gleb Smirnoff <glebius@FreeBSD.org> +.\" Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.6 2005/02/05 11:30:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.8 2005/03/23 10:08:28 glebius Exp $ .\" -.Dd September 17, 2004 +.Dd March 23, 2005 .Os .Dt NG_NETFLOW 4 .Sh NAME @@ -66,11 +66,23 @@ hooks named .Va iface0 , iface1 , etc., +and the same number of hooks named +.Va out0 , out1 , +etc., plus a single hook named .Va export . -The node reads data on +The node does NetFlow accounting of data received on .Va iface* -hooks, and sends export datagrams to the +hooks. +If corresponding +.Va out +hook is connected, unmodified data is bypassed to it, otherwise data is freed. +If data is received on +.Va out +hook, it is bypassed to corresponding +.Va iface +hook without any processing. +When full export datagram is built it is sent to the .Va export hook. In normal operation, the @@ -186,10 +198,9 @@ flow collecting is enabled. .Bd -literal -offset indent /usr/sbin/ngctl -f- <<-SEQ - mkpeer fxp0: tee lower right - connect fxp0: fxp0:lower upper left - mkpeer fxp0:lower netflow right2left iface0 - name fxp0:lower.right2left netflow + mkpeer fxp0: netflow lower iface0 + name fxp0:lower netflow + connect fxp0: netflow: upper out0 mkpeer netflow: ksocket export inet/dgram/udp msg netflow:export connect inet/10.0.0.1:4444 SEQ @@ -204,6 +215,10 @@ .Va ng0: node in this example is connected to .Xr ng_tee 4 . +The latter sends us a copy of IP packets, which we analyze and free. +On +.Va fxp0: +we don't use tee, but send packets back to ether node. .Bd -literal -offset indent /usr/sbin/ngctl -f- <<-SEQ # connect ng0's tee to iface0 hook @@ -214,11 +229,9 @@ # set interface index (5 in this example) msg netflow: setifindex { iface=0 index=5 } - # Create tee on fxp0, and connect it to iface1 hook - mkpeer fxp0: tee lower right - connect fxp0: fxp0:lower upper left - name fxp0:lower fxp0_tee - connect fxp0_tee: netflow: right2left iface1 + # Connect fxp0: to iface1 and out1 hook + connect fxp0: netflow: lower iface1 + connect fxp0: netflow: upper out1 # Create ksocket node on export hook, and configure it # to send exports to proper destination @@ -227,6 +240,7 @@ SEQ .Ed .Sh SEE ALSO +.Xr flowctl 8 , .Xr netgraph 4 , .Xr ng_ksocket 4 , .Xr ng_tee 4 , ==== //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_sysvec.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.6 2005/02/18 18:51:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.7 2005/03/23 08:27:58 das Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -207,9 +207,9 @@ struct linux32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ - int ps_nargvstr; /* the number of argument strings */ + u_int ps_nargvstr; /* the number of argument strings */ u_int32_t ps_envstr; /* first of 0 or more environment strings */ - int ps_nenvstr; /* the number of environment strings */ + u_int ps_nenvstr; /* the number of environment strings */ }; /* ==== //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_stream.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.52 2005/02/07 21:53:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.53 2005/03/23 08:28:06 das Exp $"); #define COMPAT_43 1 @@ -2226,6 +2226,8 @@ } if (uap->ctl) { + if (ctl.len > sizeof(sc)) + ctl.len = sizeof(sc); if (ctl.len != -1) if ((error = copyout(&sc, ctl.buf, ctl.len)) != 0) return error; ==== //depot/projects/davidxu_thread/src/sys/i386/i386/sys_machdep.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.95 2005/01/26 13:59:46 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.96 2005/03/23 08:28:03 das Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -103,6 +103,8 @@ if ((error = copyin(uap->parms, &kargs.largs, sizeof(struct i386_ldt_args))) != 0) return (error); + if (kargs.largs.num > MAX_LD || kargs.largs.num <= 0) + return (EINVAL); break; default: break; ==== //depot/projects/davidxu_thread/src/sys/netgraph/netflow/ng_netflow.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ static const char rcs_id[] = - "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.7 2005/03/21 15:40:25 glebius Exp $"; + "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.8 2005/03/22 15:49:22 glebius Exp $"; #include <sys/param.h> #include <sys/systm.h> @@ -235,6 +235,31 @@ */ iface->info.ifinfo_dlt = DLT_EN10MB; + } else if (strncmp(name, NG_NETFLOW_HOOK_OUT, + strlen(NG_NETFLOW_HOOK_OUT)) == 0) { + iface_p iface; + int ifnum = -1; + const char *cp; + char *eptr; + + cp = name + strlen(NG_NETFLOW_HOOK_OUT); + if (!isdigit(*cp) || (cp[0] == '0' && cp[1] != '\0')) + return (EINVAL); + + ifnum = (int)strtoul(cp, &eptr, 10); + if (*eptr != '\0' || ifnum < 0 || ifnum >= NG_NETFLOW_MAXIFACES) + return (EINVAL); + + /* See if hook is already connected */ + if (priv->ifaces[ifnum].out != NULL) + return (EISCONN); + + iface = &priv->ifaces[ifnum]; + + /* Link private info and hook together */ + NG_HOOK_SET_PRIVATE(hook, iface); + iface->out = hook; + } else if (strcmp(name, NG_NETFLOW_HOOK_EXPORT) == 0) { if (priv->export != NULL) @@ -411,12 +436,11 @@ const node_p node = NG_HOOK_NODE(hook); const priv_p priv = NG_NODE_PRIVATE(node); const iface_p iface = NG_HOOK_PRIVATE(hook); - struct mbuf *m; + struct mbuf *m = NULL; struct ip *ip; int pullup_len = 0; int error = 0; - NGI_GET_M(item, m); if (hook == priv->export) { /* * Data arrived on export hook. @@ -426,6 +450,19 @@ ERROUT(EINVAL); }; + if (hook == iface->out) { + /* + * Data arrived on out hook. Bypass it. + */ + if (iface->hook == NULL) + ERROUT(ENOTCONN); + + NG_FWD_ITEM_HOOK(error, item, iface->hook); + return (error); + } + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503231415.j2NEFTiq049399>