rpms/nsd/EL-5 .cvsignore, 1.7, 1.8 nsd.cron, 1.3, 1.4 nsd.init, 1.8, 1.9 nsd.spec, 1.27, 1.28 sources, 1.10, 1.11

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825

Modified Files:
	.cvsignore nsd.cron nsd.init nsd.spec sources 
Log Message:
* Wed Jan 06 2010 Paul Wouters <paul at xelerance.com> - 3.2.4-1
- Updated to nsd 3.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Aug 2009 22:08:44 -0000	1.7
+++ .cvsignore	6 Jan 2010 21:34:36 -0000	1.8
@@ -2,3 +2,4 @@ nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
 nsd-2.3.7.tar.gz
 nsd-3.2.3.tar.gz
+nsd-3.2.4.tar.gz


Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.cron,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsd.cron	14 Sep 2009 15:03:26 -0000	1.3
+++ nsd.cron	6 Jan 2010 21:34:36 -0000	1.4
@@ -2,20 +2,19 @@
 
 # Paul Wouters <paul at xelerance.com>
 # This folds back zone updates, dynamic updates, etc that nsd records
-# in the ixfr.db and nsd.db files back into the zone files or visa
-# versa
+# in the ixfr.db and nsd.db files back into the zone files or vice-versa
 
 # Default settings - do not edit these but /etc/sysconfig/nsd instead!
 NSD_CONF="/etc/nsd/nsd.conf"
 NSDC_PROG="/usr/sbin/nsdc"
 NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
-NSD_AUTOREBUILD="yes"
+NSD_AUTORELOAD="yes"
 
 # Read in local settings.
 [ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
 
 # Ideally check if ixfr.db newer then any zones, only then do
-$NSDC_PROG patch > /dev/null 2>&1
+$NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
 
 # We try to only rebuild/reload when neccessary. If 1 zone is newer,
 # we need to rebuild the db file.
@@ -23,7 +22,7 @@ $NSDC_PROG patch > /dev/null 2>&1
 # complete this operation within an hour, but it should work fine for
 # most other uses.
 
-case "$NSD_AUTOREBUILD" in
+case "$NSD_AUTORELOAD" in
 	[Yy]|[Yy][Ee][Ss])
 		database="`$NSD_CHECKCONF_PROG -o database $NSD_CONF`"
 		$NSD_CHECKCONF_PROG -v $NSD_CONF | grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/" | while read zonefile
@@ -31,8 +30,8 @@ case "$NSD_AUTOREBUILD" in
 			if [ $zonefile -nt $database ]
 			then
 				echo "Zone $zonefile update requires database rebuild"
-				$NSDC_PROG rebuild > /dev/null 2>&1
-				$NSDC_PROG reload > /dev/null 2>&1
+				$NSDC_PROG -c $NSD_CONF rebuild > /dev/null 2>&1
+				$NSDC_PROG -c $NSD_CONF reload > /dev/null 2>&1
 				break
 			fi
 		done
@@ -44,4 +43,4 @@ esac
 # nsd checks the serial in notify requests, so its better to send an
 # occasional redundant notify, then to miss it.
 # According to the nsd team, this is no longer neccessary
-# $NSDC_PROG notify > /dev/null 2>&1
+# $NSDC_PROG -c $NSD_CONF notify > /dev/null 2>&1


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nsd.init	20 Aug 2009 15:28:12 -0000	1.8
+++ nsd.init	6 Jan 2010 21:34:36 -0000	1.9
@@ -44,6 +44,9 @@ start() {
   [ -f $NSD_CONF ] || exit 5
   [ -x $NSD_PROG ] || exit 5
 
+  [ -G /var/run/nsdhm ] || chown nsd.nsd /var/run/nsdhm
+  [ -G /var/lib/nsdhm ] || chown nsd.nsd /var/lib/nsdhm
+
   echo -n $"Starting nsd:"
   $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nsd.spec	14 Sep 2009 15:03:26 -0000	1.27
+++ nsd.spec	6 Jan 2010 21:34:36 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.3
-Release: 3%{?dist}
+Version: 3.2.4
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Wed Jan 06 2010 Paul Wouters <paul at xelerance.com> - 3.2.4-1
+- Updated to nsd 3.2.4
+
 * Mon Sep 14 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-3
 - Fix for another redirection error in nsd.cron (Ville Mattila)
 - Add support for NSD_AUTOREBUILD disabling via /etc/sysconfig/nsd (Ville Mattila)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Aug 2009 22:08:44 -0000	1.10
+++ sources	6 Jan 2010 21:34:36 -0000	1.11
@@ -1,2 +1 @@
-a0dcb0a3b3c1a8d386125eeafe403f58  nsd-3.2.2.tar.gz
-5ddb35dfb7da0defb82cda4f7388cba2  nsd-3.2.3.tar.gz
+0c394fd713d194bde24a1035e56d5a79  nsd-3.2.4.tar.gz