From f76ae8ef7e469ac854de7ac7a5261054e5f322a0 Mon Sep 17 00:00:00 2001 From: ghen Date: Tue, 18 Dec 2007 09:34:17 +0000 Subject: Pullup ticket 2251 - requested by martti latest update for clamav - pkgsrc/mail/clamav/Makefile 1.81 - pkgsrc/mail/clamav/PLIST 1.19 - pkgsrc/mail/clamav/distinfo 1.49 - pkgsrc/mail/clamav/patches/patch-ad 1.13 - pkgsrc/mail/clamav/patches/patch-ah 1.12 Module Name: pkgsrc Committed By: martti Date: Tue Dec 18 08:16:11 UTC 2007 Modified Files: pkgsrc/mail/clamav: Makefile PLIST distinfo pkgsrc/mail/clamav/patches: patch-ad patch-ah Log Message: Updated mail/clamav to 0.92 This release provides various bugfixes, optimisations and improvements to the scanning engine. The new features include support for ARJ and SFX-ARJ archives, AutoIt, basic SPF parser in clamav-milter (to reduce phishing false-positives), faster scanning and others (see ChangeLog). To get a consistent behaviour of the anti-phishing module on all platforms, libclamav now includes the regex library from OpenBSD. --- mail/clamav/Makefile | 18 +++++++++--------- mail/clamav/PLIST | 4 +++- mail/clamav/distinfo | 12 ++++++------ mail/clamav/patches/patch-ad | 8 ++++---- mail/clamav/patches/patch-ah | 12 ++++++------ 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 7bcf06ab357..71b597b0f6a 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2007/08/22 08:02:57 martti Exp $ +# $NetBSD: Makefile,v 1.80.2.1 2007/12/18 09:34:17 ghen Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -12,16 +12,16 @@ COMMENT= Anti-virus toolkit PKG_INSTALLATION_TYPES= overwrite pkgviews -CLAMAV_VERSION= 0.91.2 +CLAMAV_VERSION= 0.92 USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-clamav -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR:Q} -CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER:Q} -CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} +CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER} +CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} CONFIGURE_ARGS+= --with-tcpwrappers CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --enable-readdir_r .endif BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR -FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q} +FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER} MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} RCD_SCRIPTS= clamd freshclamd @@ -42,10 +42,10 @@ PKG_GROUPS+= ${CLAMAV_GROUP} PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP} PKG_GROUPS_VARS+= CLAMAV_GROUP -PKG_USERS_VARS+= CLAMAV_USER +PKG_USERS_VARS= CLAMAV_USER EGDIR= ${PREFIX}/share/examples/clamav -FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR:Q} +FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR} OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 CONF_FILES= # empty diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index f0bc67f78f1..fa3e4638dbc 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2007/02/16 14:40:41 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.18.6.1 2007/12/18 09:34:18 ghen Exp $ bin/clamav-config bin/clamconf bin/clamdscan @@ -7,6 +7,8 @@ bin/freshclam bin/sigtool include/clamav.h lib/libclamav.la +lib/libclamunrar.la +lib/libclamunrar_iface.la lib/pkgconfig/libclamav.pc man/man1/clamconf.1 man/man1/clamdscan.1 diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index 8f2b860bc19..6aa194046b7 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.48 2007/08/22 08:02:57 martti Exp $ +$NetBSD: distinfo,v 1.48.2.1 2007/12/18 09:34:18 ghen Exp $ -SHA1 (clamav-0.91.2.tar.gz) = f18007c3045a1d78967adad805c6934d46ca6419 -RMD160 (clamav-0.91.2.tar.gz) = 9e181a7a4fd08377ff47663aed27f8cc97249a21 -Size (clamav-0.91.2.tar.gz) = 13394538 bytes -SHA1 (patch-ad) = a2be74368afe30bb473ba02d967380f8cad02256 +SHA1 (clamav-0.92.tar.gz) = b6573acd9a7bb6bf3bd4b39a0102ce0be764c5bc +RMD160 (clamav-0.92.tar.gz) = 37f0450b9b3c6fc863f94811ae372ece1677d791 +Size (clamav-0.92.tar.gz) = 14300798 bytes +SHA1 (patch-ad) = d738d2c31b821791789ad46d2bc84ad5f2093df4 SHA1 (patch-af) = 32922fa6a9f908c8fcd80452b505f39b29125b32 -SHA1 (patch-ah) = f142a2f052d5ebed148917d391c0648b4a7ef8dd +SHA1 (patch-ah) = 346e35a163841d7f7f2f1579781329c289189379 diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad index 66a1bc64cc1..e8ed806463b 100644 --- a/mail/clamav/patches/patch-ad +++ b/mail/clamav/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.12 2007/08/22 08:02:58 martti Exp $ +$NetBSD: patch-ad,v 1.12.2.1 2007/12/18 09:34:18 ghen Exp $ ---- docs/Makefile.in.orig 2007-08-20 22:48:18.000000000 +0000 -+++ docs/Makefile.in 2007-08-22 10:56:42.000000000 +0000 -@@ -204,6 +204,8 @@ +--- docs/Makefile.in.orig 2007-12-13 01:06:48.000000000 +0200 ++++ docs/Makefile.in 2007-12-18 09:33:55.000000000 +0200 +@@ -198,6 +198,8 @@ man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5 man/clamconf.1 all: all-am diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah index 15651c51144..04bd3ae0d2d 100644 --- a/mail/clamav/patches/patch-ah +++ b/mail/clamav/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $ +$NetBSD: patch-ah,v 1.11.2.1 2007/12/18 09:34:18 ghen Exp $ ---- clamav-milter/clamav-milter.c.orig 2007-08-20 21:01:19.000000000 +0000 -+++ clamav-milter/clamav-milter.c 2007-08-22 10:57:57.000000000 +0000 -@@ -3726,7 +3726,7 @@ +--- clamav-milter/clamav-milter.c.orig 2007-12-13 00:41:25.000000000 +0200 ++++ clamav-milter/clamav-milter.c 2007-12-18 09:34:20.000000000 +0200 +@@ -3803,7 +3803,7 @@ * the postmaster, so include * some useful information */ @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $ sendmailId, privdata->from); else fprintf(sendmail, _("A message sent from %s to\n"), -@@ -3740,7 +3740,7 @@ +@@ -3817,7 +3817,7 @@ fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename); if(hflag) { @@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $ smfi_getsymval(ctx, "j"), privdata->from, smfi_getsymval(ctx, "_")); fputs(_("For your information, the original message headers were:\n\n"), sendmail); -@@ -4924,7 +4924,7 @@ +@@ -5000,7 +5000,7 @@ cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname); if(move(privdata->filename, newname) < 0) { -- cgit v1.2.3