rpms/nsd/devel .cvsignore, 1.5, 1.6 nsd.init, 1.4, 1.5 nsd.spec, 1.15, 1.16 sources, 1.5, 1.6

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25202

Modified Files:
	.cvsignore nsd.init nsd.spec sources 
Log Message:
* Mon Nov 27 2006 Paul Wouters <paul at xelerance.com> 3.0.2-1
- Upgraded to 3.0.2.
- Use new configuration file nsd.conf. Still needs migration script.
  patch from Farkas Levente <lfarkas at bppiac.hu>

Postponing release to FC-x until we have a migration script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2006 19:43:29 -0000	1.5
+++ .cvsignore	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
+nsd.init
+nsd-3.0.2.tar.gz


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.init	12 Oct 2006 19:43:29 -0000	1.4
+++ nsd.init	27 Nov 2006 17:43:39 -0000	1.5
@@ -6,7 +6,7 @@
 # description:  NSD is a complete implementation of an authoritative \
 #               DNS name server. 
 # processname: /usr/sbin/nsd
-# config: /etc/nsd/nsdc.config
+# config: /etc/nsd/nsd.conf
 #
 ### BEGIN INIT INFO
 # Provides: nsd
@@ -18,21 +18,13 @@
 ### END INIT INFO
 
 # Sanity checks.
-[ -f /etc/nsd/nsdc.conf ] || exit 0
-[ -f /etc/nsd/nsd.zones ] || exit 0
+[ -f /etc/nsd/nsd.conf ] || exit 0
 [ -x /usr/sbin/nsd ] || exit 0
 
 #extra verbosity
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
-#fixed in 2.3.6
-#work around for bug in nsd-2.3.x when no ipv6 is available
-#if [ ! -d /proc/sys/net/ipv6/ ]
-#then
-#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-#fi
-
 # Source function library.
 . /etc/init.d/functions
 


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsd.spec	16 Oct 2006 13:52:51 -0000	1.15
+++ nsd.spec	27 Nov 2006 17:43:39 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.6
-Release: 2%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -34,20 +34,20 @@
 install -d 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsdc.conf
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
+mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
+   %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+#mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
+#   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
+%doc doc/*
 %dir %{_sysconfdir}/nsd/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
+#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
@@ -73,6 +73,11 @@
 fi
 
 %changelog
+* Mon Nov 27 2006 Paul Wouters <paul at xelerance.com> 3.0.2-1
+- Upgraded to 3.0.2.
+- Use new configuration file nsd.conf. Still needs migration script.
+  patch from Farkas Levente <lfarkas at bppiac.hu>
+
 * Mon Oct 16 2006  Paul Wouters <paul at xelerance.com> 2.3.6-2
 - Bump version for upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2006 19:43:29 -0000	1.5
+++ sources	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
+e64633bb4e6eb46e8e16049e87333cb9  nsd.init
+a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz