Merge pull request #1947 from danielg4/master

vpnc: dirty hack for musl compatibility
This commit is contained in:
Ted Hess 2015-11-11 16:52:58 -05:00
commit 7be003f324
2 changed files with 6 additions and 6 deletions

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vpnc PKG_NAME:=vpnc
PKG_REV:=550 PKG_REV:=550
PKG_VERSION:=0.5.3.r$(PKG_REV) PKG_VERSION:=0.5.3.r$(PKG_REV)
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/ PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/

View file

@ -19,17 +19,17 @@
#endif #endif
--- a/sysdep.c --- a/sysdep.c
+++ b/sysdep.c +++ b/sysdep.c
@@ -59,7 +59,9 @@ @@ -59,6 +59,10 @@
#if defined(__DragonFly__) #if defined(__DragonFly__)
#include <net/tun/if_tun.h> #include <net/tun/if_tun.h>
#elif defined(__linux__) #elif defined(__linux__)
-#include <linux/if_tun.h> +# if !defined(__GLIBC__) && !defined(__UCLIBC__)
+# if defined(__GLIBC__) || defined(__UCLIBC__) +# define _LINUX_IF_ETHER_H
+# include <linux/if_tun.h> +# include <net/ethernet.h>
+# endif +# endif
#include <linux/if_tun.h>
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* no header for tun */ /* no header for tun */
#elif defined(__CYGWIN__)
--- a/config.c --- a/config.c
+++ b/config.c +++ b/config.c
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@