- new version 2.5.2 and some bug fix

2010-01-26 16:24:33 +00:00 · 2010-01-26 16:24:33 +00:00 · 0d9e8c4cc1
commit 0d9e8c4cc1
parent d0f2c37ec7
5 changed files with 12 additions and 6 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma
--- a/dnsmasq.init
+++ b/dnsmasq.init
@ -62,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=$?
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@ -10,8 +10,8 @@
 %endif

 Name:           dnsmasq
-Version:        2.51
-Release:        2%{?extraversion}%{?dist}
+Version:        2.52
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server

 Group:          System Environment/Daemons
@ -50,7 +50,7 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
 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,11 @@ fi


 %changelog
+* Tue Jan 26 2010 Itamar Reis Peixoto <itamar@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@ispbrasil.com.br> - 2.51-2
 - fix bz 512664

--- a/import.log
+++ b/import.log
@ -1 +1,2 @@
 dnsmasq-2_51-1_fc12:HEAD:dnsmasq-2.51-1.fc12.src.rpm:1255825544
+dnsmasq-2_52-1_fc13:HEAD:dnsmasq-2.52-1.fc13.src.rpm:1264522855
--- a/2
+++ b/2
@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89  dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac  dnsmasq-2.52.tar.lzma