rpms/dnsmasq/F-12 .cvsignore, 1.27, 1.28 dnsmasq.init, 1.1, 1.2 dnsmasq.spec, 1.43, 1.44 import.log, 1.1, 1.2 sources, 1.27, 1.28

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/dnsmasq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24330/F-12

Modified Files:
	.cvsignore dnsmasq.init dnsmasq.spec import.log sources 
Log Message:
- new version + some bug fix 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	19 Nov 2009 07:47:15 -0000	1.27
+++ .cvsignore	26 Jan 2010 17:23:42 -0000	1.28
@@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma


Index: dnsmasq.init
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/dnsmasq.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dnsmasq.init	19 Nov 2009 07:47:16 -0000	1.1
+++ dnsmasq.init	26 Jan 2010 17:23:42 -0000	1.2
@@ -24,6 +24,10 @@ if [ ! -z "${DOMAIN_SUFFIX}" ]; then
   OPTIONS="-s $DOMAIN_SUFFIX"
 fi
 
+pidfile=${PIDFILE-/var/run/dnsmasq.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/dnsmasq}
+
+
 RETVAL=0
 
 # See how we were called.
@@ -33,16 +37,14 @@ case "$1" in
         daemon $dnsmasq $OPTIONS
 	RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
+        [ $RETVAL -eq 0 ] && touch ${lockfile}
         ;;
   stop)
-        if test "x`pidof dnsmasq`" != x; then
-            echo -n "Shutting down dnsmasq: "
-            killproc dnsmasq
-        fi
+        echo -n "Shutting down dnsmasq: "
+        killproc -p ${pidfile} ${dnsmasq}
 	RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
+        [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
         ;;
   status)
 	status dnsmasq
@@ -50,7 +52,7 @@ case "$1" in
 	;;
   reload)
 	echo -n "Reloading dnsmasq: "
-	killproc dnsmasq -HUP
+	killproc -p ${pidfile} ${dnsmasq} -HUP
 	RETVAL=$?
 	echo
 	;;
@@ -60,7 +62,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	    if test "x`/sbin/pidof dnsmasq`" != x; then
+	    if test "x`pidfileofproc dnsmasq`" != x; then
 		$0 stop
 		$0 start
 		RETVAL=$?


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/dnsmasq.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- dnsmasq.spec	19 Nov 2009 07:47:16 -0000	1.43
+++ dnsmasq.spec	26 Jan 2010 17:23:42 -0000	1.44
@@ -10,7 +10,7 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.51
+Version:        2.52
 Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -50,7 +50,7 @@ for file in dnsmasq.conf.example man/dns
 done
 
 #enable dbus
-sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
 
 #enable /etc/dnsmasq.d fix bz 526703
 sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
@@ -118,6 +118,14 @@ fi
 
 
 %changelog
+* Tue Jan 26 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.52-1
+- New Version 2.52
+- fix condrestart() in initscript bz 547605
+- fix sed to enable DBUS(the '*' need some escaping) bz 553161
+
+* Sun Nov 22 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.51-2
+- fix bz 512664
+
 * Sat Oct 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.51-1
 - move initscript from patch to a plain text file
 - drop (dnsmasq-configuration.patch) and use sed instead


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Nov 2009 07:47:16 -0000	1.1
+++ import.log	26 Jan 2010 17:23:42 -0000	1.2
@@ -1 +1,2 @@
 dnsmasq-2_51-1_fc12:F-12:dnsmasq-2.51-1.fc12.src.rpm:1258616775
+dnsmasq-2_52-1_fc13:F-12:dnsmasq-2.52-1.fc13.src.rpm:1264526528


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	19 Nov 2009 07:47:16 -0000	1.27
+++ sources	26 Jan 2010 17:23:42 -0000	1.28
@@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89  dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac  dnsmasq-2.52.tar.lzma