Pullup ticket 2422 - requested by martti

latest update for clamav

- pkgsrc/mail/clamav/Makefile				1.84
- pkgsrc/mail/clamav/distinfo				1.52
- pkgsrc/mail/clamav/patches/patch-ah			1.15
- pkgsrc/mail/clamav/patches/patch-ba			1.3

   Module Name:	pkgsrc
   Committed By:	martti
   Date:		Tue Jun 10 08:23:54 UTC 2008

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

   Log Message:
   Updated mail/clamav to 0.93.1

      * libclamav/petite.c: fix possible invalid memory access (bb#1000)
        Reported by Damian Put
      * clamdscan/clamdscan.c: don't show scan summary when clamd cannot be
        contacted (bb#1041)
      * libclamav/hashtab.[ch], scanners.c: avoid using C99 flexible array members
        (bb #1039)
      * libclamav/unzip.c: correct the previous fix
      * libclamav/unzip.c: check for unprefixed bz2 - bb#1038
      * libclamav/ole2_extract.c: revert last commit
      * libclamav/ole2_extract.c: use cli_unlink
      * libclamav/ole2_extract.c: partial scan of broken ole files
      * contrib/init/RedHat: check for already running clamav-milter (bb #823)
      * libclamav/regex: avoid name collisions on AIX (bb #947)
        sync with libc: minor cleanups
      * doc/clamdoc.tex: add a note about forking daemons (bb#906)
      * libclamav/Makefile.am: link .la files first, this
        should avoid linking to old libclamav as in bb #931
      * libclamav/readdb.h: read daily.cfg stored inside .cld containers (bb#1006)
      * libclamav/mbox.c, shared/network.c: prevent uninitialized use of hostent
        structure (bb #1003).
      * libclamav/mspack.c: downgrade some error messages (bb#911)
      * clamav-milter: retrieve db version from daily.cld (bb#942)
      * libclamav/scanners.c: don't return CL_EMAX* error codes to
        applications (bb#1001)
      * clamscan/manager.c: print information about clean files when the RAR
        code is not compiled-in (bb#999)
      * libclamav/unzip.c: remove detection of Suspect.Zip and
        Exploit.Zip.ModifiedHeaders (bb#997)
      * libclamav: scan for embedded PEs inside OLE2 files (bb#914)
      * libclamav/cvd.c: add work-around for zlib issues with mixed data (bb#932)
      * libclamav/others.h: explicitely cast some constants (bb#936)
      * sigtool/sigtool.c: bb#938 (sigtool --list-sigs not working with .cld files)
      * libclamav/dconf.h: fix flag code assignment (bb #952)
      * libclamav/iana_tld.h, libclamav/phishcheck.c: update TLD list (bb #925)

4 files changed, 23 insertions, 23 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 7813defa10c..c0016931c45 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82.2.1 2008/04/16 19:23:54 ghen Exp $
+# $NetBSD: Makefile,v 1.82.2.2 2008/06/13 13:57:36 ghen 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.93
+CLAMAV_VERSION=		0.93.1
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 3b2541c62ac..e5a7fc9c21f 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50.2.1 2008/04/16 19:23:54 ghen Exp $
+$NetBSD: distinfo,v 1.50.2.2 2008/06/13 13:57:36 ghen Exp $
 
-SHA1 (clamav-0.93.tar.gz) = bae5f70331e8592e9c53a04517038890845d406d
-RMD160 (clamav-0.93.tar.gz) = a1f301345983ed0606e2f2e13ef63275bd341cd4
-Size (clamav-0.93.tar.gz) = 16134725 bytes
+SHA1 (clamav-0.93.1.tar.gz) = 3306f3cd289aac3793962c9834cd1bd500abfb0c
+RMD160 (clamav-0.93.1.tar.gz) = 22296401b3ce96a268f0db224e72c31e69090895
+Size (clamav-0.93.1.tar.gz) = 17246314 bytes
 SHA1 (patch-ad) = db632e0e44e5a6c42cbe30726aa492881b5a5384
 SHA1 (patch-af) = e8d3f68e8017c5a6e7377cb03fc978a6581b7d5e
-SHA1 (patch-ah) = 24d64a6abbddfb0986d73afbde7db8cf2f08ca3e
-SHA1 (patch-ba) = dbaeb15f9f52990abfccfd9b0674a300e0d22e05
+SHA1 (patch-ah) = b61efd44878e0b9a2bbc3c41e2e50d72b833fea3
+SHA1 (patch-ba) = 80208ac7e447776073a6e539f1deaa45d4195096
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index a5804c2a4cf..d5ae5b10bf2 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.13.2.1 2008/04/16 19:23:54 ghen Exp $
+$NetBSD: patch-ah,v 1.13.2.2 2008/06/13 13:57:36 ghen Exp $
 
 Build fixes.
 
---- 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 @@
+--- clamav-milter/clamav-milter.c.orig	2008-05-27 13:40:29.000000000 +0300
++++ clamav-milter/clamav-milter.c	2008-06-10 10:42:12.000000000 +0300
+@@ -3830,7 +3830,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -13,7 +13,7 @@ Build fixes.
  							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3838,7 +3838,7 @@
+@@ -3844,7 +3844,7 @@
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -22,7 +22,7 @@ Build fixes.
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -5027,7 +5027,7 @@
+@@ -5034,7 +5034,7 @@
  	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
  	if(move(privdata->filename, newname) < 0) {
diff --git a/mail/clamav/patches/patch-ba b/mail/clamav/patches/patch-ba
index 61bb8404626..ef674be30df 100644
--- a/mail/clamav/patches/patch-ba
+++ b/mail/clamav/patches/patch-ba
@@ -1,9 +1,9 @@
-$NetBSD: patch-ba,v 1.1.4.1 2008/04/16 19:23:54 ghen Exp $
+$NetBSD: patch-ba,v 1.1.4.2 2008/06/13 13:57:36 ghen Exp $
 
 Fix pkg/36853
 
---- 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
+--- clamav-milter/clamav-milter.c.orig	2008-06-10 10:42:12.000000000 +0300
++++ clamav-milter/clamav-milter.c	2008-06-10 10:42:58.000000000 +0300
 @@ -90,6 +90,9 @@
  #if	HAVE_RESOLV_H
  #include <arpa/nameser.h>	/* for HEADER */
@@ -35,7 +35,7 @@ Fix pkg/36853
  
  #ifndef	SHUT_RD
  #define	SHUT_RD		0
-@@ -2051,12 +2068,19 @@
+@@ -2053,12 +2070,19 @@
  	logg(_("Starting %s\n"), clamav_version);
  	logg(_("*Debugging is on\n"));
  
@@ -55,7 +55,7 @@ Fix pkg/36853
  
  	if(blacklist_time) {
  		char name[MAXHOSTNAMELEN + 1];
-@@ -2571,6 +2595,18 @@
+@@ -2574,6 +2598,18 @@
  	int sock = s->sock;
  	struct sockaddr *server = (struct sockaddr *)s->server;
  	int server_index = s->server_index;
@@ -74,7 +74,7 @@ Fix pkg/36853
  
  	if(last_failed_pings[server_index]) {
  		s->rc = 0;
-@@ -6172,7 +6208,7 @@
+@@ -6178,7 +6214,7 @@
  			return NULL;
  	}
  
@@ -83,7 +83,7 @@ Fix pkg/36853
  	if(len < 0)
  		return t;	/* Host has no MX records */
  
-@@ -6241,7 +6277,7 @@
+@@ -6247,7 +6283,7 @@
  	if((host == NULL) || (*host == '\0'))
  		return t;
  
@@ -92,7 +92,7 @@ Fix pkg/36853
  	if(len < 0)
  		return t;	/* Host has no A records */
  
-@@ -6300,7 +6336,6 @@
+@@ -6306,7 +6342,6 @@
   *	an SPF system, we ONLY use SPF records to reduce phish false positives
   * TODO: IPv6?
   * TODO: cache queries?
@@ -100,7 +100,7 @@ Fix pkg/36853
   *
   * INPUT: prevhosts, a list of hosts already searched: stops include loops
   *	e.g. mercado.com includes medrcadosw.com which includes mercado.com,
-@@ -6352,7 +6387,7 @@
+@@ -6358,7 +6393,7 @@
  		*ptr = '\0';
  
  	logg("*SPF query '%s'\n", host);