From owner-svn-src-head@freebsd.org Fri Jun 28 05:12:33 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF78C15D83D5; Fri, 28 Jun 2019 05:12:32 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7086889EC6; Fri, 28 Jun 2019 05:12:32 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pf1-x443.google.com with SMTP id x15so2362544pfq.0; Thu, 27 Jun 2019 22:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zuYwX4AI91e7QlyQoVABAbC2aJOdhCi8K8TeifDwgrc=; b=NNlzEfbUQPeTiGBUe3ibGJ2l648k6TmRY2trbzzTQN+ZYtx+Sau7X8EUEaFCIBzpsb 8EA9jZVYPjatRr38LfwBjhvBqt5IJT42ddV+kJgF/hTYRYVk8bZvigrZxa11EEJzzS2H FeNaH1ab24aBHg3Qg0yjdC/rl3vhFZVr9mqwxE1QVLsx5tcUYffOqVW7rWOaXPi0xb2x SrKqkZt5Fb/V2UaJGwYcip9dtvqMA4FHDip6V9Ef0XuXFV0nL0e0bngpII9bVCFoscLr FNCbp10F1K0Cdz2FKYid679S6BYuh8QixqU1MlyVYoi5DZ9/grMQ3TabORcBE5EtWzhA 3nNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:references:cc:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=zuYwX4AI91e7QlyQoVABAbC2aJOdhCi8K8TeifDwgrc=; b=Qd8us/92bq4VHLoJCaXcEDKwhnvNtiimfTzH7DcQwwbIKiW0wj2RBzz2Z/X4NzANPL Et1oUog3T3sJO9mDZv6tTIwe1uvJwjf9tgpKHTDctdfiKV/RPgqoI24G4lUJpiioTfsn ziD4pHwCj4ptUexqVV5P6x2aLOEN04UYaMWc/YinQc3pdv5dDIpooxo2HKmBQvDhujyV FY9KFK0I1dEF2spYPJ2n6N408LhdSwX79IZMUjG1vmKVqplrk/R0o/6KEWyHmUY269EG ISyZZ5AcJbbXTx53eEFypZsoDAFeltW5eqkB6SwlrXGn41yBMGEjRL0Xa8uoHcb4U6x3 MzCQ== X-Gm-Message-State: APjAAAXav4zq9/LY5CofVZd/P2QwXLZsdVkNS1vZ9KAWgMRFytDGrY+M 1CyipLjI0aqovQjsqOxo0i+LGqV0 X-Google-Smtp-Source: APXvYqw0OQuFKL7Nw8+Rfhi4gzDtlu2subXYmDHof06CjdrhbYNn2tAn8/mM8MV/EGvolYWZuH4wmw== X-Received: by 2002:a65:55ca:: with SMTP id k10mr7530817pgs.14.1561698750960; Thu, 27 Jun 2019 22:12:30 -0700 (PDT) Received: from [192.168.1.103] (180-150-68-130.b49644.syd.nbn.aussiebb.net. [180.150.68.130]) by smtp.gmail.com with ESMTPSA id v184sm860194pfb.82.2019.06.27.22.12.28 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jun 2019 22:12:30 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r349505 - head/contrib/bzip2 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201906280511.x5S5B25N019677@repo.freebsd.org> Cc: Xin LI From: Kubilay Kocak Message-ID: <60eaa49c-cd73-c807-bf4e-57e56f1efb73@FreeBSD.org> Date: Fri, 28 Jun 2019 15:12:26 +1000 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.0 MIME-Version: 1.0 In-Reply-To: <201906280511.x5S5B25N019677@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 7086889EC6 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2019 05:12:33 -0000 On 28/06/2019 3:11 pm, Xin LI wrote: > Author: delphij > Date: Fri Jun 28 05:11:02 2019 > New Revision: 349505 > URL: https://svnweb.freebsd.org/changeset/base/349505 > > Log: > Upgrade to Bzip2 version 1.0.7. PR: 238843 > MFC after: 3 days > > Modified: > head/contrib/bzip2/CHANGES > head/contrib/bzip2/LICENSE > head/contrib/bzip2/README > head/contrib/bzip2/README.COMPILATION.PROBLEMS > head/contrib/bzip2/blocksort.c > head/contrib/bzip2/bzip2.1 > head/contrib/bzip2/bzip2.c > head/contrib/bzip2/bzip2recover.c > head/contrib/bzip2/bzlib.c > head/contrib/bzip2/bzlib.h > head/contrib/bzip2/bzlib_private.h > head/contrib/bzip2/compress.c > head/contrib/bzip2/crctable.c > head/contrib/bzip2/decompress.c > head/contrib/bzip2/huffman.c > head/contrib/bzip2/randtable.c > head/contrib/bzip2/spewG.c > head/contrib/bzip2/unzcrash.c > head/contrib/bzip2/words2 > Directory Properties: > head/contrib/bzip2/ (props changed) > > Modified: head/contrib/bzip2/CHANGES > ============================================================================== > --- head/contrib/bzip2/CHANGES Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/CHANGES Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -325,3 +325,16 @@ Security fix only. Fixes CERT-FI 20469 as it applies > Izdebski. > > * Make the documentation build on Ubuntu 10.04 > + > +1.0.7 (27 Jun 19) > +~~~~~~~~~~~~~~~~~ > + > +* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH > + > +* bzip2: Fix return value when combining --test,-t and -q. > + > +* bzip2recover: Fix buffer overflow for large argv[0] > + > +* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) > + > +* Make sure nSelectors is not out of range (CVE-2019-12900) > > Modified: head/contrib/bzip2/LICENSE > ============================================================================== > --- head/contrib/bzip2/LICENSE Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/LICENSE Fri Jun 28 05:11:02 2019 (r349505) > @@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUD > 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.6 of 6 September 2010 > +Julian Seward, jseward@acm.org > +bzip2/libbzip2 version 1.0.7 of 27 June 2019 > > -------------------------------------------------------------------------- > > Modified: head/contrib/bzip2/README > ============================================================================== > --- head/contrib/bzip2/README Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/README Fri Jun 28 05:11:02 2019 (r349505) > @@ -6,8 +6,8 @@ This version is fully compatible with the previous pub > This file is part of bzip2/libbzip2, a program and library for > lossless, block-sorting data compression. > > -bzip2/libbzip2 version 1.0.6 of 6 September 2010 > -Copyright (C) 1996-2010 Julian Seward > +bzip2/libbzip2 version 1.0.7 of 27 June 2019 > +Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in this file. > > @@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. > > It's difficult for me to support compilation on all these platforms. > My approach is to collect binaries for these platforms, and put them > -on the master web site (http://www.bzip.org). Look there. However > +on the master web site (https://sourceware.org/bzip2/). Look there. However > (FWIW), bzip2-1.0.X is very standard ANSI C and should compile > unmodified with MS Visual C. If you have difficulties building, you > might want to read README.COMPILATION.PROBLEMS. > @@ -161,43 +161,22 @@ WHAT'S NEW IN 0.9.5 ? > * Many small improvements in file and flag handling. > * A Y2K statement. > > -WHAT'S NEW IN 1.0.0 ? > +WHAT'S NEW IN 1.0.x ? > > See the CHANGES file. > > -WHAT'S NEW IN 1.0.2 ? > - > - See the CHANGES file. > - > -WHAT'S NEW IN 1.0.3 ? > - > - See the CHANGES file. > - > -WHAT'S NEW IN 1.0.4 ? > - > - See the CHANGES file. > - > -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 > + jseward@acm.org > if you have any suggestions or queries. Many people mailed me with > comments, suggestions and patches after the releases of bzip-0.15, > bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, > 1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this > feedback. I thank you for your comments. > > -bzip2's "home" is http://www.bzip.org/ > +bzip2's "home" is https://sourceware.org/bzip2/ > > Julian Seward > -jseward@bzip.org > +jseward@acm.org > Cambridge, UK. > > 18 July 1996 (version 0.15) > @@ -213,3 +192,4 @@ Cambridge, UK. > 20 December 2006 (bzip2, version 1.0.4) > 10 December 2007 (bzip2, version 1.0.5) > 6 Sept 2010 (bzip2, version 1.0.6) > +27 June 2019 (bzip2, version 1.0.7) > > Modified: head/contrib/bzip2/README.COMPILATION.PROBLEMS > ============================================================================== > --- head/contrib/bzip2/README.COMPILATION.PROBLEMS Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/README.COMPILATION.PROBLEMS Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > -Copyright (C) 1996-2010 Julian Seward > +bzip2/libbzip2 version 1.0.7 of 27 June 2019 > +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 licens > in the file LICENSE. > ------------------------------------------------------------------ > > -bzip2-1.0.6 should compile without problems on the vast majority of > +bzip2 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 > > Modified: head/contrib/bzip2/blocksort.c > ============================================================================== > --- head/contrib/bzip2/blocksort.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/blocksort.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap, > bhtab [ 0 .. 2+(nblock/32) ] destroyed > */ > > -#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) > -#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) > -#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) > +#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31)) > +#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31)) > +#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31))) > #define WORD_BH(zz) bhtab[(zz) >> 5] > #define UNALIGNED_BH(zz) ((zz) & 0x01f) > > > Modified: head/contrib/bzip2/bzip2.1 > ============================================================================== > --- head/contrib/bzip2/bzip2.1 Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzip2.1 Fri Jun 28 05:11:02 2019 (r349505) > @@ -1,6 +1,6 @@ > .TH bzip2 1 > .SH NAME > -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6 > +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.7 > .br > bzcat \- decompresses files to stdout > .br > @@ -404,7 +404,7 @@ 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.6 of > +This manual page pertains to version 1.0.7 of > .I bzip2. > Compressed data created by this version is entirely forwards and > backwards compatible with the previous public releases, versions > @@ -426,9 +426,9 @@ with MaybeUInt64 set to be an unsigned 64-bit integer. > > > .SH AUTHOR > -Julian Seward, jsewardbzip.org. > +Julian Seward, jseward@acm.org. > > -http://www.bzip.org > +https://sourceware.org/bzip2/ > > The ideas embodied in > .I bzip2 > > Modified: head/contrib/bzip2/bzip2.c > ============================================================================== > --- head/contrib/bzip2/bzip2.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzip2.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -554,7 +554,7 @@ static > Bool testStream ( FILE *zStream ) > { > BZFILE* bzf = NULL; > - Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i; > + Int32 bzerr, bzerr_dummy, ret, streamNo, i; > UChar obuf[5000]; > UChar unused[BZ_MAX_UNUSED]; > Int32 nUnused; > @@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream ) > streamNo++; > > while (bzerr == BZ_OK) { > - nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); > + BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); > if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler; > } > if (bzerr != BZ_STREAM_END) goto errhandler; > @@ -749,7 +749,7 @@ void panic ( const Char* s ) > "\n%s: PANIC -- internal consistency error:\n" > "\t%s\n" > "\tThis is a BUG. Please report it to me at:\n" > - "\tjseward@bzip.org\n", > + "\tjseward@acm.org\n", > progName, s ); > showFileNames(); > cleanUpAndFail( 3 ); > @@ -829,7 +829,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNative n ) > " The user's manual, Section 4.3, has more info on (1) and (2).\n" > " \n" > " If you suspect this is a bug in bzip2, or are unsure about (1)\n" > - " or (2), feel free to report it to me at: jseward@bzip.org.\n" > + " or (2), feel free to report it to me at: jseward@acm.org.\n" > " Section 4.3 of the user's manual describes the info a useful\n" > " bug report should have. If the manual is available on your\n" > " system, please try and read it before mailing me. If you don't\n" > @@ -852,7 +852,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNative n ) > " The user's manual, Section 4.3, has more info on (2) and (3).\n" > " \n" > " If you suspect this is a bug in bzip2, or are unsure about (2)\n" > - " or (3), feel free to report it to me at: jseward@bzip.org.\n" > + " or (3), feel free to report it to me at: jseward@acm.org.\n" > " Section 4.3 of the user's manual describes the info a useful\n" > " bug report should have. If the manual is available on your\n" > " system, please try and read it before mailing me. If you don't\n" > @@ -1609,7 +1609,7 @@ void license ( void ) > " \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.6 source distribution.\n" > + " in the bzip2 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" > @@ -2005,12 +2005,14 @@ IntNative main ( IntNative argc, Char *argv[] ) > testf ( aa->name ); > } > } > - if (testFailsExist && noisy) { > - fprintf ( stderr, > - "\n" > - "You can use the `bzip2recover' program to attempt to recover\n" > - "data from undamaged sections of corrupted files.\n\n" > - ); > + if (testFailsExist) { > + if (noisy) { > + fprintf ( stderr, > + "\n" > + "You can use the `bzip2recover' program to attempt to recover\n" > + "data from undamaged sections of corrupted files.\n\n" > + ); > + } > setExit(2); > exit(exitValue); > } > > Modified: head/contrib/bzip2/bzip2recover.c > ============================================================================== > --- head/contrib/bzip2/bzip2recover.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzip2recover.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -309,11 +309,12 @@ Int32 main ( Int32 argc, Char** argv ) > UInt32 buffHi, buffLo, blockCRC; > Char* p; > > - strcpy ( progName, argv[0] ); > + strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); > + progName[BZ_MAX_FILENAME-1]='\0'; > inFileName[0] = outFileName[0] = 0; > > fprintf ( stderr, > - "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" ); > + "bzip2recover 1.0.7: extracts blocks from damaged .bz2 files.\n" ); > > if (argc != 2) { > fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", > @@ -457,6 +458,7 @@ Int32 main ( Int32 argc, Char** argv ) > bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); > bsPutUInt32 ( bsWr, blockCRC ); > bsClose ( bsWr ); > + outFile = NULL; > } > if (wrBlock >= rbCtr) break; > wrBlock++; > > Modified: head/contrib/bzip2/bzlib.c > ============================================================================== > --- head/contrib/bzip2/bzlib.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzlib.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -47,7 +47,7 @@ void BZ2_bz__AssertH__fail ( int errcode ) > fprintf(stderr, > "\n\nbzip2/libbzip2: internal error number %d.\n" > "This is a bug in bzip2/libbzip2, %s.\n" > - "Please report it to me at: jseward@bzip.org. If this happened\n" > + "Please report it to me at: jseward@acm.org. If this happened\n" > "when you were using some program which uses libbzip2 as a\n" > "component, you should also report this bug to the author(s)\n" > "of that program. Please make an effort to report this bug;\n" > > Modified: head/contrib/bzip2/bzlib.h > ============================================================================== > --- head/contrib/bzip2/bzlib.h Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzlib.h Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/bzlib_private.h > ============================================================================== > --- head/contrib/bzip2/bzlib_private.h Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/bzlib_private.h Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + 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.6, 6-Sept-2010" > +#define BZ_VERSION "1.0.7, 27-Jun-2019" > > typedef char Char; > typedef unsigned char Bool; > > Modified: head/contrib/bzip2/compress.c > ============================================================================== > --- head/contrib/bzip2/compress.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/compress.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/crctable.c > ============================================================================== > --- head/contrib/bzip2/crctable.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/crctable.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/decompress.c > ============================================================================== > --- head/contrib/bzip2/decompress.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/decompress.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > @@ -285,9 +285,9 @@ Int32 BZ2_decompress ( DState* s ) > > /*--- Now the selectors ---*/ > GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); > - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); > + if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR); > GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); > - if (nSelectors < 1) RETURN(BZ_DATA_ERROR); > + if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); > for (i = 0; i < nSelectors; i++) { > j = 0; > while (True) { > > Modified: head/contrib/bzip2/huffman.c > ============================================================================== > --- head/contrib/bzip2/huffman.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/huffman.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/randtable.c > ============================================================================== > --- head/contrib/bzip2/randtable.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/randtable.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/spewG.c > ============================================================================== > --- head/contrib/bzip2/spewG.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/spewG.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/unzcrash.c > ============================================================================== > --- head/contrib/bzip2/unzcrash.c Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/unzcrash.c Fri Jun 28 05:11:02 2019 (r349505) > @@ -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.6 of 6 September 2010 > - Copyright (C) 1996-2010 Julian Seward > + bzip2/libbzip2 version 1.0.7 of 27 June 2019 > + Copyright (C) 1996-2010 Julian Seward > > Please read the WARNING, DISCLAIMER and PATENTS sections in the > README file. > > Modified: head/contrib/bzip2/words2 > ============================================================================== > --- head/contrib/bzip2/words2 Fri Jun 28 04:52:24 2019 (r349504) > +++ head/contrib/bzip2/words2 Fri Jun 28 05:11:02 2019 (r349505) > @@ -1,5 +1,5 @@ > > Checking test results. If any of the four "cmp"s which follow > report any differences, something is wrong. If you can't easily > -figure out what, please let me know (jseward@bzip.org). > +figure out what, please let me know (jseward@acm.org). > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >