[unbound/el5] * Thu Aug 23 2012 Paul Wouters <pwouters at redhat.com> - 1.4.16-3 - Updated to 1.4.18 - Removed merged

[Paul Wouters]

commit b1a6bde843550280dea44d63b616791055e3f3df
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Aug 23 19:40:18 2012 -0400

    * Thu Aug 23 2012 Paul Wouters <pwouters at redhat.com> - 1.4.16-3
    - Updated to 1.4.18
    - Removed merged in patch
    - Added comment in root.key
    - Add proper links to man pages
    - Split man pages in proper unbound/unbound-devel package
    
    Conflicts:
    	unbound.spec

 .gitignore   |    1 +
 root.key     |    2 ++
 sources      |    5 ++---
 unbound.spec |   28 +++++++++++++++++++++++-----
 4 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f243afd..26cd013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ unbound-1.4.4.tar.gz
 /unbound-1.4.13.tar.gz
 /unbound-1.4.14.tar.gz
 /unbound-1.4.16.tar.gz
+/unbound-1.4.18.tar.gz
diff --git a/root.key b/root.key
index f9ce549..e340ed0 100644
--- a/root.key
+++ b/root.key
@@ -1,3 +1,5 @@
+; // The root key in bind format. This can be read by most tools, including
+; // named, unbound, et. For libunbound, use ub_ctx_trustedkeys() to load this
 trusted-keys {
 "." 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0="; // key id = 19036
 
diff --git a/sources b/sources
index 798bd91..33188b2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-7e3b27dee2b97640dd2e1783253317ab  unbound-1.4.13.tar.gz
-cd69fdaaa6af01ea0b6fbc59802f74ba  unbound-1.4.14.tar.gz
-5158d03d2ab0a8e60925c7a9b9903631  unbound-1.4.16.tar.gz
+812d49064a78c92765970a1364736da7  unbound-1.4.17.tar.gz
+2cad65b6a2d08bb6e0210ea92156ca4b  unbound-1.4.18.tar.gz
diff --git a/unbound.spec b/unbound.spec
index 8ec27aa..519aad5 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -7,8 +7,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.16
-Release: 2%{?dist}
+Version: 1.4.18
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -27,7 +27,7 @@ BuildRequires: libevent-devel expat-devel
 BuildRequires:  python-devel swig
 %endif
 # Required for SVN versions
-#BuildRequires: bison
+# BuildRequires: bison
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -100,7 +100,7 @@ Python modules and extensions for unbound
 %if %{with_python}
             --with-pythonmodule --with-pyunbound \
 %endif
-            --enable-sha2 --disable-gost --disable-static
+            --enable-sha2 --disable-gost --disable-static --disable-ecdsa
 %{__make} %{?_smp_mflags}
 
 %install
@@ -127,6 +127,12 @@ rm -rf %{buildroot}%{_libdir}/*.la
 rm -rf %{buildroot}%{python_sitearch}/*.la
 %endif
 
+# create softlink for all functions of libunbound man pages
+for mpage in ub_ctx ub_result ub_ctx_create ub_ctx_delete ub_ctx_set_option ub_ctx_get_option ub_ctx_config ub_ctx_set_fwd ub_ctx_resolvconf ub_ctx_hosts ub_ctx_add_ta ub_ctx_add_ta_file ub_ctx_trustedkeys ub_ctx_debugout ub_ctx_debuglevel ub_ctx_async ub_poll ub_wait ub_fd ub_process ub_resolve ub_resolve_async ub_cancel ub_resolve_free ub_strerror ub_ctx_print_local_zones ub_ctx_zone_add ub_ctx_zone_remove ub_ctx_data_add ub_ctx_data_remove;
+do
+  echo ".so man3/libunbound.3" > %{buildroot}%{_mandir}/man3/$mpage ;
+done
+
 mkdir -p %{buildroot}%{_localstatedir}/run/unbound
 
 %clean
@@ -142,7 +148,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dlv.isc.org.key
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/root.key
 %{_sbindir}/*
-%{_mandir}/*/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 %if %{with_python}
 %files python
@@ -160,6 +168,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root,-)
 %{_libdir}/libunbound.so
 %{_includedir}/unbound.h
+%{_mandir}/man3/*
 %doc README
 
 %files libs
@@ -198,6 +207,15 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 23 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-1
+- Updated to 1.4.18
+- Removed merged in patch
+- Added comment in root.key
+- Add proper links to man pages
+- Split man pages in proper unbound/unbound-devel package
+- Added --disable-ecdsa since it requires ECC which is not available
+- Added --disable-static
+
 * Tue Feb 28 2012 Paul Wouters <pwouters at redhat.com> - 1.4.16-2
 - Change initscript "reload" to call "restart" rhbz#489278