pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2008Q2]: pkgsrc/mail/clamav Pullup ticket 2518 - requested by ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/57d5bec728b4
branches: pkgsrc-2008Q2
changeset: 544308:57d5bec728b4
user: ghen <ghen%pkgsrc.org@localhost>
date: Fri Sep 05 11:41:53 2008 +0000
description:
Pullup ticket 2518 - requested by martti
security update for clamav
- pkgsrc/mail/clamav/Makefile 1.87
- pkgsrc/mail/clamav/buildlink3.mk 1.16
- pkgsrc/mail/clamav/distinfo 1.54
- pkgsrc/mail/clamav/patches/patch-ad 1.15
- pkgsrc/mail/clamav/patches/patch-af 1.6
- pkgsrc/mail/clamav/patches/patch-ah 1.16
- pkgsrc/mail/clamav/patches/patch-ba removed
Module Name: pkgsrc
Committed By: martti
Date: Thu Sep 4 06:44:07 UTC 2008
Modified Files:
pkgsrc/mail/clamav: Makefile buildlink3.mk distinfo
pkgsrc/mail/clamav/patches: patch-ad patch-af patch-ah
Removed Files:
pkgsrc/mail/clamav/patches: patch-ba
Log Message:
Updated mail/clamav to 0.94
* Lots of bug fixes
I removed patch-ba and tested this on NetBSD/i386 3.1.1_PATCH and
NetBSD/amd64 4.0_STABLE and everything seems to work...
diffstat:
mail/clamav/Makefile | 4 +-
mail/clamav/buildlink3.mk | 4 +-
mail/clamav/distinfo | 15 ++---
mail/clamav/patches/patch-ad | 8 +-
mail/clamav/patches/patch-af | 16 +++---
mail/clamav/patches/patch-ah | 12 ++--
mail/clamav/patches/patch-ba | 111 -------------------------------------------
7 files changed, 29 insertions(+), 141 deletions(-)
diffs (251 lines):
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/Makefile
--- a/mail/clamav/Makefile Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/Makefile Fri Sep 05 11:41:53 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2008/07/09 08:40:13 ghen Exp $
+# $NetBSD: Makefile,v 1.86.4.1 2008/09/05 11:41:53 ghen Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -13,7 +13,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
-CLAMAV_VERSION= 0.93.3
+CLAMAV_VERSION= 0.94
USE_LIBTOOL= yes
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/buildlink3.mk
--- a/mail/clamav/buildlink3.mk Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/buildlink3.mk Fri Sep 05 11:41:53 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/02/12 14:17:16 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15.6.1 2008/09/05 11:41:53 ghen Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
.if ${CLAMAV_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.clamav+= clamav>=0.92.1
+BUILDLINK_API_DEPENDS.clamav+= clamav>=0.94
BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav
.endif # CLAMAV_BUILDLINK3_MK
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/distinfo
--- a/mail/clamav/distinfo Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/distinfo Fri Sep 05 11:41:53 2008 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.53 2008/07/09 08:40:13 ghen Exp $
+$NetBSD: distinfo,v 1.53.4.1 2008/09/05 11:41:53 ghen Exp $
-SHA1 (clamav-0.93.3.tar.gz) = 01240613b639144fa8fa655825f6587e044a1c1c
-RMD160 (clamav-0.93.3.tar.gz) = 8379148790cc545c801709d46b7db87634f43f67
-Size (clamav-0.93.3.tar.gz) = 18242568 bytes
-SHA1 (patch-ad) = db632e0e44e5a6c42cbe30726aa492881b5a5384
-SHA1 (patch-af) = e8d3f68e8017c5a6e7377cb03fc978a6581b7d5e
-SHA1 (patch-ah) = b61efd44878e0b9a2bbc3c41e2e50d72b833fea3
-SHA1 (patch-ba) = 80208ac7e447776073a6e539f1deaa45d4195096
+SHA1 (clamav-0.94.tar.gz) = d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5
+RMD160 (clamav-0.94.tar.gz) = 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5
+Size (clamav-0.94.tar.gz) = 20509228 bytes
+SHA1 (patch-ad) = f13bc822a3f405861fb1c2a219d238efcaddf64a
+SHA1 (patch-af) = 87ae131299a99df40252590f4400234e3de7c2b3
+SHA1 (patch-ah) = 5c5d06d305c9bdeb6c794ccbb0be33f0088026d8
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/patches/patch-ad
--- a/mail/clamav/patches/patch-ad Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/patches/patch-ad Fri Sep 05 11:41:53 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.14 2008/04/15 07:56:06 martti Exp $
+$NetBSD: patch-ad,v 1.14.4.1 2008/09/05 11:41:53 ghen Exp $
Optionally build clamav-milter.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 @@
+--- docs/Makefile.in.orig 2008-09-01 21:49:47.000000000 +0300
++++ docs/Makefile.in 2008-09-04 08:26:43.000000000 +0300
+@@ -210,6 +210,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 5b95b2d5067c -r 57d5bec728b4 mail/clamav/patches/patch-af
--- a/mail/clamav/patches/patch-af Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/patches/patch-af Fri Sep 05 11:41:53 2008 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-af,v 1.5 2008/04/15 07:56:06 martti Exp $
+$NetBSD: patch-af,v 1.5.4.1 2008/09/05 11:41:53 ghen Exp $
Installation fixes.
---- 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)
-- @if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
+--- database/Makefile.in.orig 2008-09-01 21:49:47.000000000 +0300
++++ database/Makefile.in 2008-09-04 08:28:24.000000000 +0300
+@@ -375,17 +375,6 @@
+ $(mkinstalldirs) $(DESTDIR)$(DBINST);\
+ test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\
+ test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\
+- if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
- chmod 775 $(DESTDIR)$(DBINST); \
- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/patches/patch-ah
--- a/mail/clamav/patches/patch-ah Fri Sep 05 11:35:15 2008 +0000
+++ b/mail/clamav/patches/patch-ah Fri Sep 05 11:41:53 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.15 2008/06/10 08:23:54 martti Exp $
+$NetBSD: patch-ah,v 1.15.4.1 2008/09/05 11:41:53 ghen Exp $
Build fixes.
---- 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 @@
+--- clamav-milter/clamav-milter.c.orig 2008-09-01 20:19:44.000000000 +0300
++++ clamav-milter/clamav-milter.c 2008-09-04 08:28:44.000000000 +0300
+@@ -3926,7 +3926,7 @@
* the postmaster, so include
* some useful information
*/
@@ -13,7 +13,7 @@
sendmailId, privdata->from);
else
fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3844,7 +3844,7 @@
+@@ -3940,7 +3940,7 @@
fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
if(hflag) {
@@ -22,7 +22,7 @@
smfi_getsymval(ctx, "j"), privdata->from,
smfi_getsymval(ctx, "_"));
fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -5034,7 +5034,7 @@
+@@ -5129,7 +5129,7 @@
cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
if(move(privdata->filename, newname) < 0) {
diff -r 5b95b2d5067c -r 57d5bec728b4 mail/clamav/patches/patch-ba
--- a/mail/clamav/patches/patch-ba Fri Sep 05 11:35:15 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2008/06/10 08:23:54 martti Exp $
-
-Fix pkg/36853
-
---- 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 */
- #include <resolv.h>
-+#if __RES >= 20030124
-+#define HAVE_BIND9
-+#endif
- #endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-@@ -513,6 +516,20 @@
- #endif /*SESSION*/
-
- static pthread_cond_t watchdog_cond = PTHREAD_COND_INITIALIZER;
-+#ifndef HAVE_BIND9
-+static pthread_mutex_t res_mutex = PTHREAD_MUTEX_INITIALIZER;
-+#define RES_QUERY(len, h, c, t, q, s) \
-+ do { \
-+ 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
-@@ -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];
-@@ -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;
-@@ -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 */
-
-@@ -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 */
-
-@@ -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,
-@@ -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 */
Home |
Main Index |
Thread Index |
Old Index