[patch] Proposed patch

qmail-scanner-opts.patch (text/plain), 2.18 KB, created by Michael Moen on 2005-02-26 11:44:44 UTC

diff -NaurbB /usr/portage/mail-filter/qmail-scanner/files/qmail-scanner.conf /usr/local/portage/mail-filter/qmail-scanner/files/qmail-scanner.conf
--- /usr/portage/mail-filter/qmail-scanner/files/qmail-scanner.conf	1969-12-31 16:00:00.000000000 -0800
+++ /usr/local/portage/mail-filter/qmail-scanner/files/qmail-scanner.conf	2005-02-26 09:59:32.000000000 -0800
@@ -0,0 +1,9 @@
+# this file controls what gets passed to ./configure when building qmail-scanner
+# for options see http://qmail-scanner.sourceforge.net/configure-options.php
+
+QS_CONF="--domain localhost \
+	--batch \
+	--log-details yes \
+	--mime-unpacker ripmime \
+	--skip-setuid-test \
+"
diff -NaurbB /usr/portage/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild /usr/local/portage/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild
--- /usr/portage/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild	2005-02-17 17:11:15.000000000 -0800
+++ /usr/local/portage/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild	2005-02-26 11:00:50.000000000 -0800
@@ -58,14 +58,27 @@

 src_compile () {
	local myconf
+
	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"

+	if [ -f "/etc/conf.d/qmail-scanner" ]; then
+		source /etc/conf.d/qmail-scanner
+		ewarn ""
+		ewarn "Using the following configure options"
+		ewarn ${QS_CONF} ${myconf}
+		ewarn ""
+	else
+		source ${FILESDIR}/qmail-scanner.conf
+		ewarn ""
+		ewarn "Using the ebuild configure options, if you want to specify your own"
+		ewarn "edit /etc/conf.d/qmail-scanner and re-emerge qmail-scanner."
+		ewarn ""
+		ewarn ${QS_CONF} ${myconf}
+		ewarn ""
+	fi
+
	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
+	${QS_CONF} \
	${myconf} \
	|| die "./configure failed!"

@@ -118,6 +131,9 @@
	exeinto /etc/cron.daily/
	newexe ${FILESDIR}/qmailscanner.cronjob qmail-scanner

+	insinto /etc/conf.d
+	newins ${FILESDIR}/qmail-scanner.conf qmail-scanner
+
	# Install documentation
	dodoc README CHANGES COPYING
	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php