[nsd/el5] * prepare nsd for 3.2.15

Paul Wouters pwouters at fedoraproject.org
Fri Feb 1 17:02:13 UTC 2013


commit 3284bf07c39332bf3e7226069b8e66e04af7b5b5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Feb 1 11:59:30 2013 -0500

    * prepare nsd for 3.2.15
    
    Conflicts:
    	nsd.init
    	nsd.spec

 nsd.init |    7 +++++++
 nsd.spec |   13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/nsd.init b/nsd.init
index 9b42669..95975cf 100644
--- a/nsd.init
+++ b/nsd.init
@@ -105,8 +105,15 @@ case "$1" in
   condrestart)
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
+<<<<<<< HEAD
   status)
 	status -p $NSD_PIDFILE $NSD_PROG
+=======
+    status)
+	status -p ${NSD_PIDFILE} ${NSD_PROG}
+	RETVAL=$?
+	exit $RETVAL
+>>>>>>> b44d648... * prepare nsd for 3.2.15
 	;;
   reload)
 	echo -n $"Rebuilding zonefiles:"
diff --git a/nsd.spec b/nsd.spec
index fa9a20b..dc990e8 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,6 +1,10 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
+<<<<<<< HEAD
 Version: 3.2.13
+=======
+Version: 3.2.15
+>>>>>>> b44d648... * prepare nsd for 3.2.15
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -31,7 +35,8 @@ consult the REQUIREMENTS document which is a part of this distribution
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
            --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state \
-           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db
+           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db \
+           --with-rate-limit
 
 %{__make} %{?_smp_mflags}
 #convert to utf8
@@ -98,6 +103,12 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Fri Feb 01 2013 Paul Wouters <pwouters at redhat.com> - 3.2.15-1
+- Updates to 3.2.15 which contains rate limit code
+- Fix to nsd.init script to return non-zero on service status
+  when not running (broke puppet)
+- Only run nsdc rebuild hourly cronjob when nsd service is running
+
 * Fri Jul 27 2012 Paul Wouters <pwouters at redhat.com> - 3.2.13-1
 - Updated to 3.2.13, addresses VU#517036 CVE-2012-2979
   (note Fedora/EPEL packages are not vulnerable to this)


More information about the scm-commits mailing list