update unbound, fix unbound openssl issue on OS X

3 files changed, 40 insertions, 40 deletions

diff --git a/external/unbound/contrib/aaaa-filter-iterator.patch b/external/unbound/contrib/aaaa-filter-iterator.patch
index 8e03d7c99..71a57b46f 100644
--- a/external/unbound/contrib/aaaa-filter-iterator.patch
+++ b/external/unbound/contrib/aaaa-filter-iterator.patch
@@ -312,7 +312,7 @@
 +	/**
  	 * Each time a delegation point changes for a given query or a 
  	 * query times out and/or wakes up, this state is (re)visited. 
- 	 * This state is reponsible for iterating through a list of 
+ 	 * This state is responsible for iterating through a list of 
 @@ -309,6 +320,13 @@ struct iter_qstate {
  	 */
  	int refetch_glue;
diff --git a/external/unbound/contrib/create_unbound_ad_servers.cmd b/external/unbound/contrib/create_unbound_ad_servers.cmd
index e5ada0bf4..91d18db3e 100644
--- a/external/unbound/contrib/create_unbound_ad_servers.cmd
+++ b/external/unbound/contrib/create_unbound_ad_servers.cmd
@@ -1,33 +1,33 @@
-@Echo off
-rem Convert the Yoyo.org anti-ad server listing
-rem into an unbound dns spoof redirection list.
-rem Written by Y.Voinov (c) 2014
-
-rem Note: Wget required!
-
-rem Variables
-set prefix="C:\Program Files (x86)"
-set dst_dir=%prefix%\Unbound
-set work_dir=%TEMP%
-set list_addr="http://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=1&startdate%5Bday%5D=&startdate%5Bmonth%5D=&startdate%5Byear%5D="
-
-rem Check Wget installed
-for /f "delims=" %%a in ('where wget') do @set wget=%%a
-if /I "%wget%"=="" echo Wget not found. If installed, add path to PATH environment variable. & exit 1
-echo Wget found: %wget%
-
-"%wget%" -O %work_dir%\yoyo_ad_servers %list_addr%
-
-del /Q /F /S %dst_dir%\unbound_ad_servers
-
-for /F "eol=; tokens=*" %%a in (%work_dir%\yoyo_ad_servers) do (
-echo local-zone: %%a redirect>>%dst_dir%\unbound_ad_servers
-echo local-data: "%%a A 127.0.0.1">>%dst_dir%\unbound_ad_servers
-)
-
-echo Done.
-rem  then add an include line to your unbound.conf pointing to the full path of
-rem  the unbound_ad_servers file:
-rem
-rem   include: $dst_dir/unbound_ad_servers
-rem
+@Echo off

+rem Convert the Yoyo.org anti-ad server listing

+rem into an unbound dns spoof redirection list.

+rem Written by Y.Voinov (c) 2014

+

+rem Note: Wget required!

+

+rem Variables

+set prefix="C:\Program Files (x86)"

+set dst_dir=%prefix%\Unbound

+set work_dir=%TEMP%

+set list_addr="http://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=1&startdate%5Bday%5D=&startdate%5Bmonth%5D=&startdate%5Byear%5D="

+

+rem Check Wget installed

+for /f "delims=" %%a in ('where wget') do @set wget=%%a

+if /I "%wget%"=="" echo Wget not found. If installed, add path to PATH environment variable. & exit 1

+echo Wget found: %wget%

+

+"%wget%" -O %work_dir%\yoyo_ad_servers %list_addr%

+

+del /Q /F /S %dst_dir%\unbound_ad_servers

+

+for /F "eol=; tokens=*" %%a in (%work_dir%\yoyo_ad_servers) do (

+echo local-zone: %%a redirect>>%dst_dir%\unbound_ad_servers

+echo local-data: "%%a A 127.0.0.1">>%dst_dir%\unbound_ad_servers

+)

+

+echo Done.

+rem  then add an include line to your unbound.conf pointing to the full path of

+rem  the unbound_ad_servers file:

+rem

+rem   include: $dst_dir/unbound_ad_servers

+rem

diff --git a/external/unbound/contrib/unbound.spec_fedora b/external/unbound/contrib/unbound.spec_fedora
index f8b2e7512..e7e9ac073 100644
--- a/external/unbound/contrib/unbound.spec_fedora
+++ b/external/unbound/contrib/unbound.spec_fedora
@@ -273,7 +273,7 @@ fi
 - Change make/configure lines to attempt to fix -lphtread linking issue
 
 * Thu Feb 18 2010 Paul Wouters <paul@xelerance.com> - 1.4.1-2
-- Removed dependancy for dnssec-conf
+- Removed dependency for dnssec-conf
 - Added ISC DLV key (formerly in dnssec-conf)
 - Fixup old DLV locations in unbound.conf file via %%post
 - Fix parent child disagreement handling and no-ipv6 present [svn r1953]
@@ -312,7 +312,7 @@ fi
 - Re-enabled glob.patch
 
 * Wed May 20 2009 Paul Wouters <paul@xelerance.com> - 1.2.1-7
-- unbound-iterator.patch was not commited
+- unbound-iterator.patch was not committed
 
 * Wed May 20 2009 Paul Wouters <paul@xelerance.com> - 1.2.1-6
 - Fix for https://bugzilla.redhat.com/show_bug.cgi?id=499793
@@ -338,11 +338,11 @@ fi
 
 * Wed Jan 14 2009 Paul Wouters <paul@xelerance.com - 1.2.0-1
 - Updated to 1.2.0
-- Added dependancy on minimum SSL for CVE-2008-5077
-- Added dependancy on bc for unbound-munin
+- Added dependency on minimum SSL for CVE-2008-5077
+- Added dependency on bc for unbound-munin
 - Added minimum requirement of libevent 1.4.5. Crashes with older versions
   (note: libevent is stale in EL-4 and not in EL-5, needs fixing there)
-- Removed dependancy on selinux-policy (will get used when available)
+- Removed dependency on selinux-policy (will get used when available)
 - Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
 - Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
 - Enable val-clean-additional to drop addition unsigned data from signed
@@ -423,7 +423,7 @@ fi
 - Build against ldns-1.3.0
 
 * Wed May 21 2008 Paul Wouters <paul@xelerance.com> - 1.0.0-1
-- Split of -devel package, fixed dependancies, make rpmlint happy
+- Split of -devel package, fixed dependencies, make rpmlint happy
 
 * Thu Apr 25 2008 Wouter Wijngaards <wouter@nlnetlabs.nl> - 0.12
 - Using parts from ports collection entry by Jaap Akkerhuis.