Pullup ticket #3295 - requested by bouyer

mail/clamav: bug fix update

Revisions pulled up:
- mail/clamav/Makefile				1.106-1.108
- mail/clamav/distinfo				1.68-1.69
- mail/clamav/patches/patch-ab			1.14
- mail/clamav/patches/patch-ac			deleted
- mail/clamav/patches/patch-ah			deleted
---
Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct 26 06:38:37 UTC 2010

Modified Files:
        pkgsrc/mail/clamav: Makefile distinfo

Log Message:
Changes 0.96.4:
* This is a bugfix release recommended for all users.
---
Module Name:    pkgsrc
Committed By:   bouyer
Date:           Thu Oct 28 20:15:38 UTC 2010

Modified Files:
        pkgsrc/mail/clamav: Makefile distinfo
Removed Files:
        pkgsrc/mail/clamav/patches: patch-ah

Log Message:
Revert previous, this patch is already in 0.96.4.
---
Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Dec  1 07:44:10 UTC 2010

Modified Files:
        pkgsrc/mail/clamav: Makefile distinfo
        pkgsrc/mail/clamav/patches: patch-ab
Removed Files:
        pkgsrc/mail/clamav/patches: patch-ac

Log Message:
Changes 0.96.5:
* libclamav/pdf.c: fix crashes
* libclamav/pe_icons.c: off by one while
* libclamav: fix detection of embedded executables
* libclamav/matcher-ac.c: fix offset handling for sigs with {x-y} wildcards
* freshclam/manager.c: fix error path infinite loop
* clamd/clamd.c: fix RLIMIT_DATA setting on BSD
* freshclam: improve mirror management
* libclamav: fix possible use of uninitialized values
* libclamav: Set the unreliability flag on (un)packed files
* libclamav/c++: Update embedded copy of LLVM to version 2.8
* freshclam: make query format backward compatible
* freshclam: get detection stats directly from clamd
* libclamav/cache.c,c++/bytecode2llvm.cpp}: make cl_load thread safe
* freshclam: load database in subprocess
* clamd: add new commands DETSTATS and DETSTATSCLEAR
* libclamav/7z.c: fix file descriptor leak
* clamd, libclamavll: add ability to logg messages from libclamav
* libclamav/builtin_bytecodes.h: Don't disable JIT on pentium4

5 files changed, 26 insertions, 68 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 27bdd5e8308..30249775004 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.105.2.1 2010/10/29 08:08:56 tron Exp $
+# $NetBSD: Makefile,v 1.105.2.2 2010/12/05 23:31:06 tron Exp $
 
-DISTNAME=	clamav-${CLAMAV_VERSION}
-PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	1
+DISTNAME=	clamav-0.96.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -14,8 +12,6 @@ LICENSE=	gnu-gpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.96.3
-
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
@@ -23,9 +19,14 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-dbdir=${CLAMAV_DBDIR}
 CONFIGURE_ARGS+=	--with-user=${CLAMAV_USER}
 CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+# pkgsrc enforces a "secure" version of zlib, so don't let this check
+# bomb the build.
+CONFIGURE_ARGS+=	--disable-zlib-vcheck
+# avoid multiarch libdir on Darwin
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -66,10 +67,6 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
 .include "options.mk"
 
-# pkgsrc enforces a "secure" version of zlib, so don't let this check
-# bomb the build.
-CONFIGURE_ARGS+=	--disable-zlib-vcheck
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 6b2346571c1..e30ea6c3528 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.67.2.1 2010/10/29 08:08:56 tron Exp $
+$NetBSD: distinfo,v 1.67.2.2 2010/12/05 23:31:06 tron Exp $
 
-SHA1 (clamav-0.96.3.tar.gz) = b4566c83bc7ca8bdc3783a9487cfe5eaf6084c65
-RMD160 (clamav-0.96.3.tar.gz) = ef0f326158b25525200a09d1531eb0eb45f137cf
-Size (clamav-0.96.3.tar.gz) = 42129283 bytes
+SHA1 (clamav-0.96.5.tar.gz) = a7253e30d40e0c03964a60ed589b356a115b26c5
+RMD160 (clamav-0.96.5.tar.gz) = 70c465548395301b83bb2f5428aa383825089af4
+Size (clamav-0.96.5.tar.gz) = 41164924 bytes
 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
-SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229
-SHA1 (patch-ac) = af6c04bdeff91dec5e672f84fea6bd18d4e2fa1d
+SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
 SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed
 SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3
 SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
