From d6715b0be254d05b30837176f22101e8fa7a04a7 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 26 Jun 2015 17:31:45 +0200 Subject: [PATCH] nodogsplash: fix musl compatiblity - Replace nonstandard `sys/unistd.h` includes with `unistd.h` ones - Add missing `fcntl.h` include to `libhttpd/protocol.c` in order to provide declarations for `open()`, `O_RDONLY` etc. Signed-off-by: Jo-Philipp Wich --- nodogsplash/Makefile | 4 +-- nodogsplash/patches/100-musl-compat.patch | 43 +++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 nodogsplash/patches/100-musl-compat.patch diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile index 38e8f2b..11fa5fc 100644 --- a/nodogsplash/Makefile +++ b/nodogsplash/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2013-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nodogsplash PKG_FIXUP:=autoreconf PKG_VERSION:=0.9_beta9.9.9 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/nodogsplash/patches/100-musl-compat.patch b/nodogsplash/patches/100-musl-compat.patch new file mode 100644 index 0000000..bb186bc --- /dev/null +++ b/nodogsplash/patches/100-musl-compat.patch @@ -0,0 +1,43 @@ +--- a/src/client_list.c ++++ b/src/client_list.c +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + + #include + +--- a/src/firewall.c ++++ b/src/firewall.c +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + + #include + +--- a/src/util.c ++++ b/src/util.c +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- a/libhttpd/protocol.c ++++ b/libhttpd/protocol.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #if defined(_WIN32) + #else -- 2.30.2