From 3f9ccf5ce6bdcaff11c30617cc8475f4e12fe4f9 Mon Sep 17 00:00:00 2001
From: ghen <ghen@pkgsrc.org>
Date: Sat, 8 Apr 2006 21:56:55 +0000
Subject: Adjust the default clamd socket location to match the real default
 used by pkgsrc/mail/clamav (/tmp/clamd).  Bump PKGREVISION.  Ok with xtraeme.

---
 mail/clamsmtp/Makefile         |  3 ++-
 mail/clamsmtp/distinfo         |  4 +++-
 mail/clamsmtp/patches/patch-aa | 13 +++++++++++++
 mail/clamsmtp/patches/patch-ab | 13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 mail/clamsmtp/patches/patch-aa
 create mode 100644 mail/clamsmtp/patches/patch-ab

(limited to 'mail/clamsmtp')

diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index 6bdc440d391..d206b2c26e9 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/12/29 06:21:47 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/08 21:56:55 ghen Exp $
 
 DISTNAME=		clamsmtp-1.6
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://memberwebs.com/nielsen/software/clamsmtp/
 
diff --git a/mail/clamsmtp/distinfo b/mail/clamsmtp/distinfo
index 12021adc5a2..0001e08908d 100644
--- a/mail/clamsmtp/distinfo
+++ b/mail/clamsmtp/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.17 2005/12/02 08:48:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.18 2006/04/08 21:56:56 ghen Exp $
 
 SHA1 (clamsmtp-1.6.tar.gz) = 235e44a956140cd60781e37da3491618bb4a42cc
 RMD160 (clamsmtp-1.6.tar.gz) = f051732e6d75852c73cc9aefa4eb55aaddaa2987
 Size (clamsmtp-1.6.tar.gz) = 149113 bytes
+SHA1 (patch-aa) = 4a59000b6c9ca4dfcfa37e125f620a5f674beafa
+SHA1 (patch-ab) = 34d6dd097155d27cdffacccdd3b4df6fab6c37fc
diff --git a/mail/clamsmtp/patches/patch-aa b/mail/clamsmtp/patches/patch-aa
new file mode 100644
index 00000000000..6fe62f45f04
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/04/08 21:56:56 ghen Exp $
+
+--- doc/clamsmtpd.conf.orig	2006-04-06 16:42:26.000000000 +0200
++++ doc/clamsmtpd.conf
+@@ -29,7 +29,7 @@ OutAddress: 10026
+ #Listen: 0.0.0.0:10025
+ 
+ # The address clamd is listening on
+-#ClamAddress: /var/run/clamav/clamd
++#ClamAddress: /tmp/clamd
+ 
+ # A header to add to all scanned email
+ #Header: X-Virus-Scanned: ClamAV using ClamSMTP
diff --git a/mail/clamsmtp/patches/patch-ab b/mail/clamsmtp/patches/patch-ab
new file mode 100644
index 00000000000..47f38f9ff0f
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/04/08 21:56:56 ghen Exp $
+
+--- src/clamsmtpd.c.orig	2006-04-06 16:44:13.000000000 +0200
++++ src/clamsmtpd.c
+@@ -100,7 +100,7 @@ clctx_t;
+ #endif
+ 
+ #define DEFAULT_CONFIG      CONF_PREFIX "/clamsmtpd.conf"
+-#define DEFAULT_CLAMAV      "/var/run/clamav/clamd"
++#define DEFAULT_CLAMAV      "/tmp/clamd"
+ #define DEFAULT_HEADER      "X-Virus-Scanned: ClamAV using ClamSMTP"
+ 
+ /* -----------------------------------------------------------------------
-- 
cgit v1.2.3