Revamped initscript and config with dropped privs and options, see #134258 and #134118

Package-Manager: portage-2.0.54-r2

7 files changed, 108 insertions, 9 deletions

diff --git a/mail-filter/spamass-milter/ChangeLog b/mail-filter/spamass-milter/ChangeLog
index 1d478f1b9610..11a0d4600ef7 100644
--- a/mail-filter/spamass-milter/ChangeLog
+++ b/mail-filter/spamass-milter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/spamass-milter
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.12 2006/04/05 21:43:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.13 2006/05/29 18:06:30 gustavoz Exp $
+
+*spamass-milter-0.3.1-r1 (29 May 2006)
+
+  29 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> files/README.gentoo,
+  +files/spamass-milter.conf2, +files/spamass-milter.rc2,
+  +spamass-milter-0.3.1-r1.ebuild:
+  Revamped initscript and config with dropped privs and options, see #134258
+  and #134118
 
 *spamass-milter-0.3.1 (05 Apr 2006)
 
diff --git a/mail-filter/spamass-milter/Manifest b/mail-filter/spamass-milter/Manifest
index b64ffb8e574a..bbd6d8ce7975 100644
--- a/mail-filter/spamass-milter/Manifest
+++ b/mail-filter/spamass-milter/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 07fdb510227d93aecb8d8948ed3b9e9c ChangeLog 2021
-MD5 6eb8a3de8515f037fac65110c0f01563 files/README.gentoo 756
+MD5 a62edd219e5a7a4bd1abfedcfdbb1188 ChangeLog 2321
+MD5 6991afd951bb7430fa90ec0681d237f4 files/README.gentoo 826
 MD5 61950fa1041550e97fa464db1faafa92 files/digest-spamass-milter-0.3.0 73
 MD5 ba9a68bf6aa5dce14dd7d2a655165ae1 files/digest-spamass-milter-0.3.1 73
+MD5 ba9a68bf6aa5dce14dd7d2a655165ae1 files/digest-spamass-milter-0.3.1-r1 73
 MD5 9b3cd222a3e0e7e2d9efcf05ab733597 files/spamass-milter.conf 388
+MD5 4af380c79f46c2eae4030f39d3267cd2 files/spamass-milter.conf2 445
 MD5 6a292dff25de76c223735d09f8c25c8b files/spamass-milter.rc 750
+MD5 0ce853a0b7dfdd66659466bc449108de files/spamass-milter.rc2 702
 MD5 06dd3cc51e395ab6b5a26a08d478a20b metadata.xml 224
 MD5 093f3e9855739d8691eaeebd450928dc spamass-milter-0.3.0.ebuild 1068
+MD5 8c0b22c69e960c0ced1052bfd506fd0b spamass-milter-0.3.1-r1.ebuild 1291
 MD5 5e0c600422ef3c5e473790f3757099be spamass-milter-0.3.1.ebuild 1070
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFENDpTKRy60XGEcJIRAq8jAKCHh415ndlKA7crgSJTszCK2Y59/ACgk1h8
-HIcrt3azQviNclOBcZDQT5I=
-=Al9p
+iD8DBQFEezg4KRy60XGEcJIRAojlAJ4vIAo7pFgJ2yzI9xMRAFsgM2kqTACcDYin
+EP+dm+HvEzyT81ajQrru1sg=
+=HA4b
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamass-milter/files/README.gentoo b/mail-filter/spamass-milter/files/README.gentoo
index 470d2f31001d..c1a841fbbce3 100644
--- a/mail-filter/spamass-milter/files/README.gentoo
+++ b/mail-filter/spamass-milter/files/README.gentoo
@@ -1,14 +1,15 @@
-Simple install instructions by raker@gentoo.org :)
---------------------------------------------------
+Simple install instructions by raker @ g.o, updates by gustavoz
+---------------------------------------------------------------
 
 Open /etc/mail/sendmail.mc in your favorite editor:
 
