[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa
Stephen Gran
steve at lobefin.net
Thu Sep 4 12:36:49 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 68b9a4cd32c7afc9f1bcab4a903aadfbd38289cd
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Sep 4 13:25:25 2008 +0100
Revert "bb#1038 - second attempt"
This reverts commit 514839dbbd3ec800e7c6ff1c64d6d8a133a5d007.
diff --git a/ChangeLog b/ChangeLog
index bdfb6f7..af7f983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Thu May 29 21:22:35 CEST 2008 (acab)
-------------------------------------
- * libclamav/unzip.c: correct the previous fix
-
Thu May 29 17:33:37 CEST 2008 (acab)
------------------------------------
* libclamav/unzip.c: check for unprefixed bz2 - bb#1038
diff --git a/libclamav/unzip.c b/libclamav/unzip.c
index cce61a1..2632d5a 100644
--- a/libclamav/unzip.c
+++ b/libclamav/unzip.c
@@ -178,9 +178,9 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
#if HAVE_BZLIB_H
#ifdef NOBZ2PREFIX
-#define BZ2_bzDecompressInit bzDecompressInit
-#define BZ2_bzDecompressEnd bzDecompressEnd
-#define BZ2_bzDecompress bzDecompress
+#define BZ2_bzReadOpen bzReadOpen
+#define BZ2_bzReadClose bzReadClose
+#define BZ2_bzRead bzRead
#endif
case ALG_BZIP2: {
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list