-SHA1 (patch-ah) = a4a6e666f892d65c90ac3e6fe219b3b5fb47e34d
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
index e250e513c12..dde7b680587 100644
--- a/mail/clamav/patches/patch-ab
+++ b/mail/clamav/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.13 2010/04/01 12:02:22 martti Exp $
+$NetBSD: patch-ab,v 1.13.6.1 2010/12/05 23:31:06 tron Exp $
 
 Make this pkgsrc friedly.
 
---- libclamav/c++/llvm/utils/buildit/build_llvm.orig	2010-04-01 12:29:52.000000000 +0300
-+++ libclamav/c++/llvm/utils/buildit/build_llvm	2010-04-01 12:30:04.000000000 +0300
-@@ -232,7 +232,7 @@
+--- libclamav/c++/llvm/utils/buildit/build_llvm.orig	2010-11-10 16:57:04.000000000 +0000
++++ libclamav/c++/llvm/utils/buildit/build_llvm
+@@ -224,7 +224,7 @@ make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNI
      LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
      OPTIMIZE_OPTION='-O3' VERBOSE=1 install
  
@@ -13,3 +13,12 @@ Make this pkgsrc friedly.
      echo "error: LLVM 'make install' failed!"
      exit 1
  fi 
+@@ -332,7 +332,7 @@ if [ "$INSTALL_LIBLTO" = "yes" ]; then
+   # PPC objects!
+   strip -arch all -Sl $DT_HOME/lib/libLTO.dylib
+ 
+-  if [ "x$DISABLE_USR_LINKS" == "x" ]; then
++  if [ "x$DISABLE_USR_LINKS" = "x" ]; then
+     # Add a symlink in /usr/lib for B&I.
+     mkdir -p $DEST_DIR/usr/lib/
+     (cd $DEST_DIR/usr/lib && \
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
deleted file mode 100644
index 59dae1cce10..00000000000
--- a/mail/clamav/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2010/08/26 05:49:30 adam Exp $
-
-Make this pkgsrc friedly.
-
---- contrib/safe_clamd/safe_clamd.orig	2010-08-25 11:26:02.000000000 +0000
-+++ contrib/safe_clamd/safe_clamd
-@@ -71,7 +71,7 @@ signalClamd() {
- 	else
- 		echo "$CLAMDBIN is not running."
- 	fi
--	if [ "$1" == "TERM" ]; then
-+	if [ "$1" = "TERM" ]; then
- 		echo Exiting $0 ...
- 		exit
- 	fi
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
deleted file mode 100644
index c053fe9bdca..00000000000
--- a/mail/clamav/patches/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ah,v 1.20.2.2 2010/10/29 08:08:56 tron Exp $
-
-Fix "Unknown error code ERROR" on some PDF. Will be in 0.96.4:
-http://git.clamav.net/gitweb?p=clamav-devel.git;a=commitdiff;h=e142504b07d7f81435f6ac99ec1eedf6c08f2188
-
-Fix "LibClamAV Error: cli_pdf: mmap() failed (2)" on some PDF.
-Will be in 0.96.4:
-http://git.clamav.net/gitweb?p=clamav-devel.git;a=commitdiff;h=8f6bf9fc080aa54badcd7608f253821d5a8b1786
-
-diff --git a/libclamav/pdf.c b/libclamav/pdf.c
-index cd4d25a..e242135 100644 (file)
---- libclamav/pdf.c.orig	2010-09-20 15:24:46.000000000 +0200
-+++ libclamav/pdf.c	2010-10-23 16:46:49.000000000 +0200
-@@ -1024,7 +1024,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)
-     offset += pdfver - start;
- 
-     /* find trailer and xref, don't fail if not found */
--    map_off = map->len - 2048;
-+    map_off = (off_t)map->len - 2048;
-     if (map_off < 0)
-	map_off = 0;
-     bytesleft = map->len - map_off;
-@@ -1087,7 +1087,7 @@
-     rc = run_pdf_hooks(&pdf, PDF_PHASE_PRE, -1, -1);
-     if (rc) {
- 	cli_dbgmsg("cli_pdf: returning %d\n", rc);
--	return rc;
-+	return rc == CL_BREAK ? CL_CLEAN : rc;
-     }
-     /* parse PDF and find obj offsets */
-     while ((rc = pdf_findobj(&pdf)) > 0) {