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-08-03 20:55:52 +0100
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-08-03 20:55:52 +0100
commitfc5d46dc62285ff16deae26818764eafce17f0a6 (patch)
tree3e774451ab444ad0232dcedae26efbcc5efbab56 /package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
parenta2754667291bef7e2e5f003e0f9c3296dcfd1959 (diff)
downloadupstream-fc5d46dc62285ff16deae26818764eafce17f0a6.tar.gz
upstream-fc5d46dc62285ff16deae26818764eafce17f0a6.tar.bz2
upstream-fc5d46dc62285ff16deae26818764eafce17f0a6.zip
Revert "dnsmasq: backport latest patches"
This reverts commit e9eec39aacde450ba87598d85987b374ce6aed95. 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, 0 insertions, 22 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
deleted file mode 100644
index 98364ea797..0000000000
--- a/package/network/services/dnsmasq/patches/0057-Fix-build-after-y2038-changes-in-glib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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. */