-	nano /etc/mail/sendmail.mc
+	vi /etc/mail/sendmail.mc
 
 Add these lines before MAILER(local):
 
 INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass-milter.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl
 define(`confMILTER_MACROS_CONNECT',`b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl
+define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')
 
 When that's done run this command:
 
diff --git a/mail-filter/spamass-milter/files/digest-spamass-milter-0.3.1-r1 b/mail-filter/spamass-milter/files/digest-spamass-milter-0.3.1-r1
new file mode 100644
index 000000000000..8b79d8b331d1
--- /dev/null
+++ b/mail-filter/spamass-milter/files/digest-spamass-milter-0.3.1-r1
@@ -0,0 +1 @@
+MD5 5f3a441de032c7c044cbb7b922311f1b spamass-milter-0.3.1.tar.bz2 116591
diff --git a/mail-filter/spamass-milter/files/spamass-milter.conf2 b/mail-filter/spamass-milter/files/spamass-milter.conf2
new file mode 100644
index 000000000000..66728f100b83
--- /dev/null
+++ b/mail-filter/spamass-milter/files/spamass-milter.conf2
@@ -0,0 +1,11 @@
+# Copyright 1999-2006 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/files/spamass-milter.conf2,v 1.1 2006/05/29 18:06:30 gustavoz Exp $
+
+DAEMON=/usr/sbin/spamass-milter
+SOCKET=/var/run/milter/spamass-milter.sock
+PIDFILE=/var/run/milter/spamass-milter.pid
+USER="milter"
+
+# Example: reject mails above score 20
+#OPTIONS="-r 20"
diff --git a/mail-filter/spamass-milter/files/spamass-milter.rc2 b/mail-filter/spamass-milter/files/spamass-milter.rc2
new file mode 100755
index 000000000000..089b0d1f68b5
--- /dev/null
+++ b/mail-filter/spamass-milter/files/spamass-milter.rc2
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/files/spamass-milter.rc2,v 1.1 2006/05/29 18:06:30 gustavoz Exp $
+
+depend() {
+	need net spamd
+	use logger
+	before sendmail
+}
+
+start() {
+	ebegin "Starting spamass-milter"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} -c ${USER} \
+		--exec ${DAEMON} -- -P ${PIDFILE} -p ${SOCKET} -f ${OPTIONS}
+	eend $? "Failed to start ${DAEMON}"
+}
+
+stop() {
+	ebegin "Stopping spamass-milter"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} &&
+	{
+		sleep 5
+		rm -f ${SOCKET}
+	}
+	eend $? "Failed to stop ${DAEMON}"
+}
diff --git a/mail-filter/spamass-milter/spamass-milter-0.3.1-r1.ebuild b/mail-filter/spamass-milter/spamass-milter-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..4a001e079d27
--- /dev/null
+++ b/mail-filter/spamass-milter/spamass-milter-0.3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/spamass-milter-0.3.1-r1.ebuild,v 1.1 2006/05/29 18:06:30 gustavoz Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="A Sendmail milter for SpamAssassin"
+HOMEPAGE="http://savannah.nongnu.org/projects/spamass-milt/"
+SRC_URI="http://savannah.nongnu.org/download/spamass-milt/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=sys-devel/autoconf-2.57
+	>=sys-devel/automake-1.7.2"
+RDEPEND=">=mail-mta/sendmail-8.13.6
+	>=mail-filter/spamassassin-3.1.0"
+
+pkg_setup() {
+	enewgroup milter
+	enewuser milter -1 -1 /var/milter milter
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	newinitd ${FILESDIR}/spamass-milter.rc2 spamass-milter
+	newconfd ${FILESDIR}/spamass-milter.conf2 spamass-milter
+	dodir /var/run/milter
+	keepdir /var/run/milter
+	fowners milter:milter /var/run/milter
+	dodir /var/milter
+	keepdir /var/milter
+	fowners milter:milter /var/milter
+
+	dodoc AUTHORS NEWS README ChangeLog ${FILESDIR}/README.gentoo
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Documentation is in /usr/share/doc/${P}"
+	einfo "Check README.gentoo.gz there for some basic gentoo installation instructions"
+	einfo ""
+}