diff options
Diffstat (limited to 'mail/clamav')
| -rw-r--r-- | mail/clamav/Makefile | 4 | ||||
| -rw-r--r-- | mail/clamav/distinfo | 12 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-ah | 12 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-ba | 18 |
4 files changed, 23 insertions, 23 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 0bd5e565bf2..80f07a9b1cd 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2008/04/15 07:56:06 martti Exp $ +# $NetBSD: Makefile,v 1.84 2008/06/10 08:23:54 martti 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 f2a5c1f3d63..5c9859aea17 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.51 2008/04/15 07:56:06 martti Exp $ +$NetBSD: distinfo,v 1.52 2008/06/10 08:23:54 martti 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 72f6548fe23..e4609f45a01 100644 --- a/mail/clamav/patches/patch-ah +++ b/mail/clamav/patches/patch-ah @@ -1,10 +1,10 @@ -$NetBSD: patch-ah,v 1.14 2008/04/15 07:56:06 martti Exp $ +$NetBSD: patch-ah,v 1.15 2008/06/10 08:23:54 martti 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 710b8c4b29b..89aecab0906 100644 --- a/mail/clamav/patches/patch-ba +++ b/mail/clamav/patches/patch-ba @@ -1,9 +1,9 @@ -$NetBSD: patch-ba,v 1.2 2008/04/15 07:56:06 martti Exp $ +$NetBSD: patch-ba,v 1.3 2008/06/10 08:23:54 martti 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); |