mail-filter/MailScanner: Major cleanup.

svn path=/sunrise/; revision=1520

3 files changed, 69 insertions, 71 deletions

diff --git a/mail-filter/MailScanner/ChangeLog b/mail-filter/MailScanner/ChangeLog
index c3c73563a..9251f4b86 100644
--- a/mail-filter/MailScanner/ChangeLog
+++ b/mail-filter/MailScanner/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Oct 2006; David Shakaryan <d@ompty.org> MailScanner-4.55.10.3.ebuild:
+  Major cleanup.
+
   05 Oct 2006; Chan Min Wai (dcmwai) <dcmwai@gmail.com>
   +MailScanner-4.55.10.3.ebuild:
   Version Pumb 4.55.10.3
diff --git a/mail-filter/MailScanner/MailScanner-4.55.10.3.ebuild b/mail-filter/MailScanner/MailScanner-4.55.10.3.ebuild
index 219a697c3..6b499f025 100644
--- a/mail-filter/MailScanner/MailScanner-4.55.10.3.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.55.10.3.ebuild
@@ -9,15 +9,15 @@ MY_PVR=$(replace_version_separator 3 '-' )
 
 DESCRIPTION="Free Anti-Virus and Anti-Spam Filter"
 HOMEPAGE="http://www.mailscanner.info/"
-SRC_URI="http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
+SRC_URI="http://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="bitdefender clamav doc exim f-prot postfix sendmail spamassassin vlnx"
 
 DEPEND="dev-lang/perl"
-
-RDEPEND="dev-lang/perl
+RDEPEND="${DEPEND}
 	dev-perl/Archive-Zip
 	dev-perl/Compress-Zlib
 	dev-perl/Convert-BinHex
@@ -39,27 +39,25 @@ RDEPEND="dev-lang/perl
 	perl-core/Getopt-Long
 	>=perl-core/Sys-Syslog-0.18
 	>=perl-core/MIME-Base64-3.05
+	virtual/cron
 	|| (
 		sendmail? ( mail-mta/sendmail )
 		postfix? ( mail-mta/postfix )
 		exim? ( mail-mta/exim )
 		mail-mta/sendmail
 	)
+	bitdefender? ( app-antivirus/bitdefender-console )
 	clamav? ( >=app-antivirus/clamav-0.88.4 )
 	f-prot? ( app-antivirus/f-prot )
-	vlnx? ( app-antivirus/vlnx )
-	bitdefender? ( app-antivirus/bitdefender-console )
 	spamassassin? ( >=mail-filter/spamassassin-3.1.5 )
-	virtual/cron"
-
-IUSE="postfix sendmail exim clamav vlnx spamassassin f-prot bitdefender doc"
+	vlnx? ( app-antivirus/vlnx )"
 
