[unbound/el6] * Thu Mar 21 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-1 - Updated to 1.4.20 - Build with ful

[Paul Wouters]

commit 8e75ecc52a4952c5738a8e986a12dac31cf8a036
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Mar 21 18:39:29 2013 -0400

    * Thu Mar 21 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-1
    - Updated to 1.4.20
    - Build with full RELRO (Adam)
    - Symlink unbound-control-setup.8 manpage to unbound-control.8 (Adam)
    - Allow for non-default config location in init script (Ville)

 .gitignore   |    1 +
 sources      |    2 +-
 unbound.init |    6 +++---
 unbound.spec |   20 ++++++++++----------
 4 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f6097c..5892338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ unbound-1.4.4.tar.gz
 /unbound-1.4.16.tar.gz
 /unbound-1.4.18.tar.gz
 /unbound-1.4.19.tar.gz
+/unbound-1.4.20.tar.gz
diff --git a/sources b/sources
index 6d04e1f..9435d03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39f121e1921c7b5ad2f05a4d756a0487  unbound-1.4.19.tar.gz
+1f2d0b490fd7928a708a326beda21948  unbound-1.4.20.tar.gz
diff --git a/unbound.init b/unbound.init
index d8f54af..ddf187a 100644
--- a/unbound.init
+++ b/unbound.init
@@ -69,7 +69,7 @@ start() {
     fi
 
 
-    unbound-checkconf > /dev/null
+    unbound-checkconf $config > /dev/null
     RETVAL=$?
     if [ $RETVAL != 0 ]
     then
@@ -80,7 +80,7 @@ start() {
     echo -n $"Starting unbound: "
 
     # if not running, start it up here
-    daemon --pidfile=$pidfile $exec
+    daemon --pidfile=$pidfile $exec -c $config
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     echo
@@ -96,7 +96,7 @@ stop() {
 }
 
 restart() {
-    unbound-checkconf > /dev/null
+    unbound-checkconf $config > /dev/null
     RETVAL=$?
     if [ $RETVAL != 0 ]
     then
diff --git a/unbound.spec b/unbound.spec
index cb44d3c..5f3284c 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -7,7 +7,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.19
+Version: 1.4.20
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
@@ -27,10 +27,8 @@ Source13: root.anchor
 Source14: unbound.sysconfig
 Source15: unbound-monthly.cron
 Source16: unbound-munin.README
-Patch1: unbound-1.4.19-888759.patch
 
 Group: System Environment/Daemons
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel , ldns-devel >= 1.6.13, 
 BuildRequires: libevent-devel expat-devel
 # Needed because /usr/sbin/unbound links unbound libs staticly
@@ -101,9 +99,9 @@ Python modules and extensions for unbound
 
 %prep
 %setup -q 
-%patch1 -p1 -b .888759
 
 %build
+export LDFLAGS="$LDFLAGS -Wl,-z,now"
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
             --disable-rpath --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
@@ -162,11 +160,10 @@ install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/unbound/keys.d/
 install -p %{SOURCE10} %{buildroot}%{_sysconfdir}/unbound/conf.d/
 install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/unbound/local.d/
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+# Symlink unbound-control-setup.8 manpage to unbound-control.8
+ln -s %{_mandir}/man8/unbound-control.8 %{buildroot}/%{_mandir}/man8/unbound-control-setup.8
 
 %files 
-%defattr(-,root,root,-)
 %doc doc/README doc/CREDITS doc/LICENSE doc/FEATURES
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
@@ -196,19 +193,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %files munin
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/unbound
 %{_datadir}/munin/plugins/unbound*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libunbound.so
 %{_includedir}/unbound.h
 %{_mandir}/man3/*
 %doc README
 
 %files libs
-%defattr(-,root,root,-)
 %{_sbindir}/unbound-anchor
 %{_libdir}/libunbound.so.*
 %{_sysconfdir}/%{name}/icannbundle.pem
@@ -251,6 +245,12 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 21 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-1
+- Updated to 1.4.20
+- Build with full RELRO (Adam)
+- Symlink unbound-control-setup.8 manpage to unbound-control.8 (Adam)
+- Allow for non-default config location in init script (Ville)
+
 * Wed Dec 21 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1
 - Updated to 1.4.19 - this integrates all existing patches
 - Patch for unbound-anchor (rhbz#888759)