Accepting request 714370 from home:jirislaby:branches:network
- add 0001-fix-build-after-y2038-changes-in-glibc.patch OBS-URL: https://build.opensuse.org/request/show/714370 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=110
This commit is contained in:
parent
8f7f833592
commit
9c019eebb6
27
0001-fix-build-after-y2038-changes-in-glibc.patch
Normal file
27
0001-fix-build-after-y2038-changes-in-glibc.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From: Jiri Slaby <jslaby@suse.cz>
|
||||||
|
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 <jslaby@suse.cz>
|
||||||
|
---
|
||||||
|
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 <linux/sockios.h>
|
||||||
|
#include <linux/capability.h>
|
||||||
|
/* There doesn't seem to be a universally-available
|
||||||
|
userspace header for these. */
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 10 06:28:36 UTC 2019 - Jiri Slaby <jslaby@suse.com>
|
||||||
|
|
||||||
|
- add 0001-fix-build-after-y2038-changes-in-glibc.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 11 12:31:25 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
Tue Jun 11 12:31:25 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ Source6: SuSEFirewall.dnsmasq-dhcp
|
|||||||
Source7: SuSEFirewall.dnsmasq-dns
|
Source7: SuSEFirewall.dnsmasq-dns
|
||||||
Source8: %{name}-rpmlintrc
|
Source8: %{name}-rpmlintrc
|
||||||
Patch0: dnsmasq-groups.patch
|
Patch0: dnsmasq-groups.patch
|
||||||
|
Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
@ -69,6 +70,7 @@ server's leases.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0
|
%patch0
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
# Remove the executable bit from python example files to
|
# Remove the executable bit from python example files to
|
||||||
# avoid unwanted automatic dependencies
|
# avoid unwanted automatic dependencies
|
||||||
|
Loading…
Reference in New Issue
Block a user