1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From 5452961750275b1e3f7c95e9528338f0ee0357ad Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 14 Sep 2017 09:17:35 -0700
Subject: [PATCH] dns_hosts: Fix build with musl
Add NETDB_* defines which are not available in musl
remove need for sys/cdefs.h by remove __P
Add _GNU_SOURCE for missing u_char definition
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/Makefile.am | 2 +-
lib/dns_hosts.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 977a8db..35cb5b3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,7 +8,7 @@
noinst_LIBRARIES = libcompat.a
noinst_HEADERS = ypbind3_binding.h
-AM_CFLAGS = -D_REENTRANT=1 @WARNFLAGS@
+AM_CFLAGS = -D_GNU_SOURCE -D_REENTRANT=1 @WARNFLAGS@
AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @NSL_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
libcompat_a_SOURCES = dns_hosts.c res_options.h ypbind3_binding_dup.c \
diff --git a/lib/dns_hosts.c b/lib/dns_hosts.c
index fd421fd..6067879 100644
--- a/lib/dns_hosts.c
+++ b/lib/dns_hosts.c
@@ -64,6 +64,7 @@
#include <sys/param.h>
#include <sys/socket.h>
+#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
@@ -84,6 +85,12 @@ extern struct hostent *_gethtbyaddr(const char *, int, int);
#ifndef LOG_AUTH
# define LOG_AUTH 0
#endif
+#ifndef NETDB_SUCCESS
+# define NETDB_SUCCESS 0
+#endif
+#ifndef NETDB_INTERNAL
+# define NETDB_INTERNAL -1
+#endif
#define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */
@@ -101,7 +108,7 @@ static char hostbuf[8*1024];
static struct in_addr host_addr;
#ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort (char **, int);
#endif
#if PACKETSZ > 1024
--
2.14.1
|