net-mgmt/kismet: fix build on current

6 files changed, 55 insertions, 1 deletions

diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index fbf2d1bfe93b..c1e05b0e03c8 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kismet
 DISTVERSION=	2016-07-R1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
diff --git a/net-mgmt/kismet/files/patch-alertracker.cc b/net-mgmt/kismet/files/patch-alertracker.cc
index 980f49d681b6..00fe85115810 100644
--- a/net-mgmt/kismet/files/patch-alertracker.cc
+++ b/net-mgmt/kismet/files/patch-alertracker.cc
@@ -1,6 +1,6 @@
 --- alertracker.cc.orig	2016-07-02 18:06:10 UTC
 +++ alertracker.cc
-@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(Config
+@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(ConfigFile *in_conf)
  						  &(rec->limit_burst)) < 0) {
  			_MSG("Invalid alert line in config file: " + clines[x], MSGFLAG_FATAL);
  			globalreg->fatal_condition = 1;
diff --git a/net-mgmt/kismet/files/patch-kis_panel_widgets.cc b/net-mgmt/kismet/files/patch-kis_panel_widgets.cc
new file mode 100644
index 000000000000..a5982133e00e
--- /dev/null
+++ b/net-mgmt/kismet/files/patch-kis_panel_widgets.cc
@@ -0,0 +1,11 @@
+--- kis_panel_widgets.cc.orig	2016-07-02 18:06:10 UTC
++++ kis_panel_widgets.cc
+@@ -2582,7 +2582,7 @@ int Kis_Single_Input::KeyPress(int in_key) {
+ 	// and if we have room, insert it and scroll to the right
+ 	if ((int) text.length() < max_len && 
+ 		filter_map.find(in_key) != filter_map.end()) {
+-		char ins[2] = { in_key, 0 };
++		char ins[2] = { (char) in_key, (char) 0 };
+ 		text.insert(inp_pos, ins);
+ 		inp_pos++;
+ 
diff --git a/net-mgmt/kismet/files/patch-tcpclient.cc b/net-mgmt/kismet/files/patch-tcpclient.cc
new file mode 100644
index 000000000000..f68c11a7ad99
--- /dev/null
+++ b/net-mgmt/kismet/files/patch-tcpclient.cc
@@ -0,0 +1,20 @@
+--- tcpclient.cc.orig	2016-07-02 18:06:10 UTC
++++ tcpclient.cc
+@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_remotehost, shor
+     local_sock.sin_addr.s_addr = htonl(INADDR_ANY);
+     local_sock.sin_port = htons(0);
+ 
+-    if (bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) {
++    if (::bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) {
+         snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno));
+         globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR);
+ 		close(cli_fd);
+@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *in_remotehost, 
+     local_sock.sin_addr.s_addr = htonl(INADDR_ANY);
+     local_sock.sin_port = htons(0);
+ 
+-    if (bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) {
++    if (::bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) {
+         snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno));
+         globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR);
+ 		close(cli_fd);
diff --git a/net-mgmt/kismet/files/patch-tcpserver.cc b/net-mgmt/kismet/files/patch-tcpserver.cc
new file mode 100644
index 000000000000..1112199d2016
--- /dev/null
+++ b/net-mgmt/kismet/files/patch-tcpserver.cc
@@ -0,0 +1,11 @@
+--- tcpserver.cc.orig	2016-07-02 18:06:10 UTC
++++ tcpserver.cc
+@@ -84,7 +84,7 @@ int TcpServer::EnableServer() {
+     }
+ 
+     // Bind the socket
+-    if (bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) {
++    if (::bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) {
+         snprintf(errstr, STATUS_MAX, "TCP server bind() failed: %s",
+                  strerror(errno));
+         globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR);
diff --git a/net-mgmt/kismet/files/patch-unixdomainserver.cc b/net-mgmt/kismet/files/patch-unixdomainserver.cc
new file mode 100644
index 000000000000..d448b1bea0a1
--- /dev/null
+++ b/net-mgmt/kismet/files/patch-unixdomainserver.cc
@@ -0,0 +1,11 @@
+--- unixdomainserver.cc.orig	2016-07-02 18:06:10 UTC
++++ unixdomainserver.cc
+@@ -64,7 +64,7 @@ int UnixDomainServer::EnableServer() {
+     }
+ 
+     // Bind the socket
+-    if (bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) {
++    if (::bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) {
+         _MSG("Unix domain server bind() failed: " + string(strerror(errno)),
+              MSGFLAG_ERROR);
+         return -1;