diff options
Diffstat (limited to 'contrib/bzip2')
| -rw-r--r-- | contrib/bzip2/FREEBSD-Xlist | 24 | ||||
| -rw-r--r-- | contrib/bzip2/FREEBSD-upgrade | 27 | ||||
| -rw-r--r-- | contrib/bzip2/bzip2.c | 8 | ||||
| -rw-r--r-- | contrib/bzip2/bzlib.c | 16 |
4 files changed, 67 insertions, 8 deletions
diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist new file mode 100644 index 0000000..2725621 --- /dev/null +++ b/contrib/bzip2/FREEBSD-Xlist @@ -0,0 +1,24 @@ +# $FreeBSD$ +*README.XML.STUFF +*bz-common.xsl +*bz-fo.xsl +*bz-html.xsl +*bzdiff +*bzdiff.1 +*bzgrep +*bzgrep.1 +*bzip.css +*bzip2.1.preformatted +*bzip2.txt +*bzmore +*bzmore.1 +*dlltest.dsp +*entities.xml +*format.pl +*libbz2.dsp +*manual.html +*manual.pdf +*manual.ps +*manual.xml +*mk251.c +*xmlproc.sh diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade new file mode 100644 index 0000000..5d0b771 --- /dev/null +++ b/contrib/bzip2/FREEBSD-upgrade @@ -0,0 +1,27 @@ +$FreeBSD$ + +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 + +Notes: + The following log shows details of trimming: + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist + cd bzip2-1.0.4 + uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu + uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu + uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu + gzip -9 sample1.ref sample2.ref sample3.ref + uuencode sample1.ref.gz sample1.ref.gz > sample1.ref.gz.uu + uuencode sample2.ref.gz sample2.ref.gz > sample2.ref.gz.uu + uuencode sample3.ref.gz sample3.ref.gz > sample3.ref.gz.uu + rm sample1.bz2 sample1.ref.gz sample2.bz2 sample2.ref.gz + rm sample3.bz2 sample3.ref.gz + +obrien@FreeBSD.org +15 May 2005 diff --git a/contrib/bzip2/bzip2.c b/contrib/bzip2/bzip2.c index 3904107..5fbae0e 100644 --- a/contrib/bzip2/bzip2.c +++ b/contrib/bzip2/bzip2.c @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ void license ( void ) "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2007 by Julian Seward.\n" + " Copyright (C) 1996-2006 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.5 source distribution.\n" + " in the bzip2-1.0.4 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" diff --git a/contrib/bzip2/bzlib.c b/contrib/bzip2/bzlib.c index ef86c91..ef0791e 100644 --- a/contrib/bzip2/bzlib.c +++ b/contrib/bzip2/bzlib.c @@ -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.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -28,8 +28,12 @@ bzBuffToBuffDecompress. Fixed. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "bzlib_private.h" +#ifndef BZ_NO_COMPRESS /*---------------------------------------------------*/ /*--- Compression stuff ---*/ @@ -48,7 +52,7 @@ void BZ2_bz__AssertH__fail ( int errcode ) "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, 10 December 2007.\n\n", + "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", errcode, BZ2_bzlibVersion() ); @@ -85,6 +89,7 @@ void BZ2_bz__AssertH__fail ( int errcode ) } #endif +#endif /* BZ_NO_COMPRESS */ /*---------------------------------------------------*/ static @@ -111,6 +116,7 @@ void default_bzfree ( void* opaque, void* addr ) if (addr != NULL) free ( addr ); } +#ifndef BZ_NO_COMPRESS /*---------------------------------------------------*/ static @@ -483,6 +489,7 @@ int BZ_API(BZ2_bzCompressEnd) ( bz_stream *strm ) return BZ_OK; } +#endif /* BZ_NO_COMPRESS */ /*---------------------------------------------------*/ /*--- Decompression stuff ---*/ @@ -598,7 +605,6 @@ Bool unRLE_obuf_to_output_FAST ( DState* s ) 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; @@ -877,6 +883,7 @@ int BZ_API(BZ2_bzDecompressEnd) ( bz_stream *strm ) return BZ_OK; } +#ifndef BZ_NO_COMPRESS #ifndef BZ_NO_STDIO /*---------------------------------------------------*/ @@ -1566,6 +1573,7 @@ const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum) } #endif +#endif /* BZ_NO_COMPRESS */ /*-------------------------------------------------------------*/ /*--- end bzlib.c ---*/ |
