aboutsummaryrefslogtreecommitdiffstats
path: root/main/dhcpcd/musl.patch
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-10-16 15:37:05 -0300
committerKevin Daudt <kdaudt@alpinelinux.org>2019-10-20 19:31:49 +0000
commit7c6cd40b6e4b414ab90e2c2dac87a5a87e37f9ed (patch)
tree10e9f6a6e4f076a9b52ff21a200e4cafb86f4233 /main/dhcpcd/musl.patch
parent98f4986dfb208e28ab19da157d285dcf82b94316 (diff)
downloadaports-7c6cd40b6e4b414ab90e2c2dac87a5a87e37f9ed.tar.gz
aports-7c6cd40b6e4b414ab90e2c2dac87a5a87e37f9ed.tar.bz2
aports-7c6cd40b6e4b414ab90e2c2dac87a5a87e37f9ed.tar.xz
main/dhcpcd: upgrade to 8.1.1
Closes !504
Diffstat (limited to 'main/dhcpcd/musl.patch')
-rw-r--r--main/dhcpcd/musl.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/main/dhcpcd/musl.patch b/main/dhcpcd/musl.patch
new file mode 100644
index 0000000000..9de5163db7
--- /dev/null
+++ b/main/dhcpcd/musl.patch
@@ -0,0 +1,24 @@
+Include linux/if_tun.h after netinet/if_tun.h to avoid redefinition of struct ethhdr
+
+diff --git a/src/if-linux.c b/src/if-linux.c
+index fd47278..cca4e36 100644
+--- a/src/if-linux.c
++++ b/src/if-linux.c
+@@ -37,7 +37,6 @@
+ #include <linux/if_addr.h>
+ #include <linux/if_link.h>
+ #include <linux/if_packet.h>
+-#include <linux/if_tun.h>
+ #include <linux/if_vlan.h>
+ #include <linux/filter.h>
+ #include <linux/netlink.h>
+@@ -51,6 +50,8 @@
+ #include <netinet/in.h>
+ #include <net/route.h>
+
++#include <linux/if_tun.h>
++
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+