rpms/nsd/devel nsd.spec,1.6,1.7 nsd.init,1.1,1.2

[Paul Wouters (pwouters)]

Author: pwouters

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

Modified Files:
	nsd.spec nsd.init 
Log Message:
updated spec and init file for nsd-2.3.4



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsd.spec	15 Dec 2005 15:48:59 -0000	1.6
+++ nsd.spec	7 May 2006 18:56:28 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.3
-Release: 7%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
 Source1: nsd.init
-Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
@@ -19,9 +18,8 @@
 
 %prep
 %setup -q 
-%patch0 -p1 -b .checking.patch
 
-%configure --enable-bind8-stats --enable-plugins \
+%configure --enable-bind8-stats --enable-plugins --enable-checking \
            --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
@@ -30,22 +28,16 @@
 
 %install
 rm -rf %{buildroot}
-# Not using their 'make install' since it uses install-sh which does not
-# get the correct install path within the RPM_BUILD_ROOT
-#%{__make} install
-install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
-install -d 0755 %{buildroot}/%{_sbindir}
-install -d 0755 %{buildroot}/%{_mandir}/man8
-install -d 0755 %{buildroot}/%{_initrddir}
-install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
-
-install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
-install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
+%{__make} DESTDIR=%{buildroot} install
+install -d 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -d 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
-install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir}
-install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc
-install -m 0644 *.8 %{buildroot}/%{_mandir}/man8
+# 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
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -84,6 +76,12 @@
 fi
 
 %changelog
+* Sun May  7 2006 Paul Wouters <paul at xelerance.com> - 2.3.4-1
+- Upgraded to nsd-2.3.4. 
+- Removed manual install targets because DESTDIR is now supported
+- Re-enabled --checking, checking patch no longer needed and removed.
+- Work around in nsd.init for nsd failing to start when there is no ipv6
+
 * Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-7
 - chkconfig and attribute  changes as proposed by Dmitry Butskoy
 


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.init	13 Dec 2005 03:51:03 -0000	1.1
+++ nsd.init	7 May 2006 18:56:28 -0000	1.2
@@ -24,9 +24,14 @@
 
 #extra verbosity
 #ZONEC_VERBOSE=-v
-
 OTHER_NSD_OPTS=""
 
+#work around for bug in nsd-2.3.4 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