rpms/nsd/F-7 nsd.init,1.5,1.6 nsd.spec,1.20,1.21 sources,1.8,1.9

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8320

Modified Files:
	nsd.init nsd.spec sources 
Log Message:

Pulled in from devel branch after testing.

* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-3
- Do not include examples from nsd.conf.sample that causes
  bogus network traffic.

* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-2
- Change locations of ixfr.db and xfrd.state to /var/lib/nsd
- Enable NSEC3
- Delay running nsdc update until after nsd has started
- Delete xfrd.state on nsd stop
- Run nsdc notify in the background, since it can take
  a very long time when remote servers are unavailable.

* Tue Sep 11 2007 Paul Wouters <paul at xelerance.com> 3.0.6-1
- Upgraded to 3.0.6
- Do not include bind2nsd, since it didn't compile for me




Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	18 Sep 2007 01:44:30 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	killproc nsd
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then
+	  rm -f /var/run/nsd/nsd.pid
+	  # ensure notifies are sent at startup
+	  rm -f /var/lib/nsd/xfrd.state
 	  rm -f /var/lock/subsys/nsd
-	  rm -f /var/run/nsd.pid
 	fi
 	echo
 	return $RETVAL


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	13 Jul 2007 18:47:21 -0000	1.20
+++ nsd.spec	18 Sep 2007 01:44:30 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -20,8 +20,10 @@
 %setup -q 
 
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
-           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
-           --with-user=nsd
+           --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
+           --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
 
 %build
 %{__make} %{?_smp_mflags}
@@ -30,14 +32,14 @@
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d -m 0755 %{buildroot}%{_initrddir}
-install -d -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.conf
-#mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
-#   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
+head -76 %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample > %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+rm %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample 
+echo "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,6 +53,7 @@
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -74,6 +77,22 @@
 fi
 
 %changelog
+* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-3
+- Do not include examples from nsd.conf.sample that causes
+  bogus network traffic.
+
+* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-2
+- Change locations of ixfr.db and xfrd.state to /var/lib/nsd
+- Enable NSEC3
+- Delay running nsdc update until after nsd has started
+- Delete xfrd.state on nsd stop
+- Run nsdc notify in the background, since it can take
+  a very long time when remote servers are unavailable.
+
+* Tue Sep 11 2007 Paul Wouters <paul at xelerance.com> 3.0.6-1
+- Upgraded to 3.0.6
+- Do not include bind2nsd, since it didn't compile for me
+
 * Fri Jul 13 2007 Paul Wouters <paul at xelerance.com> 3.0.5-2
 - Fix init script, bug #245546
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2007 04:27:39 -0000	1.8
+++ sources	18 Sep 2007 01:44:30 -0000	1.9
@@ -1,6 +1,2 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
-72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-e64633bb4e6eb46e8e16049e87333cb9  nsd.init
-a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
-73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
-ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz
+02fd7cfe4c455f180a2178da78b6cd21  nsd.init
+db964272bb653f3691cdae6932953432  nsd-3.0.6.tar.gz