From bf292cda75d129fdb182ad8843ef562bba7e85a8 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 24 Sep 2010 08:19:49 +0000 Subject: Pullup ticket #3228 - requested by joerg archivers/bzip2: security update Revisions pulled up: - archivers/bzip2/files/LICENSE 1.3 - archivers/bzip2/files/blocksort.c 1.3 - archivers/bzip2/files/bzip2.1 1.3 - archivers/bzip2/files/bzip2.c 1.3 - archivers/bzip2/files/bzip2recover.c 1.3 - archivers/bzip2/files/bzlib.c 1.3 - archivers/bzip2/files/bzlib.h 1.3 - archivers/bzip2/files/bzlib_private.h 1.3 - archivers/bzip2/files/compress.c 1.3 - archivers/bzip2/files/crctable.c 1.3 - archivers/bzip2/files/huffman.c 1.3 - archivers/bzip2/files/randtable.c 1.3 --- Module Name: pkgsrc Committed By: joerg Date: Thu Sep 23 11:03:36 UTC 2010 Modified Files: pkgsrc/archivers/bzip2/files: LICENSE blocksort.c bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib.h bzlib_private.h compress.c crctable.c huffman.c randtable.c Log Message: Forcefully merge the branch back. This updates the included version numbers. --- archivers/bzip2/files/LICENSE | 4 ++-- archivers/bzip2/files/blocksort.c | 4 ++-- archivers/bzip2/files/bzip2.1 | 6 +++--- archivers/bzip2/files/bzip2.c | 8 ++++---- archivers/bzip2/files/bzip2recover.c | 6 +++--- archivers/bzip2/files/bzlib.c | 4 ++-- archivers/bzip2/files/bzlib.h | 4 ++-- archivers/bzip2/files/bzlib_private.h | 6 +++--- archivers/bzip2/files/compress.c | 4 ++-- archivers/bzip2/files/crctable.c | 4 ++-- archivers/bzip2/files/huffman.c | 4 ++-- archivers/bzip2/files/randtable.c | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/archivers/bzip2/files/LICENSE b/archivers/bzip2/files/LICENSE index f420cffb67d..cc614178cf7 100644 --- a/archivers/bzip2/files/LICENSE +++ b/archivers/bzip2/files/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/archivers/bzip2/files/blocksort.c b/archivers/bzip2/files/blocksort.c index bd2dec157fa..d0d662cd4e9 100644 --- a/archivers/bzip2/files/blocksort.c +++ b/archivers/bzip2/files/blocksort.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 + 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/archivers/bzip2/files/bzip2.1 b/archivers/bzip2/files/bzip2.1 index 947ba936ae3..ce3a78e6b4f 100644 --- a/archivers/bzip2/files/bzip2.1 +++ b/archivers/bzip2/files/bzip2.1 @@ -1,7 +1,7 @@ .PU .TH bzip2 1 .SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.5 +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6 .br bzcat \- decompresses files to stdout .br @@ -405,11 +405,11 @@ I/O error messages are not as helpful as they could be. 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 .I bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions -0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following +0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following exception: 0.9.0 and above can correctly decompress multiple concatenated compressed files. 0.1pl2 cannot do this; it will stop after decompressing just the first file in the stream. diff --git a/archivers/bzip2/files/bzip2.c b/archivers/bzip2/files/bzip2.c index 390410735b5..6de9d1d1488 100644 --- a/archivers/bzip2/files/bzip2.c +++ b/archivers/bzip2/files/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 + 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. @@ -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-2010 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.6 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/archivers/bzip2/files/bzip2recover.c b/archivers/bzip2/files/bzip2recover.c index 5f6d6218095..f9de0496abf 100644 --- a/archivers/bzip2/files/bzip2recover.c +++ b/archivers/bzip2/files/bzip2recover.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 + 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. @@ -313,7 +313,7 @@ Int32 main ( Int32 argc, Char** argv ) inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", diff --git a/archivers/bzip2/files/bzlib.c b/archivers/bzip2/files/bzlib.c index ef86c91e695..bd358a793b8 100644 --- a/archivers/bzip2/files/bzlib.c +++ b/archivers/bzip2/files/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 + 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/archivers/bzip2/files/bzlib.h b/archivers/bzip2/files/bzlib.h index c5b75d6d8ff..8277123da8c 100644 --- a/archivers/bzip2/files/bzlib.h +++ b/archivers/bzip2/files/bzlib.h @@ -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 + 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/archivers/bzip2/files/bzlib_private.h b/archivers/bzip2/files/bzlib_private.h index 23427879b18..5d0217f4635 100644 --- a/archivers/bzip2/files/bzlib_private.h +++ b/archivers/bzip2/files/bzlib_private.h @@ -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 + 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. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.5, 10-Dec-2007" +#define BZ_VERSION "1.0.6, 6-Sept-2010" typedef char Char; typedef unsigned char Bool; diff --git a/archivers/bzip2/files/compress.c b/archivers/bzip2/files/compress.c index 8c80a079700..caf7696011b 100644 --- a/archivers/bzip2/files/compress.c +++ b/archivers/bzip2/files/compress.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 + 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/archivers/bzip2/files/crctable.c b/archivers/bzip2/files/crctable.c index 215687b2c05..1fea7e946c5 100644 --- a/archivers/bzip2/files/crctable.c +++ b/archivers/bzip2/files/crctable.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 + 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/archivers/bzip2/files/huffman.c b/archivers/bzip2/files/huffman.c index 87e79e38af0..2283fdbc5a1 100644 --- a/archivers/bzip2/files/huffman.c +++ b/archivers/bzip2/files/huffman.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 + 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/archivers/bzip2/files/randtable.c b/archivers/bzip2/files/randtable.c index 068b76367bc..6d624599061 100644 --- a/archivers/bzip2/files/randtable.c +++ b/archivers/bzip2/files/randtable.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 + 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. -- cgit v1.2.3