[dnsmasq/f20] Update to 2.68rc3

[Tomas Hozza]

commit fad2ab1eb0549d4e5d37b95caec5ec77086f7c81
Author: Tomas Hozza <thozza at redhat.com>
Date:   Tue Nov 26 14:09:59 2013 +0100

    Update to 2.68rc3
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 .gitignore                                         |    1 +
 ...2.68-Add-missing-malloc-return-code-check.patch |   41 ++++++++++++++++++++
 dnsmasq.spec                                       |   15 ++++---
 sources                                            |    2 +-
 4 files changed, 52 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be0c738..1e40d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.67rc2.tar.xz
 /dnsmasq-2.67rc4.tar.xz
 /dnsmasq-2.67.tar.xz
+/dnsmasq-2.68rc3.tar.xz
diff --git a/dnsmasq-2.68-Add-missing-malloc-return-code-check.patch b/dnsmasq-2.68-Add-missing-malloc-return-code-check.patch
new file mode 100644
index 0000000..2bb638b
--- /dev/null
+++ b/dnsmasq-2.68-Add-missing-malloc-return-code-check.patch
@@ -0,0 +1,41 @@
+From 532066ee2d7a4addd0af1a5f4ac0b8c3b5ad73cf Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon at thekelleys.org.uk>
+Date: Tue, 26 Nov 2013 10:14:47 +0000
+Subject: [PATCH] Add missing malloc() return-code check.
+
+Signed-off-by: Tomas Hozza <thozza at redhat.com>
+---
+ src/cache.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/cache.c b/src/cache.c
+index 582b882..43a7ce9 100644
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -945,15 +945,15 @@ void cache_reload(void)
+   /* Add CNAMEs to interface_names to the cache */
+   for (a = daemon->cnames; a; a = a->next)
+     for (intr = daemon->int_names; intr; intr = intr->next)
+-      if (hostname_isequal(a->target, intr->name))
++      if (hostname_isequal(a->target, intr->name) &&
++	  ((cache = whine_malloc(sizeof(struct crec)))))
+ 	{
+-	  struct crec *aliasc = whine_malloc(sizeof(struct crec));
+-	  aliasc->flags = F_FORWARD | F_NAMEP | F_CNAME | F_IMMORTAL | F_CONFIG;
+-	  aliasc->name.namep = a->alias;
+-	  aliasc->addr.cname.target.int_name = intr;
+-	  aliasc->addr.cname.uid = -1;
+-	  cache_hash(aliasc);
+-	  add_hosts_cname(aliasc); /* handle chains */
++	  cache->flags = F_FORWARD | F_NAMEP | F_CNAME | F_IMMORTAL | F_CONFIG;
++	  cache->name.namep = a->alias;
++	  cache->addr.cname.target.int_name = intr;
++	  cache->addr.cname.uid = -1;
++	  cache_hash(cache);
++	  add_hosts_cname(cache); /* handle chains */
+ 	}
+   
+   /* borrow the packet buffer for a temporary by-address hash */
+-- 
+1.8.3.1
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 6544193..1c4423e 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,19 +1,19 @@
 %define testrelease 0
-%define releasecandidate 0
+%define releasecandidate 1
 %if 0%{testrelease}
   %define extrapath test-releases/
   %define extraversion test16
 %endif
 %if 0%{releasecandidate}
   %define extrapath release-candidates/
-  %define extraversion rc4
+  %define extraversion rc3
 %endif
 
 %define _hardened_build 1
 
 Name:           dnsmasq
-Version:        2.67
-Release:        1%{?extraversion}%{?dist}
+Version:        2.68
+Release:        0.1.%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -23,7 +23,7 @@ Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{vers
 Source1:        %{name}.service
 
 # Patches
-Patch0:         %{name}-2.67-Fix-check-for-local-domains-in-CNAME-case.patch
+Patch0:         %{name}-2.68-Add-missing-malloc-return-code-check.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +58,7 @@ query/remove a DHCP server's leases.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .cname
+%patch0 -p1
 
 # 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
@@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Tue Nov 26 2013 Tomas Hozza <thozza at redhat.com> - 2.68-0.1.rc3
+- Update to 2.68rc3
+
 * Fri Nov 01 2013 Tomas Hozza <thozza at redhat.com> - 2.67-1
 - Update to 2.67 stable
 - Include one post release upstream fix for CNAME
diff --git a/sources b/sources
index e2b4afa..cc1970e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3560068c6cc644a01924fa089a70bb9c  dnsmasq-2.67.tar.xz
+04e065737ebb4d1361534e10444e8361  dnsmasq-2.68rc3.tar.xz