From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCE36138334 for ; Wed, 14 Aug 2019 01:00:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20632E084E; Wed, 14 Aug 2019 01:00:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0776DE084E for ; Wed, 14 Aug 2019 01:00:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E0D8349AAC for ; Wed, 14 Aug 2019 01:00:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B002A759 for ; Wed, 14 Aug 2019 01:00:48 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1565744428.872fbe5391c7714bd4fc869c92c711b34049e1f0.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/, net-dns/dnsmasq/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch X-VCS-Directories: net-dns/dnsmasq/files/ net-dns/dnsmasq/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 872fbe5391c7714bd4fc869c92c711b34049e1f0 X-VCS-Branch: master Date: Wed, 14 Aug 2019 01:00:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 723a8770-0406-4d61-b109-e8b71bccb5c2 X-Archives-Hash: b56af65d3c97eea169e338092d33a343 commit: 872fbe5391c7714bd4fc869c92c711b34049e1f0 Author: Patrick McLean sony com> AuthorDate: Wed Aug 14 01:00:28 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Aug 14 01:00:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872fbe53 net-dns/dnsmasq: Patch fix build with linux-headers 5.2 (bug #690788) Closes: https://bugs.gentoo.org/690788 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Patrick McLean gentoo.org> net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild | 5 ++++- .../files/dnsmasq-2.80-linux-headers-5.2.patch | 25 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild index 20c55be8ff0..e73c42b41c1 100644 --- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild @@ -1,5 +1,4 @@ # Copyright 1999-2019 Gentoo Authors -# Copyright 2017-2018 Sony Interactive Entertainment Inc. # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,6 +57,10 @@ REQUIRED_USE="dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )" +PATCHES=( + "${FILESDIR}/dnsmasq-2.80-linux-headers-5.2.patch" +) + use_have() { local useflag no_only uword if [[ ${1} == '-n' ]]; then diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch new file mode 100644 index 00000000000..21bd7cd39ff --- /dev/null +++ b/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch @@ -0,0 +1,25 @@ +From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Wed, 24 Jul 2019 17:34:48 +0100 +Subject: [PATCH] Fix build after y2038 changes in glib. + +SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. +--- + src/dnsmasq.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index ff3204a..3ef04ad 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -137,6 +137,7 @@ typedef unsigned long long u64; + #endif + + #if defined(HAVE_LINUX_NETWORK) ++#include + #include + /* There doesn't seem to be a universally-available + userspace header for these. */ +-- +1.7.10.4 +