diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2014-11-25 16:40:24 -0200 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2014-11-25 16:40:24 -0200 |
| commit | a2f2b7ee10b95866455953d297e0ab97b5468295 (patch) | |
| tree | 7b50ff0fd0e1912513e50e6d1b4236651bee6193 | |
| parent | 2dc85fc7519fe17550841919a6a1447495561e4c (diff) | |
| parent | c1a92316095d36d6413bfe86f219902f78ed2692 (diff) | |
| download | pfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.tar.gz pfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.tar.bz2 pfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.zip | |
Merge remote-tracking branch 'upstream/master'
| -rwxr-xr-x | config/postfix/postfix.inc | 5 | ||||
| -rwxr-xr-x | config/postfix/postfix_queue.php | 6 | ||||
| -rw-r--r-- | config/postfix/postfix_view_config.php | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
4 files changed, 5 insertions, 16 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index 99af671b..35087149 100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -37,10 +37,7 @@ require_once("globals.inc"); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php index 6f8a7e19..1db2b8e2 100755 --- a/config/postfix/postfix_queue.php +++ b/config/postfix/postfix_queue.php @@ -34,12 +34,8 @@ $uname=posix_uname(); if ($uname['machine']=='amd64') ini_set('memory_limit', '250M'); -$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php index f50ae991..a844ce65 100644 --- a/config/postfix/postfix_view_config.php +++ b/config/postfix/postfix_view_config.php @@ -29,12 +29,8 @@ */ $shortcut_section = "postfix"; require("guiconfig.inc"); -$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 8bcf7617..e8a8e6a2 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -415,14 +415,14 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file> <depends_on_package_pbi>postfix-2.11.3_2-##ARCH##.pbi</depends_on_package_pbi> - <version>2.11.3_2 pkg v.2.3.9</version> + <version>2.11.3_2 pkg v.2.4.0</version> <status>Release</status> <required_version>2.2</required_version> <configurationfile>postfix.xml</configurationfile> <build_pbi> <port>mail/postfix</port> </build_pbi> - <build_options>WITH_PCRE=true;WITH_SPF=true;WITH_SASL2=true;WITH_TLS=true</build_options> + <build_options>postfix_SET_FORCE=PCRE SASL2 SPF TLS</build_options> </package> <package> <name>Dansguardian</name> |