 @@ -1,28 +1,28 @@
-# $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/-/./}
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-CLAMAV_VERSION=		0.93
+CLAMAV_VERSION=		0.93.1
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
 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}
 .include "../../mk/bsd.prefs.mk"

 @@ -1,33 +1,33 @@
-$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.orig	2008-05-27 13:40:29.000000000 +0300
-+++ clamav-milter/clamav-milter.c	2008-04-15 10:32:16.000000000 +0300
++++ clamav-milter/clamav-milter.c	2008-06-10 10:42:12.000000000 +0300
-@@ -3824,7 +3824,7 @@
+@@ -3830,7 +3830,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
 -						fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
 +						fprintf(sendmail, _("The message %s sent from %s to\n"),
  							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) {
 -						fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
 +						fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
  							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) {
 -		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;

 @@ -1,19 +1,19 @@
-$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.orig	2008-06-10 10:42:12.000000000 +0300
-+++ clamav-milter/clamav-milter.c	2008-04-15 10:32:35.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 */
  #include <resolv.h>
 +#if __RES >= 20030124
 +#define	HAVE_BIND9
 +#endif
  #endif
  #ifdef	HAVE_UNISTD_H
  #include <unistd.h>
 @@ -513,6 +516,20 @@
  #endif	/*SESSION*/
 @@ -25,87 +25,87 @@ Fix pkg/36853
 +		pthread_mutex_lock(&res_mutex); \
 +		len = res_query((h), (c), (t), (q), (s)); \
 +		pthread_mutex_unlock(&res_mutex); \
 +	} while (/*CONSTCOND*/0)
 +#else
 +static	pthread_key_t res_key;
 +#define RES_QUERY(len, h, c, t, q, s) \
 +	len = res_nquery((res_state)pthread_getspecific(res_key), \
 +	    (h), (c), (t), (q), (s))
 +#endif
  #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"));
 +#ifndef HAVE_BIND9
  	if(!(_res.options&RES_INIT))
  		if(res_init() < 0) {
  			fprintf(stderr, "%s: Can't initialise the resolver\n",
  				argv[0]);
  			return EX_UNAVAILABLE;
+ 		}
 +#else
 +	if (pthread_key_create(&res_key, free)) {
 +		perror("pthread_key_create");
 +		return EX_UNAVAILABLE;
 +	}
 +#endif
  	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;
 +#ifdef HAVE_BIND9
 +	res_state res = cli_calloc(1, sizeof(*res));
 +	if (pthread_setspecific(res_key, res)) {
 +		perror("pthread_setspecific");
 +		free(res);
 +		return NULL;
 +	}
 +	if (res_ninit(res) < 0) {
 +		perror("res_ninit");
 +		return NULL;
 +	}
 +#endif
  	if(last_failed_pings[server_index]) {
  		s->rc = 0;
-@@ -6172,7 +6208,7 @@
+@@ -6178,7 +6214,7 @@
  			return NULL;
+ 	}
 -	len = res_query(host, C_IN, T_MX, (u_char *)&q, sizeof(q));
 +	RES_QUERY(len, host, C_IN, T_MX, (u_char *)&q, sizeof(q));
  	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;
 -	len = res_query(host, C_IN, T_A, (u_char *)&q, sizeof(q));
 +	RES_QUERY(len, host, C_IN, T_A, (u_char *)&q, sizeof(q));
  	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?
 - * TODO: check res_query is thread safe
+  *
   * 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);
 -	len = res_query(host, C_IN, T_TXT, (u_char *)&q, sizeof(q));
 +	RES_QUERY(len, host, C_IN, T_TXT, (u_char *)&q, sizeof(q));
  	if(len < 0) {
  		free(host);
  		return 0;	/* Host has no TXT records */

 @@ -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
+SHA1 (clamav-0.93.1.tar.gz) = 3306f3cd289aac3793962c9834cd1bd500abfb0c
-RMD160 (clamav-0.93.tar.gz) = a1f301345983ed0606e2f2e13ef63275bd341cd4
+RMD160 (clamav-0.93.1.tar.gz) = 22296401b3ce96a268f0db224e72c31e69090895
-Size (clamav-0.93.tar.gz) = 16134725 bytes
+Size (clamav-0.93.1.tar.gz) = 17246314 bytes
 SHA1 (patch-ad) = db632e0e44e5a6c42cbe30726aa492881b5a5384
 SHA1 (patch-af) = e8d3f68e8017c5a6e7377cb03fc978a6581b7d5e
-SHA1 (patch-ah) = 24d64a6abbddfb0986d73afbde7db8cf2f08ca3e
+SHA1 (patch-ah) = b61efd44878e0b9a2bbc3c41e2e50d72b833fea3
-SHA1 (patch-ba) = dbaeb15f9f52990abfccfd9b0674a300e0d22e05
+SHA1 (patch-ba) = 80208ac7e447776073a6e539f1deaa45d4195096