[dnsmasq/f20] Update to 2.68 stable

Tomas Hozza thozza at fedoraproject.org
Mon Dec 9 09:12:51 UTC 2013


commit f828140df374abd0e828dd30f25b320c81881837
Author: Tomas Hozza <thozza at redhat.com>
Date:   Mon Dec 9 10:11:48 2013 +0100

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

 .gitignore                                         |    1 +
 ...Fix-check-for-local-domains-in-CNAME-case.patch |   49 --------------------
 ...2.68-Add-missing-malloc-return-code-check.patch |   41 ----------------
 dnsmasq.spec                                       |    9 ++--
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e40d0a..691628f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.67rc4.tar.xz
 /dnsmasq-2.67.tar.xz
 /dnsmasq-2.68rc3.tar.xz
+/dnsmasq-2.68.tar.xz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 1c4423e..a8efb16 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 test16
@@ -13,7 +13,7 @@
 
 Name:           dnsmasq
 Version:        2.68
-Release:        0.1.%{?extraversion}%{?dist}
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -23,7 +23,6 @@ Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{vers
 Source1:        %{name}.service
 
 # Patches
-Patch0:         %{name}-2.68-Add-missing-malloc-return-code-check.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +57,6 @@ query/remove a DHCP server's leases.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%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 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Mon Dec 09 2013 Tomas Hozza <thozza at redhat.com> - 2.68-1
+- Update to 2.68 stable
+
 * Tue Nov 26 2013 Tomas Hozza <thozza at redhat.com> - 2.68-0.1.rc3
 - Update to 2.68rc3
 
diff --git a/sources b/sources
index cc1970e..58ba28b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04e065737ebb4d1361534e10444e8361  dnsmasq-2.68rc3.tar.xz
+fec885ba0a9df0f7d8f2e44db48f19ae  dnsmasq-2.68.tar.xz


More information about the scm-commits mailing list