[pkgsrc/pkgsrc-2005Q3]: pkgsrc/mail/clamav Pullup ticket 891 - requested by L...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da65f2add523
branches:  pkgsrc-2005Q3
changeset: 499670:da65f2add523
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Nov 05 17:37:40 2005 +0000

description:
Pullup ticket 891 - requested by Lubomir Sedlacik
security update for clamav

Revisions pulled up:
- pkgsrc/mail/clamav/distinfo           1.31
- pkgsrc/mail/clamav/distinfo           1.32
- pkgsrc/mail/clamav/patches/patch-ah   1.5
- pkgsrc/mail/clamav/patches/patch-ah   1.6
- pkgsrc/mail/clamav/Makefile           1.46
- pkgsrc/mail/clamav/Makefile           1.47

   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Thu Oct 13 18:09:06 UTC 2005

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

   Log Message:
   Added a chunk to patch-ah that fixes one of the ubiquitous
   declaration-after-code occurences. Fixes PR #31576.
---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Sun Oct 23 22:32:20 UTC 2005

   Modified Files:
           pkgsrc/mail/clamav: Makefile

   Log Message:
   Added --with-zlib=${BUILDLINK_PREFIX.zlib} to CONFIGURE_ARGS. This
   should fix PR 31898.
---
   Module Name:    pkgsrc
   Committed By:   grant
   Date:           Fri Nov  4 03:47:49 UTC 2005

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

   Log Message:
   update clamav to 0.87.1.

   changes since 0.87:

     * Bugfixes:
       - libclamav/petite.c: fix boundary checks (acab)
       - libclamav/mbox.c: scan attachments that have no filename (njh)
       - libclamav/fsg.c: fix buffer size calculation in unfsg_133
         Reported by Zero Day Initiative (ZDI-CAN-004)
       - libclamav/tnef.c: fix possible infinite loop
         Reported by iDEFENSE (IDEF1169).
       - libclamav/mspack/cabd.c: fix possible infinite loop in cabd_find
         (tk)
         Reported by iDEFENSE (IDEF1180).
       - clamd/others.c: fix compilation error on Cobalt Qube 1 (tk)
       - clamd: properly handle ReadTimeout in SESSION (tk)
         Bug reported by Kamil Kaczkowski <kamil*kamil.eisp.pl>
       - libclamav/others.c,h: Add generic bitset implementation (trog)
       - libclamav/ole2_extract.c: Make sure the property tree doesn't
         loop (trog)
         Fixes CAN-2005-3239. Installations with default settings were
         not affected by this bug.

diffstat:

 mail/clamav/Makefile         |   5 +++--
 mail/clamav/distinfo         |  10 +++++-----
 mail/clamav/patches/patch-ah |  12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs (79 lines):

diff -r 7779109c0770 -r da65f2add523 mail/clamav/Makefile
--- a/mail/clamav/Makefile      Sat Nov 05 17:25:35 2005 +0000
+++ b/mail/clamav/Makefile      Sat Nov 05 17:37:40 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44.2.1 2005/09/30 02:24:50 snj Exp $
+# $NetBSD: Makefile,v 1.44.2.2 2005/11/05 17:37:40 snj Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
@@ -11,7 +11,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-CLAMAV_VERSION=                0.87
+CLAMAV_VERSION=                0.87.1
 
 USE_LIBTOOL=           yes
 
@@ -22,6 +22,7 @@
 CONFIGURE_ARGS+=       --with-uid=${CLAMAV_USER}
 CONFIGURE_ARGS+=       --with-group=${CLAMAV_GROUP}
 CONFIGURE_ARGS+=       --with-tcpwrappers
+CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 7779109c0770 -r da65f2add523 mail/clamav/distinfo
--- a/mail/clamav/distinfo      Sat Nov 05 17:25:35 2005 +0000
+++ b/mail/clamav/distinfo      Sat Nov 05 17:37:40 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29.2.1 2005/09/30 02:24:50 snj Exp $
+$NetBSD: distinfo,v 1.29.2.2 2005/11/05 17:37:40 snj Exp $
 
-SHA1 (clamav-0.87.tar.gz) = 783d8bbd7dd956333a5c66c09cef7b2f410e229e
-RMD160 (clamav-0.87.tar.gz) = eced1d11a2747ff2ffda6060b959afe00ba21561
-Size (clamav-0.87.tar.gz) = 4273714 bytes
+SHA1 (clamav-0.87.1.tar.gz) = 995f0d70c71455056d5c399b6704e07c42742646
+RMD160 (clamav-0.87.1.tar.gz) = cc8c4436e2da70955d067b8bbe1610a7d20c4884
+Size (clamav-0.87.1.tar.gz) = 4468992 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
 SHA1 (patch-ab) = afe9915e3fbed6c8dee93101149206a9b2f5c13c
 SHA1 (patch-ad) = 3723ad7212f15ba4e2690127515bfb1f37b97f71
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ah) = ab0bb5ccef06ad4fc37cc0210f939c00a9a2e052
+SHA1 (patch-ah) = 26e0d7db6a6ea8f491459f65197278de4b232f89
diff -r 7779109c0770 -r da65f2add523 mail/clamav/patches/patch-ah
--- a/mail/clamav/patches/patch-ah      Sat Nov 05 17:25:35 2005 +0000
+++ b/mail/clamav/patches/patch-ah      Sat Nov 05 17:37:40 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2005/05/05 00:42:56 xtraeme Exp $
+$NetBSD: patch-ah,v 1.4.4.1 2005/11/05 17:37:40 snj Exp $
 
---- clamav-milter/clamav-milter.c.orig 2005-05-05 02:31:54.000000000 +0200
-+++ clamav-milter/clamav-milter.c      2005-05-05 02:33:45.000000000 +0200
-@@ -2892,7 +2892,7 @@
+--- clamav-milter/clamav-milter.c.orig 2005-10-26 07:40:59.000000000 +1000
++++ clamav-milter/clamav-milter.c
+@@ -2973,7 +2973,7 @@ clamfi_eom(SMFICTX *ctx)
                                                 * the postmaster, so include
                                                 * some useful information
                                                 */
@@ -11,7 +11,7 @@
                                                        sendmailId, privdata->from);
                                        else
                                                fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -2906,7 +2906,7 @@
+@@ -2987,7 +2987,7 @@ clamfi_eom(SMFICTX *ctx)
                                                fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
                                        if(hflag) {
@@ -20,7 +20,7 @@
                                                        smfi_getsymval(ctx, "j"), privdata->from,
                                                        smfi_getsymval(ctx, "_"));
                                                fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4047,7 +4047,7 @@
+@@ -4150,7 +4150,7 @@ qfile(struct privdata *privdata, const c
  
        if(move(privdata->filename, newname) < 0) {
                if(use_syslog)