More config sed's and add masked beta version

(Portage version: 2.1.4.4)

3 files changed, 35 insertions, 14 deletions

diff --git a/mail-filter/MailScanner/ChangeLog b/mail-filter/MailScanner/ChangeLog
index 2239f7af828c..6969fd9a4d75 100644
--- a/mail-filter/MailScanner/ChangeLog
+++ b/mail-filter/MailScanner/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/MailScanner
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.2 2008/03/27 01:33:23 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.3 2008/03/27 12:18:40 jokey Exp $
+
+*MailScanner-4.68.6.1 (27 Mar 2008)
+*MailScanner-4.67.6.1-r2 (27 Mar 2008)
+
+  27 Mar 2008; Markus Ullmann <jokey@gentoo.org>
+  -MailScanner-4.67.6.1.ebuild, -MailScanner-4.67.6.1-r1.ebuild,
+  +MailScanner-4.67.6.1-r2.ebuild, +MailScanner-4.68.6.1.ebuild:
+  More config sed's and add masked beta version
 
 *MailScanner-4.67.6.1-r1 (27 Mar 2008)
 
diff --git a/mail-filter/MailScanner/MailScanner-4.67.6.1.ebuild b/mail-filter/MailScanner/MailScanner-4.67.6.1-r2.ebuild
index e419fe288a39..ae6bd4c605a2 100644
--- a/mail-filter/MailScanner/MailScanner-4.67.6.1.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.67.6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.67.6.1.ebuild,v 1.1 2008/03/20 15:34:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.67.6.1-r2.ebuild,v 1.1 2008/03/27 12:18:40 jokey Exp $
 
 inherit eutils versionator
 
@@ -118,23 +118,28 @@ src_unpack() {
 		-e "s#msbindir=/opt/MailScanner/bin#msbindir=/usr/sbin#g" \
 		-e "s#config=/opt/MailScanner/etc/MailScanner.conf#config=/etc/MailScanner/MailScanner.conf#g" \
 		"${S}/bin/check_mailscanner"
-	sed -i \
+	for each in update_virus_scanners update_phishing_sites update_bad_phishing_sites ; do
+		sed -i \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
-		"${S}/bin/update_virus_scanners"
+		"${S}"/bin/${each}
+	done
+	sed -i \
+		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/MailScanner#g" \
+		"${S}"/bin/update_spamassassin
 	sed -i \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/bin/MailScanner"
+		"${S}"/bin/MailScanner
 
 	# update cron files
 	sed -i \
 		-e "s#/opt/MailScanner/bin/check_mailscanner#/usr/sbin/check_MailScanner#g" \
-		"${S}/bin/cron/check_MailScanner.cron"
+		"${S}"/bin/cron/check_MailScanner.cron
 	for cronfile in update_virus_scanners.cron update_{,bad_}phishing_sites.cron; do
 	sed -i \
 		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \
 		-e "s#/opt/MailScanner/bin#/usr/sbin#g" \
-		"${S}/bin/cron/${cronfile}"
+		"${S}"/bin/cron/${cronfile}
 	done
 
 	# Determine some things that may need to be changed in conf file
@@ -177,6 +182,9 @@ src_unpack() {
 		-e "s#^\(Incoming Work Permissions[ \t]*=\).*#\1 ${WORKPERM}#" \
 		"${S}/etc/MailScanner.conf"
 
+	# update spam.assassin.prefs.conf
+	sed -i -e "s#YOURDOMAIN-COM#${YOURSITE}#" ${S}/etc/spam.assassin.prefs.conf
+
 	# net-mail/clamav net-mail/f-prot package compatibility
 	sed -i \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \
@@ -273,6 +281,8 @@ src_install() {
 	else
 		keepdir /var/spool/mqueue.in
 	fi
+	use spamassassin && dosym /etc/MailScanner/spam.assassin.prefs.conf /etc/mail/spamassassin/mailscanner.cf
+
 }
 
 pkg_postinst() {
diff --git a/mail-filter/MailScanner/MailScanner-4.67.6.1-r1.ebuild b/mail-filter/MailScanner/MailScanner-4.68.6.1.ebuild
index 3bf9bb1b9b94..0f9f8c566f16 100644
--- a/mail-filter/MailScanner/MailScanner-4.67.6.1-r1.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.68.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.67.6.1-r1.ebuild,v 1.1 2008/03/27 01:33:23 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.68.6.1.ebuild,v 1.1 2008/03/27 12:18:40 jokey Exp $
 
 inherit eutils versionator
 
@@ -121,25 +121,25 @@ src_unpack() {
 	for each in update_virus_scanners update_phishing_sites update_bad_phishing_sites ; do
 		sed -i \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
-		"${S}/bin/${each}"
+		"${S}"/bin/${each}
 	done
 	sed -i \
-		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/MailScanner#g"
-		${S}/bin/update_spamassassin
+		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/MailScanner#g" \
+		"${S}"/bin/update_spamassassin
 	sed -i \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/bin/MailScanner"
+		"${S}"/bin/MailScanner
 
 	# update cron files
 	sed -i \
 		-e "s#/opt/MailScanner/bin/check_mailscanner#/usr/sbin/check_MailScanner#g" \
-		"${S}/bin/cron/check_MailScanner.cron"
+		"${S}"/bin/cron/check_MailScanner.cron
 	for cronfile in update_virus_scanners.cron update_{,bad_}phishing_sites.cron; do
 	sed -i \
 		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \
 		-e "s#/opt/MailScanner/bin#/usr/sbin#g" \
-		"${S}/bin/cron/${cronfile}"
+		"${S}"/bin/cron/${cronfile}
 	done
 
 	# Determine some things that may need to be changed in conf file
@@ -182,6 +182,9 @@ src_unpack() {
 		-e "s#^\(Incoming Work Permissions[ \t]*=\).*#\1 ${WORKPERM}#" \
 		"${S}/etc/MailScanner.conf"
 
+	# update spam.assassin.prefs.conf
+	sed -i -e "s#YOURDOMAIN-COM#${YOURSITE}#" ${S}/etc/spam.assassin.prefs.conf
+
 	# net-mail/clamav net-mail/f-prot package compatibility
 	sed -i \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \