diff options
| -rw-r--r-- | main/dhcpcd/APKBUILD | 8 | ||||
| -rw-r--r-- | main/dhcpcd/musl.patch | 24 |
2 files changed, 29 insertions, 3 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 0f43df147e9..75627412622 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=8.0.6 +pkgver=8.1.1 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -15,6 +15,7 @@ source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$pkgver.tar.xz busybox-logger.patch fix-chrony-conf-location.patch dhcpcd.initd + musl.patch " build() { CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M" @@ -43,7 +44,8 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 dhcpcd-8.0.6.tar.xz +sha512sums="2acca049029fa629ab6ba4f45959a2b67cf20c13e8659e71c1d5688fff5527df7007a4edfd9e88634ded9c76179d91b3e7adb92719f7a049d4f0cdbbd06e9a79 dhcpcd-8.1.1.tar.xz 692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch -d4610be2b694ae3c7ba2defc4273635b87579c51ae5a74cc4c3ecce66dfc7cb32c4713655ac0324781445c5271fcfdc14b20584b332a2c1e2dbbeaf7ff17b44b dhcpcd.initd" +d4610be2b694ae3c7ba2defc4273635b87579c51ae5a74cc4c3ecce66dfc7cb32c4713655ac0324781445c5271fcfdc14b20584b332a2c1e2dbbeaf7ff17b44b dhcpcd.initd +082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4 musl.patch" diff --git a/main/dhcpcd/musl.patch b/main/dhcpcd/musl.patch new file mode 100644 index 00000000000..9de5163db70 --- /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> + |