More config sed's and add masked beta version

Package-Manager: portage-2.1.4.4

4 files changed, 42 insertions, 20 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#" \
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 84832dbb1b9d..3a0894233174 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -4,14 +4,15 @@ Hash: SHA1
 AUX confd.mailscanner 147 RMD160 2472095d115d136498f93a6dca3ce540e335222f SHA1 377447317cf1354b4e377912d18a459b12f7a8d6 SHA256 d0ef32a53c83a2c2938d970f30b3765676fe4669b2ec98407c39ca070cd24bbb
 AUX initd.mailscanner 756 RMD160 f75589025bbe9e7a3bc2f10a4a5eadab11f8d36a SHA1 cb4c505b3c9f4f993b656b6c96c6992ae00be5e0 SHA256 ba63aec0dae9c820b533d467c3325ada70a4b73761bed2207d10814f82f31b65
 DIST MailScanner-install-4.67.6-1.tar.gz 8128173 RMD160 6a38ba6dd02cd90ebb887c6146485cbc771a3643 SHA1 51d08b364566bc902a1d3d91386c479b5f6e68ef SHA256 e0c803a6c3b243aa19b7e6bbac009617c02a308bc394eb64615e2148ac5d72e1
-EBUILD MailScanner-4.67.6.1-r1.ebuild 9341 RMD160 1753cb7e69779bb916e42c4f9a2502068bfde941 SHA1 e7d118916b7b3a03a8e7d3e443f6a73f837661a4 SHA256 2760c5195fa14408004b18c030dfc4cfba10b3d3e2faa388d403dd90bded9aa8
-EBUILD MailScanner-4.67.6.1.ebuild 9046 RMD160 b6a730f3bb1ea13987f7deb5a2f37fc6387bf4e1 SHA1 935afcf84ae6c95a14d8366308838b5edb1f73de SHA256 6f2c0ee028f3620a3c5a43e405eb802b4368bad2019352927f5395fbe13d05e5
-MISC ChangeLog 1940 RMD160 67bc740f643e93ddfbdfa1d415026460d8f47e99 SHA1 0e9f5d42c1b5961cd0220940ad4891c8c61b689d SHA256 280e0cb7b359ae1b5cb6bd2f4e01cda92ae213c97a9910f3682bb41d1216c87f
+DIST MailScanner-install-4.68.6-1.tar.gz 8317710 RMD160 177925005204bd150e370c7000a4af3f19fee1f8 SHA1 4408785bfa93441e52ecb0962b2e70c0b76b1670 SHA256 1d0ad342a87c11caea1718e867eff42574e1db86ca6cb7065564a4d5ee1c640c
+EBUILD MailScanner-4.67.6.1-r2.ebuild 9458 RMD160 cd0e3022e0314f45e88113f5a2f8af55f59f1dee SHA1 cd0c6a0a79b2d9d74698611ab0f12351822b6339 SHA256 99fef7798eb28324c75bb9595b46a36f5e2abf4966dfee8869dce06a1d8e0cbd
+EBUILD MailScanner-4.68.6.1.ebuild 9455 RMD160 78334696f3cdb0330bb55df48817c0a1451066a7 SHA1 f14b3cf691f3ffb74810947b55aa29034b3a98d3 SHA256 d91491990d42dbe1735e4948b9b39a9e272af42cb94db245d892f8a5e3716410
+MISC ChangeLog 2244 RMD160 3c7b46ed472fe079fa4e4ef185bd7d76cbc3d645 SHA1 91c971b1f9567c8bc54c40c36ec5fb5039ff2a56 SHA256 1c478b04a9ef21eb2dea377b4c4d6f0d8e3f8c66211a836b25dbebefb82192b5
 MISC metadata.xml 251 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d SHA1 f58b9ae8d4a67e568288a4cf7d0037f228ba3fc4 SHA256 2ecb6b4fcce7435885895d82f44bd288b8ab797c7d6476eaac494d44a56f8886
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfq+WgACgkQz974XjDVpbnbogCfYyvfG3TIfsVWw1EOWdd+gBIU
-GLEAoNgoWSB/jnBbaOs9yv/ISA069zwI
-=+vHq
+iEYEARECAAYFAkfrkKsACgkQz974XjDVpbmngwCfTWFwr3eBYv2kz9X3gx37A92u
+nj8AoJAk6n+afIIgdFRBIcLTrdUPoinA
+=5l7p
 -----END PGP SIGNATURE-----