pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2008Q1]: pkgsrc/mail/clamav Pullup ticket 2333 - requested by ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c887fd56066
branches:  pkgsrc-2008Q1
changeset: 540265:7c887fd56066
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Apr 16 19:23:54 2008 +0000

description:
Pullup ticket 2333 - requested by martti
latest update for clamav

- pkgsrc/mail/clamav/Makefile                           1.83
- pkgsrc/mail/clamav/distinfo                           1.51
- pkgsrc/mail/clamav/patches/patch-ad                   1.14
- pkgsrc/mail/clamav/patches/patch-af                   1.5
- pkgsrc/mail/clamav/patches/patch-ah                   1.14
- pkgsrc/mail/clamav/patches/patch-ba                   1.2

   Module Name: pkgsrc
   Committed By:        martti
   Date:                Tue Apr 15 07:56:06 UTC 2008

   Modified Files:
           pkgsrc/mail/clamav: Makefile distinfo
           pkgsrc/mail/clamav/patches: patch-ad patch-af patch-ah patch-ba

   Log Message:
   Updated mail/clamav to 0.93

   http://secunia.com/secunia_research/2008-11/advisory/
   http://www.frsirt.com/english/advisories/2008/1218

   Changes since 0.92.1

   This release introduces many new features and engine enhancements, please
   see the notes below for the list of major changes. The most visible one
   is the new logic in scan limits which affects some command line and config
   options of clamscan and clamd. Please see clamscan(1) and clamd.conf(5)
   and the example config file for more information on the new options.

   Most important changes include:

      * libclamav:
        - New logic in scan limits: provides much more efficient protection against
          DoS attacks but also results in different command line and config options
          to clamscan and clamd (see below)
        - New/improved modules: unzip, SIS, cabinet, CHM, SZDD, text normalisator,
          entity converter
        - Improved filetype detection; filetype definitions can be remotely updated
        - Support for .cld containers (which replace .inc directories)
        - Improved pattern matcher and signature formats
        - More efficient scanning of HTML files
        - Many other improvements

      * clamd:
        - NEW CONFIG FILE OPTIONS: MaxScanSize, MaxFileSize, MaxRecursion, MaxFiles
        - ** THE FOLLOWING OPTIONS ARE NO LONGER SUPPORTED **: MailMaxRecursion,
          ArchiveMaxFileSize, ArchiveMaxRecursion, ArchiveMaxFiles,
          ArchiveMaxCompressionRatio, ArchiveBlockMax

      * clamscan:
        - NEW CMDLINE OPTIONS: --max-filesize, --max-scansize
        - REMOVED OPTIONS: --block-max, --max-space, --max-ratio

      * freshclam:
        - NEW CONFIG OPTION CompressLocalDatabase
        - NEW CMDLINE SWITCH --no-warnings
        - main.inc and daily.inc directories are no longer used by ClamAV; please
          remove them manually from your database directory

diffstat:

 mail/clamav/Makefile         |   4 ++--
 mail/clamav/distinfo         |  16 ++++++++--------
 mail/clamav/patches/patch-ad |  10 ++++++----
 mail/clamav/patches/patch-af |  10 ++++++----
 mail/clamav/patches/patch-ah |  14 ++++++++------
 mail/clamav/patches/patch-ba |  20 ++++++++++----------
 6 files changed, 40 insertions(+), 34 deletions(-)

diffs (190 lines):

diff -r c994c67d33ea -r 7c887fd56066 mail/clamav/Makefile
--- a/mail/clamav/Makefile      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/Makefile      Wed Apr 16 19:23:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2008/02/12 14:17:16 martti Exp $
+# $NetBSD: Makefile,v 1.82.2.1 2008/04/16 19:23:54 ghen Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
@@ -12,7 +12,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-CLAMAV_VERSION=                0.92.1
+CLAMAV_VERSION=                0.93
 
 USE_LIBTOOL=           yes
 
diff -r c994c67d33ea -r 7c887fd56066 mail/clamav/distinfo
--- a/mail/clamav/distinfo      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/distinfo      Wed Apr 16 19:23:54 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2008/02/12 14:17:16 martti Exp $
+$NetBSD: distinfo,v 1.50.2.1 2008/04/16 19:23:54 ghen Exp $
 
-SHA1 (clamav-0.92.1.tar.gz) = 6ee4fa5a1c5f71eecc99beb17bc5f3c5a3b580ec
-RMD160 (clamav-0.92.1.tar.gz) = 5cf4b36a665dba6be366e94d02b6c8112048d647
-Size (clamav-0.92.1.tar.gz) = 15284752 bytes
-SHA1 (patch-ad) = d738d2c31b821791789ad46d2bc84ad5f2093df4
-SHA1 (patch-af) = 32922fa6a9f908c8fcd80452b505f39b29125b32
-SHA1 (patch-ah) = f764dd96467f5f3522db544ed2e2acb5f4cf2ec8
-SHA1 (patch-ba) = 461c4d3afd04993105f2474dfd34bc559b52a8e1
+SHA1 (clamav-0.93.tar.gz) = bae5f70331e8592e9c53a04517038890845d406d
+RMD160 (clamav-0.93.tar.gz) = a1f301345983ed0606e2f2e13ef63275bd341cd4
+Size (clamav-0.93.tar.gz) = 16134725 bytes
+SHA1 (patch-ad) = db632e0e44e5a6c42cbe30726aa492881b5a5384
+SHA1 (patch-af) = e8d3f68e8017c5a6e7377cb03fc978a6581b7d5e
+SHA1 (patch-ah) = 24d64a6abbddfb0986d73afbde7db8cf2f08ca3e
+SHA1 (patch-ba) = dbaeb15f9f52990abfccfd9b0674a300e0d22e05
diff -r c994c67d33ea -r 7c887fd56066 mail/clamav/patches/patch-ad
--- a/mail/clamav/patches/patch-ad      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/patches/patch-ad      Wed Apr 16 19:23:54 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.13 2007/12/18 08:16:11 martti Exp $
+$NetBSD: patch-ad,v 1.13.4.1 2008/04/16 19:23:54 ghen Exp $
+
+Optionally build clamav-milter.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 @@
+--- docs/Makefile.in.orig      2008-04-09 18:55:29.000000000 +0300
++++ docs/Makefile.in   2008-04-15 10:31:39.000000000 +0300
+@@ -201,6 +201,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 -r c994c67d33ea -r 7c887fd56066 mail/clamav/patches/patch-af
--- a/mail/clamav/patches/patch-af      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/patches/patch-af      Wed Apr 16 19:23:54 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.4 2007/08/22 08:02:58 martti Exp $
+$NetBSD: patch-af,v 1.4.6.1 2008/04/16 19:23:54 ghen Exp $
+
+Installation fixes.
 
---- database/Makefile.in.orig  2007-08-20 22:48:18.000000000 +0000
-+++ database/Makefile.in       2007-08-22 10:57:32.000000000 +0000
-@@ -360,17 +360,6 @@
+--- database/Makefile.in.orig  2008-04-09 18:55:29.000000000 +0300
++++ database/Makefile.in       2008-04-15 10:31:57.000000000 +0300
+@@ -365,17 +365,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)
diff -r c994c67d33ea -r 7c887fd56066 mail/clamav/patches/patch-ah
--- a/mail/clamav/patches/patch-ah      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/patches/patch-ah      Wed Apr 16 19:23:54 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ah,v 1.13 2008/02/12 14:17:16 martti Exp $
+$NetBSD: patch-ah,v 1.13.2.1 2008/04/16 19:23:54 ghen Exp $
+
+Build fixes.
 
---- clamav-milter/clamav-milter.c.orig 2008-02-06 18:00:43.000000000 +0200
-+++ clamav-milter/clamav-milter.c      2008-02-12 16:03:08.000000000 +0200
-@@ -3801,7 +3801,7 @@
+--- clamav-milter/clamav-milter.c.orig 2008-04-09 18:39:18.000000000 +0300
++++ clamav-milter/clamav-milter.c      2008-04-15 10:32:16.000000000 +0300
+@@ -3824,7 +3824,7 @@
                                                 * the postmaster, so include
                                                 * some useful information
                                                 */
