From 9ddca3c02919e4f9327c4a3c8a147c5c79625911 Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Tue, 14 Dec 2010 19:55:31 +0200
Subject: forward-zone: expect upstream DNS server to be authorative for
 everything. So in the case of a CNAME it could potentially return FAIL.
 Rather let Unbound do the resolving. Bump version number.

---
 config/unbound/unbound.inc | 5 +++--
 pkg_config.8.xml           | 3 +--
 pkg_config.8.xml.amd64     | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index 3392c6a2..7f7aff78 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -565,10 +565,11 @@ function unbound_add_domain_overrides() {
 		
 		$domain_entries = "";
 		foreach($result as $domain=>$ips) {
-			$domain_entries .= "forward-zone:\n";
+			$domain_entries .= "stub-zone:\n";
 			$domain_entries .= "\tname: \"$domain\"\n";
 			foreach($ips as $ip) {
-				$domain_entries .= "\tforward-addr: $ip\n";
+				$domain_entries .= "\tstub-addr: $ip\n";
+				$domain_entries .= "\tstub-prime: no\n";
 			}
 		}
 		return $domain_entries;
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 4f612e5c..ca6c4522 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -947,7 +947,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.</descr>
       <website>http://www.unbound.net/</website>
       <category>Services</category>
-      <version>1.2.4</version>
+      <version>1.2.5</version>
       <status>Alpha</status>
       <required_version>2.0</required_version>
       <pkginfolink>http://doc.pfsense.org/index.php/Unbound_package</pkginfolink>
@@ -956,7 +956,6 @@
       <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
       <depends_on_package>unbound-1.4.7.tbz</depends_on_package>
       <depends_on_package>expat-2.0.1_1.tbz</depends_on_package>
-      <depends_on_package>openssl-1.0.0_2.tbz</depends_on_package>
       <depends_on_package>libevent-1.4.14b_1.tbz</depends_on_package>
 	<build_port_path>/usr/ports/dns/unbound</build_port_path>
 	<build_options>WITH_LIBEVENT=true WITH_THREADS=true WITHOUT_GOST=true WITHOUT_MAN=true</build_options>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index c15c9dfe..3ad95761 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -961,7 +961,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.</descr>
       <website>http://www.unbound.net/</website>
       <category>Services</category>
-      <version>1.2.4</version>
+      <version>1.2.5</version>
       <status>Alpha</status>
       <required_version>2.0</required_version>
       <pkginfolink>http://doc.pfsense.org/index.php/Unbound_package</pkginfolink>
@@ -970,7 +970,6 @@
 	  <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
       <depends_on_package>unbound-1.4.7.tbz</depends_on_package>
       <depends_on_package>expat-2.0.1_1.tbz</depends_on_package>
-      <depends_on_package>openssl-1.0.0_3.tbz</depends_on_package>
       <depends_on_package>libevent-1.4.14b_1.tbz</depends_on_package>
       <build_port_path>/usr/ports/dns/unbound</build_port_path>
 		<build_options>WITH_LIBEVENT=true WITH_THREADS=true WITHOUT_GOST=true WITHOUT_MAN=true</build_options>
-- 
cgit v1.2.3