From owner-p4-projects@FreeBSD.ORG Fri Oct 13 22:19:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B694216A5F8; Fri, 13 Oct 2006 22:19:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D1CC16A47B for ; Fri, 13 Oct 2006 22:19:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B92643D5F for ; Fri, 13 Oct 2006 22:19:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DMJuoV062020 for ; Fri, 13 Oct 2006 22:19:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DMJtCW062017 for perforce@freebsd.org; Fri, 13 Oct 2006 22:19:55 GMT (envelope-from jb@freebsd.org) Date: Fri, 13 Oct 2006 22:19:55 GMT Message-Id: <200610132219.k9DMJtCW062017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Oct 2006 22:19:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107846 Change 107846 by jb@jb_freebsd8 on 2006/10/13 22:19:19 IFC. Drop my changes to hvcons. I'll do those in a separate branch. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#27 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#6 integrate .. //depot/projects/dtrace/src/bin/cp/cp.c#7 integrate .. //depot/projects/dtrace/src/bin/ls/ls.1#5 integrate .. //depot/projects/dtrace/src/gnu/lib/libgcc/Makefile#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/basename.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/dirname.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/msgsnd.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_emu.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/getenv.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/ffs.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/intro.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/read.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/stat.2#4 integrate .. //depot/projects/dtrace/src/lib/libpam/modules/pam_unix/pam_unix.8#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/alpha/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#5 integrate .. //depot/projects/dtrace/src/sbin/dump/main.c#5 integrate .. //depot/projects/dtrace/src/sbin/restore/restore.8#4 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ndis.4#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/boot/common/help.common#5 integrate .. //depot/projects/dtrace/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/dtrace/src/sys/boot/forth/support.4th#4 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#21 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/fpemu.c#3 delete .. //depot/projects/dtrace/src/sys/sun4v/sun4v/genassym.c#5 delete .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.holiday#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/tput/tput.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/syslogd/syslog.conf.5#6 integrate .. //depot/projects/dtrace/src/usr.sbin/wicontrol/wicontrol.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/wicontrol/wicontrol.c#4 integrate .. //depot/projects/dtrace/www/en/about.sgml#6 integrate .. //depot/projects/dtrace/www/en/applications.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/Makefile#5 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2506,12 +2506,29 @@ information on configuring the bridge as a firewall. If you need to allow non-IP packets (such as ARP) to flow - through the bridge, there is a firewall option that - must be set. This option is - IPFIREWALL_DEFAULT_TO_ACCEPT. Note that this - changes the default rule for the firewall to accept any packet. - Make sure you know how this changes the meaning of your ruleset - before you set it. + through the bridge, there are three options available. + The first is to add the following option to the kernel and + rebuild: + + option IPFIREWALL_DEFAULT_TO_ACCEPT + + The second is to set the firewall type to accept in the + rc.conf file: + + firewall_type="open" + + Note that these options will make the firewall seem completely + transparent; any packet or connection will be permitted by default. + This may require significant changes to the firewall ruleset. + + The third option is to apply the following &man.ipfw.8; + rule: + + &prompt.root; ipfw add allow mac-type arp layer2 + + Or add it to the current firewall ruleset. This rule effectively + allows &man.arp.8; packets through, so it must be be applied near the + beginning of the ruleset for early evaluation. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ FreeBSD &rel2.current;-RELEASE and FreeBSD &rel.current;-RELEASE. This manual is a work in progress and is the work - of many individuals. Many sections do not yet exist and some of those - that do exist need to be updated. If you are interested in helping + of many individuals. As such, some sections may become dated and + require updating. If you are interested in helping out with this project, send email to the &a.doc;. The latest version of this document is always available from the FreeBSD web site ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -822,6 +822,32 @@ + Locking + + Some applications (e.g. mutt) + require file locking to operate correctly. In the case of + NFS, rpc.lockd + can be used for file locking. To enable it, add the following + to the /etc/rc.conf file on both client + and server (it is assumed that the NFS + client and server are configured already): + + rpc_lockd_enable="YES" +rpc_statd_enable="YES" + + Start the application by using: + + &prompt.root; /etc/rc.d/nfslocking start + + If real locking between the NFS clients + and NFS server is not required, it is + possible to let the NFSclient do locking + locally by passing to &man.mount.nfs.8;. + Refer to the &man.mount.nfs.8; manual page for further details. + + + + Practical Uses NFS has many practical uses. Some of @@ -4489,15 +4515,16 @@ backend is used, the /usr/local/private/smbpasswd file must be created to allow Samba to - authenticate clients. If you would like to give all of + authenticate clients. If you would like to give your &unix; user accounts access from &windows; clients, use the following command: - &prompt.root; grep -v "^#" /etc/passwd | make_smbpasswd > /usr/local/private/smbpasswd -&prompt.root; chmod 600 /usr/local/private/smbpasswd + &prompt.root; smbpasswd -a username - Please see the Samba - documentation for additional information about configuration + Please see the + Official Samba HOWTO + for additional information about configuration options. With the basics outlined here, you should have everything you need to start running Samba. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3422,18 +3422,20 @@ configured using &man.ifconfig.8;. On the gateway machine on network #1 you would run the - following two commands to configure the tunnel. + following commands to configure the tunnel. - ifconfig gif0 A.B.C.D W.X.Y.Z -ifconfig gif0 inet 192.168.1.1 192.168.2.1 netmask 0xffffffff - - + &prompt.root; ifconfig gif0 create +&prompt.root; ifconfig tunnel gif0 A.B.C.D W.X.Y.Z +&prompt.root; ifconfig gif0 inet 192.168.1.1 192.168.2.1 netmask 0xffffffff + + On the other gateway machine you run the same commands, but with the order of the IP addresses reversed. - - ifconfig gif0 W.X.Y.Z A.B.C.D -ifconfig gif0 inet 192.168.2.1 192.168.1.1 netmask 0xffffffff - + + &prompt.root; ifconfig gif0 create +&prompt.root; ifconfig tunnel gif0 W.X.Y.Z A.B.C.D +&prompt.root; ifconfig gif0 inet 192.168.2.1 192.168.1.1 netmask 0xffffffff + You can then run: @@ -3443,11 +3445,11 @@ gateway, you would see this: &prompt.root; ifconfig gif0 -gif0: flags=8011<UP,POINTTOPOINT,MULTICAST> mtu 1280 -inet 192.168.1.1 --> 192.168.2.1 netmask 0xffffffff -physical address inet A.B.C.D --> W.X.Y.Z +gif0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1280 + tunnel inet A.B.C.D --> W.X.Y.Z + inet 192.168.1.1 --> 192.168.2.1 netmask 0xffffffff - + As you can see, a tunnel has been created between the physical addresses A.B.C.D and W.X.Y.Z, and the traffic allowed @@ -3565,7 +3567,8 @@ Edit /etc/rc.conf on gateway host #1 and add the following lines (replacing IP addresses as necessary). - gifconfig_gif0="A.B.C.D W.X.Y.Z" + gif_interfaces="gif0" +gifconfig_gif0="A.B.C.D W.X.Y.Z" ifconfig_gif0="inet 192.168.1.1 192.168.2.1 netmask 0xffffffff" static_routes="vpn" route_vpn="192.168.2.0 192.168.2.1 netmask 0xffffff00" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ The exception to this rule is when the relevant directory does not - exist. In such case, using author's id as + exist or the distfile does not exist in the directory. In such case, using author's id as MASTER_SITE_SUBDIR is allowed. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -231,7 +231,7 @@ FreeBSD related employment mailing list"> freebsd-jobs"> - +FreeBSD KDE/Qt and KDE applications mailing list"> freebsd-kde"> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#3 (text+ko) ==== @@ -27,44 +27,43 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml,v 1.2 2006/01/31 01:31:01 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml,v 1.3 2006/10/13 16:10:00 chinsan Exp $ Original revision: 1.22 --> - The Website + 建構 Website - Preparation + 事前準備 - Get 200MB free disk space. You will need the disk space for the - SGML tools, a subset of the CVS tree, temporary build space and the - installed web pages. If you already have installed the SGML tools and - the CVS tree, you need only ~100MB free disk space. + 請先準備約 200MB 空間，這些是要用來放 SGML 工具程式、CVS tree、 + 臨時編譯用的空間，以及編譯好的網頁存放空間。若事先已有裝 SGML 工具程式、 + CVS tree 的話，那麼只需頂多約 100MB 空間即可。 - Make sure your documentation ports are up to date! When in - doubt, remove the old ports using &man.pkg.delete.1; command before - installing the port. For example, we currently depend on - jade-1.2 and if you have installed jade-1.1, please do: + 請確認一下你的相關文件製作所會用到的 ports 都是最新版！ + 若不清楚所裝的版本為何，那麼就先以 &man.pkg.delete.1; 指令來移除舊版， + 接著才去裝 port。 舉例來說，若已裝的是 jade-1.1， + 但是我們目前需要的卻是 jade-1.2，那麼先用下列方式來移除舊版： &prompt.root; pkg_delete jade-1.1 - Set up a CVS repository. You need the directories www, doc and - ports in the CVS tree (plus the CVSROOT of course). Please read the - CVSup introduction - on how to mirror a CVS tree or parts of a CVS tree. + 接著，就是設定 CVS repository。需要至少 www, doc, ports 這三樣 + CVS tree(當然還要加上 CVSROOT)。 請參閱 + CVSup 簡介 + 以瞭解如何來 mirror a CVS tree 或部分 CVS tree。 - The essential cvsup collections are: www, - doc-all, cvs-base, and - ports-base. + 最低需求的 cvsup collections 為：www, + doc-all, cvs-base 以及 + ports-base。 - These collections require ~105MB free disk space. + 剛講的這些需要約 105MB 空間。 - A full CVS tree - including src, - doc, www, and - ports - is currently 940MB. + 而完整的 CVS tree - 包括 src, + doc, www 以及 + ports - 目前約為 940MB。 @@ -72,23 +71,21 @@ - Create and change directory into a build directory with at least 60MB of free - space. + 先建立要編譯的目錄(至少要有 60MB 空間)，並切換到該目錄。 &prompt.root; mkdir /var/tmp/webbuild &prompt.root; cd /var/tmp/webbuild - Checkout the SGML files from the CVS tree. + 從 CVS tree 內 checkout 相關的 SGML 檔。 &prompt.root; cvs -R co www doc - Change into the www/en directory, and run - the &man.make.1; all target, to create - the web pages. + 切到 www/en 目錄，然後打 + &man.make.1; all 來產生網頁。 &prompt.root; cd en &prompt.root; make all @@ -97,30 +94,28 @@ - Install the web pages into your web server + 在你的網頁伺服器上安裝網頁 - If you have moved out of the en - directory, change back to it. + 如果你已經離開 en + 這個目錄，請切換回這個目錄中。 &prompt.root; cd path/www/en - Run the &man.make.1; install target, - setting the DESTDIR variable to the name of the - directory you want to install the files to. + 執行 &man.make.1; install ， + 並將 DESTDIR 設定為你想安裝檔案的目錄名稱。 &prompt.root; make DESTDIR=/usr/local/www install - If you have previously installed the web pages into the same - directory the install process will not have deleted any old or - outdated pages. For example, if you build and install a new copy - of the site every day, this command will find and delete all - files that have not been updated in three days. + 如果你之前已經在相同的目錄中安裝了這些網頁， + 安裝過程並不會刪除任何既有或過期的網頁。 + 舉例來說，如果你每日建構和安裝新的網頁副本， + 這個指令將會搜尋並刪除在三天內沒有更新的檔案。 &prompt.root; find /usr/local/www -ctime 3 -print0 | xargs -0 rm @@ -128,14 +123,14 @@ - Environment variables + 環境變數 CVSROOT - Location of the CVS tree. Essential. + 設定 CVS tree 的位置，此為必備條件。 &prompt.root; CVSROOT=/home/ncvs; export CVSROOT @@ -145,16 +140,15 @@ ENGLISH_ONLY - If set and not empty, the makefiles will build and - install only the English documents. All translations will be - ignored. E.g.: + 如果設定這個環境變數，而且值不為空白， + makefiles 將只會建構和安裝英文文件。 + 所以將會略過其他的各國翻譯。例如： &prompt.root; make ENGLISH_ONLY=YES all install - If you want to unset the variable - ENGLISH_ONLY and build all pages, including - translations, set the variable ENGLISH_ONLY - to an empty value: + 如果你想要取消變數 ENGLISH_ONLY + 以及建構所有的頁面並包括翻譯，只要將變數 ENGLISH_ONLY + 的值設定成空白即可。 &prompt.root; make ENGLISH_ONLY="" all install clean @@ -164,10 +158,10 @@ WEB_ONLY - If set and not empty, the makefiles will build and install - only the HTML pages from the www directory. All documents from - the doc directory (Handbook, FAQ, Tutorials) will be ignored. - E.g.: + 如果有設定這個變數的話， + makefiles 將只會從 www 目錄建構及安裝 HTML 頁面。 + 所有從 doc 目錄下的文件全部都會被忽略 (Handbook, FAQ, Tutorials)。 + 例如： &prompt.root; make WEB_ONLY=YES all install @@ -177,22 +171,22 @@ NOPORTSCVS - If set, the makefiles will not checkout files from the ports - cvs repository. Instead, it will copy the files from - /usr/ports (or where the variable - PORTSBASE points to). + 如果設了這個變數，makefiles 就不會從 ports cvs repository + 取出檔案。 取而代之會從 + /usr/ports (或是 PORTSBASE + 所設定的值) 內複製檔案。 - CVSROOT is an environment variable. You must set it - on the command line or in your dot files (e.g., ~/.profile). + CVSROOT 是環境變數。 + 你必須直接使用指令或是在 dot files (如： ~/.profile) 中 + 設定這個環境變數。 - WEB_ONLY, ENGLISH_ONLY and - NOPORTSCVS are makefile variables. You can set the - variables in /etc/make.conf, - Makefile.inc, as environment variables on the - command line, or in your dot files. + WEB_ONLY、ENGLISH_ONLY 及 + NOPORTSCVS 都是 makefile 變數。 + 你可以在 /etc/make.conf、Makefile.inc + 中設定這些變數，作法就像是用命令列或使用 dot files 來設定環境變數一般。 ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.84 2006/10/09 14:27:26 perky Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.85 2006/10/13 07:16:44 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -159,8 +159,8 @@ # specific version of zope. # -_PYTHON_PORTBRANCH= 2.5 -_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 2.2 2.1 # preferred first +_PYTHON_PORTBRANCH= 2.4 +_PYTHON_ALLBRANCHES= 2.4 2.5 2.3 2.2 2.1 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 3.2 @@ -358,8 +358,8 @@ @${ECHO} " python2.1" @${ECHO} " python2.2" @${ECHO} " python2.3" - @${ECHO} " python2.4" - @${ECHO} " python2.5 (default)" + @${ECHO} " python2.4 (default)" + @${ECHO} " python2.5" @${FALSE} .endif ==== //depot/projects/dtrace/src/bin/cp/cp.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -155,12 +155,9 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - } - if (rflag && !Hflag && !Pflag) + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) Rflag = 1; if (Rflag) { if (Hflag) @@ -230,7 +227,7 @@ else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; ==== //depot/projects/dtrace/src/bin/ls/ls.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/dtrace/src/gnu/lib/libgcc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.55 2006/03/18 21:37:03 ru Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $ .include .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -98,7 +98,7 @@ # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func +LIB1ASMFUNCS = _dvmd_tls _bb_init_func OBJS+= dp-bit.o fp-bit.o # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.1#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.8 2005/07/28 15:59:52 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ .Dd March 2, 2005 .Os .Dt KGDB 1 @@ -34,6 +34,7 @@ .Op Fl a | Fl f | Fl fullname .Op Fl q | Fl quiet .Op Fl v +.Op Fl w .Op Fl d Ar crashdir .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device .Op Ar kernel Op Ar core @@ -67,6 +68,13 @@ form is supported for compatibility as well. .It Fl v Increase verbosity. +.It Fl w +Opens kmem-based targets in read-write mode. +(This is identical to what +.Fl -wcore +used to do in previous +gdb versions for +.Fx . ) .It Fl d Ar crashdir Use .Ar crashdir ==== //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.30 2006/10/11 09:52:32 trhodes Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -202,6 +202,12 @@ as a list of fixed strings, separated by newlines, any of which is to be matched. .TP +.BR \-P ", " \-\^\-perl-regexp +Interpret +.I PATTERN +as a Perl regular expression. +This option is not supported in FreeBSD. +.TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , ==== //depot/projects/dtrace/src/lib/libc/gen/basename.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -58,6 +58,13 @@ is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. +.Sh IMPLEMENTATION NOTES +The +.Fn basename +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. .Sh RETURN VALUES On successful completion, .Fn basename @@ -77,12 +84,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn basename -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/dtrace/src/lib/libc/gen/dirname.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt DIRNAME 3 .Os .Sh NAME @@ -58,6 +58,20 @@ returns a pointer to the string .Qq \&. , signifying the current directory. +.Sh IMPLEMENTATION NOTES +The +.Fn dirname +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. +.Pp +Other vendor implementations of +.Fn dirname +may modify the contents of the string passed to +.Fn dirname ; +this should be taken into account when writing code which calls this function +if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname @@ -77,19 +91,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn dirname -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls (each function has its own separate storage). -.Pp -Other vendor implementations of -.Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/dtrace/src/lib/libc/gen/msgsnd.3#4 (text+ko) ==== @@ -29,9 +29,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/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $ .\" -.Dd November 24, 1997 +.Dd October 12, 2006 .Dt MSGSND 3 .Os .Sh NAME @@ -65,8 +65,13 @@ is an integer greater than 0 that can be used for selecting messages (see .Xr msgrcv 3 ) , .Va mtext -is an array of bytes, with a size up to that of the system limit -.Pf ( Dv MSGMAX ) . +is an array of +.Fa msgsz +bytes. +The argument +.Fa msgsz +can range from 0 to a system-imposed maximum, +.Dv MSGMAX . .Pp If the number of bytes already on the message queue plus .Fa msgsz @@ -144,7 +149,7 @@ The .Fa msgsz argument -is less than 0, or greater than +is greater than .Va msg_qbytes . .Pp The ==== //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_emu.h#4 (text+ko) ==== @@ -41,7 +41,7 @@ * * @(#)fpu_emu.h 8.1 (Berkeley) 6/11/93 * $NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $ - * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.4 2002/03/22 23:41:59 obrien Exp $ + * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.5 2006/10/12 04:38:41 kmacy Exp $ */ /* @@ -157,6 +157,7 @@ struct fpemu { u_long fe_fsr; /* fsr copy (modified during op) */ int fe_cx; /* exceptions */ + int pad; /* align access to following fields */ struct fpn fe_f1; /* operand 1 */ struct fpn fe_f2; /* operand 2, if required */ struct fpn fe_f3; /* available storage for result */ ==== //depot/projects/dtrace/src/lib/libc/stdlib/getenv.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.19 2006/10/12 08:39:24 trhodes Exp $ .\" -.Dd December 11, 1993 +.Dd October 12, 2006 .Dt GETENV 3 .Os .Sh NAME @@ -75,6 +75,10 @@ .Fn getenv function obtains the current value of the environment variable, .Fa name . +The application should not modify the string pointed +to by the +.Fn getenv +function. .Pp The .Fn setenv ==== //depot/projects/dtrace/src/lib/libc/string/ffs.3#4 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.9 2004/06/30 20:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.10 2006/10/12 15:08:41 ru Exp $ .\" -.Dd January 13, 2004 +.Dd October 12, 2006 .Dt FFS 3 .Os .Sh NAME @@ -60,7 +60,9 @@ .Fn ffs and .Fn ffsl -functions find the first bit set in +functions find the first bit set +(beginning with the least significant bit) +in .Fa value and return the index of that bit. .Pp @@ -72,8 +74,7 @@ .Fa value and return the index of that bit. .Pp -Bits are numbered starting from 1, starting at the right-most -(least significant) bit. +Bits are numbered starting at 1 (the least significant bit). A return value of zero from any of these functions means that the argument was zero. .Sh SEE ALSO ==== //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.121 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ # sys sources >>> TRUNCATED FOR MAIL (1000 lines) <<<