From d17e9860497794ee19cdb8d726962221db59c7b1 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Sat, 11 Jul 2009 04:29:04 +0000
Subject: [PATCH] - Updated to 1.6.0 - (did not yet compile with --without-ssl
 due to compile failures)

---
 ldns.spec | 33 +++++++++++++++++++--------------
 sources   |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ldns.spec b/ldns.spec
index 76d6895..216f75e 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -1,15 +1,15 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.5.1
-Release: 4%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
-Patch1: ldns-keygen-hmac-memory.patch
+Patch0: ldns-ssl.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen,
-BuildRequires: perl libpcap-devel
+BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
+BuildRequires: perl, libpcap-devel, openssl-devel
 
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
@@ -20,7 +20,7 @@ packets.
 %package devel
 Summary: Development package that includes the ldns header files
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, openssl-devel
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The devel package contains the ldns library and the include files
@@ -32,16 +32,13 @@ The devel package contains the ldns library and the include files
 #libtoolize
 #autoreconf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=493953
-%patch1
-
-%configure --disable-rpath --with-sha2
+%patch0 -p1
 
 %build
-
+%configure --disable-rpath --with-sha2 
 make %{?_smp_mflags}
-(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/)
-(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/)
+(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
+(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
 ( cd drill ; make %{?_smp_mflags} )
 ( cd examples ; make %{?_smp_mflags} )
 make %{?_smp_mflags} doc
@@ -71,8 +68,11 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_libdir}/libldns*so.*
 %{_bindir}/drill
-%{_bindir}/ldns-*
 %{_bindir}/ldnsd
+#%{_bindir}/ldns-*
+%{_bindir}/ldns-chaos
+%{_bindir}/ldns-compare-zones
+%{_bindir}/ldns-[d-z]*
 %doc README LICENSE 
 %{_mandir}/*/*
 
@@ -80,6 +80,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libldns.a
 %{_libdir}/libldns*so
+%{_bindir}/ldns-config
 %dir %{_includedir}/ldns
 %{_includedir}/ldns/*.h
 %doc doc Changelog README
@@ -89,6 +90,10 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Jul 11 2009 Paul Wouters <paul@xelerance.com> - 1.6.0-1
+- Updated to 1.6.0
+- (did not yet compile with --without-ssl due to compile failures)
+
 * Thu Apr 16 2009 Paul Wouters <paul@xelerance.com> - 1.5.1-4
 - Memory management bug when generating a sha256 key, see:
   https://bugzilla.redhat.com/show_bug.cgi?id=493953
diff --git a/sources b/sources
index 7f50124..7fe1e29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17f73def98711e1475409d9a8d5d9dcd  ldns-1.5.1.tar.gz
+cd0d4d34a60d018fbfedae6d3ee4049b  ldns-1.6.0.tar.gz