[dnsmasq] update to the latest testing release 2.67test4 (#962246)

[Tomas Hozza]

commit f9818256f6927518068b18f462207b299bb91f42
Author: Tomas Hozza <thozza(a)redhat.com&gt;
Date:   Wed May 15 09:31:14 2013 +0200

    update to the latest testing release 2.67test4 (#962246)
    
    - drop mergerd patches
    
    Signed-off-by: Tomas Hozza <thozza(a)redhat.com&gt;

 .gitignore                                         |    1 +
 ..._number_zero_in_encapsulated_DHCP_options.patch |  142 ----------
 ...ix-crash-on-SERVFAIL-when-using-conntrack.patch |   50 ----
 ...Fix-regression-in-dhcp_lease_time-utility.patch |  103 -------
 dnsmasq-2.66-Fix-wrong_size_in_memset_call.patch   |   26 --
 dnsmasq-2.66-Manpage-typos.patch                   |   97 -------
 ...lease_time-and-dhcp_release-work-for-IPv4.patch |   45 ---
 ...6-Send-TCP-DNS-messages-in-one-write-call.patch |   90 -------
 dnsmasq-2.66-dhcp-match-now-work-with-BOOTP.patch  |  282 --------------------
 dnsmasq.spec                                       |   39 +---
 sources                                            |    2 +-
 11 files changed, 10 insertions(+), 867 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5382b85..b72b52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.66rc1.tar.gz
 /dnsmasq-2.66rc5.tar.gz
 /dnsmasq-2.66.tar.gz
+/dnsmasq-2.67test4.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index f5f41cc..b007ecb 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,8 +1,8 @@
-%define testrelease 0
+%define testrelease 1
 %define releasecandidate 0
 %if 0%{testrelease}
   %define extrapath test-releases/
-  %define extraversion test30
+  %define extraversion test4
 %endif
 %if 0%{releasecandidate}
   %define extrapath release-candidates/
@@ -10,8 +10,8 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.66
-Release:        5%{?extraversion}%{?dist}
+Version:        2.67
+Release:        0.1.%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,24 +20,6 @@ URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:       
http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
 Source1:        %{name}.service
 
-#include upstream bug fix patches committed after stable release
-# commit 4582c0efe7d7af93517b1f3bcc7af67685ab3e5c
-Patch0:         %{name}-2.66-Fix-wrong_size_in_memset_call.patch
-# commit bd08ae67f9a0cae2ce15be885254cad9449d4551
-Patch1:         %{name}-2.66-Allow-option_number_zero_in_encapsulated_DHCP_options.patch
-# commit 4b5ea12e90024ade5033b3b83a8b2620035952ba
-Patch2:         %{name}-2.66-Send-TCP-DNS-messages-in-one-write-call.patch
-# commit 797a7afba477390bc016c647cfb792c85ee6102d
-Patch3:         %{name}-2.66-Fix-crash-on-SERVFAIL-when-using-conntrack.patch
-# commit aa63a21ce0b20dfe988e0bcdf14b8b930de20311
-Patch4:         %{name}-2.66-Fix-regression-in-dhcp_lease_time-utility.patch
-# commit a66d36ea1112c861ad2f11ed40cc26973873e5be
-Patch5:         %{name}-2.66-Manpage-typos.patch
-# commit 1c10b9de118c951a5aedc130e55101987dcc3feb
-Patch6:        
%{name}-2.66-Note-that-dhcp_lease_time-and-dhcp_release-work-for-IPv4.patch
-# commit 86e92f998379d219e10517dfa2c42f544ba164ce
-Patch7:         %{name}-2.66-dhcp-match-now-work-with-BOOTP.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -72,15 +54,6 @@ query/remove a DHCP server's leases.
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-%patch0 -p1 -b .wrong_size
-%patch1 -p1 -b .zero_DHCP_option
-%patch2 -p1 -b .tcp_dns_in_one_packet
-%patch3 -p1 -b .SERVFAIL_crash
-%patch4 -p1 -b .dhcp_lease_time-regression
-%patch5 -p1
-%patch6 -p1 -b .utils_work_only_ipv4
-%patch7 -p1 -b .dhcp-match_bootp
-
 # 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"
@@ -164,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Wed May 15 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.67-0.1.test4
+- update to the latest testing release 2.67test4 (#962246)
+- drop mergerd patches
+
 * Tue Apr 30 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.66-5
 - dnsmasq unit file cleanup
   - drop forking Type and PIDfile and rather start dnsmasq with "-k" option
diff --git a/sources b/sources
index ee41294..91c493a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5eb8fb88847a5e9bf18db67c74efd47  dnsmasq-2.66.tar.gz
+11a823a512d7aeb1dedee5606a787d6f  dnsmasq-2.67test4.tar.gz