From 96cbae77e5e13b9131d43d61dccd4f08081cc793 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 13 Nov 2019 19:21:39 +0000 Subject: [PATCH] dhcpcd: bump to 8.1.2 --- core/dhcpcd/build | 2 -- core/dhcpcd/checksums | 3 +-- core/dhcpcd/patches/dhcpcd-fix-musl.patch | 21 --------------------- core/dhcpcd/sources | 3 +-- core/dhcpcd/version | 2 +- 5 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 core/dhcpcd/patches/dhcpcd-fix-musl.patch diff --git a/core/dhcpcd/build b/core/dhcpcd/build index dc74149f..5e4235c7 100755 --- a/core/dhcpcd/build +++ b/core/dhcpcd/build @@ -1,7 +1,5 @@ #!/bin/sh -e -patch -p1 < dhcpcd-fix-musl.patch - ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/core/dhcpcd/checksums b/core/dhcpcd/checksums index 8f0a2942..222a143b 100644 --- a/core/dhcpcd/checksums +++ b/core/dhcpcd/checksums @@ -1,3 +1,2 @@ -485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82 dhcpcd-8.1.1.tar.xz -588cf6f8e51c82dd652949b023b58eacd3c7a6cb6f17cd59b74ac4b682322cfe dhcpcd-fix-musl.patch +cbd3e7ab1584a5a3a49d863376fa138e5fa388397a3e27d2b35bb81a2e8c35ad dhcpcd-8.1.2.tar.xz 533714c2f3edcd70e47822cb880d8e8ffdba673b10452ea808037ec2714a375c dhcpcd.run diff --git a/core/dhcpcd/patches/dhcpcd-fix-musl.patch b/core/dhcpcd/patches/dhcpcd-fix-musl.patch deleted file mode 100644 index 95bb937c..00000000 --- a/core/dhcpcd/patches/dhcpcd-fix-musl.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/if-linux.c b/src/if-linux.c -index fd47278..6a6c0d0 100644 ---- a/src/if-linux.c -+++ b/src/if-linux.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -291,7 +290,7 @@ if_tap(const char *ifname) - snprintf(path, sizeof(path), SYS_TUNTAP, ifname); - if (check_proc_hex(path, &n) == -1) - return false; -- return n & IFF_TAP; -+ return n & 0x0002; - } - - bool diff --git a/core/dhcpcd/sources b/core/dhcpcd/sources index e8243c21..1ec6221f 100644 --- a/core/dhcpcd/sources +++ b/core/dhcpcd/sources @@ -1,3 +1,2 @@ -https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.1.1.tar.xz -patches/dhcpcd-fix-musl.patch +https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.1.2.tar.xz files/dhcpcd.run diff --git a/core/dhcpcd/version b/core/dhcpcd/version index 52ca3f76..1679acdb 100644 --- a/core/dhcpcd/version +++ b/core/dhcpcd/version @@ -1 +1 @@ -8.1.1 1 +8.1.2 1