diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-04-27 17:33:56 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-04-27 17:33:56 -0300 |
commit | 845bbd12e24f26f2141c164ce22c2a1b78664933 (patch) | |
tree | c4f869b4098c55f4faf08690079c6957882cc45f | |
parent | de558fafcae6f624440f669040269eb931cf38d5 (diff) | |
download | pfsense-packages-845bbd12e24f26f2141c164ce22c2a1b78664933.tar.gz pfsense-packages-845bbd12e24f26f2141c164ce22c2a1b78664933.tar.bz2 pfsense-packages-845bbd12e24f26f2141c164ce22c2a1b78664933.zip |
Fix unbound and update it to 1.4.20_3
- Silence pw useradd
- Simplify directory structure creation
- Fix typo s/cont_mount_/conf_mount_/
Tichet #2817
-rw-r--r-- | config/unbound/unbound.inc | 8 | ||||
-rw-r--r-- | config/unbound/unbound.xml | 2 | ||||
-rw-r--r-- | pkg_config.8.xml | 2 | ||||
-rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc index eb27b577..ec08cba9 100644 --- a/config/unbound/unbound.inc +++ b/config/unbound/unbound.inc @@ -53,11 +53,11 @@ function unbound_initial_setup() { $unbound_config = &$config['installedpackages']['unbound']['config'][0]; // Ensure Unbound user exists - exec("/usr/sbin/pw useradd unbound"); + mwexec("/usr/sbin/pw useradd unbound", true); // Setup unbound // Create and chown dirs - mwexec("/bin/mkdir -p " . UNBOUND_BASE . "/etc/unbound " . UNBOUND_BASE . "/etc/unbound/dev"); + mwexec("/bin/mkdir -p " . UNBOUND_BASE . "/etc/unbound/dev"); @chown(UNBOUND_BASE . "/etc/unbound/.", "unbound"); @chown(UNBOUND_BASE . "/etc/unbound/dev.", "unbound"); // Touch needed files @@ -593,9 +593,9 @@ control-cert-file: "{$unbound_base}/etc/unbound/unbound_control.pem" EOD; - cont_mount_rw(); + conf_mount_rw(); file_put_contents("{$unbound_base}/etc/unbound/unbound.conf", $unbound_conf); - cont_mount_ro(); + conf_mount_ro(); } diff --git a/config/unbound/unbound.xml b/config/unbound/unbound.xml index 1193f999..109e666c 100644 --- a/config/unbound/unbound.xml +++ b/config/unbound/unbound.xml @@ -40,7 +40,7 @@ <requirements/> <faq/> <name>unbound</name> - <version>1.4.14</version> + <version>1.4.20_3</version> <title>Services: Unbound DNS Forwarder: Basic Settings</title> <include_file>/usr/local/pkg/unbound.inc</include_file> <menu> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 85bc67fa..9a7c1636 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1533,7 +1533,7 @@ <descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr> <website>http://www.unbound.net/</website> <category>Services</category> - <version>1.4.20_2</version> + <version>1.4.20_3</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 54f41b49..6bb60ce0 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1520,7 +1520,7 @@ <descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr> <website>http://www.unbound.net/</website> <category>Services</category> - <version>1.4.20_2</version> + <version>1.4.20_3</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> |