From 88c066ff18638844cebc166eca9caba425950c4d Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 24 Apr 2015 16:20:47 -0300 Subject: Sanitize mailscanner version, add port_category, run_depends and fix pbi detection --- config/mailscanner/mailscanner.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'config/mailscanner/mailscanner.inc') diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc index 8418c85c..62905091 100644 --- a/config/mailscanner/mailscanner.inc +++ b/config/mailscanner/mailscanner.inc @@ -33,11 +33,16 @@ require_once("globals.inc"); #require("guiconfig.inc"); $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m")); -if ($pf_version == "2.1") - define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX); -else - define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local'); +if ($pf_version == "2.1" || $pf_version == "2.2") { + define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m")); + if ($pf_version == "2.1") + define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX); + else + define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local'); +} else { + define('MAILSCANNER_PREFIX', '/usr/local'); + define('MAILSCANNER_LOCALBASE', '/usr/local'); +} $uname=posix_uname(); if ($uname['machine']=='amd64') -- cgit v1.2.3