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
This commit is contained in:
adam 2010-12-01 07:44:09 +00:00
parent 57e024754f
commit eb9e0e8849
4 changed files with 26 additions and 35 deletions

View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.108 2010/10/28 20:15:38 bouyer Exp $
# $NetBSD: Makefile,v 1.109 2010/12/01 07:44:09 adam Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
DISTNAME= clamav-0.96.5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
@ -13,8 +12,6 @@ LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
CLAMAV_VERSION= 0.96.4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-clamav
@ -22,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"
@ -65,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"

View file

@ -1,11 +1,10 @@
$NetBSD: distinfo,v 1.70 2010/10/28 20:15:38 bouyer Exp $
$NetBSD: distinfo,v 1.71 2010/12/01 07:44:09 adam Exp $
SHA1 (clamav-0.96.4.tar.gz) = ffff540b330f3d33c9ff9e8d551763b4e0028d72
RMD160 (clamav-0.96.4.tar.gz) = c12a7a09b2bef06b48596a159f3bcae5b12e61dc
Size (clamav-0.96.4.tar.gz) = 42856612 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

View file

@ -1,10 +1,10 @@
$NetBSD: patch-ab,v 1.13 2010/04/01 12:02:22 martti Exp $
$NetBSD: patch-ab,v 1.14 2010/12/01 07:44:10 adam 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 && \

View file

@ -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