[arch-commits] Commit in dnsmasq/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, August 23, 2017 @ 08:06:24
  Author: eworm
Revision: 303332

upgpkg: dnsmasq 2.77-3

do not include stdio.h before dnsmasq.h (FS#54834)

Added:
  dnsmasq/trunk/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
Modified:
  dnsmasq/trunk/PKGBUILD

----------------------------------------------------+
 0001-do-not-include-stdio-h-before-dnsmasq-h.patch |   24 +++++++++++++++++++
 PKGBUILD                                           |   11 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

Added: 0001-do-not-include-stdio-h-before-dnsmasq-h.patch
===================================================================
--- 0001-do-not-include-stdio-h-before-dnsmasq-h.patch	                        (rev 0)
+++ 0001-do-not-include-stdio-h-before-dnsmasq-h.patch	2017-08-23 08:06:24 UTC (rev 303332)
@@ -0,0 +1,24 @@
+Subject: [PATCH 1/1] do not include stdio.h before dnsmasq.h
+Date: Tue, 22 Aug 2017 23:19:29 +0200
+From: Christian Hesse <mail at eworm.de>
+
+We define some constants in dnsmasq.h, which have an influence on
+stdio.h. So do not include stdio.h before dnsmasq.h.
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ src/helper.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/helper.c b/src/helper.c
+index 635677e..281cb4a 100644
+--- a/src/helper.c
++++ b/src/helper.c
+@@ -14,7 +14,6 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-#include <stdio.h>
+ #include "dnsmasq.h"
+ 
+ #ifdef HAVE_SCRIPT

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-23 07:21:51 UTC (rev 303331)
+++ PKGBUILD	2017-08-23 08:06:24 UTC (rev 303332)
@@ -1,4 +1,5 @@
 # $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
@@ -5,7 +6,7 @@
 
 pkgname=dnsmasq
 pkgver=2.77
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
@@ -14,15 +15,23 @@
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+        '0001-do-not-include-stdio-h-before-dnsmasq-h.patch'
         'dnsmasq-sysusers.conf'
         'dnsmasq.service')
 sha256sums=('6eac3b1c50ae25170e3ff8c96ddb55236cf45007633fdb8a35b1f3e02f5f8b8a'
             'SKIP'
+            'bd39af88222ec44d269734d0513656bed865fb0f0901b538fdbbe19768e91bcf'
             '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
             '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
 
 _build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < "${srcdir}"/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"