From patchwork Thu Feb 6 18:02:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 20155 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A846C168DC; Thu, 6 Feb 2020 18:04:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5A80E16397 for ; Thu, 6 Feb 2020 18:04:34 +0000 (GMT) Received: from localhost ([::1]:44098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izlVx-0002Hw-U5 for patchwork@mira.cbaines.net; Thu, 06 Feb 2020 13:04:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izlVT-0001km-UI for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izlVS-00012d-NF for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izlVS-000126-IQ for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1izlVS-0000AV-F2 for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39456] [PATCH 2/6] gnu: dnsmasq: Fix build with linux-libre-headers >= 5.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2020 18:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39456 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39456@debbugs.gnu.org Received: via spool by 39456-submit@debbugs.gnu.org id=B39456.1581012183554 (code B ref 39456); Thu, 06 Feb 2020 18:04:02 +0000 Received: (at 39456) by debbugs.gnu.org; 6 Feb 2020 18:03:03 +0000 Received: from localhost ([127.0.0.1]:48407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izlUQ-000084-IS for submit@debbugs.gnu.org; Thu, 06 Feb 2020 13:03:03 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izlUM-00007W-5R for 39456@debbugs.gnu.org; Thu, 06 Feb 2020 13:02:54 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 13A2021BA9 for <39456@debbugs.gnu.org>; Thu, 6 Feb 2020 13:02:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 06 Feb 2020 13:02:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm2; bh= 92DyJH9ptitPqMwiwP65lkrZKmE2Rx/5LDM11/eAttY=; b=Srfemba0bMRx645M G7se/tasdk/aNgJ+bIgt5DbqlIKiF06fiowvYnm88HB+mi2T+uIKNQpq4Iu7LQ6G cv8KmLLX0j1e0E/C17xxV1mDg1mMAAvR5URxexTahVrrhK+sNcaGVkF+t6f4kbGZ Uk9OVKfsTkNHX0eQWpbgD8LBfjMbPoTA2wA4BCVylz1IqMsUySoC9skww/oOSdVq 2An8SSKvzXzqUyJvGjQFRLHpBZQ6GRVJyVpImydBvSHKPSW2gtdnnS2DSSOkCD5d 9NiVETaHrh0oYb30onk1VONLQ8YbtVkC6Ul1+P5rpOqpUguCyZ/2c4rp0KLvGRr7 YAnAQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=92DyJH9ptitPqMwiwP65lkrZKmE2Rx/5LDM11/eAt tY=; b=fVtcX4h2uyMg1vts6L2/26hCPZblRoiMv5wbb7WCX7wi4AQQ3tJDhVw5S votoZ1M4O5nJ2szrv84ca89xZ/EZn3ZDtgr6wl74OmfMPqpaBrr6NWwyEslzcnOk U9TtAgkSomIeg7vo7EzKy0AU68qtQwgHpZlYxvu4p4c92wVbvSzZRTQYzi/sCD+F UOIvEpADXk+pFISch+5L4AEl/G8Ru5fqFc3MFz8ZISajJFyq21yPqj4oH3bXnyKj eVq0WdX4vcSfwA5PIb/eosSVD2pigIFIDj2/KNwN7HMu7s54nUg+bVRr53zs2hHA qOyEMG8IIj8xfPqi5lKrFKo+sRszQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrheefgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmqeenucfkphepkeegrddvtddvrdeiledrvdehfeenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id 9DF9330605C8 for <39456@debbugs.gnu.org>; Thu, 6 Feb 2020 13:02:48 -0500 (EST) From: Marius Bakke Date: Thu, 6 Feb 2020 19:02:41 +0100 Message-Id: <20200206180245.12470-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200206180245.12470-1-mbakke@fastmail.com> References: <20200206180245.12470-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dns.scm (dnsmasq)[source](modules, snippet): New fields. --- gnu/packages/dns.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7c52722cb6..a1f506905f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2018 Oleg Pykhalov @@ -83,7 +83,17 @@ version ".tar.xz")) (sha256 (base32 - "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")))) + "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; The SIOCGSTAMP ioctl is defined in instead + ;; of starting with linux-libre-headers 5.2. + ;; Remove this for dnsmasq versions > 2.80. + (substitute* "src/dnsmasq.h" + (("#if defined\\(HAVE_LINUX_NETWORK\\)" all) + (string-append all "\n#include "))) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config)))