Added spamd stuff; closing bug #4463

7 files changed, 46 insertions, 27 deletions

diff --git a/dev-perl/Mail-SpamAssassin/ChangeLog b/dev-perl/Mail-SpamAssassin/ChangeLog
index 5b1883e971ab..f6cb11142eb5 100644
--- a/dev-perl/Mail-SpamAssassin/ChangeLog
+++ b/dev-perl/Mail-SpamAssassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Mail-SpamAssassin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.3 2002/07/02 16:16:05 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.4 2002/07/04 05:16:57 g2boojum Exp $
+
+*Mail-SpamAssassin-2.31-r2 (04 Jul 2002)
+
+  04 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  Adding spamd init stuff (thanks to Marcelo Fontenele S Santos); removing
+  old versions
 
 *Mail-SpamAssassin-2.31-r1 (02 Jul 2002)
 
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.20.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.20.ebuild
deleted file mode 100644
index 435332ad16c9..000000000000
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.20.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# /space/gentoo/cvsroot/gentoo-x86/dev-perl/Net-DNS/Net-DNS-0.19.ebuild,v 1.2 2002/05/21 18:14:07 danarmak Exp
-
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-SRC_URI="http://www.spamassassin.org/released/${P}.tar.gz"
-HOMEPAGE="http://www.spamassassin.org"
-
-DEPEND="dev-perl/Net-DNS"
-LICENSE="GPL-2 | Artistic"
-
-mydoc="License TODO"
-
-src_install () {
-	make PREFIX=${D}/usr INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-	LOCAL_RULES_DIR=${D}/etc/mail/spamassassin \
-	INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die
-	dodoc Changes MANIFEST README TODO License
-	dodoc procmailrc.example sample-nonspam.txt sample-spam.txt
-}
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.31-r1.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.31-r2.ebuild
index a26836acbecc..bfdb8ea36957 100644
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.31-r1.ebuild
+++ b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.31-r2.ebuild
@@ -22,4 +22,8 @@ src_install () {
 	INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die
 	dodoc Changes MANIFEST README TODO License
 	dodoc procmailrc.example sample-nonspam.txt sample-spam.txt
+	dodir /etc/init.d /etc/conf.d
+	cp ${FILESDIR}/spamd.init ${D}/etc/init.d/spamd
+	chmod +x ${D}/etc/init.d/spamd
+	cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
 }
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.20 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.20
deleted file mode 100644
index b0c12f636e20..000000000000
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d1ce17ca848c3528e14f588873d1164 Mail-SpamAssassin-2.20.tar.gz 249143
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.31-r1 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.31-r2
index e1e783f8ba38..e1e783f8ba38 100644
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.31-r1
+++ b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.31-r2
diff --git a/dev-perl/Mail-SpamAssassin/files/spamd.conf b/dev-perl/Mail-SpamAssassin/files/spamd.conf
new file mode 100644
index 000000000000..83248f8ac505
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/files/spamd.conf
@@ -0,0 +1,11 @@
+# Config file for /etc/init.d/spamd
+
+# Some options:
+#
+# -a for auto-white-list
+# -c to create a per user configuration file
+# -L if you want to suppress DNS lookup 
+#
+# for more help look in man spamd
+
+SPAMD_OPTS="-a -c"
diff --git a/dev-perl/Mail-SpamAssassin/files/spamd.init b/dev-perl/Mail-SpamAssassin/files/spamd.init
new file mode 100644
index 000000000000..cf06fcf51626
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/files/spamd.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+# NB: Config is in /etc/conf.d/spamd.conf
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting spamd"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/spamd -- -d -r /var/run/spamd.pid \
+			${SPAMD_OPTS}
+	eend $? "Failed to start spamd"
+}
+
+stop() {
+	ebegin "Stopping spamd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/spamd.pid
+	eend $? "Failed to stop spamd"
+}