PERFORCE change 138263 for review
John Birrell
jb at FreeBSD.org
Sat Mar 22 01:30:11 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=138263
Change 138263 by jb at jb_freebsd1 on 2008/03/22 01:29:31
IFC
Affected files ...
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml#4 integrate
.. //depot/projects/dtrace/ports/KNOBS#12 integrate
.. //depot/projects/dtrace/ports/MOVED#72 integrate
.. //depot/projects/dtrace/ports/UPDATING#58 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/CHANGES#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/FREEBSD-upgrade#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/FREEBSD-vendor#1 branch
.. //depot/projects/dtrace/src/contrib/bzip2/LICENSE#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/Makefile#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/Makefile-libbz2_so#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/README#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/README.COMPILATION.PROBLEMS#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/blocksort.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/bzip2.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/bzip2recover.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/bzlib.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/bzlib.h#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/bzlib_private.h#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/compress.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/crctable.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/decompress.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/huffman.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/randtable.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/spewG.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bzip2/unzcrash.c#5 integrate
.. //depot/projects/dtrace/src/lib/libarchive/Makefile#13 integrate
.. //depot/projects/dtrace/src/lib/libfetch/common.c#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutexattr.c#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_rtld.c#4 integrate
.. //depot/projects/dtrace/src/sbin/devd/token.l#4 integrate
.. //depot/projects/dtrace/src/sbin/newfs/newfs.8#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/streams.4#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/nexus.c#11 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/atpic.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 edit
.. //depot/projects/dtrace/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#42 integrate
.. //depot/projects/dtrace/src/sys/conf/files#76 integrate
.. //depot/projects/dtrace/src/sys/conf/options#43 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-raid.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#26 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdi.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdivar.h#6 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_rule.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/nexus.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/atpic.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/bus_if.m#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_switch.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#35 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#31 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_bus.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_trap.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#22 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#11 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tee.c#5 integrate
.. //depot/projects/dtrace/src/sys/netipsec/xform_tcp.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/aac_ioctl.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/bus.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#39 integrate
.. //depot/projects/dtrace/src/sys/sys/runq.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/sched.h#14 integrate
.. //depot/projects/dtrace/src/sys/sys/sysctl.h#15 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#32 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.h#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_pageout.c#12 integrate
.. //depot/projects/dtrace/src/tools/tools/README#6 integrate
.. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#9 integrate
.. //depot/projects/dtrace/src/tools/tools/track/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/tools/track/track.sh#1 branch
.. //depot/projects/dtrace/src/usr.bin/ktrace/ktrace.c#5 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#12 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#22 integrate
Differences ...
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#4 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.273
+ Original revision 1.274
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml,v 1.10 2008/01/28 23:02:21 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml,v 1.11 2008/03/20 14:39:16 keramida Exp $
-->
<chapter id="ports">
@@ -464,6 +464,11 @@
<row><entry>*</entry><entry>ÐÐ°Ð³Ñ Ð¾Ð»Ð¾Ð½ Ñ
ÑвилбаÑÑай байна.</entry></row>
+ <row><entry>!</entry><entry>СÑÑлгагдÑан Ð±Ð°Ð³Ñ Ð¶Ð°Ð³ÑаалÑад байгаа боловÑ
+ ÑÐ¼Ð°Ñ Ð½Ñг ÑалÑÐ³Ð°Ð°Ð½Ñ ÑÐ»Ð¼Ð°Ð°Ñ <command>pkg_version</command> ÑÑÑаал нÑ
+ ÑÑÑлгагдÑан багÑÑн Ñ
ÑвилбаÑÑн дÑгааÑÑг жагÑÐ°Ð°Ð»Ñ Ð´Ð°Ñ
Ñ Ñ
аÑгалзаÑ
оÑÑÑлгаÑай
+ Ñ
аÑÑÑÑÑлж ÑадаÑ
гүй байна.</entry></row>
+
</tbody>
</tgroup>
</informaltable>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#4 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.102
+ Original revision 1.107
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.7 2008/03/07 03:59:09 ganbold Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.8 2008/03/21 23:04:13 ganbold Exp $
-->
<chapter id="printing">
@@ -1447,10 +1447,9 @@
<listitem>
<para><application>LPD</application> Ð½Ñ Ñ
ÑвлÑÐ³Ñ Ð±Ò¯Ñийг анÑ
Ð½Ñ ÑоÑ
иÑÑÑлгааÑаа
- еÑдийн ÑекÑÑийг Ñ
ÑвлÑж Ñадна гÑж Ð°Ð²Ñ Ò¯Ð·Ð´Ñг. ÐÐ½Ñ Ð½Ñ &postscript; (
- ÑÑвÑл бÑÑад пÑогÑамÑн Ñ
Ñл дÑÑÑ Ò¯Ð½Ð´ÑÑлÑÑÑн Ñ
ÑвлÑгÑид ) Ñ
ÑвлÑгÑ
- зÑÑгийн еÑдийн ÑекÑÑийг ÑÑÑд Ñ
ÑвлÑж Ñаддаггүй Ñ
ÑвлÑгÑид дÑÑÑ Ñ
үндÑÑл
- гаÑгадаг.
+ еÑдийн ÑекÑÑийг Ñ
ÑвлÑж Ñадна гÑж Ð°Ð²Ñ Ò¯Ð·Ð´Ñг. ÐÐ½Ñ Ð½Ñ ÐµÑдийн ÑекÑÑийг
+ ÑÑÑд Ñ
ÑвлÑж Ñаддаггүй &postscript; Ñ
ÑвлÑгÑид (ÑÑвÑл бÑÑад пÑогÑамÑн
+ Ñ
Ñл дÑÑÑ Ò¯Ð½Ð´ÑÑлÑÑÑн Ñ
ÑвлÑгÑид ) дÑÑÑ Ñ
үндÑÑл гаÑгадаг.
<link
linkend="printing-advanced-if-conversion">
&postscript; Ñ
ÑвлÑгÑид дÑÑÑ ÐµÑдийн ÑекÑÑ Ñ
ÑвлÑдÑг болоÑ
</link> Ñ
ÑÑÑгÑ
@@ -1558,7 +1557,7 @@
Ñ
ÑвÑд бүÑÑгÑлÑÑй Ñийм оÑÑинд байгаа бол ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñ Ð½Ñ
Ñ
ÑвлÑгдÑÑн мөÑүүдийн Ñоог Ñоолж ÑÑÑ Ñоогоо Ñ
ÑвлÑгÑийн дÑмждÑг нÑг Ñ
ÑÑдÑан
даÑ
Ñ Ð¼Ó©Ñийн ÑооÑой жиÑиж Ñ
ÑвлÑÑÑн Ñ
ÑÑдаÑнÑÑдÑг Ð±Ð°Ñ Ð±Ò¯ÑÑгÑÑ
ÑÑÑой.
- ТекÑÑ ÑүүлÑÒ¯Ò¯Ñийг даÑааÑ
нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ð¸Ð¹Ð½ жагÑаалÑÑай ÑÑ
лүүлдÑг:
+ ТекÑÑ ÑүүлÑÒ¯Ò¯Ñийг даÑааÑ
нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ð¸Ð¹Ð½ жагÑаалÑÑай ÑÑ
лүүлдÑг:</para>
<cmdsynopsis>
<command>filter-name</command>
@@ -1571,7 +1570,7 @@
<arg choice="plain"><replaceable>acct-file</replaceable></arg>
</cmdsynopsis>
- Ñнд байгаа
+ <para>Ñнд байгаа</para>
<variablelist>
<varlistentry>
@@ -1637,7 +1636,6 @@
</listitem>
</varlistentry>
</variablelist>
- </para>
</listitem>
<indexterm>
@@ -1654,7 +1652,8 @@
linkend="printing-advanced-convfilters">Ð¥ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñүүд</link>
Ñ
ÑÑÑг Ñ
Ñлж өгдөг. Ð¥ÑÑÑв Ñанд Ñ
ÑвлÑгÑийн бүÑÑгÑл Ñ
Ð¸Ð¹Ð»Ñ Ñ
ÑÑÑгÑÑй бол Ñ
ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñүүд
Ð±Ð°Ñ Ð±Ò¯ÑÑгÑл Ñ
ийÑ
Ñ
ÑÑÑгÑÑй болно. Ð¥ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñүүдийг даÑааÑ
нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ò¯Ò¯Ð´ÑÑй
- ÑÑ
лүүлдÑг:
+ ÑÑ
лүүлдÑг:</para>
+
<cmdsynopsis>
<command>filter-name</command>
@@ -1666,7 +1665,7 @@
<arg choice="plain"><replaceable>acct-file</replaceable></arg>
</cmdsynopsis>
- Ñнд байгаа <replaceable>pixel-width</replaceable> нÑ
+ <para>Ñнд байгаа <replaceable>pixel-width</replaceable> нÑ
<literal>px</literal> боломжийн ÑÑга (анÑ
дагÑÐ°Ð°Ñ 0) бөгөөд
<replaceable>pixel-height</replaceable> Ð½Ñ <literal>py</literal>
боломжийн ÑÑга Ñм (анÑ
дагÑÐ°Ð°Ñ 0).</para>
@@ -1675,11 +1674,11 @@
<listitem>
<para><emphasis>ÐаÑалÑÑн ÑүүлÑÒ¯Ò¯Ñ</emphasis> Ð½Ñ ÑÒ¯Ò¯Ñ
ÑекÑÑ Ð±Ð°Ð¹Ñ
гүй байÑ
Ñм ÑÑ ÑÑвÑл Ñолгой Ñ
ÑÑдаÑнÑÑд идÑвÑ
ÑÑй байÑ
ÑоÑ
иолдолд зөвÑ
өн аÑиглагддаг.
- Ðиний ÑÑÑÑлага дÑÑÑÑÑÑ Ñ
аÑаÑ
ад гаÑалÑÑн ÑүүлÑÒ¯Ò¯Ñүүд Ñ
Ð¾Ð²Ð¾Ñ Ð°Ñиглагддаг.
+ Ðидний ÑÑÑÑлага дÑÑÑÑÑÑ Ñ
аÑаÑ
ад гаÑалÑÑн ÑүүлÑÒ¯Ò¯Ñүүд Ñ
Ð¾Ð²Ð¾Ñ Ð°Ñиглагддаг.
<link
linkend="printing-advanced-of">ÐаÑалÑÑн ÑүүлÑÒ¯Ò¯Ñүүд</link> Ñ
ÑÑÑг
ÑÑдгÑÑÑийг ÑайлбаÑладаг. ÐаÑалÑÑн ÑүүлÑÒ¯Ò¯ÑÑ Ð·Ó©Ð²Ñ
өн Ñ
оÑÑ Ð½ÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ó©Ð»
- байдаг:
+ байдаг:</para>
<cmdsynopsis>
<command>filter-name</command>
@@ -1687,7 +1686,7 @@
<arg choice="plain">-l <replaceable>length</replaceable></arg>
</cmdsynopsis>
- ÑдгÑÑÑ Ð½Ñ ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñийн <option>-w</option> болон
+ <para>ÑдгÑÑÑ Ð½Ñ ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñийн <option>-w</option> болон
<option>-l</option> нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ò¯Ò¯Ð´ÑÑй адил Ñм.</para>
</listitem>
</itemizedlist>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml#4 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.15
+ Original revision 1.16
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml,v 1.6 2008/03/03 09:17:38 ganbold Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml,v 1.7 2008/03/20 14:39:16 keramida Exp $
-->
<chapter id="virtualization">
@@ -765,7 +765,7 @@
<sect2 id="virtualization-guest-vmware">
<title>MacOS дÑÑÑÑ
VMWare</title>
- <para>&mac;-д зоÑиÑлÑан <application>FMWare Fusion</application>
+ <para>&mac;-д зоÑиÑлÑан <application>VMWare Fusion</application>
Ð½Ñ &macos; 10.4.9 болон ÑүүнÑÑÑ Ñ
ойÑÑ
Ñ
ÑÐ²Ð¸Ð»Ð±Ð°Ñ Ð±Ò¯Ñ
ий
&intel; дÑÑÑ ÑÑлгÑÑÑлаÑан &apple; &mac; компÑÑÑеÑÑÑдад
зоÑиÑлагдÑан аÑÐ¸Ð»Ð¶Ð°Ð°Ð½Ñ Ð¿ÑогÑам Ñ
ангамж бүÑÑÑгдÑÑ
үүн Ñм.
==== //depot/projects/dtrace/ports/KNOBS#12 (text+ko) ====
@@ -1,21 +1,20 @@
#
-# KNOBS - A list of popular knobs and descriptions
+# KNOBS - A list of popular knobs and their descriptions
#
-# $FreeBSD: ports/KNOBS,v 1.22 2007/12/11 21:21:20 lioux Exp $
+# $FreeBSD: ports/KNOBS,v 1.24 2008/03/20 12:34:56 danfe Exp $
#
-# Rules to adding knobs:
+# Rules for adding knobs:
#
# - Knob names must be 12 characters or less
# - Knob descriptions must be 45 characters or less
#
# - Naming knobs:
-# When a port has a lib-prefix (ie: libquicktime, libxine)
-# the lib-prefix should be stripped from the knob name.
-# (ie: QUICKTIME, XINE).
+# When a port has a lib-prefix (e.g.: libquicktime, libxine)
+# the lib-prefix should be stripped from the knob name
+# (e.g.: QUICKTIME, XINE).
#
+# Keep this list sorted in alphabetical order.
#
-# Keep this list sorted in alphabetical order
-#
# Knob name: Knob description:
# Length | | Length |
@@ -59,7 +58,7 @@
IMAGEMAGICK ImageMagick graphics support
IMAP Adds support for IMAP mail protocol
IODBC Use IODBC as the ODBC driver
-IPV6 IPv6 internet support
+IPV6 IPv6 internet protocol support
ISPELL Use textproc/ispell for spell checking
JAVA Adds support for Java
KDE Adds KDE support
==== //depot/projects/dtrace/ports/MOVED#72 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1562 2008/03/18 09:29:47 johans Exp $
+# $FreeBSD: ports/MOVED,v 1.1563 2008/03/21 16:27:29 miwi Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3436,3 +3436,7 @@
www/mod_dosevasise20||2008-03-14|Has expired: Use www/mod_evasive20 instead
textproc/p5-Text-ParseWords||2008-03-16|Module included in core perl
devel/hc12mem|devel/hcs12mem|2008-03-17|Project renamed
+mail/claws-mail-maildir||2008-03-21|Has expired: no longer supported by developers
+x11/e17-module-devian||2008-03-21|Has expired: abandoned by developer
+x11/e17-module-engage||2008-03-21|Has expired: abandoned by developer
+x11/e17-module-eveil||2008-03-21|Has expired: abandoned by developer
==== //depot/projects/dtrace/ports/UPDATING#58 (text+ko) ====
@@ -26,7 +26,7 @@
3. Uninstall your current linux_base port
4. Unload linux kernel module (kldunload linux.ko)
5. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
- 6. Install emulation/linux_base-fc6
+ 6. Install emulators/linux_base-fc6
4 Remount linprocfs (mount /compat/linux/proc)
5. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
@@ -6206,4 +6206,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.602 2008/03/18 19:52:50 beech Exp $
+$FreeBSD: ports/UPDATING,v 1.603 2008/03/20 12:11:56 lioux Exp $
==== //depot/projects/dtrace/src/contrib/bzip2/CHANGES#5 (text+ko) ====
@@ -2,8 +2,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -312,3 +312,8 @@
* Fix minor doc/comment bugs.
+
+1.0.5 (10 Dec 07)
+~~~~~~~~~~~~~~~~~
+Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
+
==== //depot/projects/dtrace/src/contrib/bzip2/FREEBSD-upgrade#5 (text+ko) ====
@@ -1,12 +1,12 @@
-$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $
Julian Seward's bzip2
originals can be found at: http://www.bzip.org/downloads.html
Imported by:
- cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \
- src/contrib/bzip2 BZIP2 v1_0_4
+ cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \
+ src/contrib/bzip2 BZIP2 v1_0_5
Notes:
The following log shows details of trimming:
==== //depot/projects/dtrace/src/contrib/bzip2/LICENSE#5 (text+ko) ====
@@ -2,7 +2,7 @@
--------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2006 Julian R Seward. All
+documentation, are copyright (C) 1996-2007 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Julian Seward, Cambridge, UK.
-jseward at bzip.org
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Julian Seward, jseward at bzip.org
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
--------------------------------------------------------------------------
==== //depot/projects/dtrace/src/contrib/bzip2/Makefile#5 (text+ko) ====
@@ -2,8 +2,8 @@
# This file is part of bzip2/libbzip2, a program and library for
# lossless, block-sorting data compression.
#
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
#
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
# README file.
@@ -137,7 +137,7 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.4
+DISTNAME=bzip2-1.0.5
dist: check manual
rm -f $(DISTNAME)
ln -s -f . $(DISTNAME)
==== //depot/projects/dtrace/src/contrib/bzip2/Makefile-libbz2_so#5 (text+ko) ====
@@ -10,8 +10,8 @@
# This file is part of bzip2/libbzip2, a program and library for
# lossless, block-sorting data compression.
#
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
#
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
# README file.
==== //depot/projects/dtrace/src/contrib/bzip2/README#5 (text+ko) ====
@@ -6,8 +6,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
@@ -177,7 +177,11 @@
See the CHANGES file.
+WHAT'S NEW IN 1.0.5 ?
+ See the CHANGES file.
+
+
I hope you find bzip2 useful. Feel free to contact me at
jseward at bzip.org
if you have any suggestions or queries. Many people mailed me with
@@ -203,3 +207,4 @@
30 December 2001 (bzip2, version 1.0.2pre1)
15 February 2005 (bzip2, version 1.0.3)
20 December 2006 (bzip2, version 1.0.4)
+10 December 2007 (bzip2, version 1.0.5)
==== //depot/projects/dtrace/src/contrib/bzip2/README.COMPILATION.PROBLEMS#5 (text+ko) ====
@@ -2,8 +2,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -12,7 +12,7 @@
in the file LICENSE.
------------------------------------------------------------------
-bzip2-1.0.4 should compile without problems on the vast majority of
+bzip2-1.0.5 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
==== //depot/projects/dtrace/src/contrib/bzip2/blocksort.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/bzip2.c#5 (text+ko) ====
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -1605,11 +1605,11 @@
"bzip2, a block-sorting file compressor. "
"Version %s.\n"
" \n"
- " Copyright (C) 1996-2006 by Julian Seward.\n"
+ " Copyright (C) 1996-2007 by Julian Seward.\n"
" \n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n"
- " in the bzip2-1.0.4 source distribution.\n"
+ " in the bzip2-1.0.5 source distribution.\n"
" \n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
==== //depot/projects/dtrace/src/contrib/bzip2/bzip2recover.c#5 (text+ko) ====
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -313,7 +313,7 @@
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
+ "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
==== //depot/projects/dtrace/src/contrib/bzip2/bzlib.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $");
#include "bzlib_private.h"
@@ -52,7 +52,7 @@
"component, you should also report this bug to the author(s)\n"
"of that program. Please make an effort to report this bug;\n"
"timely and accurate bug reports eventually lead to higher\n"
- "quality software. Thanks. Julian Seward, 15 February 2005.\n\n",
+ "quality software. Thanks. Julian Seward, 10 December 2007.\n\n",
errcode,
BZ2_bzlibVersion()
);
@@ -605,6 +605,7 @@
UInt32 c_tPos = s->tPos;
char* cs_next_out = s->strm->next_out;
unsigned int cs_avail_out = s->strm->avail_out;
+ Int32 ro_blockSize100k = s->blockSize100k;
/* end restore */
UInt32 avail_out_INIT = cs_avail_out;
==== //depot/projects/dtrace/src/contrib/bzip2/bzlib.h#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/bzlib_private.h#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -36,7 +36,7 @@
/*-- General stuff. --*/
-#define BZ_VERSION "1.0.4, 20-Dec-2006"
+#define BZ_VERSION "1.0.5, 10-Dec-2007"
typedef char Char;
typedef unsigned char Bool;
@@ -442,11 +442,15 @@
/*-- Macros for decompression. --*/
#define BZ_GET_FAST(cccc) \
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
s->tPos = s->tt[s->tPos]; \
cccc = (UChar)(s->tPos & 0xff); \
s->tPos >>= 8;
#define BZ_GET_FAST_C(cccc) \
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
c_tPos = c_tt[c_tPos]; \
cccc = (UChar)(c_tPos & 0xff); \
c_tPos >>= 8;
@@ -469,8 +473,10 @@
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
#define BZ_GET_SMALL(cccc) \
- cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
- s->tPos = GET_LL(s->tPos);
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+ cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
+ s->tPos = GET_LL(s->tPos);
/*-- externs for decompression. --*/
==== //depot/projects/dtrace/src/contrib/bzip2/compress.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/crctable.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/decompress.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/huffman.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/randtable.c#5 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/spewG.c#5 (text+ko) ====
@@ -13,8 +13,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/contrib/bzip2/unzcrash.c#5 (text+ko) ====
@@ -17,8 +17,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace/src/lib/libarchive/Makefile#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.83 2008/03/21 11:10:20 kaiw Exp $
LIB= archive
DPADD= ${LIBBZ2} ${LIBZ}
@@ -214,6 +214,7 @@
MLINKS+= archive_util.3 archive_format.3
MLINKS+= archive_util.3 archive_format_name.3
MLINKS+= archive_util.3 archive_set_error.3
+MLINKS+= archive_write.3 archive_write_close.3
MLINKS+= archive_write.3 archive_write_data.3
MLINKS+= archive_write.3 archive_write_finish.3
MLINKS+= archive_write.3 archive_write_finish_entry.3
==== //depot/projects/dtrace/src/lib/libfetch/common.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.54 2008/02/08 09:48:48 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.55 2008/03/20 09:55:27 des Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -377,7 +377,7 @@
ssize_t
fetch_read(conn_t *conn, char *buf, size_t len)
{
- struct timeval now, timeout, wait;
+ struct timeval now, timeout, delta;
fd_set readfds;
ssize_t rlen, total;
int r;
@@ -393,19 +393,19 @@
while (fetchTimeout && !FD_ISSET(conn->sd, &readfds)) {
FD_SET(conn->sd, &readfds);
gettimeofday(&now, NULL);
- wait.tv_sec = timeout.tv_sec - now.tv_sec;
- wait.tv_usec = timeout.tv_usec - now.tv_usec;
- if (wait.tv_usec < 0) {
- wait.tv_usec += 1000000;
- wait.tv_sec--;
+ delta.tv_sec = timeout.tv_sec - now.tv_sec;
+ delta.tv_usec = timeout.tv_usec - now.tv_usec;
+ if (delta.tv_usec < 0) {
+ delta.tv_usec += 1000000;
+ delta.tv_sec--;
}
- if (wait.tv_sec < 0) {
+ if (delta.tv_sec < 0) {
errno = ETIMEDOUT;
fetch_syserr();
return (-1);
}
errno = 0;
- r = select(conn->sd + 1, &readfds, NULL, NULL, &wait);
+ r = select(conn->sd + 1, &readfds, NULL, NULL, &delta);
if (r == -1) {
if (errno == EINTR && fetchRestartCalls)
continue;
@@ -503,7 +503,7 @@
ssize_t
fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
{
- struct timeval now, timeout, wait;
+ struct timeval now, timeout, delta;
fd_set writefds;
ssize_t wlen, total;
int r;
@@ -519,19 +519,19 @@
while (fetchTimeout && !FD_ISSET(conn->sd, &writefds)) {
FD_SET(conn->sd, &writefds);
gettimeofday(&now, NULL);
- wait.tv_sec = timeout.tv_sec - now.tv_sec;
- wait.tv_usec = timeout.tv_usec - now.tv_usec;
- if (wait.tv_usec < 0) {
- wait.tv_usec += 1000000;
- wait.tv_sec--;
+ delta.tv_sec = timeout.tv_sec - now.tv_sec;
+ delta.tv_usec = timeout.tv_usec - now.tv_usec;
+ if (delta.tv_usec < 0) {
+ delta.tv_usec += 1000000;
+ delta.tv_sec--;
}
- if (wait.tv_sec < 0) {
+ if (delta.tv_sec < 0) {
errno = ETIMEDOUT;
fetch_syserr();
return (-1);
}
errno = 0;
- r = select(conn->sd + 1, NULL, &writefds, NULL, &wait);
+ r = select(conn->sd + 1, NULL, &writefds, NULL, &delta);
if (r == -1) {
if (errno == EINTR && fetchRestartCalls)
continue;
==== //depot/projects/dtrace/src/lib/libthr/thread/thr_mutexattr.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.7 2007/01/12 07:26:20 imp Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.9 2008/03/20 11:47:08 ru Exp $
*/
/*
@@ -132,8 +132,7 @@
{
int ret;
if (attr == NULL || *attr == NULL || type >= PTHREAD_MUTEX_TYPE_MAX) {
- errno = EINVAL;
- ret = -1;
+ ret = EINVAL;
} else {
(*attr)->m_type = type;
ret = 0;
==== //depot/projects/dtrace/src/lib/libthr/thread/thr_rtld.c#4 (text) ====
@@ -23,7 +23,7 @@
* (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/libthr/thread/thr_rtld.c,v 1.4 2007/11/21 05:21:58 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $
*
*/
@@ -36,6 +36,9 @@
#include "rtld_lock.h"
#include "thr_private.h"
+#undef errno
+extern int errno;
+
#define CACHE_LINE_SIZE 64
#define WAFLAG 0x1
#define RC_INCR 0x2
@@ -88,20 +91,38 @@
free(l->base);
}
+#define SAVE_ERRNO() { \
+ if (curthread != _thr_initial) \
+ errsave = curthread->error; \
+ else \
+ errsave = errno; \
+}
+
+#define RESTORE_ERRNO() { \
+ if (curthread != _thr_initial) \
+ curthread->error = errsave; \
+ else \
+ errno = errsave; \
+}
+
static void
_thr_rtld_rlock_acquire(void *lock)
{
struct pthread *curthread;
struct rtld_lock *l;
long v;
+ int errsave;
curthread = _get_curthread();
+ SAVE_ERRNO();
l = (struct rtld_lock *)lock;
THR_CRITICAL_ENTER(curthread);
atomic_add_acq_int(&l->lock, RC_INCR);
- if (!(l->lock & WAFLAG))
+ if (!(l->lock & WAFLAG)) {
+ RESTORE_ERRNO();
return;
+ }
v = l->rd_cv;
atomic_add_int(&l->rd_waiters, 1);
while (l->lock & WAFLAG) {
@@ -109,6 +130,7 @@
v = l->rd_cv;
}
atomic_add_int(&l->rd_waiters, -1);
+ RESTORE_ERRNO();
}
static void
@@ -117,14 +139,18 @@
struct pthread *curthread;
struct rtld_lock *l;
long v;
+ int errsave;
curthread = _get_curthread();
+ SAVE_ERRNO();
l = (struct rtld_lock *)lock;
_thr_signal_block(curthread);
for (;;) {
- if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG))
+ if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) {
+ RESTORE_ERRNO();
return;
+ }
v = l->wr_cv;
atomic_add_int(&l->wr_waiters, 1);
while (l->lock != 0) {
@@ -140,8 +166,10 @@
{
struct pthread *curthread;
struct rtld_lock *l;
+ int errsave;
curthread = _get_curthread();
+ SAVE_ERRNO();
l = (struct rtld_lock *)lock;
if ((l->lock & WAFLAG) == 0) {
@@ -162,6 +190,7 @@
}
_thr_signal_unblock(curthread);
}
+ RESTORE_ERRNO();
}
static int
@@ -191,6 +220,9 @@
/* force to resolve _umtx_op PLT */
_umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0);
+
+ /* force to resolve errno() PLT */
+ __error();
li.lock_create = _thr_rtld_lock_create;
li.lock_destroy = _thr_rtld_lock_destroy;
==== //depot/projects/dtrace/src/sbin/devd/token.l#4 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list