[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 1fb42ef0b97d772f745072e156bec25cc1374350
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:26 2008 +0100

    Revert "check for unprefixed bz2 - backported from trunk"
    
    This reverts commit ef80c9b51057c6925bf09ae7ed7f4a5d6e9280d6.

diff --git a/ChangeLog b/ChangeLog
index af7f983..8263a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Thu May 29 17:33:37 CEST 2008 (acab)
-------------------------------------
-  * libclamav/unzip.c: check for unprefixed bz2 - bb#1038
-
 Tue May 27 22:21:40 CEST 2008 (acab)
 ------------------------------------
   * libclamav/ole2_extract.c: revert last commit
diff --git a/libclamav/unzip.c b/libclamav/unzip.c
index 2632d5a..6c1244c 100644
--- a/libclamav/unzip.c
+++ b/libclamav/unzip.c
@@ -177,12 +177,6 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
 
 
 #if HAVE_BZLIB_H
-#ifdef NOBZ2PREFIX
-#define BZ2_bzReadOpen bzReadOpen
-#define BZ2_bzReadClose bzReadClose
-#define BZ2_bzRead bzRead
-#endif
-
   case ALG_BZIP2: {
     bz_stream strm;
     memset(&strm, 0, sizeof(strm));

-- 
Debian repository for ClamAV