diff --git a/external/bsd/bzip2/dist/CHANGES b/external/bsd/bzip2/dist/CHANGES index 6e4f65e2e0a6..81e97ca6fa25 100644 --- a/external/bsd/bzip2/dist/CHANGES +++ b/external/bsd/bzip2/dist/CHANGES @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -317,3 +317,11 @@ Fixes some minor bugs since the last version, 1.0.3. ~~~~~~~~~~~~~~~~~ Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + +1.0.6 (6 Sept 10) +~~~~~~~~~~~~~~~~~ + +* Security fix for CVE-2010-0405. This was reported by Mikolaj + Izdebski. + +* Make the documentation build on Ubuntu 10.04 diff --git a/external/bsd/bzip2/dist/LICENSE b/external/bsd/bzip2/dist/LICENSE index f420cffb67dc..cc614178cf79 100644 --- a/external/bsd/bzip2/dist/LICENSE +++ b/external/bsd/bzip2/dist/LICENSE @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2007 Julian R Seward. All +documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,6 +37,6 @@ 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, jseward@bzip.org -bzip2/libbzip2 version 1.0.5 of 10 December 2007 +bzip2/libbzip2 version 1.0.6 of 6 September 2010 -------------------------------------------------------------------------- diff --git a/external/bsd/bzip2/dist/Makefile b/external/bsd/bzip2/dist/Makefile index eb09753ce101..9754ddf286b1 100644 --- a/external/bsd/bzip2/dist/Makefile +++ b/external/bsd/bzip2/dist/Makefile @@ -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.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ bzip2recover.o: bzip2recover.c distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.5 +DISTNAME=bzip2-1.0.6 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) diff --git a/external/bsd/bzip2/dist/Makefile-libbz2_so b/external/bsd/bzip2/dist/Makefile-libbz2_so index 9a13c77e4873..e58791b3b337 100644 --- a/external/bsd/bzip2/dist/Makefile-libbz2_so +++ b/external/bsd/bzip2/dist/Makefile-libbz2_so @@ -1,6 +1,6 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.4, with soname libbz2.so.1.0, +# libbz2.so.1.0.6, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). # Please see the README file for some important info @@ -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.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -35,13 +35,13 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c diff --git a/external/bsd/bzip2/dist/README b/external/bsd/bzip2/dist/README index e17a84e049f4..9fb0f636013a 100644 --- a/external/bsd/bzip2/dist/README +++ b/external/bsd/bzip2/dist/README @@ -6,8 +6,8 @@ This version is fully compatible with the previous public releases. This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -181,6 +181,10 @@ WHAT'S NEW IN 1.0.5 ? See the CHANGES file. +WHAT'S NEW IN 1.0.6 ? + + See the CHANGES file. + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org @@ -208,3 +212,4 @@ Cambridge, UK. 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) 10 December 2007 (bzip2, version 1.0.5) + 6 Sept 2010 (bzip2, version 1.0.6) diff --git a/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS b/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS index 22b95c6cb668..667d0d6dfe4d 100644 --- a/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS +++ b/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS @@ -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.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ This program is released under the terms of the license contained in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.5 should compile without problems on the vast majority of +bzip2-1.0.6 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 diff --git a/external/bsd/bzip2/dist/README.XML.STUFF b/external/bsd/bzip2/dist/README.XML.STUFF index 1a5b4c55a5a1..3a57f3fa89cf 100644 --- a/external/bsd/bzip2/dist/README.XML.STUFF +++ b/external/bsd/bzip2/dist/README.XML.STUFF @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/blocksort.c b/external/bsd/bzip2/dist/blocksort.c index 4048ecfdb1a7..e739bacee214 100644 --- a/external/bsd/bzip2/dist/blocksort.c +++ b/external/bsd/bzip2/dist/blocksort.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocksort.c,v 1.1.1.1 2012/05/07 00:21:45 wiz Exp $ */ +/* $NetBSD: blocksort.c,v 1.1.1.2 2012/05/07 00:41:45 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/bzlib.h b/external/bsd/bzip2/dist/bzlib.h index 2a4f043c8019..03f81563631d 100644 --- a/external/bsd/bzip2/dist/bzlib.h +++ b/external/bsd/bzip2/dist/bzlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: bzlib.h,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: bzlib.h,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/compress.c b/external/bsd/bzip2/dist/compress.c index 96c2663a8827..c3b862c0df30 100644 --- a/external/bsd/bzip2/dist/compress.c +++ b/external/bsd/bzip2/dist/compress.c @@ -1,4 +1,4 @@ -/* $NetBSD: compress.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: compress.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/crctable.c b/external/bsd/bzip2/dist/crctable.c index 490eadb6db30..fcdb0ce17d73 100644 --- a/external/bsd/bzip2/dist/crctable.c +++ b/external/bsd/bzip2/dist/crctable.c @@ -1,4 +1,4 @@ -/* $NetBSD: crctable.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: crctable.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/entities.xml b/external/bsd/bzip2/dist/entities.xml index e9e0553b7dbe..4b28f3465917 100644 --- a/external/bsd/bzip2/dist/entities.xml +++ b/external/bsd/bzip2/dist/entities.xml @@ -1,9 +1,9 @@ - + - - + + diff --git a/external/bsd/bzip2/dist/format.pl b/external/bsd/bzip2/dist/format.pl index 1928d157398c..f169fd9de2c5 100755 --- a/external/bsd/bzip2/dist/format.pl +++ b/external/bsd/bzip2/dist/format.pl @@ -4,8 +4,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. diff --git a/external/bsd/bzip2/dist/huffman.c b/external/bsd/bzip2/dist/huffman.c index e60a275ad02d..2614878c36bb 100644 --- a/external/bsd/bzip2/dist/huffman.c +++ b/external/bsd/bzip2/dist/huffman.c @@ -1,4 +1,4 @@ -/* $NetBSD: huffman.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: huffman.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/manual.html b/external/bsd/bzip2/dist/manual.html index bd9eac85914e..f59427f7f07d 100644 --- a/external/bsd/bzip2/dist/manual.html +++ b/external/bsd/bzip2/dist/manual.html @@ -1,8 +1,8 @@ -bzip2 and libbzip2, version 1.0.5 - +bzip2 and libbzip2, version 1.0.6 + -
+

