[pkgsrc/pkgsrc-2006Q4]: pkgsrc/archivers/bzip2 Pullup ticket 1980 - requested...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc5250249a4e
branches:  pkgsrc-2006Q4
changeset: 522952:cc5250249a4e
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Jan 07 03:52:44 2007 +0000

description:
Pullup ticket 1980 - requested by wiz
security update for bzip2

Revisions pulled up:
- pkgsrc/archivers/bzip2/Makefile                               1.43
- pkgsrc/archivers/bzip2/distinfo                               1.13
- pkgsrc/archivers/bzip2/patches/patch-aa                       1.12

   Module Name:         pkgsrc
   Committed By:        wiz
   Date:                Sat Jan  6 15:34:37 UTC 2007

   Modified Files:
        pkgsrc/archivers/bzip2: Makefile distinfo
        pkgsrc/archivers/bzip2/patches: patch-aa

   Log Message:
   Update to 1.0.4:

   1.0.4 (20 Dec 06)
   ~~~~~~~~~~~~~~~~~
   Fixes some minor bugs since the last version, 1.0.3.

   * Fix file permissions race problem (CAN-2005-0953).

   * Avoid possible segfault in BZ2_bzclose.  From Coverity's NetBSD
     scan.

   * 'const'/prototype cleanups in the C code.

   * Change default install location to /usr/local, and handle multiple
     'make install's without error.

   * Sanitise file names more carefully in bzgrep.  Fixes CAN-2005-0758
     to the extent that applies to bzgrep.

   * Use 'mktemp' rather than 'tempfile' in bzdiff.

   * Tighten up a couple of assertions in blocksort.c following automated
     analysis.

   * Fix minor doc/comment bugs.

diffstat:

 archivers/bzip2/Makefile         |   6 +++---
 archivers/bzip2/distinfo         |  10 +++++-----
 archivers/bzip2/patches/patch-aa |  14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (70 lines):

diff -r fa65a7b750d6 -r cc5250249a4e archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile  Sun Jan 07 03:47:56 2007 +0000
+++ b/archivers/bzip2/Makefile  Sun Jan 07 03:52:44 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.42.8.1 2007/01/07 03:52:44 salo Exp $
 #
 
-DISTNAME=      bzip2-1.0.3
+DISTNAME=      bzip2-1.0.4
 CATEGORIES=    archivers
-MASTER_SITES=  http://www.bzip.org/1.0.3/
+MASTER_SITES=  http://www.bzip.org/1.0.4/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.bzip.org/
diff -r fa65a7b750d6 -r cc5250249a4e archivers/bzip2/distinfo
--- a/archivers/bzip2/distinfo  Sun Jan 07 03:47:56 2007 +0000
+++ b/archivers/bzip2/distinfo  Sun Jan 07 03:52:44 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/05/26 15:03:11 salo Exp $
+$NetBSD: distinfo,v 1.12.14.1 2007/01/07 03:52:44 salo Exp $
 
-SHA1 (bzip2-1.0.3.tar.gz) = 7e749510f65c86fbfff37b97144a02f1b8b8617f
-RMD160 (bzip2-1.0.3.tar.gz) = 7ac2a122c254d1fcd54ca8af96a1814e9e245a1a
-Size (bzip2-1.0.3.tar.gz) = 669075 bytes
-SHA1 (patch-aa) = 10a727166e8c0a7bcf695e79a224a4f9c6534ba9
+SHA1 (bzip2-1.0.4.tar.gz) = f2388ec8f2c506e02aa89e67577b3c6331cbaa4c
+RMD160 (bzip2-1.0.4.tar.gz) = 438365cb911ef84b3bd6643e0d39f6b7567f0447
+Size (bzip2-1.0.4.tar.gz) = 841221 bytes
+SHA1 (patch-aa) = 4605d345e62684dc4fad638fee4072b218604359
diff -r fa65a7b750d6 -r cc5250249a4e archivers/bzip2/patches/patch-aa
--- a/archivers/bzip2/patches/patch-aa  Sun Jan 07 03:47:56 2007 +0000
+++ b/archivers/bzip2/patches/patch-aa  Sun Jan 07 03:52:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2005/05/26 15:03:11 salo Exp $
+$NetBSD: patch-aa,v 1.11.14.1 2007/01/07 03:52:45 salo Exp $
 
---- Makefile.orig      2005-02-17 12:28:24.000000000 +0100
-+++ Makefile   2005-05-26 16:53:13.000000000 +0200
-@@ -2,42 +2,35 @@
+--- Makefile.orig      2007-01-03 03:49:21.000000000 +0000
++++ Makefile
+@@ -15,42 +15,35 @@
  SHELL=/bin/sh
  
  # To assist in cross-compiling
@@ -17,11 +17,11 @@
 +#LDFLAGS=
  
  BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
 +CFLAGS+=$(BIGFILES)
  
 -# Where you want it installed when you do 'make install'
--PREFIX=/usr
+-PREFIX=/usr/local
 +OBJS= blocksort.lo  \
 +      huffman.lo    \
 +      crctable.lo   \
@@ -66,7 +66,7 @@
  
  check: test
  test: bzip2
-@@ -100,20 +93,20 @@
+@@ -113,20 +106,20 @@ clean: 
        sample1.rb2 sample2.rb2 sample3.rb2 \
        sample1.tst sample2.tst sample3.tst