[dnsmasq/f19] New stable version dnsmasq-2.66

[Tomas Hozza]

commit 609b978ebe1fe4fda53b13c322b4299937185ae5
Author: Tomas Hozza <thozza(a)redhat.com&gt;
Date:   Thu Apr 18 09:27:37 2013 +0200

    New stable version dnsmasq-2.66
    
    + Drop of merged patch
    
    Signed-off-by: Tomas Hozza <thozza(a)redhat.com&gt;

 .gitignore                                         |    1 +
 ...5-Fix-crash-on-exceeding-DHCP-lease-limit.patch |   61 --------------------
 dnsmasq.spec                                       |   13 ++--
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66c2e52..5382b85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.65.tar.gz
 /dnsmasq-2.66rc1.tar.gz
 /dnsmasq-2.66rc5.tar.gz
+/dnsmasq-2.66.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 2cf2be7..505f75c 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,5 +1,5 @@
 %define testrelease 0
-%define releasecandidate 1
+%define releasecandidate 0
 %if 0%{testrelease}
   %define extrapath test-releases/
   %define extraversion test30
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.66
-Release:        1.%{?extraversion}%{?dist}
+Release:        2%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,9 +20,6 @@ URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:       
http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
 Source1:        %{name}.service
 
-# Upstream fix after dnsmasq-2.66rc5 - commit 56a1142f033234e3ee3b6361e9a1bcdbe606f816
-Patch0:         dnsmasq-2.66.rc5-Fix-crash-on-exceeding-DHCP-lease-limit.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -57,8 +54,6 @@ query/remove a DHCP server's leases.
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-%patch0 -p1 -b .lease-limit
-
 # use /var/lib/dnsmasq instead of /var/lib/misc
 for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
     sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g'
"$file"
@@ -138,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Thu Apr 18 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.66-2
+- New stable version dnsmasq-2.66
+- Drop of merged patch
+
 * Fri Apr 12 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.66-1.rc5
 - Update to latest dnsmasq-2.66rc5
 - Include fix for segfault when lease limit is reached
diff --git a/sources b/sources
index 4f4ade2..ee41294 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c9fe3f9b0d6afb6a0a5d2f5c4eb1867  dnsmasq-2.66rc5.tar.gz
+c5eb8fb88847a5e9bf18db67c74efd47  dnsmasq-2.66.tar.gz