From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 1 May 2017 14:41:40 +0000 (+0000)
Subject: - Fix #1258: Windows 10 X64 unbound 1.6.2 service will not start.
X-Git-Tag: release-1.6.4rc1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb67febcc4f6c688bf0f523f36fc7af9f24b8a65;p=thirdparty%2Funbound.git

- Fix #1258: Windows 10 X64 unbound 1.6.2 service will not start.


git-svn-id: file:///svn/unbound/trunk@4139 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 782666e86..895aaf6b6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix #1259: "--disable-ecdsa" argument overwritten 
 	  by "#ifdef SHA256_DIGEST_LENGTH@daemon/remote.c".
 	- iana portlist update
+	- Fix #1258: Windows 10 X64 unbound 1.6.2 service will not start.
 
 26 April 2017: Ralph
 	- Implemented trust anchor signaling using key tag query.
diff --git a/makedist.sh b/makedist.sh
index 46a5263c2..1b98d879b 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -345,6 +345,7 @@ if [ "$DOWIN" = "yes" ]; then
     file="unbound-$version.zip"
     rm -f $file
     info "Creating $file"
+    grep '^". IN DS' smallapp/unbound-anchor.c | sed -e 's/"//' -e 's/\\n.*$//' > root.key
     mkdir tmp.$$
     # keep debug symbols
     #$strip unbound.exe
@@ -356,10 +357,11 @@ if [ "$DOWIN" = "yes" ]; then
     #$strip unbound-service-install.exe
     #$strip unbound-service-remove.exe
     cd tmp.$$
+    cp ../root.key .
     cp ../doc/example.conf ../doc/Changelog .
     cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
     # zipfile
-    zip ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog
+    zip ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf root.key unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog
     info "Testing $file"
     (cd .. ; zip -T $file )
     # installer
diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 2828088d9..19ee85b1a 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -241,6 +241,8 @@ static const char*
 get_builtin_ds(void)
 {
 	return
+/* The anchors must start on a new line with ". IN DS and end with \n"[;]
+ * because the makedist script greps on the source here */
 /* anchor 19036 is from 2010 */
 /* anchor 20326 is from 2017 */
 ". IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5\n"
diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index c5d6b2ceb..8f0852280 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -90,6 +90,7 @@ section "-hidden.postinstall"
 	File "..\unbound-service-install.exe"
 	File "..\unbound-service-remove.exe"
 	File "..\anchor-update.exe"
+	File "..\root.key"
 	File "unbound-control-setup.cmd"
 	File "unbound-website.url"
 	File "..\doc\example.conf"