@@ -11,7 +13,7 @@
                                                        sendmailId, privdata->from);
                                        else
                                                fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3815,7 +3815,7 @@
+@@ -3838,7 +3838,7 @@
                                                fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
                                        if(hflag) {
@@ -20,7 +22,7 @@
                                                        smfi_getsymval(ctx, "j"), privdata->from,
                                                        smfi_getsymval(ctx, "_"));
                                                fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4998,7 +4998,7 @@
+@@ -5027,7 +5027,7 @@
        cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
        if(move(privdata->filename, newname) < 0) {
diff -r c994c67d33ea -r 7c887fd56066 mail/clamav/patches/patch-ba
--- a/mail/clamav/patches/patch-ba      Wed Apr 16 19:15:26 2008 +0000
+++ b/mail/clamav/patches/patch-ba      Wed Apr 16 19:23:54 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ba,v 1.1 2008/02/12 14:17:16 martti Exp $
+$NetBSD: patch-ba,v 1.1.4.1 2008/04/16 19:23:54 ghen Exp $
 
 Fix pkg/36853
 
---- clamav-milter/clamav-milter.c.orig 2008-02-12 16:03:08.000000000 +0200
-+++ clamav-milter/clamav-milter.c      2008-02-12 16:04:59.000000000 +0200
+--- clamav-milter/clamav-milter.c.orig 2008-04-15 10:32:16.000000000 +0300
++++ clamav-milter/clamav-milter.c      2008-04-15 10:32:35.000000000 +0300
 @@ -90,6 +90,9 @@
  #if   HAVE_RESOLV_H
  #include <arpa/nameser.h>     /* for HEADER */
@@ -14,7 +14,7 @@
  #endif
  #ifdef        HAVE_UNISTD_H
  #include <unistd.h>
-@@ -505,6 +508,20 @@
+@@ -513,6 +516,20 @@
  #endif        /*SESSION*/
  
  static        pthread_cond_t  watchdog_cond = PTHREAD_COND_INITIALIZER;
@@ -35,7 +35,7 @@
  
  #ifndef       SHUT_RD
  #define       SHUT_RD         0
-@@ -2061,12 +2078,19 @@
+@@ -2051,12 +2068,19 @@
        logg(_("Starting %s\n"), clamav_version);
        logg(_("*Debugging is on\n"));
  
@@ -55,7 +55,7 @@
  
        if(blacklist_time) {
                char name[MAXHOSTNAMELEN + 1];
-@@ -2577,6 +2601,18 @@
+@@ -2571,6 +2595,18 @@
        int sock = s->sock;
        struct sockaddr *server = (struct sockaddr *)s->server;
        int server_index = s->server_index;
@@ -74,7 +74,7 @@
  
        if(last_failed_pings[server_index]) {
                s->rc = 0;
-@@ -6137,7 +6173,7 @@
+@@ -6172,7 +6208,7 @@
                        return NULL;
        }
  
@@ -83,7 +83,7 @@
        if(len < 0)
                return t;       /* Host has no MX records */
  
-@@ -6206,7 +6242,7 @@
+@@ -6241,7 +6277,7 @@
        if((host == NULL) || (*host == '\0'))
                return t;
  
@@ -92,7 +92,7 @@
        if(len < 0)
                return t;       /* Host has no A records */
  
-@@ -6265,7 +6301,6 @@
+@@ -6300,7 +6336,6 @@
   *    an SPF system, we ONLY use SPF records to reduce phish false positives
   * TODO: IPv6?
   * TODO: cache queries?
@@ -100,7 +100,7 @@
   *
   * INPUT: prevhosts, a list of hosts already searched: stops include loops
   *    e.g. mercado.com includes medrcadosw.com which includes mercado.com,
-@@ -6317,7 +6352,7 @@
+@@ -6352,7 +6387,7 @@
                *ptr = '\0';
  
        logg("*SPF query '%s'\n", host);



Home | Main Index | Thread Index | Old Index