From eb0de8f1140bea0d777af2c7cee426e54508077b Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 17 Jun 2015 19:38:55 +0200
Subject: [PATCH 1/2] wifidog: fix musl compatibility

 - Fix missing `fcntl.h` in `protocol.c`
 - Replace nonstandard `sys/unistd.h` includes with `unistd.h` ones

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 net/wifidog/Makefile                      |  2 +-
 net/wifidog/patches/100-musl-compat.patch | 47 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 net/wifidog/patches/100-musl-compat.patch

diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile
index ade7606c3..ddc2bb1fa 100644
--- a/net/wifidog/Makefile
+++ b/net/wifidog/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidog
 PKG_VERSION:=1.2.1
-PKG_RELEASE=1
+PKG_RELEASE=2
 
 
 PKG_LICENSE:=GPL-2.0
diff --git a/net/wifidog/patches/100-musl-compat.patch b/net/wifidog/patches/100-musl-compat.patch
new file mode 100644
index 000000000..599c1fefd
--- /dev/null
+++ b/net/wifidog/patches/100-musl-compat.patch
@@ -0,0 +1,47 @@
+--- a/libhttpd/protocol.c
++++ b/libhttpd/protocol.c
+@@ -28,6 +28,7 @@
+ 
+ #if defined(_WIN32)
+ #else
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/file.h>
+ #endif
+--- a/src/firewall.c
++++ b/src/firewall.c
+@@ -35,7 +35,6 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
+ 
+ #include <string.h>
+ 
+--- a/src/client_list.c
++++ b/src/client_list.c
+@@ -31,9 +31,9 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <pthread.h>
++#include <unistd.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
+ 
+ #include <string.h>
+ 
+--- a/src/util.c
++++ b/src/util.c
+@@ -33,10 +33,10 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <pthread.h>
++#include <unistd.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/unistd.h>
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <arpa/inet.h>

From 3df25df85833f6f497efa662985f21800946255f Mon Sep 17 00:00:00 2001
From: Michael Haas <haas@computerlinguist.org>
Date: Sun, 25 Oct 2015 09:56:55 +0100
Subject: [PATCH 2/2] wifidog: Bump to 1.3.0

* Updates wifidog to latest upstream release.
* Removes patches/100-musl-compat.patch as that's included in 1.3.0

Signed-off-by: Michael Haas <haas@computerlinguist.org>
---
 net/wifidog/Makefile                      |  6 +--
 net/wifidog/patches/100-musl-compat.patch | 47 -----------------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 net/wifidog/patches/100-musl-compat.patch

diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile
index ddc2bb1fa..591f29107 100644
--- a/net/wifidog/Makefile
+++ b/net/wifidog/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidog
-PKG_VERSION:=1.2.1
-PKG_RELEASE=2
+PKG_VERSION:=1.3.0
+PKG_RELEASE=1
 
 
 PKG_LICENSE:=GPL-2.0
@@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/wifidog/wifidog-gateway.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1.2.1
+PKG_SOURCE_VERSION:=1.3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_FIXUP:=autoreconf
diff --git a/net/wifidog/patches/100-musl-compat.patch b/net/wifidog/patches/100-musl-compat.patch
deleted file mode 100644
index 599c1fefd..000000000
--- a/net/wifidog/patches/100-musl-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/libhttpd/protocol.c
-+++ b/libhttpd/protocol.c
-@@ -28,6 +28,7 @@
- 
- #if defined(_WIN32)
- #else
-+#include <fcntl.h>
- #include <unistd.h>
- #include <sys/file.h>
- #endif
---- a/src/firewall.c
-+++ b/src/firewall.c
-@@ -35,7 +35,6 @@
- #include <pthread.h>
- #include <sys/wait.h>
- #include <sys/types.h>
--#include <sys/unistd.h>
- 
- #include <string.h>
- 
---- a/src/client_list.c
-+++ b/src/client_list.c
-@@ -31,9 +31,9 @@
- #include <syslog.h>
- #include <errno.h>
- #include <pthread.h>
-+#include <unistd.h>
- #include <sys/wait.h>
- #include <sys/types.h>
--#include <sys/unistd.h>
- 
- #include <string.h>
- 
---- a/src/util.c
-+++ b/src/util.c
-@@ -33,10 +33,10 @@
- #include <syslog.h>
- #include <errno.h>
- #include <pthread.h>
-+#include <unistd.h>
- #include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
- #include <netinet/in.h>
- #include <sys/ioctl.h>
- #include <arpa/inet.h>