Index: head/net-mgmt/kismet/Makefile =================================================================== --- head/net-mgmt/kismet/Makefile (revision 459401) +++ head/net-mgmt/kismet/Makefile (revision 459402) @@ -1,101 +1,102 @@ # Created by: Thomas Spreng # $FreeBSD$ PORTNAME= kismet DISTVERSION= 2016-07-R1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/ MAINTAINER= pi@FreeBSD.org COMMENT= 802.11 layer2 wireless network detector, sniffer, and IDS LICENSE= GPLv2 GNU_CONFIGURE= yes USES= gmake tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= PCRE PLUGINS SETUID DOCS EXAMPLES OPTIONS_DEFAULT= PCRE PLUGINS SETUID SETUID_DESC= Use privilege separation WRKSRC= ${WRKDIR}/${DISTNAME:S/a$$//} .include .if ${PORT_OPTIONS:MDOCS} PORTDOCS= README .endif .if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= * .endif .if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+=--enable-pcre LIB_DEPENDS+= libpcre.so:devel/pcre .else CONFIGURE_ARGS+=--disable-pcre .endif .if ${PORT_OPTIONS:MSETUID} GROUPS= kismet CONFIGURE_ARGS+=--with-suidgroup=wheel INSTALL_TARGET= suidinstall PLIST_SUB+= SUID="" SUIDGROUP="${GROUPS}" PKGMESSAGE= ${WRKDIR}/suid_pkg-message SUB_FILES+= suid_pkg-message .else INSTALL_TARGET= install CONFIGURE_ARGS+=--without-suidgroup PLIST_SUB+= SUID="@comment " SUIDGROUP="" .endif .if ${PORT_OPTIONS:MPLUGINS} ALL_TARGET= depend all all-plugins INSTALL_TARGET+= all-plugins-install USES+= ssl PLIST_SUB+= PLUGINS="" .else PLIST_SUB+= PLUGINS="@comment " .endif post-patch: @${REINPLACE_CMD} -e "/gps=/s/true/false/" \ -e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \ ${WRKSRC}/conf/kismet.conf.in \ ${WRKSRC}/conf/kismet_drone.conf @${REINPLACE_CMD} -e "s/plugin-/plugin-[aps]/" \ -e "s/make/${MAKE_CMD}/" \ -e "s/\$$(MAKE)/${MAKE_CMD}/" \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s/CXXFLAGS/CPPFLAGS/" \ ${WRKSRC}/plugin-alertsyslog/Makefile @${FIND} ${WRKSRC} -type f -name 'Makefile' -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -E \ '/C(XX)?FLAGS[[:blank:]]*\+=/s/ -g / /' @${FIND} ${WRKSRC} -type f \( -name Makefile -o -name Makefile.in \) -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's,-o $$(INSTUSR) -g $$(INSTGRP),,' \ -e 's,-o $$(INSTUSR) -g $$(MANGRP),,' \ -e 's,-o $$(INSTUSR) -g $$(SUIDGROUP) -m 4550,,' post-build: cd ${WRKSRC}; ${STRIP_CMD} kismet_client kismet_drone kismet_server */*.so post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR} .endif ${MV} ${STAGEDIR}${PREFIX}/etc/kismet.conf \ ${STAGEDIR}${PREFIX}/etc/kismet.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \ ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample .include Index: head/net-mgmt/kismet/files/patch-alertracker.cc =================================================================== --- head/net-mgmt/kismet/files/patch-alertracker.cc (revision 459401) +++ head/net-mgmt/kismet/files/patch-alertracker.cc (revision 459402) @@ -1,10 +1,10 @@ --- 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; + delete rec; return -1; } Index: head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc =================================================================== --- head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc (revision 459402) @@ -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++; + Property changes on: head/net-mgmt/kismet/files/patch-kis_panel_widgets.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-tcpclient.cc =================================================================== --- head/net-mgmt/kismet/files/patch-tcpclient.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-tcpclient.cc (revision 459402) @@ -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); Property changes on: head/net-mgmt/kismet/files/patch-tcpclient.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-tcpserver.cc =================================================================== --- head/net-mgmt/kismet/files/patch-tcpserver.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-tcpserver.cc (revision 459402) @@ -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); Property changes on: head/net-mgmt/kismet/files/patch-tcpserver.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-unixdomainserver.cc =================================================================== --- head/net-mgmt/kismet/files/patch-unixdomainserver.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-unixdomainserver.cc (revision 459402) @@ -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; Property changes on: head/net-mgmt/kismet/files/patch-unixdomainserver.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property