diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-12-14 20:57:55 -0500 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-12-14 20:57:55 -0500 |
| commit | fc89ab1a42101f07019c5ea10d482d45cc3499d3 (patch) | |
| tree | b2f4ef83d722bc0a09825d0e4ecbd854a8ca41dd | |
| parent | 14536b69664b95b05603ba256c0dc99f3de5846a (diff) | |
| parent | 419fe8a7818856bcc6badb4e8d601f0e01f31f5c (diff) | |
| download | pfsense-packages-fc89ab1a42101f07019c5ea10d482d45cc3499d3.tar.gz pfsense-packages-fc89ab1a42101f07019c5ea10d482d45cc3499d3.tar.bz2 pfsense-packages-fc89ab1a42101f07019c5ea10d482d45cc3499d3.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | config/bind/bind.inc | 2 | ||||
| -rw-r--r-- | config/mailscanner/mailscanner.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/config/bind/bind.inc b/config/bind/bind.inc index 146632c9..8f439d1a 100644 --- a/config/bind/bind.inc +++ b/config/bind/bind.inc @@ -432,7 +432,7 @@ EOD; $hostname = (preg_match("/(MX|NS)/",$zone['row'][$y]['hosttype'])?"@":$zone['row'][$y]['hostname']); $hosttype = $zone['row'][$y]['hosttype']; $hostdst = $zone['row'][$y]['hostdst']; - if (preg_match("/[a-zA-Z]/",$hostdst) && !preg_match("/(TXT|SPF)/",$hosttype)) + if (preg_match("/[a-zA-Z]/",$hostdst) && !preg_match("/(TXT|SPF|AAAA)/",$hosttype)) $hostdst .= "."; $hostvalue = $zone['row'][$y]['hostvalue']; diff --git a/config/mailscanner/mailscanner.xml b/config/mailscanner/mailscanner.xml index 05798a1e..87be2421 100644 --- a/config/mailscanner/mailscanner.xml +++ b/config/mailscanner/mailscanner.xml @@ -54,7 +54,7 @@ <service> <name>mailscanner</name> <rcfile>mailscanner</rcfile> - <executable>perl5.14.2</executable> + <executable>perl5.16.3</executable> <description>MailScanner</description> </service> <additional_files_needed> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 04dda1d3..0a04d15c 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -637,7 +637,7 @@ <depends_on_package>p5-IP-Country-2.28.tbz</depends_on_package> <depends_on_package>MailScanner-4.84.5_3.tbz</depends_on_package> <depends_on_package_pbi>mailscanner-4.84.5_3-i386.pbi</depends_on_package_pbi> - <version>4.84.5_3 pkg v.0.2.3</version> + <version>4.84.5_3 pkg v.0.2.4</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>mailscanner.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 855be027..0376a7df 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -624,7 +624,7 @@ <depends_on_package>p5-IP-Country-2.28.tbz</depends_on_package> <depends_on_package>MailScanner-4.84.5_3.tbz</depends_on_package> <depends_on_package_pbi>mailscanner-4.84.5_3-amd64.pbi</depends_on_package_pbi> - <version>4.84.5_3 pkg v.0.2.3</version> + <version>4.84.5_3 pkg v.0.2.4</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>mailscanner.xml</configurationfile> |