improve spamd.init as per bug #22833 so it starts in the correct place, and bump revision with slight ebuild cleanup

5 files changed, 104 insertions, 6 deletions

diff --git a/dev-perl/Mail-SpamAssassin/ChangeLog b/dev-perl/Mail-SpamAssassin/ChangeLog
index 7957c6e245ff..fb07979a80f2 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.34 2003/10/15 16:05:06 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.35 2003/10/28 20:22:12 robbat2 Exp $
+
+*Mail-SpamAssassin-2.60-r2 (28 Oct 2003)
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  Mail-SpamAssassin-2.60-r2.ebuild, files/spamd.init:
+  improve spamd.init as per bug #22833 so it starts in the correct place, and
+  bump revision with slight ebuild cleanup
 
   15 Oct 2003; Michael Cummings <mcummings@gentoo.org>
   Mail-SpamAssassin-2.60-r1.ebuild:
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60-r2.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60-r2.ebuild
new file mode 100644
index 000000000000..17ee41adace3
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60-r2.ebuild,v 1.1 2003/10/28 20:22:12 robbat2 Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
+SRC_URI="http://spamassassin.org/released/${P}.tar.bz2"
+HOMEPAGE="http://spamassassin.org"
+IUSE="berkdb ssl"
+SLOT="0"
+LICENSE="GPL-2 | Artistic"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha"
+
+newdepend ">=dev-perl/ExtUtils-MakeMaker-6.11-r1
+	dev-perl/Time-Local
+	dev-perl/Getopt-Long
+	>=dev-perl/File-Spec-0.8
+	>=dev-perl/PodParser-1.22
+	>=dev-perl/HTML-Parser-3.24
+	dev-perl/Net-DNS
+	dev-perl/Digest-SHA1
+	ssl?    ( dev-perl/IO-Socket-SSL )
+	berkdb? ( dev-perl/DB_File )"
+
+myconf="CONTACT_ADDRESS=root@localhost RUN_NET_TESTS=0"
+
+# If ssl is enabled, spamc can be built with ssl support
+if use ssl; then
+	myconf="${myconf} ENABLE_SSL=yes"
+fi
+
+# if you are going to enable taint mode, make sure that the bug where
+# spamd doesn't start when the PATH contains . is addressed, and make
+# sure you deal with versions of razor <2.36-r1 not being taint-safe.
+# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
+# <http://spamassassin.org/released/Razor2.patch>.
+
+myconf="${myconf} PERL_TAINT=no"
+
+# No settings needed for 'make all'.
+mymake=""
+
+# Neither for 'make install'.
+myinst=""
+
+# Some more files to be installed (README* and Changes are already
+# included per default)
+mydoc="License
+	COPYRIGHT
+	TRADEMARK
+	CONTRIB_CERT
+	BUGS
+	USAGE
+	procmailrc.example
+	sample-nonspam.txt
+	sample-spam.txt "
+
+src_compile() {
+	perl-module_src_compile
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Add the init and config scripts.
+	dodir /etc/init.d /etc/conf.d
+	insinto /etc/init.d
+	newins ${FILESDIR}/spamd.init spamd
+	fperms 755 /etc/init.d/spamd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/spamd.conf spamd
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if [ -z "`best_version dev-perl/DB_File`" ]; then
+		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
+		einfo "need to emerge dev-perl/DB_File to make it available."
+	fi
+
+}
diff --git a/dev-perl/Mail-SpamAssassin/Manifest b/dev-perl/Mail-SpamAssassin/Manifest
index 4ebfc6d25103..6403d75b150a 100644
--- a/dev-perl/Mail-SpamAssassin/Manifest
+++ b/dev-perl/Mail-SpamAssassin/Manifest
@@ -1,17 +1,18 @@
 MD5 88f9fcb1c14b558f2d4d384a7ea657b8 Mail-SpamAssassin-2.55-r1.ebuild 1160
-MD5 d2cf5b8a9f609a22b42cce78f07f0261 Mail-SpamAssassin-2.60-r2.ebuild 2207
+MD5 871ed2ffe63a85843cea90533421b064 Mail-SpamAssassin-2.60-r2.ebuild 2202
 MD5 3f2922db33fd2ce30f3c2a485a8e3182 Mail-SpamAssassin-2.60.ebuild 2055
+MD5 a2b0dd8515c14ddc4c0e1aee4150f623 Mail-SpamAssassin-2.60-r1.ebuild 2199
 MD5 c5b253142d058190482f51af7a8e2c7d Mail-SpamAssassin-2.44.ebuild 1342
 MD5 bb7444257b58106e1975d28fe18af876 Mail-SpamAssassin-2.55-r2.ebuild 1201
 MD5 eb31bd2628cee7457a31ab911737510d Mail-SpamAssassin-2.55.ebuild 1385
-MD5 bda57ea1e7cdd2728a81a261f482c9b9 ChangeLog 5966
+MD5 bd4dc11b99a54c18147e5a3a005967b8 ChangeLog 6235
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55-r1 74
 MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55-r2 74
 MD5 eb124c50f7f7ab2f7e12b8b5bb325e60 files/digest-Mail-SpamAssassin-2.60-r1 75
 MD5 eb124c50f7f7ab2f7e12b8b5bb325e60 files/digest-Mail-SpamAssassin-2.60-r2 75
 MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265
-MD5 cae81275c9ef421a0ede5775e26be052 files/spamd.init 536
+MD5 4bc47f7ee058bf11457cca8723fcac91 files/spamd.init 576
 MD5 1e2dfc5372ad24097799c70e896fe8c4 files/digest-Mail-SpamAssassin-2.44 74
 MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55 74
 MD5 aa8db426d67f90c5c540c2c9429b7d78 files/digest-Mail-SpamAssassin-2.60 74
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60-r2 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60-r2
new file mode 100644
index 000000000000..71231348022f
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60-r2
@@ -0,0 +1 @@
+MD5 bd1607d8fa52ef3f5fdda5e05f971e9d Mail-SpamAssassin-2.60.tar.bz2 834869
diff --git a/dev-perl/Mail-SpamAssassin/files/spamd.init b/dev-perl/Mail-SpamAssassin/files/spamd.init
index e0f66b82e789..840103a91650 100644
--- a/dev-perl/Mail-SpamAssassin/files/spamd.init
+++ b/dev-perl/Mail-SpamAssassin/files/spamd.init
@@ -6,18 +6,23 @@
 
 depend() {
 	need net
+	before mta
 }
 
+pidfile=/var/run/spamd.pid
+
 start() {
 	ebegin "Starting spamd"
 	start-stop-daemon --start --quiet \
-		--exec /usr/bin/spamd -- -d -r /var/run/spamd.pid \
+		--exec /usr/bin/spamd -- -d -r ${pidfile} \
 			${SPAMD_OPTS}
 	eend $? "Failed to start spamd"
 }
 
 stop() {
 	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/spamd.pid
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
 	eend $? "Failed to stop spamd"
 }
+
+# vim:ts=4 noexpandtab ft=sh: