From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 18 Dec 2008 10:56:18 +0000 (+0000)
Subject: DLV unit test ldns tarball update
X-Git-Tag: release-1.2.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d57b0f807c3a35f846ad4c63356273d4efb3b0;p=thirdparty%2Funbound.git

DLV unit test ldns tarball update
rc underscore removed.


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

diff --git a/Makefile.in b/Makefile.in
index 3e8c0cbf3..29fbdcdfa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -310,8 +310,8 @@ uninstall:
 download_ldns:
 	svn export https://www.nlnetlabs.nl/svn/ldns/trunk/makedist.sh ldns_makedist.sh
 	./ldns_makedist.sh -s -d https://www.nlnetlabs.nl/svn/ldns/trunk
-	mv ldns-*_pre_*.tar.gz ldns-src.tar.gz
-	rm ldns-*_pre_*.tar.gz.sha1 ldns_makedist.sh
+	mv ldns-[0-9]*.tar.gz ldns-src.tar.gz
+	rm ldns-*.tar.gz.sha1 ldns_makedist.sh
 
 iana_update:
 	curl -o port-numbers.tmp http://www.iana.org/assignments/port-numbers
diff --git a/doc/Changelog b/doc/Changelog
index e862866ba..a389e13ee 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 18 December 2008: Wouter
 	- fixed bug reported by Duane Wessels: error in DLV lookup, would make
 	  some zones that had correct DLV keys as insecure.
+	- follows -rc makedist from ldns changes (no _rc).
+	- ldns tarball updated with 1.4.1rc for DLV unit test.
 
 17 December 2008: Wouter
 	- follows ldns makedist.sh. -rc option. autom4te dir removed.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index e1ae23bb4..fced58f2f 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ
diff --git a/makedist.sh b/makedist.sh
index be318d5d7..123ff4604 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -50,7 +50,7 @@ Generate a distribution tar file for NSD.
                  automatically appended to the current NSD version number.
     -rc <nr>     Build a release candidate, the given string will be added
                  to the version number 
-                 (which will then be unbound-<version>_rc<number>)
+                 (which will then be unbound-<version>rc<number>)
     -d SVN_root  Retrieve the NSD source from the specified repository.
                  Detected from svn working copy if not specified.
     -l ldnsdir   Directory where ldns resides. Detected from Makefile.
@@ -217,7 +217,7 @@ RECONFIGURE="no"
 
 if [ "$RC" != "no" ]; then
     info "Building Unbound release candidate $RC."
-    version2="${version}_rc$RC"
+    version2="${version}rc$RC"
     info "Version number: $version2"
 
     replace_text "configure.ac" "AC_INIT(unbound, $version" "AC_INIT(unbound, $version2"