ppp: Fix build with musl
Therer are assumptions about glibc headers and features which needs to be addressed for musl (From OE-Core rev: 1949b128b87f89a56a2794ad056f2e4f4dbf6a3c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4972eddecd
commit
68f88a5a88
|
@ -0,0 +1,163 @@
|
|||
From 52a1e41d7541b2c936285844c59bd1be21797860 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 May 2015 14:57:05 -0700
|
||||
Subject: [PATCH] Fix build with musl
|
||||
|
||||
There are several assumption about glibc
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
include/net/ppp_defs.h | 2 ++
|
||||
pppd/Makefile.linux | 2 +-
|
||||
pppd/magic.h | 6 +++---
|
||||
pppd/plugins/rp-pppoe/config.h | 5 ++++-
|
||||
pppd/plugins/rp-pppoe/plugin.c | 1 -
|
||||
pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++----
|
||||
pppd/plugins/rp-pppoe/pppoe.h | 2 +-
|
||||
pppd/sys-linux.c | 3 ++-
|
||||
8 files changed, 17 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
|
||||
index b06eda5..dafa36c 100644
|
||||
--- a/include/net/ppp_defs.h
|
||||
+++ b/include/net/ppp_defs.h
|
||||
@@ -38,6 +38,8 @@
|
||||
#ifndef _PPP_DEFS_H_
|
||||
#define _PPP_DEFS_H_
|
||||
|
||||
+#include <sys/time.h>
|
||||
+
|
||||
/*
|
||||
* The basic PPP frame.
|
||||
*/
|
||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
||||
index 8ab2102..d7e2564 100644
|
||||
--- a/pppd/Makefile.linux
|
||||
+++ b/pppd/Makefile.linux
|
||||
@@ -126,7 +126,7 @@ LIBS += -lcrypt
|
||||
#endif
|
||||
|
||||
ifdef USE_LIBUTIL
|
||||
-CFLAGS += -DHAVE_LOGWTMP=1
|
||||
+#CFLAGS += -DHAVE_LOGWTMP=1
|
||||
LIBS += -lutil
|
||||
endif
|
||||
|
||||
diff --git a/pppd/magic.h b/pppd/magic.h
|
||||
index c81213b..9d399e3 100644
|
||||
--- a/pppd/magic.h
|
||||
+++ b/pppd/magic.h
|
||||
@@ -42,8 +42,8 @@
|
||||
* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
|
||||
*/
|
||||
|
||||
-void magic_init __P((void)); /* Initialize the magic number generator */
|
||||
-u_int32_t magic __P((void)); /* Returns the next magic number */
|
||||
+void magic_init (void); /* Initialize the magic number generator */
|
||||
+u_int32_t magic (void); /* Returns the next magic number */
|
||||
|
||||
/* Fill buffer with random bytes */
|
||||
-void random_bytes __P((unsigned char *buf, int len));
|
||||
+void random_bytes (unsigned char *buf, int len);
|
||||
diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h
|
||||
index 5703087..fff032e 100644
|
||||
--- a/pppd/plugins/rp-pppoe/config.h
|
||||
+++ b/pppd/plugins/rp-pppoe/config.h
|
||||
@@ -78,8 +78,9 @@
|
||||
#define HAVE_NET_IF_ARP_H 1
|
||||
|
||||
/* Define if you have the <net/ethernet.h> header file. */
|
||||
+#ifdef __GLIBC__
|
||||
#define HAVE_NET_ETHERNET_H 1
|
||||
-
|
||||
+#endif
|
||||
/* Define if you have the <net/if.h> header file. */
|
||||
#define HAVE_NET_IF_H 1
|
||||
|
||||
@@ -102,7 +103,9 @@
|
||||
#define HAVE_NETPACKET_PACKET_H 1
|
||||
|
||||
/* Define if you have the <sys/cdefs.h> header file. */
|
||||
+#ifdef __GLIBC__
|
||||
#define HAVE_SYS_CDEFS_H 1
|
||||
+#endif
|
||||
|
||||
/* Define if you have the <sys/dlpi.h> header file. */
|
||||
/* #undef HAVE_SYS_DLPI_H */
|
||||
diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
|
||||
index a8c2bb4..ca34d79 100644
|
||||
--- a/pppd/plugins/rp-pppoe/plugin.c
|
||||
+++ b/pppd/plugins/rp-pppoe/plugin.c
|
||||
@@ -46,7 +46,6 @@ static char const RCSID[] =
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
-#include <net/ethernet.h>
|
||||
#include <net/if_arp.h>
|
||||
#include <linux/ppp_defs.h>
|
||||
#include <linux/if_pppox.h>
|
||||
diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
index 3d3bf4e..d42f619 100644
|
||||
--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
@@ -27,10 +27,6 @@
|
||||
#include <linux/if_packet.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_NET_ETHERNET_H
|
||||
-#include <net/ethernet.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
#include <asm/types.h>
|
||||
#endif
|
||||
@@ -47,6 +43,10 @@
|
||||
#include <net/if_arp.h>
|
||||
#endif
|
||||
|
||||
+#ifndef __GLIBC__
|
||||
+#define error(x...) fprintf(stderr, x)
|
||||
+#endif
|
||||
+
|
||||
char *xstrdup(const char *s);
|
||||
void usage(void);
|
||||
|
||||
diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
|
||||
index 9ab2eee..75b9004 100644
|
||||
--- a/pppd/plugins/rp-pppoe/pppoe.h
|
||||
+++ b/pppd/plugins/rp-pppoe/pppoe.h
|
||||
@@ -92,7 +92,7 @@ typedef unsigned long UINT32_t;
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
-#ifndef HAVE_SYS_DLPI_H
|
||||
+#if !defined HAVE_SYS_DLPI_H && defined HAVE_NET_ETHERNET_H
|
||||
#include <netinet/if_ether.h>
|
||||
#endif
|
||||
#endif
|
||||
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
|
||||
index a105505..49b0273 100644
|
||||
--- a/pppd/sys-linux.c
|
||||
+++ b/pppd/sys-linux.c
|
||||
@@ -112,7 +112,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/if_arp.h>
|
||||
-#include <linux/route.h>
|
||||
+/* #include <linux/route.h> */
|
||||
#include <linux/if_ether.h>
|
||||
#endif
|
||||
#include <netinet/in.h>
|
||||
@@ -145,6 +145,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef INET6
|
||||
+#include <net/route.h>
|
||||
#ifndef _LINUX_IN6_H
|
||||
/*
|
||||
* This is in linux/include/net/ipv6.h.
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -32,6 +32,9 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
|||
file://fix-CVE-2015-3310.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_libc-musl = "\
|
||||
file://0001-Fix-build-with-musl.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
|
||||
SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
|
||||
|
||||
|
|
Loading…
Reference in New Issue