[dnsmasq] update to 2.67test7

[Tomas Hozza]

commit fb84f79dafc216cbf675cac0c17d3ece3dc9d7b9
Author: Tomas Hozza <thozza(a)redhat.com&gt;
Date:   Tue Jun 11 12:25:52 2013 +0200

    update to 2.67test7
    
    - drop merged patch
    - use _hardened_build macro instead of hardcoded flags
    
    Signed-off-by: Tomas Hozza <thozza(a)redhat.com&gt;

 .gitignore                                         |    1 +
 ...q-2.67-Fix-failure-to-start-with-ENOTSOCK.patch |   44 --------------------
 dnsmasq.spec                                       |   21 ++++-----
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b72b52a..5283997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.66rc5.tar.gz
 /dnsmasq-2.66.tar.gz
 /dnsmasq-2.67test4.tar.gz
+/dnsmasq-2.67test7.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 146a10f..40bbd7f 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -2,16 +2,18 @@
 %define releasecandidate 0
 %if 0%{testrelease}
   %define extrapath test-releases/
-  %define extraversion test4
+  %define extraversion test7
 %endif
 %if 0%{releasecandidate}
   %define extrapath release-candidates/
   %define extraversion rc5
 %endif
 
+%define _hardened_build 1
+
 Name:           dnsmasq
 Version:        2.67
-Release:        0.2.%{?extraversion}%{?dist}
+Release:        0.3.%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,10 +22,6 @@ URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:       
http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
 Source1:        %{name}.service
 
-# Patches from upstream repo git://thekelleys.org.uk/dnsmasq.git
-# commit cfcad42ff1ddee8e64d120f18016a654152d0215 - Bug #962874
-Patch0:         %{name}-2.67-Fix-failure-to-start-with-ENOTSOCK.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -58,8 +56,6 @@ query/remove a DHCP server's leases.
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-%patch0 -p1 -b .enotsock_failure
-
 # 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"
@@ -76,10 +72,6 @@ sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g'
dnsmasq.conf.examp
 
 
 %build
-# We need to compile the daemon with PIE, PIC and FULL RELRO
-RPM_LD_FLAGS="-Wl,-z,relro,-z,now -pie"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -DPIE -fPIC"
-
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 make -C contrib/wrt %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
LDFLAGS="$RPM_LD_FLAGS"
 
@@ -143,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Tue Jun 11 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.67-0.3.test7
+- update to 2.67test7
+- drop merged patch
+- use _hardened_build macro instead of hardcoded flags
+
 * Fri May 17 2013 Tomas Hozza <thozza(a)redhat.com&gt; - 2.67-0.2.test4
 - Fix failure to start with ENOTSOCK (#962874)
 
diff --git a/sources b/sources
index 91c493a..47cbf2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11a823a512d7aeb1dedee5606a787d6f  dnsmasq-2.67test4.tar.gz
+88f0652170247a9bae97177e075ccc43  dnsmasq-2.67test7.tar.gz