[nsd/el5] * updated to 3.2.15

[Paul Wouters]

commit 23782ddf1af1d765b4dc4a88cf5ba3d3dc1a3b5e
Author: Paul Wouters <Paul.Wouters at interisle.net>
Date:   Mon Feb 4 13:10:53 2013 -0500

    * updated to 3.2.15

 .gitignore |    1 +
 nsd.init   |    6 ------
 nsd.spec   |    8 +-------
 sources    |    4 +---
 4 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4495fd5..dd1325b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nsd-3.2.7.tar.gz
 /nsd-3.2.11.tar.gz
 /nsd-3.2.12.tar.gz
 /nsd-3.2.13.tar.gz
+/nsd-3.2.15.tar.gz
diff --git a/nsd.init b/nsd.init
index 95975cf..ce8839c 100644
--- a/nsd.init
+++ b/nsd.init
@@ -105,15 +105,9 @@ 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 dc990e8..551b8bf 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,10 +1,6 @@
 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}/
@@ -13,7 +9,6 @@ Source1: nsd.init
 Source2: nsd.cron
 Source3: nsd.sysconfig
 Patch0: nsd-install.patch
-Patch1: nsd-fixlogfile.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
@@ -28,7 +23,6 @@ consult the REQUIREMENTS document which is a part of this distribution
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --enable-bind8-stats --enable-checking --enable-nsec3  \
@@ -103,7 +97,7 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
-* Fri Feb 01 2013 Paul Wouters <pwouters at redhat.com> - 3.2.15-1
+* Mon Feb 04 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)
diff --git a/sources b/sources
index c3106c7..3b99274 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-707eabf8a32b1c53d28ccaef2cd45163  nsd-3.2.11.tar.gz
-19f12299b624819cd770eab84f177989  nsd-3.2.12.tar.gz
-b6494ffadf4ce72ff367a7c3f00498c1  nsd-3.2.13.tar.gz
+b5fdbf78bd3f4133d1295af21a61f7c8  nsd-3.2.15.tar.gz