PERFORCE change 138453 for review
Sam Leffler
sam at FreeBSD.org
Mon Mar 24 18:42:30 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=138453
Change 138453 by sam at sam_ebb on 2008/03/24 18:41:42
IFC @ 138452
Affected files ...
.. //depot/projects/vap/bin/sh/options.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/CHANGES#3 integrate
.. //depot/projects/vap/contrib/bzip2/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/bzip2/FREEBSD-vendor#1 branch
.. //depot/projects/vap/contrib/bzip2/LICENSE#3 integrate
.. //depot/projects/vap/contrib/bzip2/Makefile#3 integrate
.. //depot/projects/vap/contrib/bzip2/Makefile-libbz2_so#3 integrate
.. //depot/projects/vap/contrib/bzip2/README#3 integrate
.. //depot/projects/vap/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate
.. //depot/projects/vap/contrib/bzip2/blocksort.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/bzip2.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/bzip2recover.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/bzlib.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/bzlib.h#3 integrate
.. //depot/projects/vap/contrib/bzip2/bzlib_private.h#3 integrate
.. //depot/projects/vap/contrib/bzip2/compress.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/crctable.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/decompress.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/huffman.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/randtable.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/spewG.c#3 integrate
.. //depot/projects/vap/contrib/bzip2/unzcrash.c#3 integrate
.. //depot/projects/vap/include/pthread.h#3 integrate
.. //depot/projects/vap/include/time.h#3 integrate
.. //depot/projects/vap/lib/libarchive/Makefile#6 integrate
.. //depot/projects/vap/lib/libfetch/common.c#5 integrate
.. //depot/projects/vap/lib/libthr/pthread.map#7 integrate
.. //depot/projects/vap/lib/libthr/thread/Makefile.inc#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/vap/lib/libthr/thread/thr_mutexattr.c#3 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/Makefile#4 integrate
.. //depot/projects/vap/lib/libthread_db/kse.h#1 branch
.. //depot/projects/vap/lib/libthread_db/libc_r_db.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/libpthread_db.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/libthr_db.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/thread_db.c#3 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#4 integrate
.. //depot/projects/vap/sbin/devd/token.l#3 integrate
.. //depot/projects/vap/sbin/dhclient/dhclient.c#7 integrate
.. //depot/projects/vap/sbin/newfs/newfs.8#4 integrate
.. //depot/projects/vap/sbin/route/route.c#3 integrate
.. //depot/projects/vap/share/man/man4/bpf.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/streams.4#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/vap/sys/amd64/amd64/genassym.c#5 integrate
.. //depot/projects/vap/sys/amd64/amd64/nexus.c#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/vap/sys/amd64/include/pcb.h#5 integrate
.. //depot/projects/vap/sys/amd64/isa/atpic.c#7 integrate
.. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA#6 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA.hints#3 integrate
.. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/vap/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate
.. //depot/projects/vap/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/vap/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/vap/sys/conf/NOTES#11 integrate
.. //depot/projects/vap/sys/conf/files#26 integrate
.. //depot/projects/vap/sys/conf/options#16 integrate
.. //depot/projects/vap/sys/dev/aac/aac.c#8 integrate
.. //depot/projects/vap/sys/dev/ata/ata-raid.c#6 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#48 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate
.. //depot/projects/vap/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/vap/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/vap/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/vap/sys/dev/drm/i915_dma.c#5 integrate
.. //depot/projects/vap/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/vap/sys/dev/gem/if_gem.c#8 integrate
.. //depot/projects/vap/sys/dev/gem/if_gem_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/gem/if_gemreg.h#6 integrate
.. //depot/projects/vap/sys/dev/gem/if_gemvar.h#6 integrate
.. //depot/projects/vap/sys/dev/mfi/mfi.c#5 integrate
.. //depot/projects/vap/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/vap/sys/dev/syscons/syscons.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/ehci.c#10 integrate
.. //depot/projects/vap/sys/dev/usb/if_rum.c#13 integrate
.. //depot/projects/vap/sys/dev/usb/ohci.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/vap/sys/dev/usb/usbdi.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/usbdi.h#6 integrate
.. //depot/projects/vap/sys/dev/usb/usbdivar.h#5 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_rule.c#6 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate
.. //depot/projects/vap/sys/geom/geom.h#5 integrate
.. //depot/projects/vap/sys/geom/geom_subr.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/vap/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/vap/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/vap/sys/geom/part/g_part_mbr.c#5 integrate
.. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/vap/sys/i386/i386/nexus.c#7 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/vap/sys/i386/isa/atpic.c#6 integrate
.. //depot/projects/vap/sys/kern/bus_if.m#5 integrate
.. //depot/projects/vap/sys/kern/kern_exit.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_fork.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_switch.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_timeout.c#8 integrate
.. //depot/projects/vap/sys/kern/sched_4bsd.c#10 integrate
.. //depot/projects/vap/sys/kern/sched_ule.c#11 integrate
.. //depot/projects/vap/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/vap/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_bio.c#11 integrate
.. //depot/projects/vap/sys/kern/vfs_cluster.c#6 integrate
.. //depot/projects/vap/sys/kern/vfs_default.c#10 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#12 integrate
.. //depot/projects/vap/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/vap/sys/net/bpf.c#9 integrate
.. //depot/projects/vap/sys/net/bpf.h#6 integrate
.. //depot/projects/vap/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/vap/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/vap/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/vap/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/vap/sys/net/bpfdesc.h#5 integrate
.. //depot/projects/vap/sys/net/if_ethersubr.c#7 integrate
.. //depot/projects/vap/sys/net/if_gre.c#6 integrate
.. //depot/projects/vap/sys/netgraph/ng_tee.c#6 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.c#9 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/vap/sys/netipsec/key.c#7 integrate
.. //depot/projects/vap/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#9 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_subs.c#10 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_serv.c#8 integrate
.. //depot/projects/vap/sys/pci/if_rlreg.h#8 integrate
.. //depot/projects/vap/sys/pci/if_xl.c#6 integrate
.. //depot/projects/vap/sys/pci/if_xlreg.h#6 integrate
.. //depot/projects/vap/sys/sparc64/include/bus.h#6 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/bus_machdep.c#5 integrate
.. //depot/projects/vap/sys/sys/aac_ioctl.h#3 integrate
.. //depot/projects/vap/sys/sys/buf.h#11 integrate
.. //depot/projects/vap/sys/sys/bufobj.h#7 integrate
.. //depot/projects/vap/sys/sys/bus.h#8 integrate
.. //depot/projects/vap/sys/sys/param.h#13 integrate
.. //depot/projects/vap/sys/sys/proc.h#12 integrate
.. //depot/projects/vap/sys/sys/runq.h#5 integrate
.. //depot/projects/vap/sys/sys/sched.h#8 integrate
.. //depot/projects/vap/sys/sys/sysctl.h#7 integrate
.. //depot/projects/vap/sys/sys/vnode.h#9 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#6 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_rawread.c#8 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#10 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#10 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#10 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/vap/sys/vm/vm_page.c#8 integrate
.. //depot/projects/vap/sys/vm/vm_page.h#6 integrate
.. //depot/projects/vap/sys/vm/vm_pageout.c#6 integrate
.. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate
.. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts1.0#1 branch
.. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch
.. //depot/projects/vap/tools/tools/README#3 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#6 integrate
.. //depot/projects/vap/tools/tools/tinybsd/tinybsd#4 integrate
.. //depot/projects/vap/tools/tools/track/Makefile#1 branch
.. //depot/projects/vap/tools/tools/track/track.sh#1 branch
.. //depot/projects/vap/usr.bin/ktrace/ktrace.c#3 integrate
.. //depot/projects/vap/usr.bin/make/for.c#3 integrate
.. //depot/projects/vap/usr.bin/make/make.1#5 integrate
.. //depot/projects/vap/usr.bin/netstat/bpf.c#4 integrate
.. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
Differences ...
==== //depot/projects/vap/bin/sh/options.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
#include <signal.h>
#include <unistd.h>
@@ -383,7 +383,7 @@
}
ap2 = shellparam.p;
while ((*ap2++ = *ap1++) != NULL);
- shellparam.optnext = NULL;
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -405,6 +405,7 @@
if (*argptr != NULL) {
setparam(argptr);
}
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -414,7 +415,6 @@
getoptsreset(const char *value)
{
if (number(value) == 1) {
- shellparam.optnext = NULL;
shellparam.reset = 1;
}
}
==== //depot/projects/vap/contrib/bzip2/CHANGES#3 (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/vap/contrib/bzip2/FREEBSD-upgrade#3 (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/vap/contrib/bzip2/LICENSE#3 (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/vap/contrib/bzip2/Makefile#3 (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/vap/contrib/bzip2/Makefile-libbz2_so#3 (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/vap/contrib/bzip2/README#3 (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/vap/contrib/bzip2/README.COMPILATION.PROBLEMS#3 (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/vap/contrib/bzip2/blocksort.c#3 (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/vap/contrib/bzip2/bzip2.c#3 (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/vap/contrib/bzip2/bzip2recover.c#3 (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/vap/contrib/bzip2/bzlib.c#3 (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/vap/contrib/bzip2/bzlib.h#3 (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/vap/contrib/bzip2/bzlib_private.h#3 (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/vap/contrib/bzip2/compress.c#3 (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/vap/contrib/bzip2/crctable.c#3 (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/vap/contrib/bzip2/decompress.c#3 (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/vap/contrib/bzip2/huffman.c#3 (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/vap/contrib/bzip2/randtable.c#3 (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/vap/contrib/bzip2/spewG.c#3 (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/vap/contrib/bzip2/unzcrash.c#3 (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/vap/include/pthread.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread.h,v 1.41 2007/10/29 21:01:47 kris Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $
*/
#ifndef _PTHREAD_H_
#define _PTHREAD_H_
@@ -185,6 +185,7 @@
int pthread_equal(pthread_t, pthread_t);
void pthread_exit(void *) __dead2;
void *pthread_getspecific(pthread_key_t);
+int pthread_getcpuclockid(pthread_t, clockid_t *);
int pthread_join(pthread_t, void **);
int pthread_key_create(pthread_key_t *,
void (*) (void *));
==== //depot/projects/vap/include/time.h#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
/*
- * $FreeBSD: src/include/time.h,v 1.34 2006/04/15 03:08:55 jb Exp $
+ * $FreeBSD: src/include/time.h,v 1.35 2008/03/22 09:59:20 davidxu Exp $
*/
#ifndef _TIME_H_
@@ -108,6 +108,7 @@
#define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */
#define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */
#define CLOCK_SECOND 13 /* FreeBSD-specific. */
+#define CLOCK_THREAD_CPUTIME_ID 14
#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112
==== //depot/projects/vap/lib/libarchive/Makefile#6 (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/vap/lib/libfetch/common.c#5 (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/vap/lib/libthr/pthread.map#7 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libthr/pthread.map,v 1.28 2008/03/05 06:56:35 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/pthread.map,v 1.29 2008/03/22 09:59:20 davidxu Exp $
*/
/*
@@ -271,6 +271,7 @@
_pthread_exit;
_pthread_getaffinity_np;
_pthread_getconcurrency;
+ _pthread_getcpuclockid;
_pthread_getprio;
_pthread_getschedparam;
_pthread_getspecific;
@@ -395,6 +396,7 @@
pthread_attr_getaffinity_np;
pthread_attr_setaffinity_np;
pthread_getaffinity_np;
+ pthread_getcpuclockid;
pthread_setaffinity_np;
pthread_mutex_getspinloops_np;
pthread_mutex_getyieldloops_np;
==== //depot/projects/vap/lib/libthr/thread/Makefile.inc#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.17 2008/03/03 09:16:29 davidxu Exp $
+# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.18 2008/03/22 09:59:20 davidxu Exp $
# thr sources
.PATH: ${.CURDIR}/thread
@@ -20,6 +20,7 @@
thr_exit.c \
thr_fork.c \
thr_getprio.c \
+ thr_getcpuclockid.c \
thr_getschedparam.c \
thr_info.c \
thr_init.c \
==== //depot/projects/vap/lib/libthr/thread/thr_mutexattr.c#3 (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/vap/lib/libthr/thread/thr_rtld.c#3 (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/vap/lib/libthread_db/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthread_db/Makefile,v 1.11 2008/03/12 09:49:39 jeff Exp $
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.12 2008/03/23 09:38:11 jeff Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
@@ -6,6 +6,7 @@
SHLIB_MAJOR= 3
SRCS= thread_db.c
SRCS+= libpthread_md.c
+SRCS+= libpthread_db.c
SRCS+= libthr_db.c
INCS= thread_db.h
WARNS?= 1
==== //depot/projects/vap/lib/libthread_db/libc_r_db.c#3 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list