aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-03-09 08:40:57 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-07-25 12:23:46 +0100
commite9eec39aacde450ba87598d85987b374ce6aed95 (patch)
tree3823546edc4d7228951ea9e37f55f6fea3f06833 /package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
parent7d684b7673a7cb4f3fef366dd4f621f62fc4019c (diff)
downloadupstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.gz
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.bz2
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.zip
dnsmasq: backport latest patches
Backport upstream patches pre 2.81rc for testing purposes. Let's see what falls out! Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch')
-rw-r--r--package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch b/package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
new file mode 100644
index 0000000000..98364ea797
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
@@ -0,0 +1,22 @@
+From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Wed, 24 Jul 2019 17:34:48 +0100
+Subject: [PATCH 57/57] Fix build after y2038 changes in glib.
+
+SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/dnsmasq.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/dnsmasq.h
++++ b/src/dnsmasq.h
+@@ -137,6 +137,7 @@ typedef unsigned long long u64;
+ #endif
+
+ #if defined(HAVE_LINUX_NETWORK)
++#include <linux/sockios.h>
+ #include <linux/capability.h>
+ /* There doesn't seem to be a universally-available
+ userspace header for these. */