-S="${WORKDIR}/MailScanner-${MY_PV}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 BASE="/usr"
 
 src_unpack() {
 	unpack ${A}
-	unpack ./MailScanner-install-${MY_PV}/perl-tar/MailScanner-${MY_PVR}.tar.gz
+	unpack ./${PN}-install-${MY_PV}/perl-tar/${PN}-${MY_PVR}.tar.gz
 }
 
 src_compile() {
@@ -95,65 +93,59 @@ src_compile() {
 	# update init script parameters for selected MTA
 	sed \
 		-e "s|^\(MTA=\).*|\1${MTA}|g" \
-		"${FILESDIR}"/confd.mailscanner-mta > ${S}/confd.mailscanner-mta
+		"${FILESDIR}/confd.mailscanner-mta" > "${S}/confd.mailscanner-mta"
 
 	# setup virus scanner(s)
-		VIRUS_SCANNERS=""
-		if use clamav ; then
-			VIRUS_SCANNERS="clamav ${VIRUS_SCANNERS}"
-		fi
-		if use vlnx ; then
-			VIRUS_SCANNERS="mcafee ${VIRUS_SCANNERS}"
-		fi
-		if use f-prot ; then
-			VIRUS_SCANNERS="f-prot ${VIRUS_SCANNERS}"
-		fi
-		if use bitdefender ; then
-			VIRUS_SCANNERS="bitdefender ${VIRUS_SCANNERS}"
-		fi
-		if [ "$VIRUS_SCANNERS" == "" ]; then
-			VIRUS_SCANNERS="none"
-			VIRUS_SCANNING="no"
-		else
-			VIRUS_SCANNING="yes"
-		fi
+	VIRUS_SCANNERS=""
+	use bitdefender && VIRUS_SCANNERS="bitdefender ${VIRUS_SCANNERS}"
+	use clamav && VIRUS_SCANNERS="clamav ${VIRUS_SCANNERS}"
+	use f-prot && VIRUS_SCANNERS="f-prot ${VIRUS_SCANNERS}"
+	use vlnx && VIRUS_SCANNERS="mcafee ${VIRUS_SCANNERS}"
+
+	if [ "$VIRUS_SCANNERS" == "" ]; then
+		VIRUS_SCANNERS="none"
+		VIRUS_SCANNING="no"
+	else
+		VIRUS_SCANNING="yes"
+	fi
 
 	sed -i \
 		-e "s/^\(Virus Scanning[ \t]*=\).*/\1 ${VIRUS_SCANNING}/" \
 		-e "s/^\(Virus Scanners[ \t]*=\).*/\1 ${VIRUS_SCANNERS}/" \
-		${S}/etc/MailScanner.conf
+		"${S}/etc/MailScanner.conf"
 
 	# setup spamassassin
 	if use spamassassin ; then
 		sed -i \
 			-e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 yes/" \
-			${S}/etc/MailScanner.conf
+			"${S}/etc/MailScanner.conf"
 	else
 		sed -i \
 			-e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 no/" \
-			${S}/etc/MailScanner.conf
+			"${S}/etc/MailScanner.conf"
 	fi
 
 	# update bin files
 	sed -i \
 		-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 -e "s#/opt/MailScanner/etc#/etc/MailScanner#g" ${S}/bin/update_virus_scanners
+		"${S}/bin/check_mailscanner"
+	sed -i \
+		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
+		"${S}/bin/update_virus_scanners"
 	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
+		-e "s#/opt/MailScanner/bin/check_mailscanner#/usr/sbin/check_MailScanner#g" \
+		"${S}/bin/cron/check_MailScanner.cron"
 	sed -i \
 		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \
-	    -e "s#/opt/MailScanner/bin/update_virus_scanners#/usr/sbin/update_virus_scanners#g" \
-		${S}/bin/cron/update_virus_scanners.cron
+		-e "s#/opt/MailScanner/bin/update_virus_scanners#/usr/sbin/update_virus_scanners#g" \
+		"${S}/bin/cron/update_virus_scanners.cron"
 
 	# Determine some things that may need to be changed in conf file
 	# (need to arrive at sensible replacement for yoursite)
@@ -193,34 +185,37 @@ src_compile() {
 		-e "s#^\(Sendmail2[ \t]*=\).*#\1 ${SENDMAIL2}#" \
 		-e "s#^\(Incoming Work Group[ \t]*=\).*#\1 ${WORKGRP}#" \
 		-e "s#^\(Incoming Work Permissions[ \t]*=\).*#\1 ${WORKPERM}#" \
-		${S}/etc/MailScanner.conf
+		"${S}/etc/MailScanner.conf"
 
 	# net-mail/vlnx net-mail/clamav net-mail/f-prot package compatibility
-
-	sed -i -e "s#PREFIX=/usr/local/uvscan#PREFIX=/opt/vlnx#" ${S}/lib/mcafee-autoupdate
+	sed -i \
+		-e "s#PREFIX=/usr/local/uvscan#PREFIX=/opt/vlnx#" \
+		"${S}/lib/mcafee-autoupdate"
 	sed -i \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \
 		-e 's#^\(mcafee.*\)/usr/local/uvscan$#\1/opt/vlnx#' \
 		-e 's#^\(clamav\t.*/usr\)/local$#\1#' \
 		-e 's#^\(f-prot.*\)/usr/local/f-prot$#\1/opt/f-prot#' \
-		${S}/etc/virus.scanners.conf
+		"${S}/etc/virus.scanners.conf"
 
 	# update lib files
 	sed -i \
 		-e "s#/opt/MailScanner/bin#$BASEBIN#g" \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		${S}/lib/MailScanner/ConfigDefs.pl
-	sed -i -e "s#/etc/MailScanner#/etc/MailScanner#g" ${S}/lib/MailScanner/CustomConfig.pm
+		"${S}/lib/MailScanner/ConfigDefs.pl"
+	sed -i \
+		-e "s#/etc/MailScanner#/etc/MailScanner#g" \
+		"${S}/lib/MailScanner/CustomConfig.pm"
 
 	# finally, change MailScanner.conf into MailScanner.conf.sample
-	cp ${S}/etc/MailScanner.conf ${S}/etc/MailScanner.conf.${MY_PV}
-	mv ${S}/etc/MailScanner.conf ${S}/etc/MailScanner.conf.sample
+	cp "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.${MY_PV}"
+	mv "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.sample"
 
 }
 
 src_install() {
-	cd ${S}
+	cd "${S}"
 	exeinto ${BASE}/sbin
 	#newexe	bin/check_mailscanner.linux check_MailScanner
 	newexe	bin/check_mailscanner check_MailScanner
@@ -233,8 +228,8 @@ src_install() {
 	insinto	/etc/MailScanner
 	doins	etc/*.conf
 	doins	etc/mailscanner.conf.with.mcp
-	doins   etc/MailScanner.conf.${MY_PV}
-	doins   etc/MailScanner.conf.sample
+	doins	etc/MailScanner.conf.${MY_PV}
+	doins	etc/MailScanner.conf.sample
 
 	insinto	/etc/MailScanner/rules
 	doins	etc/rules/*
@@ -272,19 +267,19 @@ src_install() {
 	newinitd "${FILESDIR}"/initd.mailscanner MailScanner
 	newinitd "${FILESDIR}"/initd.mailscanner-mta MailScanner-mta
 	newconfd "${FILESDIR}"/confd.mailscanner MailScanner
-	newconfd ${S}/confd.mailscanner-mta MailScanner-mta
+	newconfd "${S}/confd.mailscanner-mta" MailScanner-mta
 
 	#Set up cron jobs
 	exeinto /etc/cron.hourly
-	newexe ${S}/bin/cron/check_MailScanner.cron check_MailScanner
-	newexe ${S}/bin/cron/update_virus_scanners.cron update_virus_scanners
+	newexe "${S}/bin/cron/check_MailScanner.cron" check_MailScanner
+	newexe "${S}/bin/cron/update_virus_scanners.cron" update_virus_scanners
 
 	exeinto /etc/cron.daily
-	newexe ${S}/bin/cron/clean.quarantine.cron clean.quarantine
+	newexe "${S}/bin/cron/clean.quarantine.cron" clean.quarantine
 
 	if use doc ; then
 		dodir /usr/share/doc/${PF}/html
-		cp -r docs/* "${D}"usr/share/doc/${PF}/html
+		cp -r docs/* "${D}usr/share/doc/${PF}/html"
 	fi
 
 	dodoc notes.txt docs/QuickInstall.txt docs/README.sql-logging
@@ -296,9 +291,9 @@ src_install() {
 	keepdir ${BASE}/var
 
 	if use postfix ; then
-		chown -R postfix:postfix "${D}"/var/spool/MailScanner/
+		chown -R postfix:postfix "${D}/var/spool/MailScanner/"
 	elif use exim ; then
-		chown -R mail:mail "${D}"/var/spool/MailScanner/
+		chown -R mail:mail "${D}/var/spool/MailScanner/"
 	else
 		keepdir /var/spool/mqueue.in
 	fi
@@ -327,10 +322,10 @@ pkg_postinst() {
 	if [ -f "/etc/MailScanner/MailScanner.conf" ]; then
 		einfo "Upgrading the MailScanner.conf file"
 		cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV}
-	    /usr/sbin/upgrade_MailScanner_conf \
+		/usr/sbin/upgrade_MailScanner_conf \
 		/etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} \
 		/etc/MailScanner/MailScanner.conf.${MY_PV} \
-		> /etc/MailScanner/MailScanner.conf  2> /dev/null
+		> /etc/MailScanner/MailScanner.conf 2> /dev/null
 	else
 		cp /etc/MailScanner/MailScanner.conf.sample /etc/MailScanner/MailScanner.conf
 	fi
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 15f958c07..1a8452307 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -20,14 +20,14 @@ EBUILD MailScanner-4.54.6.1.ebuild 9661 RMD160 9f808833a4df6641655212df33f339b60
 MD5 87d3b3669eee0cc14b19563e49c0bc21 MailScanner-4.54.6.1.ebuild 9661
 RMD160 9f808833a4df6641655212df33f339b60a546a2f MailScanner-4.54.6.1.ebuild 9661
 SHA256 454624c0502bbd0848f3be6c8fcdeed45ad10ff39c76e9a094a579fc193e3d80 MailScanner-4.54.6.1.ebuild 9661
-EBUILD MailScanner-4.55.10.3.ebuild 9983 RMD160 b8925cdd5557875fa914f609f76da57dd64d9141 SHA1 256f9aad59363743386a594d89bd4d1ffd496129 SHA256 ce74d82582dcc962e4700ddd8a1928e6d214f3391073d60d576f0dbb0c50be34
-MD5 8819f6ad9fe2731f9a68d8418cf67fed MailScanner-4.55.10.3.ebuild 9983
-RMD160 b8925cdd5557875fa914f609f76da57dd64d9141 MailScanner-4.55.10.3.ebuild 9983
-SHA256 ce74d82582dcc962e4700ddd8a1928e6d214f3391073d60d576f0dbb0c50be34 MailScanner-4.55.10.3.ebuild 9983
-MISC ChangeLog 435 RMD160 bc5a7562e03b74110f6dc80536ca0ebb008e0179 SHA1 d07483577e4f781c18e34783d72a1f8f6462003e SHA256 3f0c5592c63e8ff7f0d334180f658e4244808e23e7a94ac478af4606ee73f098
-MD5 8b63c9544382904eef1d234338591b3e ChangeLog 435
-RMD160 bc5a7562e03b74110f6dc80536ca0ebb008e0179 ChangeLog 435
-SHA256 3f0c5592c63e8ff7f0d334180f658e4244808e23e7a94ac478af4606ee73f098 ChangeLog 435
+EBUILD MailScanner-4.55.10.3.ebuild 9928 RMD160 f3b96aa89e9fe33df1776b42e8bbd61c497474ea SHA1 10c592f1ab4d496957788398d92bd710c999f097 SHA256 573b826a3ba4416cc74720476a9cdbc30a53c834be3de106471e385e0d9cf86d
+MD5 075c3c456010f2946c8e7d6862cfee1a MailScanner-4.55.10.3.ebuild 9928
+RMD160 f3b96aa89e9fe33df1776b42e8bbd61c497474ea MailScanner-4.55.10.3.ebuild 9928
+SHA256 573b826a3ba4416cc74720476a9cdbc30a53c834be3de106471e385e0d9cf86d MailScanner-4.55.10.3.ebuild 9928
+MISC ChangeLog 528 RMD160 ba15b89010b8a9b513fedb831d15047664533888 SHA1 4c66d558449f687d69c053fa7f54e4eccd52bbfa SHA256 b824930d4a37ea261a46911321df03f725c85608550ddf63cddc45c96d366960
+MD5 053c80fe37dc2f343bb60a4ac18b4a23 ChangeLog 528
+RMD160 ba15b89010b8a9b513fedb831d15047664533888 ChangeLog 528
+SHA256 b824930d4a37ea261a46911321df03f725c85608550ddf63cddc45c96d366960 ChangeLog 528
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170