Yet another milter/spamassassin interface

7 files changed, 147 insertions, 0 deletions

diff --git a/mail/milter-spamc/DESCR b/mail/milter-spamc/DESCR
new file mode 100644
index 00000000000..e63fce5ba9d
--- /dev/null
+++ b/mail/milter-spamc/DESCR
@@ -0,0 +1 @@
+Yet another Milter interface for Spamassassin. 
diff --git a/mail/milter-spamc/Makefile b/mail/milter-spamc/Makefile
new file mode 100644
index 00000000000..4bc12d6607e
--- /dev/null
+++ b/mail/milter-spamc/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/12/11 17:32:23 manu Exp $
+#
+
+DISTNAME=		milter-spamc-0.10
+CATEGORIES=		mail
+MASTER_SITES=		http://www.snert.com/Software/download/
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		manu@netbsd.org
+HOMEPAGE=		http://www.snert.com/Software/download/
+COMMENT=		Yet another SpamAssassin Milter
+
+WRKSRC=			${WRKDIR}/com/snert/src/milter-spamc
+GNU_CONFIGURE=		yes
+MAKEFILE=		makefile
+USE_BUILDLINK2=		yes
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/milter-spamc.sh ${PREFIX}/etc/rc.d
+	${INSTALL_PROGRAM} ${WRKSRC}/milter-spamc ${PREFIX}/sbin
+	${INSTALL} -d -o smmsp -g smmsp /var/milter-spamc
+
+.include "../../mail/libmilter/buildlink2.mk"
+.include "../../mail/libsnert/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/milter-spamc/PLIST b/mail/milter-spamc/PLIST
new file mode 100644
index 00000000000..ee06813e71e
--- /dev/null
+++ b/mail/milter-spamc/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/11 17:32:24 manu Exp $
+sbin/milter-spamc
+etc/rc.d/milter-spamc.sh
diff --git a/mail/milter-spamc/distinfo b/mail/milter-spamc/distinfo
new file mode 100644
index 00000000000..80514a88acc
--- /dev/null
+++ b/mail/milter-spamc/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/12/11 17:32:24 manu Exp $
+
+SHA1 (milter-spamc-0.10.tgz) = c7f61dea56ea80945ef0b537e5fdb8a060870483
+Size (milter-spamc-0.10.tgz) = 177508 bytes
+SHA1 (patch-aa) = 722ac42f18cd4288f2d81a17039d35ddbc5e6f77
+SHA1 (patch-ab) = b1c22b8f485cb1eab165c87be8ea49eae0a1e430
+SHA1 (patch-ad) = 6aad61235bbd0918fb4c78a9b7e9056eb3fbdafe
diff --git a/mail/milter-spamc/patches/patch-aa b/mail/milter-spamc/patches/patch-aa
new file mode 100644
index 00000000000..fdddc39878f
--- /dev/null
+++ b/mail/milter-spamc/patches/patch-aa
@@ -0,0 +1,24 @@
+--- makefile.in.orig	Wed Oct 29 11:40:29 2003
++++ makefile.in	Wed Oct 29 11:41:10 2003
+@@ -26,9 +26,9 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ BINDIR		= @sbindir@
+-STATEDIR	= @localstatedir@/lib/$(MILTER)
++STATEDIR	= @localstatedir@/$(MILTER)
+ STARTUP_SCRIPT	= @STARTUP_SCRIPT@/$(MILTER)
+ 
+ ########################################################################
+ ### No further configuration beyond this point.
+@@ -54,9 +54,9 @@
+ CC_E	= @CC_E@
+ CC_O	= @CC_O@
+ CFLAGS	= @CFLAGS@ -DSTATEDIR='"$(STATEDIR)"'
+ LDFLAGS	= @LDFLAGS@
+-LIBS	= @LIBS@
++LIBS	= @LIBS@ -lmilter -lpthread
+ 
+ XARGSI	= @XARGSI@
+ RANLIB	= @RANLIB@
+ ARCHIVE	= @ARCHIVE@
diff --git a/mail/milter-spamc/patches/patch-ab b/mail/milter-spamc/patches/patch-ab
new file mode 100644
index 00000000000..e4f8b7f7b98
--- /dev/null
+++ b/mail/milter-spamc/patches/patch-ab
@@ -0,0 +1,73 @@
+--- milter-spamc.sh.in.orig	Wed Oct 29 11:44:01 2003
++++ milter-spamc.sh.in	Tue Oct  7 13:38:30 2003
+@@ -9,10 +9,10 @@
+ 
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ PROGRAM="@sbindir@/@PACKAGE_NAME@"
+-OPTIONS="unix:@localstatedir@/lib/@PACKAGE_NAME@/socket"
+-REQUIRED_DIR="@localstatedir@/lib/@PACKAGE_NAME@"
++OPTIONS="unix:@localstatedir@/@PACKAGE_NAME@/socket"
++REQUIRED_DIR="@localstatedir@/@PACKAGE_NAME@"
+ 
+ FG_RED='\033[1;31m'
+ FG_GREEN='\033[1;32m'
+ FG_WHITE='\033[0;37m'
+@@ -68,9 +68,9 @@
+         printf "Starting %s" $NAME
+ 
+ 	pid=`getpid "$PROGRAM"`
+ 	if [ X"$pid" != X ]; then
+-		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
++		printf '\n'
+ 		return
+ 	fi
+ 
+ 	# Make sure the old socket has been removed, especially for FreeBSD.
+@@ -81,13 +81,13 @@
+ 	sh -c "$PROGRAM $OPTIONS &"
+ 
+ 	pid=`getpid "$PROGRAM"`
+ 	if [ X"$pid" = X ]; then
+-		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
++		printf '\n'
+ 		return
+ 	fi
+ 
+-	printf '\r\033[71C['${FG_GREEN}'  OK  '${FG_NORMAL}']\n'
++	printf '\n'
+ }
+ 
+ stop()
+ {
+@@ -105,14 +105,14 @@
+ 
+ 		sleep 2
+ 		pid=`getpid "$PROGRAM"`
+ 		if [ X"$pid" != X ]; then
+-			printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
++			printf '\n'
+ 			return
+ 		fi
+ 	fi
+ 
+-	printf '\r\033[71C['${FG_GREEN}'  OK  '${FG_NORMAL}']\n'
++	printf '\n'
+ }
+ 
+ case "$1" in
+ restart)
+@@ -127,11 +127,11 @@
+ 	;;
+ status)
+ 	pid=`getpid "$PROGRAM"`
+ 	if [ X"$pid" != X ]; then
+-		printf '\r\033[72C['${FG_GREEN}${pid}${FG_NORMAL}']\n'
++		printf '\n'
+ 	else
+-		printf '\r\033[70C['${FG_RED}'STOPPED'${FG_NORMAL}']\n'
++		printf '\n'
+ 	fi
+ 	;;
+ *)
+ 	printf 'Usage: %s {start|stop|restart|status}\n' $0
diff --git a/mail/milter-spamc/patches/patch-ad b/mail/milter-spamc/patches/patch-ad
new file mode 100644
index 00000000000..98e9f1926ac
--- /dev/null
+++ b/mail/milter-spamc/patches/patch-ad
@@ -0,0 +1,13 @@
+--- milter-spamc.c.orig	Wed Oct 29 11:56:48 2003
++++ milter-spamc.c	Wed Oct 29 11:57:02 2003
+@@ -57,9 +57,9 @@
+ #define DEFAULT_SPAMC_COMMAND		"REPORT"
+ #endif
+ 
+ #ifndef STATEDIR
+-#define STATEDIR			"/var/lib/milter-spamc"
++#define STATEDIR			"/var/milter-spamc"
+ #endif
+ 
+ /*
+  * Allow time for smfi_stop() to cleanly shutdown the milter and exit