Date: Fri, 19 Jan 2018 09:38:41 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459402 - in head/net-mgmt/kismet: . files Message-ID: <201801190938.w0J9cf9f011749@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Jan 19 09:38:40 2018 New Revision: 459402 URL: https://svnweb.freebsd.org/changeset/ports/459402 Log: net-mgmt/kismet: fix build on current Added: head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc (contents, props changed) head/net-mgmt/kismet/files/patch-tcpclient.cc (contents, props changed) head/net-mgmt/kismet/files/patch-tcpserver.cc (contents, props changed) head/net-mgmt/kismet/files/patch-unixdomainserver.cc (contents, props changed) Modified: head/net-mgmt/kismet/Makefile head/net-mgmt/kismet/files/patch-alertracker.cc Modified: head/net-mgmt/kismet/Makefile ============================================================================== --- head/net-mgmt/kismet/Makefile Fri Jan 19 09:02:04 2018 (r459401) +++ head/net-mgmt/kismet/Makefile Fri Jan 19 09:38:40 2018 (r459402) @@ -3,6 +3,7 @@ PORTNAME= kismet DISTVERSION= 2016-07-R1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/ Modified: head/net-mgmt/kismet/files/patch-alertracker.cc ============================================================================== --- head/net-mgmt/kismet/files/patch-alertracker.cc Fri Jan 19 09:02:04 2018 (r459401) +++ head/net-mgmt/kismet/files/patch-alertracker.cc Fri Jan 19 09:38:40 2018 (r459402) @@ -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; Added: head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc Fri Jan 19 09:38:40 2018 (r459402) @@ -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++; + Added: head/net-mgmt/kismet/files/patch-tcpclient.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/kismet/files/patch-tcpclient.cc Fri Jan 19 09:38:40 2018 (r459402) @@ -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); Added: head/net-mgmt/kismet/files/patch-tcpserver.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/kismet/files/patch-tcpserver.cc Fri Jan 19 09:38:40 2018 (r459402) @@ -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); Added: head/net-mgmt/kismet/files/patch-unixdomainserver.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/kismet/files/patch-unixdomainserver.cc Fri Jan 19 09:38:40 2018 (r459402) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801190938.w0J9cf9f011749>