Date: Wed, 9 Apr 2008 23:11:08 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139687 for review Message-ID: <200804092311.m39NB8Zj047968@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=139687 Change 139687 by jb@jb_freebsd1 on 2008/04/09 23:10:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#64 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#25 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#9 integrate .. //depot/projects/dtrace/ports/MOVED#75 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#10 integrate .. //depot/projects/dtrace/ports/UPDATING#65 integrate .. //depot/projects/dtrace/src/UPDATING#28 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#30 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#17 integrate .. //depot/projects/dtrace/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/dtrace/src/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/gpt.c#8 integrate .. //depot/projects/dtrace/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/bpf.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/psm.4#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#27 integrate .. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#14 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_dummy.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/dtrace/src/sys/arm/arm/exception.S#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/locore.S#7 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeldr.S#7 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#18 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/sscdisk.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/dtrace/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#19 integrate .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/dtrace/src/sys/net/if_loop.c#10 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/sc_machdep.h#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/atomic.h#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/eventhandler.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/kernel.h#20 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#20 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#48 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#12 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#7 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/statd.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/devices.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#12 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#28 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#21 integrate .. //depot/projects/dtrace/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#11 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss222-4-tn.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss222-4.png#1 branch .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#12 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#18 integrate .. //depot/projects/dtrace/www/en/search/index-site.sgml#4 integrate .. //depot/projects/dtrace/www/en/search/search-mid.sgml#4 integrate .. //depot/projects/dtrace/www/en/search/search.sgml#7 integrate .. //depot/projects/dtrace/www/en/search/searchhints.sgml#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.103 2008/03/28 06:03:53 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.104 2008/04/09 13:27:37 remko Exp $ --> <chapter id="network-servers"> @@ -4462,7 +4462,7 @@ <para>A default <application>Samba</application> configuration file is installed as - <filename>/usr/local/share/examples/smb.conf.default</filename>. This + <filename>/usr/local/share/examples/samba/smb.conf.default</filename>. This file must be copied to <filename>/usr/local/etc/smb.conf</filename> and customized before <application>Samba</application> can be used.</para> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#64 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.914 2008/04/06 21:48:28 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.917 2008/04/09 13:54:04 pav Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -1846,30 +1846,6 @@ </row> <row> - <entry><filename>tcl80*</filename></entry> - <entry>Ports that use Tcl version 8.0 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tcl82*</filename></entry> - <entry>Ports that use Tcl version 8.2 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tcl83*</filename></entry> - <entry>Ports that use Tcl version 8.3 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tcl84*</filename></entry> - <entry>Ports that use Tcl version 8.4 to run.</entry> - <entry></entry> - </row> - - <row> <entry><filename>textproc</filename></entry> <entry>Text processing utilities.</entry> <entry>It does not include @@ -1883,36 +1859,6 @@ </row> <row> - <entry><filename>tk80*</filename></entry> - <entry>Ports that use Tk version 8.0 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tk82*</filename></entry> - <entry>Ports that use Tk version 8.2 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tk83*</filename></entry> - <entry>Ports that use Tk version 8.3 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tk84*</filename></entry> - <entry>Ports that use Tk version 8.4 to run.</entry> - <entry></entry> - </row> - - <row> - <entry><filename>tkstep80*</filename></entry> - <entry>Ports that use TkSTEP version 8.0 to run.</entry> - <entry></entry> - </row> - - <row> <entry><filename>ukrainian</filename></entry> <entry>Ukrainian language support.</entry> <entry></entry> @@ -3287,14 +3233,14 @@ <para>For example,</para> <programlisting>RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \ - wish8.0:${PORTSDIR}/x11-toolkits/tk80</programlisting> + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting> <para>will check if the file or directory <filename>/usr/local/etc/innd</filename> exists, and build and install it from the <filename>news/inn</filename> subdirectory of the ports tree if it is not found. It will also see if an - executable called <command>wish8.0</command> is in the search - path, and descend into the <filename>x11-toolkits/tk80</filename> + executable called <command>xmlcatmgr</command> is in the search + path, and descend into the <filename>textproc/xmlcatmgr</filename> subdirectory of your ports tree to build and install it if it is not found.</para> @@ -12069,6 +12015,13 @@ <function>lockmgr_args_rw</function> functions.</entry> <entry>800031</entry> </row> + <row> + <entry>8.0-CURRENT after the implementation of the + openat and related syscalls, introduction of the O_EXEC + flag for the &man.open.2;, and providing the + corresponding linux compatibility syscalls.</entry> + <entry>800032</entry> + </row> </tbody> </tgroup> </table> ==== //depot/projects/dtrace/doc/share/sgml/mirrors.xml#12 (text+ko) ==== @@ -2,7 +2,7 @@ <mirrors> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.69 2008/02/15 12:18:12 ceri Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.70 2008/04/09 15:14:52 roberto Exp $ </cvs:keyword> </cvs:keywords> @@ -681,6 +681,10 @@ </host> <host type="cvsup"> + <name>cvsup1.fr.FreeBSD.org</name> + </host> + + <host type="cvsup"> <name>cvsup2.fr.FreeBSD.org</name> </host> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#25 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.913 - $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.35 2008/04/02 16:16:32 loader Exp $ + Original Revision: 1.914 + $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.36 2008/04/07 15:43:03 loader Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -11323,16 +11323,22 @@ <entry>800028</entry> </row> <row> - <entry>8.0-CURRENT after reintegration of the - <function>BUF_LOCKWAITERS</function> function and the - addition of &man.lockmgr.waiters.9;.</entry> + <entry>重新整合了 <function>BUF_LOCKWAITERS</function> + 函数并加入 &man.lockmgr.waiters.9; 之后的 + 8.0-CURRENT。</entry> <entry>800029</entry> </row> <row> <entry>引入 &man.rw.try.rlock.9; 和 &man.rw.try.wlock.9; 之后的 8.0-CURRENT。</entry> <entry>800030</entry> - </row> + </row> + <row> + <entry>引入 <function>lockmgr_rw</function> 和 + <function>lockmgr_args_rw</function> + 函数之后的 8.0-CURRENT。</entry> + <entry>800031</entry> + </row> </tbody> </tgroup> </table> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#9 (text+ko) ==== @@ -29,7 +29,7 @@ <corpauthor>FreeBSD ゅン璸礶</corpauthor> - <pubdate>$FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.26 2008/02/24 10:19:40 chinsan Exp $</pubdate> + <pubdate>$FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.28 2008/04/07 17:18:45 chinsan Exp $</pubdate> <copyright> <year>1995</year> @@ -10414,7 +10414,7 @@ </author> </chapterinfo> - <title>The FreeBSD Funnies</title> + <title>FreeBSD 杠栋</title> <qandaset> <qandaentry> @@ -10606,6 +10606,25 @@ routing get annoyed by it as well.</para> </answer> </qandaentry> + + + <qandaentry> + <question id="pttlz"> + <para>1993 碞Τmake world</para> + </question> + + <answer> + <para>拜沮 jkh <ulink + URL="http://www.freebsd.org/cgi/cvsweb.cgi/src/Makefile.diff?r1=1.5;r2=1.6;f=h"> + 硂 commit</ulink>莱赣琌 Aug 13 22:47:28 1994 UTC + ぇ穦Τ make world或穦Τêぇ玡穦Τ㎡</para> + + <para>氮沮 pttlz.bbs@ptt.cc (闷) Apr 7 17:09:47 2008 CST 嘿 + make world 琌иΝ (15 玡) freebsd ノ┮ 1993 碞Τ + pttlz make world叫猔種產琌嘿15 玡晋 + 叫づ癸晋舦珼驹谅谅</para> + </answer> + </qandaentry> </qandaset> </chapter> ==== //depot/projects/dtrace/ports/MOVED#75 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1569 2008/04/04 16:00:47 tabthorpe Exp $ +# $FreeBSD: ports/MOVED,v 1.1572 2008/04/09 18:40:21 ahze Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2376,7 +2376,6 @@ textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago www/sitemapgen|www/google-sitemapgen|2006-07-05|Duplicate port -security/gnutls-devel||2006-07-06|Development version is not active so far www/otrs|devel/otrs|2006-07-07|Duplicate port math/UFsparse|math/ufsparse|2006-07-09|port name should not have capital letters sysutils/lineak_defaultplugin|sysutils/lineak-defaultplugin|2006-07-09|port name changed to match upstream @@ -3446,3 +3445,7 @@ x11-toolkits/qwt-devel|x11-toolkits/qwt5|2008-04-02|Renamed for better naming audio/csound-manual||2008-04-04|Merged with main port security/acid||2008-04-04|Has expired: development has ceased, use security/base +devel/check|devel/libcheck|2008-04-07|Removed in favour to devel/libcheck +archivers/deepforest||2008-04-09|Has expired: development stalled for years, outdated, unmaintained +graphics/libimg-tkstep80||2008-04-09|Has expired: tkstep80 scheduled for expiration +x11-toolkits/tkstep80||2008-04-09|Has expired: development stalled for years, outdated, unmaintained ==== //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.71 2008/01/27 14:26:42 anray Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.72 2008/04/07 01:18:10 rafan Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -100,7 +100,7 @@ # Emacs-22.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 23.0.50 +EMACS_VER= 23.0.60 EMACS_MAJOR_VER= 23 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} ==== //depot/projects/dtrace/ports/UPDATING#65 (text+ko) ==== @@ -6,6 +6,16 @@ time you update your ports collection, before attempting any port upgrades. +20080408: + AFFECTS: users of www/p5-Apache-Test + AUTHOR: pgollucci@p6m7g8.com + + www/p5-Apache-Test doesn't actually need www/mod_perl{1,2}. If you would + like to test a mod_perl, than please install www/mod_perl2 or www/mod_perl + as well. The ports infra structure doesn't support this(yet) but you can + use this to test both www/apache13, www/apache20 and/or www/apache22 + without chaining www/p5-Apache-Test. + 20080405: AFFECTS: users of sysutils/tracker AUTHOR: ahze@FreeBSD.org @@ -19,7 +29,7 @@ portmaster -u sysutils/tracker portupgrade users: - portupgrade -o sysutils/tracker-client tacker + portupgrade -o sysutils/tracker-client tracker portupgrade -u sysutils/tracker 20080405: @@ -131,7 +141,7 @@ 5. Install emulators/linux_base-fc6 6 Remount linprocfs (mount /compat/linux/proc) 7. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf - 8. Add OVERRIDE_LINUX_BASE_PORT=f6 to /etc/make.conf + 8. Add OVERRIDE_LINUX_BASE_PORT=fc6 to /etc/make.conf Note: These instructions also apply to linux_base-f8, please use the same osrelease. @@ -6312,4 +6322,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.613 2008/04/05 17:02:15 ahze Exp $ +$FreeBSD: ports/UPDATING,v 1.616 2008/04/08 20:55:52 beech Exp $ ==== //depot/projects/dtrace/src/UPDATING#28 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#30 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include <bsd.own.mk> @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/dtrace/src/release/ia64/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/dtrace/src/sbin/gpt/gpt.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.19 2008/01/30 13:29:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.20 2008/04/07 18:23:28 jhb Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -317,6 +317,13 @@ return (0); } break; + case 'z': + if (strcmp(s, "zfs") == 0) { + uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS; + *uuid = zfs; + return (0); + } + break; } return (EINVAL); } ==== //depot/projects/dtrace/src/share/man/man4/asmc.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Rui Paulo <rpaulo@FreeBSD.org> +.\" Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.3 2007/11/13 11:31:53 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.4 2008/04/07 11:27:16 rpaulo Exp $ .\" -.Dd November 10, 2007 +.Dd April 7, 2008 .Dt ASMC 4 .Os .Sh NAME @@ -121,7 +121,7 @@ the following way: .Bd -literal -offset indent notify 0 { - match "system" "ISA"; + match "system" "ACPI"; match "subsystem" "asmc"; action "/usr/local/sbin/ataidle -s X Y"; }; ==== //depot/projects/dtrace/src/share/man/man4/bpf.4#6 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.49 2008/03/24 13:49:17 csjp Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -259,14 +259,14 @@ They will return a readable file descriptor when ownership of the next buffer is assigned to user space. .Pp -In the current implementation, the kernel will assign ownership of at most -one buffer at a time to the user process. -The user processes must acknowledge the current buffer in order to be -notified that the next buffer is ready for processing. -Programs should not rely on this as an invariant, as it may change in future -versions; in particular, they must maintain their own notion of which buffer -is "next" so that if both buffers are owned by userspace, it can process them -in the correct order. +In the current implementation, the kernel may assign zero, one, or both +buffers to the user process; however, an earlier implementation maintained +the invariant that at most one buffer could be assigned to the user process +at a time. +In order to both ensure progress and high performance, user processes should +acknowledge a completely processed buffer as quickly as possible, returning +it for reuse, and not block waiting on a second buffer while holding another +buffer. .Sh IOCTLS The .Xr ioctl 2 ==== //depot/projects/dtrace/src/share/man/man4/psm.4#4 (text+ko) ==== @@ -24,9 +24,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/psm.4,v 1.48 2005/07/15 17:35:25 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/psm.4,v 1.49 2008/04/08 17:55:25 jkim Exp $ .\" -.Dd September 29, 2004 +.Dd April 8, 2008 .Dt PSM 4 .Os .Sh NAME @@ -110,7 +110,9 @@ 8 byte data packets are sent to the user program at this level. .Pp At the operation level two, data from the pointing device is passed to the -user program as is. +user program as is. Conversely, command from the user program is passed +to the pointing device as is and the user program is responsible for +status validation and error recovery. Modern PS/2 type pointing devices often use proprietary data format. Therefore, the user program is expected to have intimate knowledge about the format from a particular device when operating ==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#27 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.337 2008/03/28 07:57:52 brooks Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.339 2008/04/09 21:24:11 emax Exp $ .\" -.Dd January 27, 2008 +.Dd April 9, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -3880,6 +3880,108 @@ If set to .Dq Li YES , enable support for sound mixer. +.It Va hcsecd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth security daemon. +.It Va hcsecd_config +.Pq Vt str +Configuration file for +.Xr hcsecd 8 . +Default +.Pa /etc/bluetooth/hcsecd.conf . +.It Va sdpd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Service Discovery Protocol daemon. +.It Va sdpd_control +.Pq Vt str +Path to +.Xr sdpd 8 +control socket. +Default +.Pa /var/run/sdp . +.It Va sdpd_groupname +.Pq Vt str +Sets +.Xr sdpd 8 +group to run as after it initializes. +Default +.Dq Li nobody . +.It Va sdpd_username +.Pq Vt str +Sets +.Xr sdpd 8 +user to run as after it initializes. +Default +.Dq Li nobody . +.It Va bthidd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Human Interface Device daemon. +.It Va bthidd_config +.Pq Vt str +Configuration file for +.Xr bthidd 8 . +Default +.Pa /etc/bluetooth/bthidd.conf . +.It Va bthidd_hids +.Pq Vt str +Path to a file, where +.Xr bthidd 8 +will store information about known HID devices. +Default +.Pa /var/db/bthidd.hids . +.It Va rfcomm_pppd_server_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth RFCOMM PPP wrapper daemon. +.It Va rfcomm_pppd_server_profile +.Pq Vt str +The name of the profile to use from +.Pa /etc/ppp/ppp.conf . +Multiple profiles can be specified here. +Also used to specify per-profile overrides. +When the profile name contains any of the characters +.Dq Li .-/+ +they are translated to +.Dq Li _ +for the proposes of the override variable names. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _bdaddr +.Pq Vt str +Overrides local address to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on +.Dq Li ANY +address. +The address can be specified as BD_ADDR or name. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _channel +.Pq Vt str +Overrides local RFCOMM channel to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on RFCOMM channel 1. +Must set properly if multiple profiles used in the same time. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_sp +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Serial Port service on the speficied RFCOMM channel. +Default +.Dq Li NO . +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_dun +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Dial-Up Networking service on the speficied +RFCOMM channel. +Default +.Dq Li NO . .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact @@ -3920,12 +4022,14 @@ .Xr amd 8 , .Xr apm 8 , .Xr atm 8 , +.Xr bthidd 8 , .Xr chkprintcap 8 , .Xr chown 8 , .Xr cron 8 , .Xr dhclient 8 , .Xr ftpd 8 , .Xr geli 8 , +.Xr hcsecd 8 , .Xr ifconfig 8 , .Xr inetd 8 , .Xr ipf 8 , @@ -3955,6 +4059,7 @@ .Xr quotaon 8 , .Xr rc 8 , .Xr rc.sendmail 8 , +.Xr rfcomm_pppd 8 , .Xr route 8 , .Xr routed 8 , .Xr rpcbind 8 , @@ -3962,6 +4067,7 @@ .Xr rpc.statd 8 , .Xr rwhod 8 , .Xr savecore 8 , +.Xr sdpd 8 , .Xr sshd 8 , .Xr swapon 8 , .Xr sysctl 8 , ==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.183 2007/10/20 19:01:49 ru Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.184 2008/04/09 20:27:53 kan Exp $ # .include <bsd.init.mk> @@ -139,7 +139,7 @@ .include <bsd.symver.mk> -# Allow librararies to specify their own version map or have it +# Allow libraries to specify their own version map or have it # automatically generated (see bsd.symver.mk above). .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) ${SHLIB_NAME}: ${VERSION_MAP} ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#39 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.613 2008/04/07 07:38:02 alc Exp $"); /* * Manages physical address maps. @@ -220,6 +220,7 @@ static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va); +static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, @@ -3673,16 +3674,29 @@ int pmap_page_wired_mappings(vm_page_t m) { - pv_entry_t pv; - pt_entry_t *pte; - pmap_t pmap; int count; count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + count = pmap_pvh_wired_mappings(&m->md, count); + return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); +} + +/* + * pmap_pvh_wired_mappings: + * + * Return the updated number "count" of managed mappings that are wired. + */ +static int +pmap_pvh_wired_mappings(struct md_page *pvh, int count) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804092311.m39NB8Zj047968>