summaryrefslogtreecommitdiff
path: root/package/wifidog
diff options
context:
space:
mode:
Diffstat (limited to 'package/wifidog')
-rw-r--r--package/wifidog/Makefile2
-rw-r--r--package/wifidog/patches/patch-libhttpd_api_c6
-rw-r--r--package/wifidog/patches/patch-libhttpd_ip_acl_c14
-rw-r--r--package/wifidog/patches/patch-libhttpd_protocol_c20
-rw-r--r--package/wifidog/patches/patch-src_client_list_c11
-rw-r--r--package/wifidog/patches/patch-src_firewall_c11
-rw-r--r--package/wifidog/patches/patch-src_util_c11
7 files changed, 63 insertions, 12 deletions
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index 2b38090af..5971eadc6 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= wifidog
PKG_VERSION:= 1.1.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31
PKG_DESCR:= a complete and embeddable captive portal
PKG_SECTION:= wifi
diff --git a/package/wifidog/patches/patch-libhttpd_api_c b/package/wifidog/patches/patch-libhttpd_api_c
index db790195b..6c76235fb 100644
--- a/package/wifidog/patches/patch-libhttpd_api_c
+++ b/package/wifidog/patches/patch-libhttpd_api_c
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- wifidog-1.1.5.orig/libhttpd/api.c 2007-11-01 21:04:20.000000000 +0100
-+++ wifidog-1.1.5/libhttpd/api.c 2008-10-16 13:15:26.000000000 +0200
++++ wifidog-1.1.5/libhttpd/api.c 2014-01-01 16:20:22.000000000 +0100
@@ -166,7 +166,7 @@ int httpdAddVariable(request *r, char *n
while(*name == ' ' || *name == '\t')
name++;
@@ -173,7 +173,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
newEntry->name = NULL;
newEntry->type = HTTP_WILDCARD;
newEntry->indexFlag = HTTP_FALSE;
-@@ -755,7 +755,7 @@ int httpdAddCContent(server, dir, name,
+@@ -755,7 +755,7 @@ int httpdAddCContent(server, dir, name,
newEntry = malloc(sizeof(httpContent));
if (newEntry == NULL)
return(-1);
@@ -200,7 +200,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
newEntry->name = strdup(name);
newEntry->type = HTTP_STATIC;
newEntry->indexFlag = indexFlag;
-@@ -946,7 +946,7 @@ void httpdProcessRequest(httpd *server,
+@@ -946,7 +946,7 @@ void httpdProcessRequest(httpd *server,
r->response.responseLength = 0;
strncpy(dirName, httpdRequestPath(r), HTTP_MAX_URL);
diff --git a/package/wifidog/patches/patch-libhttpd_ip_acl_c b/package/wifidog/patches/patch-libhttpd_ip_acl_c
index 932855b5d..95642f2b6 100644
--- a/package/wifidog/patches/patch-libhttpd_ip_acl_c
+++ b/package/wifidog/patches/patch-libhttpd_ip_acl_c
@@ -1,7 +1,17 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- wifidog-1.1.5.orig/libhttpd/ip_acl.c 2007-03-12 20:37:06.000000000 +0100
-+++ wifidog-1.1.5/libhttpd/ip_acl.c 2008-10-16 13:12:15.000000000 +0200
-@@ -52,22 +52,22 @@ static int scanCidr(val, result, length)
++++ wifidog-1.1.5/libhttpd/ip_acl.c 2014-01-01 16:34:21.000000000 +0100
+@@ -44,30 +44,30 @@
+
+ static int scanCidr(val, result, length)
+ char *val;
+- u_int *result,
++ unsigned int *result,
+ *length;
+ {
+- u_int res, res1, res2, res3, res4, res5;
++ unsigned int res, res1, res2, res3, res4, res5;
+ char *cp;
cp = val;
res1 = atoi(cp);
diff --git a/package/wifidog/patches/patch-libhttpd_protocol_c b/package/wifidog/patches/patch-libhttpd_protocol_c
index 767337dd6..6770fc729 100644
--- a/package/wifidog/patches/patch-libhttpd_protocol_c
+++ b/package/wifidog/patches/patch-libhttpd_protocol_c
@@ -1,7 +1,15 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- wifidog-1.1.5.orig/libhttpd/protocol.c 2007-11-01 21:04:20.000000000 +0100
-+++ wifidog-1.1.5/libhttpd/protocol.c 2008-10-16 13:12:58.000000000 +0200
-@@ -83,7 +83,7 @@ int _httpd_readChar(request *r, char *cp
++++ wifidog-1.1.5/libhttpd/protocol.c 2014-01-01 16:29:50.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
+@@ -83,7 +84,7 @@ int _httpd_readChar(request *r, char *cp
{
if (r->readBufRemain == 0)
{
@@ -10,7 +18,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
r->readBufRemain = _httpd_net_read(r->clientSock,
r->readBuf, HTTP_READ_BUF_LEN);
if (r->readBufRemain < 1)
-@@ -352,7 +352,7 @@ void _httpd_storeData(request *r, char *
+@@ -352,7 +353,7 @@ void _httpd_storeData(request *r, char *
cp = query;
cp2 = var;
@@ -19,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
val = NULL;
while(*cp)
{
-@@ -483,7 +483,7 @@ httpDir *_httpd_findContentDir(server, d
+@@ -483,7 +484,7 @@ httpDir *_httpd_findContentDir(server, d
if (createFlag == HTTP_TRUE)
{
curChild = malloc(sizeof(httpDir));
@@ -28,7 +36,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
curChild->name = strdup(curDir);
curChild->next = curItem->children;
curItem->children = curChild;
-@@ -606,7 +606,7 @@ void _httpd_sendFile(httpd *server, requ
+@@ -606,7 +607,7 @@ void _httpd_sendFile(httpd *server, requ
char *suffix;
struct stat sbuf;
@@ -37,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
if (suffix != NULL)
{
if (strcasecmp(suffix,".gif") == 0)
-@@ -699,7 +699,7 @@ char *_httpd_escape(str)
+@@ -699,7 +700,7 @@ char *_httpd_escape(str)
if (!ACCEPTABLE((unsigned char)*p))
unacceptable +=2;
result = (char *) malloc(p-str + unacceptable + 1);
diff --git a/package/wifidog/patches/patch-src_client_list_c b/package/wifidog/patches/patch-src_client_list_c
new file mode 100644
index 000000000..ac78a1af6
--- /dev/null
+++ b/package/wifidog/patches/patch-src_client_list_c
@@ -0,0 +1,11 @@
+--- wifidog-1.1.5.orig/src/client_list.c 2007-03-12 20:36:41.000000000 +0100
++++ wifidog-1.1.5/src/client_list.c 2014-01-01 17:02:32.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+
+ #include <string.h>
+
diff --git a/package/wifidog/patches/patch-src_firewall_c b/package/wifidog/patches/patch-src_firewall_c
new file mode 100644
index 000000000..0ebe0457c
--- /dev/null
+++ b/package/wifidog/patches/patch-src_firewall_c
@@ -0,0 +1,11 @@
+--- wifidog-1.1.5.orig/src/firewall.c 2007-11-01 21:04:20.000000000 +0100
++++ wifidog-1.1.5/src/firewall.c 2014-01-01 16:47:55.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+
+ #include <string.h>
+
diff --git a/package/wifidog/patches/patch-src_util_c b/package/wifidog/patches/patch-src_util_c
new file mode 100644
index 000000000..c4c26926f
--- /dev/null
+++ b/package/wifidog/patches/patch-src_util_c
@@ -0,0 +1,11 @@
+--- wifidog-1.1.5.orig/src/util.c 2007-11-01 21:04:20.000000000 +0100
++++ wifidog-1.1.5/src/util.c 2014-01-01 17:11:39.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+