Date: Thu, 7 Feb 2008 02:20:12 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134949 for review Message-ID: <200802070220.m172KCCA071202@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=134949 Change 134949 by jb@jb_freebsd1 on 2008/02/07 02:19:44 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#62 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#38 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#30 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/antoine.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#31 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#30 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/thierry.key#3 integrate .. //depot/projects/dtrace/src/Makefile.inc1#40 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#37 integrate .. //depot/projects/dtrace/src/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/dtrace/src/crypto/openssh/FREEBSD-Xlist#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/dtrace/src/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/dtrace/src/include/pthread_np.h#9 integrate .. //depot/projects/dtrace/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#17 integrate .. //depot/projects/dtrace/src/lib/libfetch/http.c#7 integrate .. //depot/projects/dtrace/src/lib/libkse/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libkse/kse.map#3 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#8 integrate .. //depot/projects/dtrace/src/lib/librpcsvc/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#15 integrate .. //depot/projects/dtrace/src/lib/libthr/pthread.map#11 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#18 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_expf.c#5 integrate .. //depot/projects/dtrace/src/release/fixit.profile#6 integrate .. //depot/projects/dtrace/src/sbin/geom/core/geom.8#5 integrate .. //depot/projects/dtrace/src/sbin/gpt/gpt.8#5 integrate .. //depot/projects/dtrace/src/sbin/gpt/migrate.c#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/show.c#5 integrate .. //depot/projects/dtrace/src/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/dtrace/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/dtrace/src/share/man/man9/lock.9#9 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#7 integrate .. //depot/projects/dtrace/src/share/mk/bsd.dep.mk#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/locore.S#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/asmacros.h#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/atomic.h#10 integrate .. //depot/projects/dtrace/src/sys/arm/include/sysarch.h#4 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/dtrace/src/sys/conf/kern.post.mk#12 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amrreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/subr_lock.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_id.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#37 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#33 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#7 integrate .. //depot/projects/dtrace/src/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/dtrace/src/tools/regression/netinet/ip_id_period/ip_id_period.py#1 branch .. //depot/projects/dtrace/src/tools/regression/pthread/mutex_islocked_np/Makefile#2 delete .. //depot/projects/dtrace/src/tools/regression/pthread/mutex_islocked_np/mutex_islocked_np.c#2 delete .. //depot/projects/dtrace/src/tools/regression/pthread/mutex_isowned_np/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c#1 branch .. //depot/projects/dtrace/src/tools/tools/crypto/cryptostats.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/crypto/cryptotest.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#17 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/Makefile#6 integrate .. //depot/projects/dtrace/src/usr.bin/logger/logger.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/truss/Makefile#6 integrate .. //depot/projects/dtrace/www/en/developers.sgml#28 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#38 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#62 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.758 2008/02/03 02:04:54 danger Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.759 2008/02/05 19:03:06 antoine Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -938,11 +938,6 @@ </listitem> <listitem> - <para>Antoine Brodin - <email>antoine.brodin@laposte.net</email></para> - </listitem> - - <listitem> <para>Antoine Pelisse <email>apelisse@gmail.com</email></para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#38 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.216 2008/01/27 23:27:26 gonzo Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.217 2008/02/05 19:03:06 antoine Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -123,6 +123,10 @@ </listitem> <listitem> + <para>&a.antoine;</para> + </listitem> + + <listitem> <para>&a.db;</para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#30 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.437 2008/01/27 23:27:26 gonzo Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.438 2008/02/05 18:52:24 antoine Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -68,6 +68,8 @@ <!ENTITY a.anray "Andrey Slusar <email>anray@FreeBSD.org</email>"> +<!ENTITY a.antoine "Antoine Brodin <email>antoine@FreeBSD.org</email>"> + <!ENTITY a.araujo "Marcelo Araujo <email>araujo@FreeBSD.org</email>"> <!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>"> ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#31 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.61 2008/01/11 21:48:49 marius Exp $ + $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.62 2008/02/05 19:16:20 antoine Exp $ --> <sect2 id="pgpkey-ariff"> @@ -114,6 +114,11 @@ &pgpkey.obraun; </sect2> + <sect2 id="pgpkey-antoine"> + <title>&a.antoine;</title> + &pgpkey.antoine; + </sect2> + <sect2 id="pgpkey-db"> <title>&a.db;</title> &pgpkey.db; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#30 (text+ko) ==== @@ -1,5 +1,5 @@ -<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.157 2008/01/11 21:48:49 marius Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.158 2008/02/05 19:16:20 antoine Exp $ --> <!-- PGP keyblocks --> <!ENTITY pgpkey.aaron SYSTEM "aaron.key"> <!ENTITY pgpkey.ache SYSTEM "ache.key"> @@ -14,6 +14,7 @@ <!ENTITY pgpkey.andreas SYSTEM "andreas.key"> <!ENTITY pgpkey.anholt SYSTEM "anholt.key"> <!ENTITY pgpkey.anray SYSTEM "anray.key"> +<!ENTITY pgpkey.antoine SYSTEM "antoine.key"> <!ENTITY pgpkey.araujo SYSTEM "araujo.key"> <!ENTITY pgpkey.ariff SYSTEM "ariff.key"> <!ENTITY pgpkey.arun SYSTEM "arun.key"> ==== //depot/projects/dtrace/doc/share/pgpkeys/thierry.key#3 (text+ko) ==== @@ -1,18 +1,15 @@ -<!-- $FreeBSD: doc/share/pgpkeys/thierry.key,v 1.1 2004/03/16 12:22:43 thierry Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/thierry.key,v 1.2 2008/02/05 21:36:44 thierry Exp $ --> <!-- -sh addkey.sh thierry C71405A2; +sh /usr/doc/share/pgpkeys/addkey.sh thierry C71405A2; --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 1024D/C71405A2 1997-10-11 Thierry Thomas <thierry@pompo.net> - Key fingerprint = 3BB8 F358 C2F1 776C 65C9 AE51 73DE 698C C714 05A2 -uid Thierry Thomas <thierry@thomas.as> -uid Thierry Thomas <tthomas@mail.dotcom.fr> -uid Thierry Thomas (See <http://horde.org>.) <thierry@horde.org> -uid Thierry Thomas (FreeBSD committer) <thierry@FreeBSD.org> -sub 2048g/277D65DB 1997-10-11 -sub 1024G/8866DD0F 2002-01-26 -sub 1024g/36DA7AF9 2003-11-26 [expires: 2003-11-27] -sub 1024R/C5529925 2003-11-26 +pub 1024D/C71405A2 1997-10-11 + Key fingerprint = 3BB8 F358 C2F1 776C 65C9 AE51 73DE 698C C714 05A2 +uid Thierry Thomas <thierry@pompo.net> +uid Thierry Thomas <tthomas@mail.dotcom.fr> +uid Thierry Thomas (FreeBSD committer) <thierry@FreeBSD.org> +sub 1024R/C5529925 2003-11-26 +sub 2048g/05CF3992 2008-02-05 ]]></programlisting> <programlisting role="pgpkey"><