old

3 files changed, 7 insertions, 55 deletions

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index d9b8c73d055b..2edc1094b99c 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,9 +1,10 @@
-MD5 1f069e97b1c228bc6b83314f2f3dd3a7 ChangeLog 5211
+MD5 b27b5513009cfea21410262cfdf17a97 ChangeLog 5405
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 6c80b50a0492cbcca5720055f80b5e7c bzip2-1.0.2-r4.ebuild 2119
-MD5 88eb397d1eb3af19fe800d1cee2be3df bzip2-1.0.2-r3.ebuild 2390
+MD5 8d5d6886165251e7650695b21f687367 bzip2-1.0.2-r5.ebuild 2167
+MD5 22b441db0edaf8a367830aeaface6d31 bzip2-1.0.2-r4.ebuild 2125
 MD5 9c63b399f71b03f2a58b061c1e038d0c files/bzip2-1.0.2-saneso.patch 457
 MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r4 63
-MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/1.0.2-NULL-ptr-check.patch 838
-MD5 378e8d34dd95cc65b7f65565df5d85f7 files/1.0.2-makefile-CFLAGS.patch 841
-MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r3 63
+MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141
+MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838
+MD5 378e8d34dd95cc65b7f65565df5d85f7 files/bzip2-1.0.2-makefile-CFLAGS.patch 841
+MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63
diff --git a/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch b/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch
deleted file mode 100644
index e35080f86db8..000000000000
--- a/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Mihai Limbasan writes:
-BZ2_bzclose fails to perform a NULL pointer check before actually
-using the passed BZFILE * argument. The NULL check *is* performed but
-only after the argument is used for the first time, resulting in a
-potential NULL pointer dereference.
-
-http://bugs.gentoo.org/show_bug.cgi?id=75305
-
-Sent upstream but no feedback thus far :(
-diff -Naur bzip2-1.0.2-orig/bzlib.c bzip2-1.0.2/bzlib.c
---- bzip2-1.0.2-orig/bzlib.c	2002-01-05 02:48:41.000000000 +0200
-+++ bzip2-1.0.2/bzlib.c	2004-12-22 15:12:52.824593032 +0200
-@@ -1536,9 +1536,12 @@
- void BZ_API(BZ2_bzclose) (BZFILE* b)
- {
-    int bzerr;
--   FILE *fp = ((bzFile *)b)->handle;
--   
-+   FILE *fp;
-+
-    if (b==NULL) {return;}
-+
-+   fp = ((bzFile *)b)->handle;
-+
-    if(((bzFile*)b)->writing){
-       BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
-       if(bzerr != BZ_OK){
diff --git a/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch b/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch
deleted file mode 100644
index bf7d430f9496..000000000000
--- a/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	2004-12-26 16:30:06.354116536 -0500
-+++ Makefile	2004-12-26 16:32:13.617769520 -0500
-@@ -9,7 +9,7 @@
- 
- # Suitably paranoid flags to avoid bugs in gcc-2.7
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-+CFLAGS+=-Wall -Winline -fno-strength-reduce $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr
---- Makefile-libbz2_so.orig	2004-12-26 16:32:23.972195408 -0500
-+++ Makefile-libbz2_so	2004-12-26 16:32:34.835543928 -0500
-@@ -9,7 +9,7 @@
- SHELL=/bin/sh
- CC=gcc
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
- 
- OBJS= blocksort.o  \
-       huffman.o    \