-bzip2 and libbzip2, version 1.0.5

+bzip2 and libbzip2, version 1.0.6

A program and library for data compression

@@ -91,29 +91,29 @@ div.literallayout, pre.programlisting, pre.screen {

http://www.bzip.org
-

Version 1.0.5 of 10 December 2007

-

Copyright © 1996-2007 Julian Seward

-
-

This program, bzip2, the +

Version 1.0.6 of 6 September 2010

+

Copyright © 1996-2010 Julian Seward

+
+

This program, bzip2, the associated library libbzip2, and - all documentation, are copyright © 1996-2007 Julian Seward. + all documentation, are copyright © 1996-2010 Julian Seward. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-
-
+

1. Introduction

bzip2 compresses files @@ -228,19 +228,19 @@ describes both how to use the program and how to work with the library interface. Most of the manual is devoted to this library, not the program, which is good news if your interest is only in the program.

-
-
+

2. How to use bzip2

@@ -260,34 +260,34 @@ only in the program.

This chapter contains a copy of the bzip2 man page, and nothing else.

-
+

2.1. NAME

-
    -

  • bzip2, +

      +

    • bzip2, bunzip2 - a block-sorting file - compressor, v1.0.4

      • -

    • bzcat - + compressor, v1.0.6

      • +

    • bzcat - decompresses files to stdout

      • -

    • bzip2recover - +

    • bzip2recover - recovers data from damaged bzip2 files

-
+

2.2. SYNOPSIS

-
    -

  • bzip2 [ +

      +

    • bzip2 [ -cdfkqstvzVL123456789 ] [ filenames ... ]

      • -

    • bunzip2 [ +

    • bunzip2 [ -fkvsVL ] [ filenames ... ]

      • -

    • bzcat [ -s ] [ +

    • bzcat [ -s ] [ filenames ... ]

      • -

    • bzip2recover +

    • bzip2recover filename

-
+

2.3. DESCRIPTION

bzip2 compresses files @@ -329,20 +329,20 @@ ignored, and a warning issued. bzip2 attempts to guess the filename for the decompressed file from that of the compressed file as follows:

-
    -

  • filename.bz2 +

      +

    • filename.bz2 becomes filename

      • -

    • filename.bz +

    • filename.bz becomes filename

      • -

    • filename.tbz2 +

    • filename.tbz2 becomes filename.tar

      • -

    • filename.tbz +

    • filename.tbz becomes filename.tar

      • -

    • anyothername +

    • anyothername becomes anyothername.out

    @@ -407,7 +407,7 @@ to indicate a corrupt compressed file, 3 for an internal consistency error (eg, bug) which caused bzip2 to panic.

-
+

2.4. OPTIONS

@@ -458,7 +458,7 @@ consistency error (eg, bug) which caused the same figure, at the expense of your compression ratio. In short, if your machine is low on memory (8 megabytes or less), use -s for everything. See - MEMORY MANAGEMENT below.

+ MEMORY MANAGEMENT below.

-q --quiet

Suppress non-essential warning messages. @@ -478,7 +478,7 @@ consistency error (eg, bug) which caused -9 (or -best)

Set the block size to 100 k, 200 k ... 900 k - when compressing. Has no effect when decompressing. See MEMORY MANAGEMENT below. The + when compressing. Has no effect when decompressing. See MEMORY MANAGEMENT below. The --fast and --best aliases are primarily for GNU gzip compatibility. @@ -502,7 +502,7 @@ consistency error (eg, bug) which caused renders these flags irrelevant.

-
+

2.5. MEMORY MANAGEMENT

bzip2 compresses large @@ -574,7 +574,7 @@ Flag usage usage -s usage Size -8 6800k 3300k 2100k 828642 -9 7600k 3700k 2350k 828642

-
+

2.6. RECOVERING DATA FROM DAMAGED FILES

bzip2 compresses files in @@ -612,7 +612,7 @@ cannot be recovered. If you wish to minimise any potential data loss through media or transmission errors, you might consider compressing with a smaller block size.

-
+

2.7. PERFORMANCE NOTES

The sorting phase of compression gathers together similar @@ -638,14 +638,14 @@ performance improvements. I imagine bzip2 will perform best on machines with very large caches.

-
+

2.8. CAVEATS

I/O error messages are not as helpful as they could be. bzip2 tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading.

-

This manual page pertains to version 1.0.5 of +

This manual page pertains to version 1.0.6 of bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions 0.1pl2, 0.9.0 and 0.9.5, 1.0.0, @@ -665,7 +665,7 @@ build yourself an unlimited version if you can recompile it with MaybeUInt64 set to be an unsigned 64-bit integer.

-
+

2.9. AUTHOR

Julian Seward, @@ -690,7 +690,7 @@ patches, helped with portability problems, lent machines, gave advice and were generally helpful.

-
+

3.  Programming with libbzip2 @@ -707,34 +707,34 @@ Programming with libbzip2
3.2. Error handling
3.3. Low-level interface
-
3.3.1. BZ2_bzCompressInit
-
3.3.2. BZ2_bzCompress
-
3.3.3. BZ2_bzCompressEnd
-
3.3.4. BZ2_bzDecompressInit
-
3.3.5. BZ2_bzDecompress
-
3.3.6. BZ2_bzDecompressEnd
+
3.3.1. BZ2_bzCompressInit
+
3.3.2. BZ2_bzCompress
+
3.3.3. BZ2_bzCompressEnd
+
3.3.4. BZ2_bzDecompressInit
+
3.3.5. BZ2_bzDecompress
+
3.3.6. BZ2_bzDecompressEnd
3.4. High-level interface
-
3.4.1. BZ2_bzReadOpen
-
3.4.2. BZ2_bzRead
-
3.4.3. BZ2_bzReadGetUnused
-
3.4.4. BZ2_bzReadClose
-
3.4.5. BZ2_bzWriteOpen
-
3.4.6. BZ2_bzWrite
-
3.4.7. BZ2_bzWriteClose
+
3.4.1. BZ2_bzReadOpen
+
3.4.2. BZ2_bzRead
+
3.4.3. BZ2_bzReadGetUnused
+
3.4.4. BZ2_bzReadClose
+
3.4.5. BZ2_bzWriteOpen
+
3.4.6. BZ2_bzWrite
+
3.4.7. BZ2_bzWriteClose
3.4.8. Handling embedded compressed data streams
3.4.9. Standard file-reading/writing code
3.5. Utility functions
-
3.5.1. BZ2_bzBuffToBuffCompress
-
3.5.2. BZ2_bzBuffToBuffDecompress
+
3.5.1. BZ2_bzBuffToBuffCompress
+
3.5.2. BZ2_bzBuffToBuffDecompress
-
3.6. zlib compatibility functions
-
3.7. Using the library in a stdio-free environment
+
3.6. zlib compatibility functions
+
3.7. Using the library in a stdio-free environment
-
3.7.1. Getting rid of stdio
+
3.7.1. Getting rid of stdio
3.7.2. Critical error handling
3.8. Making a Windows DLL
@@ -744,8 +744,8 @@ Programming with libbzip2 libbzip2.

For general background information, particularly about memory use and performance aspects, you'd be well advised to read -How to use bzip2 as well.

-
+How to use bzip2 as well.

+

3.1. Top-level structure

libbzip2 is a flexible @@ -765,7 +765,7 @@ library clients.

To use any part of the library, you need to #include <bzlib.h> into your sources.

-
+

3.1.1. Low-level summary

This interface provides services for compressing and @@ -800,7 +800,7 @@ to these functions. This is a flexible mechanism allowing a consumer-pull style of activity, or producer-push, or a mixture of both.

-
+

3.1.2. High-level summary

This interface provides some handy wrappers around the @@ -839,7 +839,7 @@ respectively. That avoids portability problems associated with file operations and file attributes, whilst not being much of an imposition on the programmer.

-
+

3.1.3. Utility functions summary

For very simple needs, @@ -871,7 +871,7 @@ I hope to document them properly when time permits.

library to be built as a Windows DLL.

-
+

3.2. Error handling

The library is designed to recover cleanly in all @@ -1008,12 +1008,12 @@ kind.

buffer provided.

-
+

3.3. Low-level interface

-
+

-3.3.1. BZ2_bzCompressInit

+3.3.1. BZ2_bzCompressInit

typedef struct {
   char *next_in;
   unsigned int avail_in;
@@ -1137,9 +1137,9 @@ BZ_OK
   if BZ_OK is returned
   no specific action needed in case of error
-
+

-3.3.2. BZ2_bzCompress

+3.3.2. BZ2_bzCompress
int BZ2_bzCompress ( bz_stream *strm, int action );

Provides more input and/or output buffer space for the library. The caller maintains input and output buffers, and @@ -1296,20 +1296,20 @@ FINISHING/other Return value = BZ_SEQUENCE_ERROR

That still looks complicated? Well, fair enough. The usual sequence of calls for compressing a load of data is:

-
    -

  1. Get started with +

      +

    1. Get started with BZ2_bzCompressInit.

      2. -

    2. Shovel data in and shlurp out its compressed form +

    3. Shovel data in and shlurp out its compressed form using zero or more calls of BZ2_bzCompress with action = BZ_RUN.

      4. -

    4. Finish up. Repeatedly call +

    5. Finish up. Repeatedly call BZ2_bzCompress with action = BZ_FINISH, copying out the compressed output, until BZ_STREAM_END is returned.

      6. -

    6. Close up and go home. Call +

    7. Close up and go home. Call BZ2_bzCompressEnd.

    If the data you want to compress fits into your input @@ -1329,9 +1329,9 @@ a bug in your programming.

    BZ_PARAM_ERROR
   if strm is NULL, or strm->s is NULL
-
+

-3.3.3. BZ2_bzCompressEnd

+3.3.3. BZ2_bzCompressEnd
int BZ2_bzCompressEnd ( bz_stream *strm );

Releases all memory associated with a compression stream.

@@ -1339,9 +1339,9 @@ stream.

BZ_PARAM_ERROR  if strm is NULL or strm->s is NULL
 BZ_OK           otherwise
-
+

-3.3.4. BZ2_bzDecompressInit

+3.3.4. BZ2_bzDecompressInit
int BZ2_bzDecompressInit ( bz_stream *strm, int verbosity, int small );

Prepares for decompression. As with BZ2_bzCompressInit, a @@ -1364,7 +1364,7 @@ internal state will have been initialised, and library will use an alternative decompression algorithm which uses less memory but at the cost of decompressing more slowly (roughly speaking, half the speed, but the maximum memory -requirement drops to around 2300k). See How to use bzip2 +requirement drops to around 2300k). See How to use bzip2 for more information on memory management.

Note that the amount of memory needed to decompress a stream cannot be determined until the stream's header has been @@ -1386,9 +1386,9 @@ BZ_MEM_ERROR if BZ_OK was returned no specific action required in case of error

-
+

-3.3.5. BZ2_bzDecompress

+3.3.5. BZ2_bzDecompress
int BZ2_bzDecompress ( bz_stream *strm );

Provides more input and/out output buffer space for the library. The caller maintains input and output buffers, and uses @@ -1461,9 +1461,9 @@ BZ_OK BZ2_bzDecompressEnd otherwise

-
+

-3.3.6. BZ2_bzDecompressEnd

+3.3.6. BZ2_bzDecompressEnd
int BZ2_bzDecompressEnd ( bz_stream *strm );

Releases all memory associated with a decompression stream.

@@ -1476,14 +1476,14 @@ BZ_OK 
  None.
-
+

3.4. High-level interface

This interface provides functions for reading and writing bzip2 format files. First, some general points.

-
    -

  • All of the functions take an +

      +

    • All of the functions take an int* first argument, bzerror. After each call, bzerror should be consulted @@ -1500,7 +1500,7 @@ general points.

      of the difficulty. bzerror may also be set to various other values; precise details are given on a per-function basis below.

      • -

    • If bzerror indicates +

    • If bzerror indicates an error (ie, anything except BZ_OK and BZ_STREAM_END), you should @@ -1519,22 +1519,22 @@ general points.

      BZ2_bzReadClose (BZ2_bzWriteClose) should then be called to clean up.

      • -

    • The FILE* arguments +

    • The FILE* arguments passed to BZ2_bzReadOpen / BZ2_bzWriteOpen should be set to binary mode. Most Unix systems will do this by default, but other platforms, including Windows and Mac, will not. If you omit this, you may encounter problems when moving code to new platforms.

      • -

    • Memory allocation requests are handled by +

    • Memory allocation requests are handled by malloc / free. At present there is no facility for user-defined memory allocators in the file I/O functions (could easily be added, though).

    -
    +

    -3.4.1. BZ2_bzReadOpen

    +3.4.1. BZ2_bzReadOpen
typedef void BZFILE;
 
 BZFILE *BZ2_bzReadOpen( int *bzerror, FILE *f, 
@@ -1594,9 +1594,9 @@ NULL
 BZ2_bzClose
   otherwise
-
+

-3.4.2. BZ2_bzRead

+3.4.2. BZ2_bzRead
int BZ2_bzRead ( int *bzerror, BZFILE *b, void *buf, int len );

Reads up to len (uncompressed) bytes from the compressed file @@ -1668,9 +1668,9 @@ collect data from buf, then BZ2_bzReadClose or BZ2_bzReadGetUnused BZ2_bzReadClose otherwise

-
+

-3.4.3. BZ2_bzReadGetUnused

+3.4.3. BZ2_bzReadGetUnused
void BZ2_bzReadGetUnused( int* bzerror, BZFILE *b, 
                           void** unused, int* nUnused );

Returns data which was read from the compressed file but @@ -1697,9 +1697,9 @@ BZ_OK

Allowable next actions:

BZ2_bzReadClose
-
+

-3.4.4. BZ2_bzReadClose

+3.4.4. BZ2_bzReadClose
void BZ2_bzReadClose ( int *bzerror, BZFILE *b );

Releases all memory pertaining to the compressed file b. @@ -1717,9 +1717,9 @@ BZ_OK

Allowable next actions:

none
-
+

-3.4.5. BZ2_bzWriteOpen

+3.4.5. BZ2_bzWriteOpen
BZFILE *BZ2_bzWriteOpen( int *bzerror, FILE *f, 
                          int blockSize100k, int verbosity,
                          int workFactor );
@@ -1763,9 +1763,9 @@ NULL BZ2_bzWriteClose otherwise
-
+

-3.4.6. BZ2_bzWrite

+3.4.6. BZ2_bzWrite
void BZ2_bzWrite ( int *bzerror, BZFILE *b, void *buf, int len );

Absorbs len bytes from the buffer buf, eventually to be @@ -1781,9 +1781,9 @@ BZ_IO_ERROR BZ_OK otherwise

-
+

-3.4.7. BZ2_bzWriteClose

+3.4.7. BZ2_bzWriteClose
void BZ2_bzWriteClose( int *bzerror, BZFILE* f,
                        int abandon,
                        unsigned int* nbytes_in,
@@ -1833,20 +1833,20 @@ BZ_IO_ERROR
 BZ_OK
   otherwise
-
+

3.4.8. Handling embedded compressed data streams

The high-level library facilitates use of bzip2 data streams which form some part of a surrounding, larger data stream.

-
    -

  • For writing, the library takes an open file handle, +

      +

    • For writing, the library takes an open file handle, writes compressed data to it, fflushes it but does not fclose it. The calling application can write its own data before and after the compressed data stream, using that same file handle.

      • -

    • Reading is more complex, and the facilities are not as +

    • Reading is more complex, and the facilities are not as general as they could be since generality is hard to reconcile with efficiency. BZ2_bzRead reads from the compressed file in blocks of size @@ -1882,7 +1882,7 @@ can be used. If you require extra flexibility, you'll have to bite the bullet and get to grips with the low-level interface.

    -
    +

    3.4.9. Standard file-reading/writing code

    Here's how you'd write data to a compressed file:

    @@ -1949,12 +1949,12 @@ if ( bzerror != BZ_STREAM_END ) { }
    -
    +

    3.5. Utility functions

    -
    +

    -3.5.1. BZ2_bzBuffToBuffCompress

    +3.5.1. BZ2_bzBuffToBuffCompress
    int BZ2_bzBuffToBuffCompress( char*         dest,
                               unsigned int* destLen,
                               char*         source,
@@ -2005,9 +2005,9 @@ BZ_OUTBUFF_FULL
 BZ_OK
   otherwise
    -
    +

    -3.5.2. BZ2_bzBuffToBuffDecompress

    +3.5.2. BZ2_bzBuffToBuffDecompress
int BZ2_bzBuffToBuffDecompress( char*         dest,
                                 unsigned int* destLen,
                                 char*         source,
@@ -2065,9 +2065,9 @@ BZ_OK
   otherwise
-
+

-3.6. zlib compatibility functions

+3.6. zlib compatibility functions

Yoshioka Tsuneo has contributed some functions to give better zlib compatibility. These functions are BZ2_bzopen, @@ -2108,12 +2108,12 @@ and fclose.

*errnum to its numerical value.

-
+

-3.7. Using the library in a stdio-free environment

-
+3.7. Using the library in a stdio-free environment
+

-3.7.1. Getting rid of stdio

+3.7.1. Getting rid of stdio

In a deeply embedded application, you might want to use just the memory-to-memory functions. You can do this conveniently by compiling the library with preprocessor symbol @@ -2131,7 +2131,7 @@ functions:

When compiled like this, all functions will ignore verbosity settings.

-
+

3.7.2. Critical error handling

libbzip2 contains a number @@ -2143,13 +2143,13 @@ behaviour depends on whether or not the library was compiled with message:

bzip2/libbzip2: internal error number N.

-

This is a bug in bzip2/libbzip2, 1.0.5 of 10 December 2007. +

This is a bug in bzip2/libbzip2, 1.0.6 of 6 September 2010. Please report it to me at: jseward@bzip.org. If this happened when you were using some program which uses libbzip2 as a component, you should also report this bug to the author(s) of that program. Please make an effort to report this bug; timely and accurate bug reports eventually lead to higher -quality software. Thanks. Julian Seward, 10 December 2007. +quality software. Thanks. Julian Seward, 6 September 2010.

where N is some error code @@ -2176,7 +2176,7 @@ are indicated via error return codes from functions, and can be recovered from.

-
+

3.8. Making a Windows DLL

Everything related to Windows has been contributed by @@ -2218,7 +2218,7 @@ Otherwise the resulting binary won't work correctly.

plausible.

-
+

4. Miscellanea

@@ -2233,7 +2233,7 @@ plausible.

These are just some random thoughts of mine. Your mileage may vary.

-
+

4.1. Limitations of the compressed file format

bzip2-1.0.X, @@ -2250,15 +2250,15 @@ work since the release of shown complexities in the file format which slow down decompression and, in retrospect, are unnecessary. These are:

-
    -

  • The run-length encoder, which is the first of the +

      +

    • The run-length encoder, which is the first of the compression transformations, is entirely irrelevant. The original purpose was to protect the sorting algorithm from the very worst case input: a string of repeated symbols. But algorithm steps Q6a and Q6b in the original Burrows-Wheeler technical report (SRC-124) show how repeats can be handled without difficulty in block sorting.

      • -
    • +

    • The randomisation mechanism doesn't really need to be there. Udi Manber and Gene Myers published a suffix array construction algorithm a few years back, which can be employed @@ -2281,7 +2281,7 @@ are:

      algorithm if the standard algorithm gets into difficulties.

      • -

    • The compressed file format was never designed to be +

    • The compressed file format was never designed to be handled by a library, and I have had to jump though some hoops to produce an efficient implementation of decompression. It's a bit hairy. Try passing @@ -2289,7 +2289,7 @@ are:

      preprocessor and you'll see what I mean. Much of this complexity could have been avoided if the compressed size of each block of data was recorded in the data stream.

      • -

    • An Adler-32 checksum, rather than a CRC32 checksum, +

    • An Adler-32 checksum, rather than a CRC32 checksum, would be faster to compute.

    It would be fair to say that the @@ -2298,14 +2298,14 @@ properly and fully understood the performance consequences of doing so.

    Improvements which I was able to incorporate into 0.9.0, despite using the same file format, are:

    -
      -

    • Single array implementation of the inverse BWT. This +

        +

      • Single array implementation of the inverse BWT. This significantly speeds up decompression, presumably because it reduces the number of cache misses.

        • -

      • Faster inverse MTF transform for large MTF values. +

      • Faster inverse MTF transform for large MTF values. The new implementation is based on the notion of sliding blocks of values.

        • -

      • bzip2-0.9.0 now reads +

      • bzip2-0.9.0 now reads and writes files with fread and fwrite; version 0.1 used putc and @@ -2316,7 +2316,7 @@ despite using the same file format, are:

        access into files. This will require some careful design of compressed file formats.

      -
      +

      4.2. Portability issues

      After some consideration, I have decided not to use GNU @@ -2366,7 +2366,7 @@ and BZ_LCCWIN32 to 1, in the file bzip2.c, before compiling. Otherwise the resulting binary won't work correctly.

      -
      +

      4.3. Reporting bugs

      I tried pretty hard to make sure @@ -2379,8 +2379,8 @@ failure, it will ask you to email me a bug report. Experience from years of feedback of bzip2 users indicates that almost all these problems can be traced to either compiler bugs or hardware problems.

      -
        -
      • +
          +

        • Recompile the program with no optimisation, and see if it works. And/or try a different compiler. I heard all sorts of stories about various flavours of GNU C (and other @@ -2400,7 +2400,7 @@ problems.

          a pretty good (but not 100%) indication that the compiler has done its job correctly.

          • -
        • +

        • If bzip2 crashes randomly, and the crashes are not repeatable, you may have a flaky memory subsystem. @@ -2411,7 +2411,7 @@ problems.

          Try using a different machine of the same type, and see if you can repeat the problem.

          • -

        • This isn't really a bug, but ... If +

        • This isn't really a bug, but ... If bzip2 tells you your file is corrupted on decompression, and you obtained the file via FTP, there is a possibility that you forgot to tell FTP to do a @@ -2447,7 +2447,7 @@ is the file that you were trying to compress or decompress at the time the problem happened. Without that, my ability to do anything more than speculate about the cause, is limited.

        -
        +

        4.4. Did you get the right package?

        bzip2 is a resource hog. @@ -2464,15 +2464,15 @@ uses less memory but gets pretty good compression, and has minimal latency, consider Jean-loup Gailly's and Mark Adler's work, zlib-1.2.1 and gzip-1.2.4. Look for them at -http://www.zlib.org and -http://www.gzip.org +http://www.zlib.org and +http://www.gzip.org respectively.

        For something faster and lighter still, you might try Markus F X J Oberhumer's LZO real-time compression/decompression library, at -http://www.oberhumer.com/opensource.

        +http://www.oberhumer.com/opensource.

        -
        +

        4.5. Further Reading

        bzip2 is not research diff --git a/external/bsd/bzip2/dist/manual.xml b/external/bsd/bzip2/dist/manual.xml index f22413602491..a7fbcb337527 100644 --- a/external/bsd/bzip2/dist/manual.xml +++ b/external/bsd/bzip2/dist/manual.xml @@ -9,7 +9,7 @@ - bzip2 and libbzip2, version 1.0.5 + bzip2 and libbzip2, version 1.0.6 A program and library for data compression &bz-lifespan; @@ -139,7 +139,7 @@ else. bzip2, bunzip2 - a block-sorting file - compressor, v1.0.4 + compressor, v1.0.6 bzcat - decompresses files to stdout @@ -1033,7 +1033,7 @@ kind. -<computeroutput>BZ2_bzCompressInit</computeroutput> +BZ2_bzCompressInit typedef struct { @@ -1183,7 +1183,7 @@ BZ2_bzCompress -<computeroutput>BZ2_bzCompress</computeroutput> +BZ2_bzCompress int BZ2_bzCompress ( bz_stream *strm, int action ); @@ -1408,7 +1408,7 @@ BZ_PARAM_ERROR -<computeroutput>BZ2_bzCompressEnd</computeroutput> +BZ2_bzCompressEnd int BZ2_bzCompressEnd ( bz_stream *strm ); @@ -1428,7 +1428,7 @@ BZ_OK otherwise -<computeroutput>BZ2_bzDecompressInit</computeroutput> +BZ2_bzDecompressInit int BZ2_bzDecompressInit ( bz_stream *strm, int verbosity, int small ); @@ -1492,7 +1492,7 @@ BZ2_bzDecompress -<computeroutput>BZ2_bzDecompress</computeroutput> +BZ2_bzDecompress int BZ2_bzDecompress ( bz_stream *strm ); @@ -1587,7 +1587,7 @@ BZ2_bzDecompressEnd -<computeroutput>BZ2_bzDecompressEnd</computeroutput> +BZ2_bzDecompressEnd int BZ2_bzDecompressEnd ( bz_stream *strm ); @@ -1682,7 +1682,7 @@ general points. -<computeroutput>BZ2_bzReadOpen</computeroutput> +BZ2_bzReadOpen typedef void BZFILE; @@ -1765,7 +1765,7 @@ BZ2_bzClose -<computeroutput>BZ2_bzRead</computeroutput> +BZ2_bzRead int BZ2_bzRead ( int *bzerror, BZFILE *b, void *buf, int len ); @@ -1859,7 +1859,7 @@ BZ2_bzReadClose -<computeroutput>BZ2_bzReadGetUnused</computeroutput> +BZ2_bzReadGetUnused void BZ2_bzReadGetUnused( int* bzerror, BZFILE *b, @@ -1903,7 +1903,7 @@ BZ2_bzReadClose -<computeroutput>BZ2_bzReadClose</computeroutput> +BZ2_bzReadClose void BZ2_bzReadClose ( int *bzerror, BZFILE *b ); @@ -1937,7 +1937,7 @@ none -<computeroutput>BZ2_bzWriteOpen</computeroutput> +BZ2_bzWriteOpen BZFILE *BZ2_bzWriteOpen( int *bzerror, FILE *f, @@ -2003,7 +2003,7 @@ BZ2_bzWriteClose -<computeroutput>BZ2_bzWrite</computeroutput> +BZ2_bzWrite void BZ2_bzWrite ( int *bzerror, BZFILE *b, void *buf, int len ); @@ -2031,7 +2031,7 @@ BZ_OK -<computeroutput>BZ2_bzWriteClose</computeroutput> +BZ2_bzWriteClose void BZ2_bzWriteClose( int *bzerror, BZFILE* f, @@ -2235,7 +2235,7 @@ if ( bzerror != BZ_STREAM_END ) { -<computeroutput>BZ2_bzBuffToBuffCompress</computeroutput> +BZ2_bzBuffToBuffCompress int BZ2_bzBuffToBuffCompress( char* dest, @@ -2302,7 +2302,7 @@ BZ_OK -<computeroutput>BZ2_bzBuffToBuffDecompress</computeroutput> +BZ2_bzBuffToBuffDecompress int BZ2_bzBuffToBuffDecompress( char* dest, @@ -2377,7 +2377,7 @@ BZ_OK -<computeroutput>zlib</computeroutput> compatibility functions +zlib compatibility functions Yoshioka Tsuneo has contributed some functions to give better zlib compatibility. @@ -2444,11 +2444,11 @@ value. -Using the library in a <computeroutput>stdio</computeroutput>-free environment +Using the library in a stdio-free environment -Getting rid of <computeroutput>stdio</computeroutput> +Getting rid of stdio In a deeply embedded application, you might want to use just the memory-to-memory functions. You can do this diff --git a/external/bsd/bzip2/dist/mk251.c b/external/bsd/bzip2/dist/mk251.c index 55602a189e2a..4abf1d9ce7a3 100644 --- a/external/bsd/bzip2/dist/mk251.c +++ b/external/bsd/bzip2/dist/mk251.c @@ -1,4 +1,4 @@ -/* $NetBSD: mk251.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: mk251.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /* Spew out a long sequence of the byte 251. When fed to bzip2 @@ -11,8 +11,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/randtable.c b/external/bsd/bzip2/dist/randtable.c index 330fadf2c027..2d316a68212d 100644 --- a/external/bsd/bzip2/dist/randtable.c +++ b/external/bsd/bzip2/dist/randtable.c @@ -1,4 +1,4 @@ -/* $NetBSD: randtable.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: randtable.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /*-------------------------------------------------------------*/ @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/spewG.c b/external/bsd/bzip2/dist/spewG.c index 924db7305ada..c166843b4de3 100644 --- a/external/bsd/bzip2/dist/spewG.c +++ b/external/bsd/bzip2/dist/spewG.c @@ -1,4 +1,4 @@ -/* $NetBSD: spewG.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: spewG.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /* spew out a thoroughly gigantic file designed so that bzip2 @@ -15,8 +15,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/unzcrash.c b/external/bsd/bzip2/dist/unzcrash.c index 146260a9870a..d3cf0a942229 100644 --- a/external/bsd/bzip2/dist/unzcrash.c +++ b/external/bsd/bzip2/dist/unzcrash.c @@ -1,4 +1,4 @@ -/* $NetBSD: unzcrash.c,v 1.1.1.1 2012/05/07 00:21:46 wiz Exp $ */ +/* $NetBSD: unzcrash.c,v 1.1.1.2 2012/05/07 00:41:46 wiz Exp $ */ /* A test program written to test robustness to decompression of @@ -19,8 +19,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/external/bsd/bzip2/dist/xmlproc.sh b/external/bsd/bzip2/dist/xmlproc.sh index 53841773d441..ca284ea9edd0 100755 --- a/external/bsd/bzip2/dist/xmlproc.sh +++ b/external/bsd/bzip2/dist/xmlproc.sh @@ -5,8 +5,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file.