diff --git a/0001-fix-build-after-y2038-changes-in-glibc.patch b/0001-fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 0000000..a5bbee7 --- /dev/null +++ b/0001-fix-build-after-y2038-changes-in-glibc.patch @@ -0,0 +1,27 @@ +From: Jiri Slaby +Date: Wed, 10 Jul 2019 08:19:06 +0200 +Subject: fix build after y2038 changes in glibc +Patch-mainline: submitted on 2019/07/10 + +SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. + +Signed-off-by: Jiri Slaby +--- + 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. */ +-- +2.21.0 + diff --git a/dnsmasq.changes b/dnsmasq.changes index e4adb7b..3ded235 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 10 06:28:36 UTC 2019 - Jiri Slaby + +- add 0001-fix-build-after-y2038-changes-in-glibc.patch + ------------------------------------------------------------------- Tue Jun 11 12:31:25 UTC 2019 - Dominique Leuenberger diff --git a/dnsmasq.spec b/dnsmasq.spec index cdab56b..c1905d4 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -35,6 +35,7 @@ Source6: SuSEFirewall.dnsmasq-dhcp Source7: SuSEFirewall.dnsmasq-dns Source8: %{name}-rpmlintrc Patch0: dnsmasq-groups.patch +Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: dos2unix @@ -69,6 +70,7 @@ server's leases. %prep %setup -q %patch0 +%patch1 -p1 # Remove the executable bit from python example files to # avoid unwanted automatic dependencies