net-mgmt/kismet: fix build on current

This commit is contained in:
Kurt Jaeger 2018-01-19 09:38:40 +00:00
parent 765a38953b
commit 3f41595349
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=459402
6 changed files with 55 additions and 1 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= kismet PORTNAME= kismet
DISTVERSION= 2016-07-R1 DISTVERSION= 2016-07-R1
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= http://www.kismetwireless.net/code/ MASTER_SITES= http://www.kismetwireless.net/code/

View file

@ -1,6 +1,6 @@
--- alertracker.cc.orig 2016-07-02 18:06:10 UTC --- alertracker.cc.orig 2016-07-02 18:06:10 UTC
+++ alertracker.cc +++ alertracker.cc
@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(Config @@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(ConfigFile *in_conf)
&(rec->limit_burst)) < 0) { &(rec->limit_burst)) < 0) {
_MSG("Invalid alert line in config file: " + clines[x], MSGFLAG_FATAL); _MSG("Invalid alert line in config file: " + clines[x], MSGFLAG_FATAL);
globalreg->fatal_condition = 1; globalreg->fatal_condition = 1;

View file

@ -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++;

View file

@ -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);

View file

@ -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);

View file

@ -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;