| 1 |
commit: 872fbe5391c7714bd4fc869c92c711b34049e1f0 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Aug 14 01:00:28 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 14 01:00:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872fbe53 |
| 7 |
|
| 8 |
net-dns/dnsmasq: Patch fix build with linux-headers 5.2 (bug #690788) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/690788 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild | 5 ++++- |
| 16 |
.../files/dnsmasq-2.80-linux-headers-5.2.patch | 25 ++++++++++++++++++++++ |
| 17 |
2 files changed, 29 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild |
| 20 |
index 20c55be8ff0..e73c42b41c1 100644 |
| 21 |
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild |
| 22 |
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild |
| 23 |
@@ -1,5 +1,4 @@ |
| 24 |
# Copyright 1999-2019 Gentoo Authors |
| 25 |
-# Copyright 2017-2018 Sony Interactive Entertainment Inc. |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -58,6 +57,10 @@ REQUIRED_USE="dhcp-tools? ( dhcp ) |
| 30 |
lua? ( script ) |
| 31 |
libidn2? ( idn )" |
| 32 |
|
| 33 |
+PATCHES=( |
| 34 |
+ "${FILESDIR}/dnsmasq-2.80-linux-headers-5.2.patch" |
| 35 |
+) |
| 36 |
+ |
| 37 |
use_have() { |
| 38 |
local useflag no_only uword |
| 39 |
if [[ ${1} == '-n' ]]; then |
| 40 |
|
| 41 |
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 |
| 42 |
new file mode 100644 |
| 43 |
index 00000000000..21bd7cd39ff |
| 44 |
--- /dev/null |
| 45 |
+++ b/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch |
| 46 |
@@ -0,0 +1,25 @@ |
| 47 |
+From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 |
| 48 |
+From: Jiri Slaby <jslaby@××××.cz> |
| 49 |
+Date: Wed, 24 Jul 2019 17:34:48 +0100 |
| 50 |
+Subject: [PATCH] Fix build after y2038 changes in glib. |
| 51 |
+ |
| 52 |
+SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. |
| 53 |
+--- |
| 54 |
+ src/dnsmasq.h | 1 + |
| 55 |
+ 1 file changed, 1 insertion(+) |
| 56 |
+ |
| 57 |
+diff --git a/src/dnsmasq.h b/src/dnsmasq.h |
| 58 |
+index ff3204a..3ef04ad 100644 |
| 59 |
+--- a/src/dnsmasq.h |
| 60 |
++++ b/src/dnsmasq.h |
| 61 |
+@@ -137,6 +137,7 @@ typedef unsigned long long u64; |
| 62 |
+ #endif |
| 63 |
+ |
| 64 |
+ #if defined(HAVE_LINUX_NETWORK) |
| 65 |
++#include <linux/sockios.h> |
| 66 |
+ #include <linux/capability.h> |
| 67 |
+ /* There doesn't seem to be a universally-available |
| 68 |
+ userspace header for these. */ |
| 69 |
+-- |
| 70 |
+1.7.10.4 |
| 71 |
+ |
Archives