update unbound from upstream

11 files changed, 4 insertions, 4 deletions

diff --git a/external/unbound/winrc/README.txt b/external/unbound/winrc/README.txt
index e40204bb0..d36fff14c 100644
--- a/external/unbound/winrc/README.txt
+++ b/external/unbound/winrc/README.txt
@@ -10,7 +10,7 @@ See LICENSE for the license text file.
 Unbound is a recursive DNS server.  It does caching, full recursion, stub

 recursion, DNSSEC validation, NSEC3, IPv6.  More information can be found 

 at the http://unbound.net site.  Unbound has been built and tested on 

-Windows XP, Vista and 7.

+Windows XP, Vista, 7 and 8.

 

 At http://unbound.net/documentation is an install and configuration manual

 for windows.

diff --git a/external/unbound/winrc/anchor-update.c b/external/unbound/winrc/anchor-update.c
index 2b22e0142..13d44fda6 100644
--- a/external/unbound/winrc/anchor-update.c
+++ b/external/unbound/winrc/anchor-update.c
@@ -41,9 +41,9 @@
  */
 #include "config.h"
 #include "libunbound/unbound.h"
-#include "ldns/rrdef.h"
-#include "ldns/pkthdr.h"
-#include "ldns/wire2str.h"
+#include "sldns/rrdef.h"
+#include "sldns/pkthdr.h"
+#include "sldns/wire2str.h"
 
 /** usage */
 static void
diff --git a/external/unbound/winrc/combined.ico b/external/unbound/winrc/combined.ico
index b0a4f4d16..aa65d11e2 100644
--- a/external/unbound/winrc/combined.ico
+++ b/external/unbound/winrc/combined.ico
diff --git a/external/unbound/winrc/gen_msg.bin b/external/unbound/winrc/gen_msg.bin
index ed8f79e63..6e560057c 100644
--- a/external/unbound/winrc/gen_msg.bin
+++ b/external/unbound/winrc/gen_msg.bin
diff --git a/external/unbound/winrc/setup_left.bmp b/external/unbound/winrc/setup_left.bmp
index a013276a9..ddc17d079 100644
--- a/external/unbound/winrc/setup_left.bmp
+++ b/external/unbound/winrc/setup_left.bmp
diff --git a/external/unbound/winrc/setup_top.bmp b/external/unbound/winrc/setup_top.bmp
index a7404c836..79998ec64 100644
--- a/external/unbound/winrc/setup_top.bmp
+++ b/external/unbound/winrc/setup_top.bmp
diff --git a/external/unbound/winrc/unbound16.ico b/external/unbound/winrc/unbound16.ico
index 06d82e571..e62634b70 100644
--- a/external/unbound/winrc/unbound16.ico
+++ b/external/unbound/winrc/unbound16.ico
diff --git a/external/unbound/winrc/unbound32.ico b/external/unbound/winrc/unbound32.ico
index 7e5b3a725..64272eed4 100644
--- a/external/unbound/winrc/unbound32.ico
+++ b/external/unbound/winrc/unbound32.ico
diff --git a/external/unbound/winrc/unbound48.ico b/external/unbound/winrc/unbound48.ico
index cb7291469..074d12ebc 100644
--- a/external/unbound/winrc/unbound48.ico
+++ b/external/unbound/winrc/unbound48.ico
diff --git a/external/unbound/winrc/unbound64.ico b/external/unbound/winrc/unbound64.ico
index ca2362e5d..c02f68f0a 100644
--- a/external/unbound/winrc/unbound64.ico
+++ b/external/unbound/winrc/unbound64.ico
diff --git a/external/unbound/winrc/unbound64.png b/external/unbound/winrc/unbound64.png
index 78d831565..b37bf3f11 100644
--- a/external/unbound/winrc/unbound64.png
+++ b/external/unbound/winrc/unbound64.png