ypbind-mt: Upgrade to 2.4

Fix build with musl along the way

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj
2017-09-14 09:22:55 -07:00
committed by Joe MacDonald
parent 001eaa5844
commit a02204eade
2 changed files with 74 additions and 3 deletions
@@ -0,0 +1,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
@@ -21,6 +21,7 @@ DEPENDS = " \
yp-tools \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"
DEPENDS_append_libc-musl = " bsd-headers nss"
RDEPENDS_${PN} += "yp-tools"
# ypbind-mt now provides all the functionality of ypbind
@@ -30,9 +31,10 @@ PROVIDES += "ypbind"
SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
file://ypbind.init \
file://ypbind.service \
"
SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
SRC_URI[sha256sum] = "1930ce19f6ccfe10400f3497b31867f71690d2bcd3f5b575199fa915559b7746"
file://0001-dns_hosts-Fix-build-with-musl.patch \
"
SRC_URI[md5sum] = "1aeccd0d11c064d5d59c56941bca682b"
SRC_URI[sha256sum] = "a2e1fa8fc992a12b289c229e00e38c20d59070c3bcf08babf40c692515c340e0"
inherit systemd update-rc.d
@@ -42,6 +44,8 @@ INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ."
CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/nss3"
do_install_append () {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${sysconfdir}/rcS.d