From 9194632876c9046646e9254da3918cada383057e Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul@xelerance.com>
Date: Jun 07 2011 22:03:00 +0000
Subject: * Tue Jun  7 2011 Paul Wouters <paul@xelerance.com> - 3.2.8-1

- updated to 3.2.8
- fix /var/run/nsd to be owned by root, not nsd
- fix init status to work as expected (bz#525107)
- fix nsd.conf and nsd.conf.5 to have correct logfile
- fix nsd.init syntax error by piddir change
- fix initscript to create /var/run/nsd if missing (bz#710376)

Conflicts:

	.gitignore
	nsd.spec

---

diff --git a/.gitignore b/.gitignore
index 1fe2190..c12867e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
 nsd.init
@@ -15,3 +16,7 @@ nsd-3.2.2.tar.gz
 nsd-3.2.3.tar.gz
 nsd-3.2.4.tar.gz
 /nsd-3.2.7.tar.gz
+=======
+nsd-3.2.7.tar.gz
+/nsd-3.2.8.tar.gz
+>>>>>>> ef18144... * Tue Jun  7 2011 Paul Wouters <paul@xelerance.com> - 3.2.8-1
diff --git a/nsd-fixlogfile.patch b/nsd-fixlogfile.patch
new file mode 100644
index 0000000..6149547
--- /dev/null
+++ b/nsd-fixlogfile.patch
@@ -0,0 +1,24 @@
+diff -up nsd-3.2.8/nsd.conf.5.in.fixlogfile nsd-3.2.8/nsd.conf.5.in
+--- nsd-3.2.8/nsd.conf.5.in.fixlogfile	2011-03-22 16:01:32.000000000 +0200
++++ nsd-3.2.8/nsd.conf.5.in	2011-06-03 16:37:50.000000000 +0300
+@@ -37,7 +37,7 @@ database: "@dbfile@"
+ username: @user@
+ .RE
+ .RS 5
+-logfile: "@logfile@"
++logfile: "/var/log/nsd.log"
+ .RE
+ .RS 5
+ pidfile: "@pidfile@"
+diff -up nsd-3.2.8/nsd.conf.sample.in.fixlogfile nsd-3.2.8/nsd.conf.sample.in
+--- nsd-3.2.8/nsd.conf.sample.in.fixlogfile	2011-03-22 15:13:32.000000000 +0200
++++ nsd-3.2.8/nsd.conf.sample.in	2011-06-03 16:30:49.000000000 +0300
+@@ -38,7 +38,7 @@ server:
+ 	# nsid: "aabbccdd"
+ 
+ 	# log messages to file. Default to stderr and syslog (with facility LOG_DAEMON).
+-	# logfile: "@logfile@"
++	# logfile: "/var/log/nsd.log"
+ 
+ 	# Number of NSD servers to fork.
+ 	# server-count: 1
diff --git a/nsd.init b/nsd.init
index 51eb143..9b42669 100755
--- a/nsd.init
+++ b/nsd.init
@@ -24,6 +24,7 @@ NSD_PROG="/usr/sbin/nsd"
 NSD_PIDFILE="/var/run/nsd/nsd.pid"
 NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
 NSDC_PROG="/usr/sbin/nsdc"
+NSD_PIDDIR=`dirname $NSD_PIDFILE`
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -43,6 +44,8 @@ start() {
   # Sanity checks.
   [ -f $NSD_CONF ] || exit 5
   [ -x $NSD_PROG ] || exit 5
+  # /var/run could (and should) be tmpfs
+  [ -d $NSD_PIDDIR ] || mkdir -p $NSD_PIDDIR
 
   echo -n $"Starting nsd:"
   $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
@@ -103,10 +106,10 @@ case "$1" in
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
   status)
-	$NSDC_PROG -c $NSD_CONF running
+	status -p $NSD_PIDFILE $NSD_PROG
 	;;
   reload)
-	echo -n $"Rebuilding zonfiles:"
+	echo -n $"Rebuilding zonefiles:"
 	$NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
         RETVAL=$?
         if [ $RETVAL -eq 0 ] ; then
diff --git a/nsd.spec b/nsd.spec
index c909433..f1f02a4 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.7
-Release: 5%{?dist}
+Version: 3.2.8
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@ 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
@@ -23,6 +24,7 @@ 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 --enable-nsid \
@@ -46,7 +48,7 @@ install -d -m 0755 %{buildroot}%{_initrddir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -c -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/nsd
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
-install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
 install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
@@ -70,7 +72,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %attr(0755,root,root) %{_initrddir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
-%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%ghost %attr(0755,root,root) %dir %{_localstatedir}/run/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
@@ -97,6 +99,14 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Tue Jun  7 2011 Paul Wouters <paul@xelerance.com> - 3.2.8-1
+- updated to 3.2.8
+- fix /var/run/nsd to be owned by root, not nsd
+- fix init status to work as expected (bz#525107)
+- fix nsd.conf and nsd.conf.5 to have correct logfile
+- fix nsd.init syntax error by piddir change
+- fix initscript to create /var/run/nsd if missing (bz#710376)
+
 * Wed Mar 09 2011 Paul Wouters <paul@xelerance.com> - 3.2.7-5
 - Updated to 3.2.7
 - Fix for nsd.init to report OK/FAILED properly (bz#525107)
diff --git a/sources b/sources
index 7fdb8c8..059bce9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 b5aca8a207f77db566b08db25bf77d74  nsd-3.2.7.tar.gz
+963c2123853e7759ffb772da40c68838  nsd-3.2.8.tar.gz