diff options
author | xtraeme <xtraeme> | 2007-02-16 14:40:41 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2007-02-16 14:40:41 +0000 |
commit | bc8574444c36414917bc268140d65cd4739d27ae (patch) | |
tree | 44f9c31c72d83702f3b0cb6fd4df9405d8b013a9 | |
parent | 87831600fedb22fd38c9365e8d0097c11ca9efd0 (diff) | |
download | pkgsrc-bc8574444c36414917bc268140d65cd4739d27ae.tar.gz |
Update to 0.90:
The 0.9x series introduces lots of improvements in terms of detection
rate and performance, like support for many new packers and decryptors,
RAR3 and SIS archives, and a new phishing signatures format that proves
to be very effective.
-rw-r--r-- | mail/clamav/Makefile | 5 | ||||
-rw-r--r-- | mail/clamav/PLIST | 4 | ||||
-rw-r--r-- | mail/clamav/distinfo | 16 | ||||
-rw-r--r-- | mail/clamav/patches/patch-aa | 12 | ||||
-rw-r--r-- | mail/clamav/patches/patch-ab | 43 | ||||
-rw-r--r-- | mail/clamav/patches/patch-ad | 10 | ||||
-rw-r--r-- | mail/clamav/patches/patch-af | 26 | ||||
-rw-r--r-- | mail/clamav/patches/patch-ah | 20 |
8 files changed, 41 insertions, 95 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index bb0b4d0808d..74d92fbbfaf 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2006/12/11 18:55:45 xtraeme Exp $ +# $NetBSD: Makefile,v 1.67 2007/02/16 14:40:41 xtraeme Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -12,7 +12,7 @@ COMMENT= Anti-virus toolkit PKG_INSTALLATION_TYPES= overwrite pkgviews -CLAMAV_VERSION= 0.88.7 +CLAMAV_VERSION= 0.90 USE_LIBTOOL= yes @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER:Q} CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP:Q} CONFIGURE_ARGS+= --with-tcpwrappers CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} +CONFIGURE_ARGS+= --enable-experimental .include "../../mk/bsd.prefs.mk" diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index 1a697fb0e63..f0bc67f78f1 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.17 2006/02/19 00:05:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.18 2007/02/16 14:40:41 xtraeme Exp $ bin/clamav-config +bin/clamconf bin/clamdscan bin/clamscan bin/freshclam @@ -7,6 +8,7 @@ bin/sigtool include/clamav.h lib/libclamav.la lib/pkgconfig/libclamav.pc +man/man1/clamconf.1 man/man1/clamdscan.1 man/man1/clamscan.1 man/man1/freshclam.1 diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index 6aa48f5c959..a56ab8ee20a 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.40 2006/12/11 18:55:45 xtraeme Exp $ +$NetBSD: distinfo,v 1.41 2007/02/16 14:40:41 xtraeme Exp $ -SHA1 (clamav-0.88.7.tar.gz) = 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 -RMD160 (clamav-0.88.7.tar.gz) = 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 -Size (clamav-0.88.7.tar.gz) = 9510548 bytes -SHA1 (patch-aa) = b295a8fea8937faafcbae7f08ad9a5e1bae468e2 -SHA1 (patch-ab) = 05f3ff7681e5f1ba78c31dc117c31b3e23f56339 -SHA1 (patch-ad) = 9c25ad53c9a8912f34ac99f596a887f2a3618d0d -SHA1 (patch-af) = a1c2177c3d7ecbd9bc241aa2e90004fe1c6d78a2 -SHA1 (patch-ah) = 90415d363ed701e89fbe5ca58d87fe9e1ba60a29 +SHA1 (clamav-0.90.tar.gz) = 574b84429b878df3a9d862ea386c970326850158 +RMD160 (clamav-0.90.tar.gz) = 1b22144d3a41376093b73bbeb5302092a18ca685 +Size (clamav-0.90.tar.gz) = 11575374 bytes +SHA1 (patch-ad) = 554c183224c04357609111c90d0145c08e13c1d0 +SHA1 (patch-af) = fe93995448f968c479ff91d52c1fa2a1e67ef137 +SHA1 (patch-ah) = 4839be1432e657e371757f12b01f54f73a718454 diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa deleted file mode 100644 index 53cc188b1b1..00000000000 --- a/mail/clamav/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.14 2006/10/19 07:30:15 martti Exp $ - ---- configure.orig 2006-10-15 21:56:53.000000000 +0000 -+++ configure 2006-10-19 10:16:35.000000000 +0000 -@@ -13374,6 +13374,7 @@ - LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread" - CLAMD_LIBS="-lpthread" - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" -+ TH_SAFE="-thread-safe" - - cat >>confdefs.h <<\_ACEOF - #define CL_THREAD_SAFE 1 diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab deleted file mode 100644 index ed9e97ecae4..00000000000 --- a/mail/clamav/patches/patch-ab +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2006/10/19 07:30:15 martti Exp $ - ---- configure.orig 2006-10-19 10:16:35.000000000 +0000 -+++ configure 2006-10-19 10:16:57.000000000 +0000 -@@ -13316,6 +13316,38 @@ - - use_gethostbyname_r="no" - ;; -+ -+dragonfly*) -+ if test "$have_pthreads" = "yes"; then -+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" -+ CLAMD_LIBS="$CLAMD_LIBS -pthread" -+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" -+ TH_SAFE="-thread-safe" -+ -+cat >>confdefs.h <<\_ACEOF -+#define CL_THREAD_SAFE 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define _REENTRANT 1 -+_ACEOF -+ -+ if test "$want_clamuko" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define CLAMUKO 1 -+_ACEOF -+ -+ fi -+ fi -+ -+cat >>confdefs.h <<\_ACEOF -+#define C_BSD 1 -+_ACEOF -+ -+ disable_gethostbyname_r="yes" -+ ;; - openbsd*) - if test "$have_pthreads" = "yes"; then - LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad index f774629b67a..5fb5220bcc7 100644 --- a/mail/clamav/patches/patch-ad +++ b/mail/clamav/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.10 2006/10/19 07:30:15 martti Exp $ +$NetBSD: patch-ad,v 1.11 2007/02/16 14:40:41 xtraeme Exp $ ---- docs/Makefile.in.orig 2006-10-15 21:46:39.000000000 +0000 -+++ docs/Makefile.in 2006-10-19 10:17:15.000000000 +0000 -@@ -191,6 +191,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 +--- docs/Makefile.in.orig 2007-02-16 15:25:08.000000000 +0100 ++++ docs/Makefile.in 2007-02-16 15:25:38.000000000 +0100 +@@ -203,6 +203,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 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8 diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af index 1e02c14e970..bf65efcdd68 100644 --- a/mail/clamav/patches/patch-af +++ b/mail/clamav/patches/patch-af @@ -1,21 +1,21 @@ -$NetBSD: patch-af,v 1.2 2006/10/19 07:30:15 martti Exp $ +$NetBSD: patch-af,v 1.3 2007/02/16 14:40:41 xtraeme Exp $ ---- database/Makefile.in.orig 2006-10-15 21:46:39.000000000 +0000 -+++ database/Makefile.in 2006-10-19 10:17:33.000000000 +0000 -@@ -351,17 +351,6 @@ - @test -f $(DESTDIR)$(DBINST)/mirrors.txt && rm -f $(DESTDIR)$(DBINST)/mirrors.txt || true - @test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true - @test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true +--- database/Makefile.in.orig 2007-02-16 15:27:18.000000000 +0100 ++++ database/Makefile.in 2007-02-16 15:28:06.000000000 +0100 +@@ -359,17 +359,6 @@ + $(mkinstalldirs) $(DESTDIR)$(DBINST) + @test -f $(DESTDIR)$(DBINST)/main.cvd || test -d $(DESTDIR)$(DBINST)/main.inc || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) + @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -d $(DESTDIR)$(DBINST)/daily.inc || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) - @if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ - chmod 775 $(DESTDIR)$(DBINST); \ - chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \ - chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \ -- chmod 664 $(DESTDIR)$(DBINST)/main.cvd; \ -- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; \ -- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; \ -- chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; \ -- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; \ -- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; \ +- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\ +- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\ +- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\ +- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\ +- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\ +- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\ - fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah index 61de981376f..66bd4a8c73b 100644 --- a/mail/clamav/patches/patch-ah +++ b/mail/clamav/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.7 2006/10/19 07:30:15 martti Exp $ +$NetBSD: patch-ah,v 1.8 2007/02/16 14:40:41 xtraeme Exp $ ---- clamav-milter/clamav-milter.c.orig 2006-04-29 19:14:28.000000000 +0000 -+++ clamav-milter/clamav-milter.c 2006-10-19 10:18:21.000000000 +0000 -@@ -2976,7 +2976,7 @@ clamfi_eom(SMFICTX *ctx) +--- clamav-milter/clamav-milter.c.orig 2007-02-12 23:36:49.000000000 +0100 ++++ clamav-milter/clamav-milter.c 2007-02-16 15:30:49.000000000 +0100 +@@ -3495,7 +3495,7 @@ * the postmaster, so include * some useful information */ @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.7 2006/10/19 07:30:15 martti Exp $ sendmailId, privdata->from); else fprintf(sendmail, _("A message sent from %s to\n"), -@@ -2990,7 +2990,7 @@ clamfi_eom(SMFICTX *ctx) +@@ -3509,7 +3509,7 @@ fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename); if(hflag) { @@ -20,12 +20,12 @@ $NetBSD: patch-ah,v 1.7 2006/10/19 07:30:15 martti Exp $ smfi_getsymval(ctx, "j"), privdata->from, smfi_getsymval(ctx, "_")); fputs(_("For your information, the original message headers were:\n\n"), sendmail); -@@ -4151,7 +4151,7 @@ qfile(struct privdata *privdata, const c +@@ -4700,7 +4700,7 @@ + cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname); if(move(privdata->filename, newname) < 0) { - if(use_syslog) -- syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"), -+ syslog(LOG_WARNING, _("Can't rename %s to %s"), - privdata->filename, newname); +- logg(_("^Can't rename %1$s to %2$s\n"), ++ logg(_("^Can't rename %s to %s\n"), + privdata->filename, newname); free(newname); return -1; |