Date: Sat, 9 Dec 2006 01:20:26 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 111306 for review Message-ID: <200612090120.kB91KQuF017418@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111306 Change 111306 by jb@jb_freebsd8 on 2006/12/09 01:19:49 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/nivit.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#20 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#20 integrate .. //depot/projects/dtrace/ports/LEGAL#16 integrate .. //depot/projects/dtrace/ports/MOVED#35 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#14 integrate .. //depot/projects/dtrace/ports/UPDATING#27 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#19 integrate .. //depot/projects/dtrace/src/UPDATING#12 integrate .. //depot/projects/dtrace/src/bin/hostname/hostname.1#5 integrate .. //depot/projects/dtrace/src/bin/hostname/hostname.c#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.c#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.h#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.man#4 integrate .. //depot/projects/dtrace/src/etc/pccard_ether#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/dtrace/src/release/Makefile#10 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#3 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#3 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/dtrace/src/sbin/fdisk/fdisk.8#4 integrate .. //depot/projects/dtrace/src/sbin/mount/mount_fs.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ath.4#6 integrate .. //depot/projects/dtrace/src/share/man/man9/mbuf.9#5 integrate .. //depot/projects/dtrace/src/share/misc/pci_vendors#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#16 integrate .. //depot/projects/dtrace/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#18 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#22 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_idle.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/ksched.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/uio_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#7 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#19 integrate .. //depot/projects/dtrace/src/sys/sys/rtprio.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/runq.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/sched.h#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#18 integrate .. //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/dtrace/src/usr.bin/getconf/getconf.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#19 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#14 integrate .. //depot/projects/dtrace/www/en/releases/4.11R/errata.html#7 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#8 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#12 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#18 integrate .. //depot/projects/dtrace/www/en/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#10 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#15 integrate .. //depot/projects/dtrace/www/zh_CN/releases/6.1R/errata.html#7 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.649 2006/12/06 00:07:27 ceri Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.650 2006/12/08 06:26:14 wes Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -7377,6 +7377,11 @@ </listitem> <listitem> + <para>Phil Budne + <email>phil@ultimate.com</email></para> + </listitem> + + <listitem> <para>Phil Maker <email>pjm@gnu.org</email></para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 (text+ko) ==== @@ -17,7 +17,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v 1.20 2004/08/08 13:43:54 hrs Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v 1.21 2006/12/06 16:15:45 marck Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -276,7 +276,7 @@ <devicename>xl0</devicename> towards the inside (<acronym>LAN</acronym>). The bridge machine has the IP <hostid role="ipaddr">1.2.3.4</hostid> (it is not possible that your - <acronym>ISP</acronym> can give you a class A address like this, but for + <acronym>ISP</acronym> can give you an address quite like this, but for our example it is good).</para> <programlisting># Things that we have kept state on before get to go through in a hurry ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.67 2006/12/01 11:54:39 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.68 2006/12/06 12:09:15 blackend Exp $ --> <chapter id="desktop"> @@ -317,9 +317,9 @@ run the following commands:</para> <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ - /usr/X11R6/lib/browser_plugins/</userinput> + /usr/local/lib/browser_plugins/</userinput> &prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ - /usr/X11R6/lib/browser_plugins/</userinput></screen> + /usr/local/lib/browser_plugins/</userinput></screen> <para>If you restart your browser the plugin should now appears in the previously mentioned list. Your browser may also crash ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.267 2006/11/05 00:49:34 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.268 2006/12/07 11:47:36 blackend Exp $ --> <chapter id="disks"> @@ -809,6 +809,63 @@ to format and create partitions on the USB drive if needed.</para> + <para>To make this device mountable as a normal user, certain + steps have to be taken. First, the devices that are created + when a USB storage device is connected need to be accessible + by the user. A solution is to make all users of these devices + a member of the <groupname>operator</groupname> group. This + is done with &man.pw.8;. Second, when the devices are + created, the <groupname>operator</groupname> group should be + able to read and write them. This is accomplished by adding a + line for these devices to + <filename>/etc/devfs.rules</filename>:</para> + + <programlisting>add path 'da*' mode 0660 group operator</programlisting> + + <note> + <para>If there already are SCSI disks in the system, it must + be done a bit different. E.g., if the system already + contains disks <devicename>da0</devicename> through + <devicename>da2</devicename> attached to the system, change + the line as follows:</para> + + <programlisting>add path 'da[3-9]*' mode 0660 group operator</programlisting> + + <para>This will exclude the already existing disks from + belonging to the <groupname>operator</groupname> + group.</para> + </note> + + <para>Next, the kernel has to be configured to allow regular + users to mount file systems. The easiest way is to add the + following line to + <filename>/etc/sysctl.conf</filename>:</para> + + <programlisting>vfs.usermount="1"</programlisting> + + <para>Note that this only takes effect after the next reboot. + Alternatively, one can also use &man.sysctl.8; to set this + variable.</para> + + <para>The final step is to create a directory where the file + system is to be mounted. This directory needs to be owned by + the user that is to mount the file system. One way to do that + is for <username>root</username> to create a subdirectory + owned by that user as + <filename>/mnt/<replaceable>$USER</replaceable></filename> + (replace <replaceable>$USER</replaceable> by the login name of + the actual user):</para> + + <screen>&prompt.root; <userinput>mkdir /mnt/$USER</userinput> +&prompt.root; <userinput>chown <replaceable>$USER</replaceable>:<replaceable>$USER</replaceable> /mnt/<replaceable>$USER</replaceable></userinput></screen> + + <para>Suppose a USB thumbdrive is plugged in, and a device + <filename>/dev/da0s1</filename> appears. Since these devices + usually come preformatted with a FAT file system, one can + mount them like this:</para> + + <screen>&prompt.user; <userinput>mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>$USER</replaceable></userinput></screen> + <para>If you unplug the device (the disk must be unmounted before), you should see, in the system message buffer, something like the following:</para> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.338 2006/12/04 14:43:50 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.339 2006/12/06 16:15:45 marck Exp $ --> <chapter id="install"> @@ -2356,11 +2356,11 @@ <listitem> <para>The address block being used for this local area - network is a Class C block - (<hostid role="ipaddr">192.168.0.0</hostid> - - <hostid role="ipaddr">192.168.0.255</hostid>). - The default netmask is for a Class C network - (<hostid role="netmask">255.255.255.0</hostid>).</para> + network is + <hostid role="ipaddr">192.168.0.0</hostid> - + <hostid role="ipaddr">192.168.0.255</hostid> + with a netmask of + <hostid role="netmask">255.255.255.0</hostid>.</para> </listitem> </varlistentry> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.118 2006/10/16 09:14:38 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.119 2006/12/08 07:28:05 blackend Exp $ --> <chapter id="multimedia"> @@ -1486,7 +1486,7 @@ scanner is supported by <application>SANE</application> prior to performing any configuration. <application>SANE</application> has a <ulink - url="http://sane-project.org/sane-supported-devices.html">supported + url="http://www.sane-project.org/sane-supported-devices.html">supported devices</ulink> list that can provide you with information about the support for a scanner and its status. The &man.uscanner.4; manual page also provides a list of supported ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.173 2006/05/30 23:08:24 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.175 2006/12/06 19:35:57 marck Exp $ --> <chapter id="ppp-and-slip"> @@ -760,7 +760,7 @@ <para>For example, if you have three dialup customers, <username>fred</username>, <username>sam</username>, and - <username>mary</username>, that you route class C networks + <username>mary</username>, that you route /24 CIDR networks for, you would type the following:</para> <screen>&prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred</userinput> @@ -826,8 +826,8 @@ <para>The file <filename>/etc/ppp/ppp.linkup</filename> should also contain routing information for each static IP user if required. The line below would add a route - for the <hostid role="ipaddr">203.14.101.0</hostid> - class C via the client's ppp link.</para> + for the <hostid role="ipaddr">203.14.101.0/24</hostid> + network via the client's ppp link.</para> <programlisting>fred: add 203.14.101.0 netmask 255.255.255.0 HISADDR ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.37 2006/12/05 22:13:09 gabor Exp $ + $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.38 2006/12/06 22:55:51 nivit Exp $ --> <sect2 id="pgpkey-ariff"> @@ -1039,6 +1039,11 @@ &pgpkey.nectar; </sect2> + <sect2 id="pgpkey-nivit"> + <title>&a.nivit;</title> + &pgpkey.nivit; + </sect2> + <sect2 id="pgpkey-stefan"> <title>&a.stefan;</title> &pgpkey.stefan; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#20 (text+ko) ==== @@ -1,5 +1,5 @@ -<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.129 2006/12/05 22:13:09 gabor Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.130 2006/12/06 22:55:51 nivit Exp $ --> <!-- PGP keyblocks --> <!ENTITY pgpkey.aaron SYSTEM "aaron.key"> <!ENTITY pgpkey.ache SYSTEM "ache.key"> @@ -169,6 +169,7 @@ <!ENTITY pgpkey.niels SYSTEM "niels.key"> <!ENTITY pgpkey.nik SYSTEM "nik.key"> <!ENTITY pgpkey.niklas SYSTEM "niklas.key"> +<!ENTITY pgpkey.nivit SYSTEM "nivit.key"> <!ENTITY pgpkey.nork SYSTEM "nork.key"> <!ENTITY pgpkey.novel SYSTEM "novel.key"> <!ENTITY pgpkey.nsouch SYSTEM "nsouch.key"> ==== //depot/projects/dtrace/ports/LEGAL#16 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.512 2006/12/04 16:28:34 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.513 2006/12/07 10:06:07 ale Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -357,7 +357,8 @@ jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted john-* security/john Crypto; export-controlled -jpgraph-* graphics/jpgraph Not for commercial use +jpgraph-1.* graphics/jpgraph Not for commercial use +jpgraph-2.* graphics/jpgraph2 Not for commercial use jre*i_ELF.*.tar.gz java/jre License does not allow distribution with fee jre118_v3-glibc-* java/linux-blackdown-jre11 License does not allow ==== //depot/projects/dtrace/ports/MOVED#35 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1197 2006/12/04 16:28:34 vd Exp $ +# $FreeBSD: ports/MOVED,v 1.1198 2006/12/07 10:52:37 ade Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2558,3 +2558,4 @@ editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14 emulators/vmware2||2006-12-04|Has expired: Unfetchable finance/ccard||2006-12-04|Has expired: Project disappeared from the internet +devel/autoconf26|devel/autoconf261|2006-12-07|Move to correct location ==== //depot/projects/dtrace/ports/Mk/bsd.database.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.17 2006/12/06 16:48:56 girgen Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -152,6 +152,7 @@ PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 PGSQL81_LIBVER= 4 +PGSQL82_LIBVER= 5 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.86 2006/11/30 13:51:28 pav Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.88 2006/12/08 21:50:19 alexbl Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -99,10 +99,17 @@ # PYNUMERIC - Dependency line for the numeric extension. Py-Numeric-17 # is the last release that works with Python versions older # than 1.6. +# PYNUMPY - Dependency line for the new numeric extension.# py-numpy, Py-Numeric is deprecated. # # PYXML - Dependency line for the XML extension. As of Python-2.0, # this extension is in the base distribution. # +# PYEXPAT - Dependency line for the Expat XML Parser. As of Python-2.3.2, +# this module is in the base distribution. +# +# PYCTYPES - Dependency line for the ctypes package. As of Python-2.5, +# this module is in the base distribution. +# # USE_PYTHON_PREFIX - Says that the port installs in ${PYTHONBASE}. # # USE_PYDISTUTILS - Use distutils as do-configure, do-build and do-install @@ -419,6 +426,7 @@ # Python 3rd-party modules PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR} PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric +PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml .if defined(PYTHON_REL) && ${PYTHON_REL} < 232 @@ -427,6 +435,12 @@ PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR} .endif +.if defined(PYTHON_REL) && ${PYTHON_REL} < 250 +PYCTYPES= ${PYTHON_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes +.else +PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__py:${PYTHON_PORTSDIR} +.endif + # dependencies PYTHON_NO_DEPENDS?= NO ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#14 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.403 2006/12/02 21:57:05 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.405 2006/12/06 14:37:53 acm Exp $ # # Where to put distfiles that don't have any other master site @@ -165,6 +165,17 @@ ${MASTER_SITE_DEBIAN:C|(/%SUBDIR%/)|/pool/main/${PORTNAME:C/^(.).*$/\1/}/${PORTNAME}/|} .endif +.if !defined(IGNORE_MASTER_SITE_EASYSW) +MASTER_SITE_EASYSW+= \ + http://ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp2.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp3.easysw.com/pub/%SUBDIR%/ \ + http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_ECLIPSE) MASTER_SITE_ECLIPSE+= \ http://download.eclipse.org/eclipse/downloads/drops/%SUBDIR%/ \ @@ -708,6 +719,17 @@ ftp://melanoma.cs.rmit.edu.au/pub/NetBSD/packages/distfiles/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_NVIDIA) +MASTER_SITE_NVIDIA+= \ + http://jp.download.nvidia.com/%SUBDIR%/ \ + http://us.download.nvidia.com/%SUBDIR%/ \ + http://tw.download.nvidia.com/%SUBDIR%/ \ + http://download.nvidia.com/%SUBDIR%/ \ + http://download1.nvidia.com/%SUBDIR%/ \ + ftp://download.nvidia.com/%SUBDIR%/ \ + ftp://download1.nvidia.com/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_OSSP) MASTER_SITE_OSSP+= \ ftp://ftp.ossp.org/pkg/%SUBDIR%/ \ ==== //depot/projects/dtrace/ports/UPDATING#27 (text+ko) ==== @@ -6,6 +6,24 @@ time you update your ports collection, before attempting any port upgrades. +20061207: + AFFECTS: users of devel/p5-PAR + AUTHOR: rafan@FreeBSD.org + + As of version 0.97.0, all PAR::Packer logic, i.e. pp, parl and + all packaging tools are moved to another distribution. You can + install devel/p5-PAR-Packer to get them. + +20061207: + AFFECTS: users of net/samba3 + AUTHOR: timur@gnu.org + + Version 3.0.23d of net/samba3 finally got ability to conditionaly + link smbd daemon against FAM libraries. If you don't need this + support make sure that it's not selected in the options menu - + run 'make config' to verify it. You can remove FAM package if it + was installed before as a part of Samba dependencies. + 20061201: AFFECTS: users of mail/assp AUTHOR: fbsd@opal.com @@ -4440,4 +4458,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.429 2006/12/01 08:14:19 miwi Exp $ +$FreeBSD: ports/UPDATING,v 1.431 2006/12/08 03:27:47 rafan Exp $ ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.66 2006/12/01 16:23:25 piso Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -735,6 +735,31 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20011001: UUCP migration to ports +OLD_FILES+=usr/bin/uucp +OLD_FILES+=usr/bin/uulog +OLD_FILES+=usr/bin/uuname +OLD_FILES+=usr/bin/uupick +OLD_FILES+=usr/bin/uusched +OLD_FILES+=usr/bin/uustat +OLD_FILES+=usr/bin/uuto +OLD_FILES+=usr/bin/uux +OLD_FILES+=usr/libexec/uucp/uucico +OLD_FILES+=usr/libexec/uucp/uuxqt +OLD_FILES+=usr/libexec/uucpd +OLD_FILES+=usr/share/man/man1/uuconv.1.gz +OLD_FILES+=usr/share/man/man1/uucp.1.gz +OLD_FILES+=usr/share/man/man1/uulog.1.gz +OLD_FILES+=usr/share/man/man1/uuname.1.gz +OLD_FILES+=usr/share/man/man1/uupick.1.gz +OLD_FILES+=usr/share/man/man1/uustat.1.gz +OLD_FILES+=usr/share/man/man1/uuto.1.gz +OLD_FILES+=usr/share/man/man1/uux.1.gz +OLD_FILES+=usr/share/man/man8/uuchk.8.gz +OLD_FILES+=usr/share/man/man8/uucico.8.gz +OLD_FILES+=usr/share/man/man8/uucpd.8.gz +OLD_FILES+=usr/share/man/man8/uusched.8.gz +OLD_FILES+=usr/share/man/man8/uuxqt.8.gz # 20010523 mount_portal -> mount_portalfs OLD_FILES+=sbin/mount_portal OLD_FILES+=usr/share/man/man8/mount_portal.8.gz @@ -3545,6 +3570,8 @@ OLD_DIRS+=usr/include/ntfs OLD_DIRS+=usr/include/nwfs OLD_DIRS+=usr/include/ufs/mfs +# 20011001: UUCP migration to ports +OLD_DIRS+=usr/libexec/uucp .include "tools/build/mk/OptionalObsoleteFiles.inc" ==== //depot/projects/dtrace/src/UPDATING#12 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20061205: + The removal of several facets of the experimental Threading + system from the kernel means that the proc and thread structures + have changed quite a bit. I suggest all kernel modules that might + reference these structures be recompiled.. Especially the + linux module. + 20061126: Sound infrastructure has been updated with various fixes and improvements. Most of the changes are pretty much transparent, @@ -675,4 +682,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.466 2006/11/26 12:24:04 ariff Exp $ +$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ ==== //depot/projects/dtrace/src/bin/hostname/hostname.1#5 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.19 2006/12/05 12:09:50 ru Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $ .\" -.Dd December 5, 2006 +.Dd December 7, 2006 .Dt HOSTNAME 1 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd set or print name of current host system .Sh SYNOPSIS .Nm -.Op Fl s +.Op Fl fs .Op Ar name-of-host .Sh DESCRIPTION The @@ -56,6 +56,9 @@ .Pp Options: .Bl -tag -width flag +.It Fl f +Include domain information in the printed name. +This is the default behavior. .It Fl s Trim off any domain information from the printed name. ==== //depot/projects/dtrace/src/bin/hostname/hostname.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $"); #include <sys/param.h> @@ -58,8 +58,15 @@ char *p, hostname[MAXHOSTNAMELEN]; sflag = 0; - while ((ch = getopt(argc, argv, "s")) != -1) + while ((ch = getopt(argc, argv, "fs")) != -1) switch (ch) { + case 'f': + /* + * On Linux, "hostname -f" prints FQDN. + * BSD "hostname" always prints FQDN by + * default, so we accept but ignore -f. + */ + break; case 's': sflag = 1; break; @@ -93,6 +100,6 @@ usage(void) { - (void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n"); + (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); exit(1); } ==== //depot/projects/dtrace/src/contrib/libbegemot/rpoll.c#4 (text+ko) ==== @@ -101,16 +101,16 @@ # endif -typedef signed long long tval_t; +typedef int64_t tval_t; -static inline tval_t GETMSECS(void); +static inline tval_t GETUSECS(void); static inline tval_t -GETMSECS(void) { +GETUSECS(void) { struct timeval tval; (void)gettimeofday(&tval, NULL); - return (tval_t)tval.tv_sec*1000+tval.tv_usec/1000; + return (tval_t)tval.tv_sec * 1000000 + tval.tv_usec; } /* @@ -170,11 +170,11 @@ * Now for timers */ typedef struct { - u_int msecs; /* millisecond value of the timer */ + uint64_t usecs; /* microsecond value of the timer */ int repeat; /* one shot or repeat? */ void *arg; /* client arg */ timer_f func; /* handler, 0 means disfunct */ - tval_t when; /* next time to trigger in msecs! */ + tval_t when; /* next time to trigger in usecs! */ } PollTim_t; /* how many records should our table grow at once? */ @@ -296,8 +296,8 @@ poll_unblocksig(); if(rpoll_trace) - fprintf(stderr, "poll_register(%d, %#lx, %#lx, %#x)->%d", - fd, (u_long)func, (u_long)arg, mask, p - regs); + fprintf(stderr, "poll_register(%d, %p, %p, %#x)->%tu", + fd, (void *)func, (void *)arg, mask, p - regs); return p - regs; } @@ -373,6 +373,13 @@ int poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg) { + return (poll_start_utimer((unsigned long long)msecs * 1000, + repeat, func, arg)); +} + +int +poll_start_utimer(unsigned long long usecs, int repeat, timer_f func, void *arg) +{ PollTim_t *p; /* find unused entry */ @@ -392,19 +399,19 @@ } /* create entry */ - p->msecs = msecs; + p->usecs = usecs; p->repeat = repeat; p->arg = arg; p->func = func; - p->when = GETMSECS() + msecs; + p->when = GETUSECS() + usecs; tims_used++; resort = 1; if(rpoll_trace) - fprintf(stderr, "poll_start_timer(%u, %d, %#lx, %#lx)->%u", - msecs, repeat, (u_long)func, (u_long)arg, p - tims); + fprintf(stderr, "poll_start_utimer(%llu, %d, %p, %p)->%tu", + usecs, repeat, (void *)func, (void *)arg, p - tims); return p - tims; } @@ -497,7 +504,7 @@ u_int i, idx; int ret; tval_t now; - int tout; + tval_t tout; static u_int last_index; # ifdef USE_SELECT @@ -519,12 +526,13 @@ /* in wait mode - compute the timeout */ if(wait) { if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); # ifdef DEBUG { - fprintf(stderr, "now=%"QUADFMT"u", now); + fprintf(stderr, "now=%llu", now); for(i = 0; i < tims_used; i++) - fprintf(stderr, "timers[%2d] = %"QUADFMT"d", i, tfd[i]->when - now); + fprintf(stderr, "timers[%2d] = %lld", + i, tfd[i]->when - now); } # endif if((tout = tims[tfd[0]].when - now) < 0) @@ -539,7 +547,7 @@ # endif # ifdef USE_POLL - ret = poll(pfd, regs_used, tout); + ret = poll(pfd, regs_used, tout == INFTIM ? INFTIM : (tout / 1000)); # endif # ifdef USE_SELECT @@ -547,13 +555,13 @@ nwset = wset; nxset = xset; if(tout != INFTIM) { - tv.tv_sec = tout / 1000; - tv.tv_usec = (tout % 1000) * 1000; + tv.tv_sec = tout / 1000000; + tv.tv_usec = tout % 1000000; } ret = select(maxfd+1, SELECT_CAST(&nrset), SELECT_CAST(&nwset), - SELECT_CAST(&nxset), (tout==INFTIM) ? 0 : &tv); + SELECT_CAST(&nxset), (tout==INFTIM) ? NULL : &tv); # endif if(ret == -1) { @@ -574,20 +582,26 @@ # ifdef USE_POLL if(regs[idx].pfd) { - if(regs[idx].pfd->revents & poll_in) + if ((regs[idx].mask & POLL_IN) && + (regs[idx].pfd->revents & poll_in)) mask |= POLL_IN; - if(regs[idx].pfd->revents & poll_out) + if ((regs[idx].mask & POLL_OUT) && + (regs[idx].pfd->revents & poll_out)) mask |= POLL_OUT; - if(regs[idx].pfd->revents & poll_except) + if((regs[idx].mask & POLL_EXCEPT) && + (regs[idx].pfd->revents & poll_except)) mask |= POLL_EXCEPT; } # endif # ifdef USE_SELECT - if(FD_ISSET(regs[idx].fd, &nrset)) + if ((regs[idx].mask & POLL_IN) && + FD_ISSET(regs[idx].fd, &nrset)) mask |= POLL_IN; - if(FD_ISSET(regs[idx].fd, &nwset)) + if ((regs[idx].mask & POLL_OUT) && + FD_ISSET(regs[idx].fd, &nwset)) mask |= POLL_OUT; - if(FD_ISSET(regs[idx].fd, &nxset)) + if ((regs[idx].mask & POLL_EXCEPT) && + FD_ISSET(regs[idx].fd, &nxset)) mask |= POLL_EXCEPT; # endif assert(idx < regs_alloc); @@ -595,8 +609,8 @@ if(mask) { if(rpoll_trace) fprintf(stderr, "poll_dispatch() -- " - "file %d/%d", - regs[idx].fd, idx); + "file %d/%d %x", + regs[idx].fd, idx, mask); (*regs[idx].func)(regs[idx].fd, mask, regs[idx].arg); } } @@ -607,7 +621,7 @@ /* dispatch timeouts */ if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); for(i = 0; i < tfd_used; i++) { if(tfd[i] < 0) continue; @@ -619,7 +633,7 @@ if(tfd[i] < 0) continue; if(tims[tfd[i]].repeat) - tims[tfd[i]].when = now + tims[tfd[i]].msecs; + tims[tfd[i]].when = now + tims[tfd[i]].usecs; else { tims[tfd[i]].func = NULL; tims_used--; @@ -644,8 +658,8 @@ { gettimeofday(&now, NULL); - return (double)(10 * now.tv_sec + now.tv_usec / 100000 - 10 * start.tv_sec - start.tv_usec / 100000) - / 10; + return (double)(10 * now.tv_sec + now.tv_usec / 100000 - + 10 * start.tv_sec - start.tv_usec / 100000) / 10; } void @@ -675,6 +689,14 @@ { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); } +void +tfunc2(int tid, void *arg) +{ + static u_int count = 0; + + if (++count % 10000 == 0) + printf("%4.1f -- %d\n", elaps(), tid); +} void first(int tid, void *arg); void second(int tid, void *arg); @@ -683,7 +705,7 @@ second(int tid, void *arg) { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); - poll_start_timer(5500, 0, first, "first"); + poll_start_utimer(5500000, 0, first, "first"); poll_stop_timer(t1); t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); } @@ -699,12 +721,16 @@ int main(int argc, char *argv[]) { - argc = argc; argv = argv; gettimeofday(&start, NULL); poll_register(0, infunc, NULL, POLL_IN); - t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); - poll_start_timer(2500, 0, first, "first"); + + if (argc < 2) { + t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); + poll_start_timer(2500, 0, first, "first"); + } else { + t0 = poll_start_utimer(300, 1, tfunc2, NULL); + } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612090120.kB91KQuF017418>