From 864adfef6f21dff0d19a5947f838aa9879d6cc84 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 18 Nov 2019 16:44:08 -0600 Subject: [PATCH] boringtun: unmark broken on musl --- ...y-letting-Rust-infer-the-correct-typ.patch | 26 +++++++++++++++++++ srcpkgs/boringtun/template | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/boringtun/patches/0001-Fix-musl-build-by-letting-Rust-infer-the-correct-typ.patch diff --git a/srcpkgs/boringtun/patches/0001-Fix-musl-build-by-letting-Rust-infer-the-correct-typ.patch b/srcpkgs/boringtun/patches/0001-Fix-musl-build-by-letting-Rust-infer-the-correct-typ.patch new file mode 100644 index 0000000000..54bbab5842 --- /dev/null +++ b/srcpkgs/boringtun/patches/0001-Fix-musl-build-by-letting-Rust-infer-the-correct-typ.patch @@ -0,0 +1,26 @@ +From 3fad8bed118e629a985da17bf7af3de43e1e690b Mon Sep 17 00:00:00 2001 +From: Vlad Krasnov +Date: Tue, 2 Apr 2019 07:37:55 -0400 +Subject: [PATCH] Fix musl build by letting Rust infer the correct type for + SIOCGIFMTU (#60) + +--- + src/device/tun_linux.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/device/tun_linux.rs b/src/device/tun_linux.rs +index ffac9c6..7167553 100644 +--- src/device/tun_linux.rs ++++ src/device/tun_linux.rs +@@ -122,7 +122,7 @@ impl TunSocket { + + ifr.ifr_name[..iface_name.len()].copy_from_slice(iface_name); + +- if unsafe { ioctl(fd, SIOCGIFMTU, &ifr) } < 0 { ++ if unsafe { ioctl(fd, SIOCGIFMTU as _, &ifr) } < 0 { + return Err(Error::IOCtl(errno_str())); + } + +-- +2.24.0 + diff --git a/srcpkgs/boringtun/template b/srcpkgs/boringtun/template index 73dc4cc76e..f8007444c8 100644 --- a/srcpkgs/boringtun/template +++ b/srcpkgs/boringtun/template @@ -11,7 +11,6 @@ distfiles="https://github.com/cloudflare/${pkgname}/archive/v${version}.tar.gz" checksum=544c72fc482b636e7f6460bfee205adafc55de534067819e4e4914980f0d1350 case "$XBPS_TARGET_MACHINE" in - *-musl) broken="ioctl function signature differs on glibc and musl" ;; ppc*) broken="ftbfs in ring" ;; esac