Index: head/net-mgmt/kismet/Makefile =================================================================== --- head/net-mgmt/kismet/Makefile (revision 417964) +++ head/net-mgmt/kismet/Makefile (revision 417965) @@ -1,108 +1,101 @@ # Created by: Thomas Spreng # $FreeBSD$ PORTNAME= kismet -DISTVERSION= 2013-03-R1b -PORTREVISION= 1 +DISTVERSION= 2016-07-R1 PORTEPOCH= 1 CATEGORIES= net-mgmt -MASTER_SITES= http://www.kismetwireless.net/code/:1 \ - http://anonsvn.wireshark.org/wireshark/trunk/:2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1 -DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= http://www.kismetwireless.net/code/ -MAINTAINER= ports@FreeBSD.org +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 manuf -DISTFILES+= manuf:2 +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 -USE_OPENSSL= yes +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 + 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} - @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manuf ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR} .endif - @${MV} ${STAGEDIR}${PREFIX}/etc/kismet.conf \ + ${MV} ${STAGEDIR}${PREFIX}/etc/kismet.conf \ ${STAGEDIR}${PREFIX}/etc/kismet.conf.sample - @${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \ + ${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \ ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample .include Index: head/net-mgmt/kismet/distinfo =================================================================== --- head/net-mgmt/kismet/distinfo (revision 417964) +++ head/net-mgmt/kismet/distinfo (revision 417965) @@ -1,4 +1,3 @@ -SHA256 (kismet/kismet-2013-03-R1b.tar.xz) = 636d4d7ef8c67ae6ee8d8e1635f5115700eecb9fa4c208afaee30238db527c2c -SIZE (kismet/kismet-2013-03-R1b.tar.xz) = 699968 -SHA256 (kismet/manuf) = 42dcb7c3a677cfd23d0c08d30b9cd8abc8a57237ea2f7b90014eb4ea98446140 -SIZE (kismet/manuf) = 1393916 +TIMESTAMP = 1467539059 +SHA256 (kismet-2016-07-R1.tar.xz) = bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 +SIZE (kismet-2016-07-R1.tar.xz) = 709364 Index: head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc =================================================================== --- head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc (revision 417964) +++ head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc (nonexistent) @@ -1,10 +0,0 @@ ---- restricted-plugin-ptw/aircrack-crypto.cc.orig 2010-05-24 11:40:15.000000000 +0200 -+++ restricted-plugin-ptw/aircrack-crypto.cc 2010-05-24 11:39:34.000000000 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "aircrack-crypto.h" - #include "aircrack-crctable.h" - #include "aircrack-ptw2-lib.h" Property changes on: head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile =================================================================== --- head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile (revision 417964) +++ head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- restricted-plugin-ptw/Makefile.orig 2013-04-04 15:43:05.000000000 -0400 -+++ restricted-plugin-ptw/Makefile 2013-04-04 15:44:50.000000000 -0400 -@@ -22,7 +22,7 @@ - - install: $(PLUGOUT) - mkdir -p $(DESTDIR)/$(plugindir) -- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)/$(plugindir)/$^ -+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $(PLUGOUT) $(DESTDIR)/$(plugindir)/$(PLUGOUT) - - userinstall: $(PLUGOUT) - mkdir -p ${HOME}/.kismet/plugins/ Property changes on: head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile =================================================================== --- head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile (revision 417964) +++ head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- restricted-plugin-autowep/Makefile.orig 2013-03-25 13:29:11.000000000 -0400 -+++ restricted-plugin-autowep/Makefile 2013-04-04 15:37:44.000000000 -0400 -@@ -22,7 +22,7 @@ - - install: $(PLUGOUT) - mkdir -p $(DESTDIR)/$(plugindir) -- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)/$(plugindir)/$^ -+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $(PLUGOUT) $(DESTDIR)/$(plugindir)/$(PLUGOUT) - - userinstall: $(PLUGOUT) - mkdir -p ${HOME}/.kismet/plugins/ Property changes on: head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/kismet/files/patch-alertracker.cc =================================================================== --- head/net-mgmt/kismet/files/patch-alertracker.cc (revision 417964) +++ head/net-mgmt/kismet/files/patch-alertracker.cc (revision 417965) @@ -1,10 +1,10 @@ ---- alertracker.cc.orig 2010-09-03 10:57:56.000000000 -0400 -+++ alertracker.cc 2010-09-03 11:36:42.000000000 -0400 -@@ -397,6 +397,7 @@ +--- alertracker.cc.orig 2016-07-02 18:06:10 UTC ++++ alertracker.cc +@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(Config &(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-packetsource__pcap.cc =================================================================== --- head/net-mgmt/kismet/files/patch-packetsource__pcap.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-packetsource__pcap.cc (revision 417965) @@ -0,0 +1,10 @@ +--- packetsource_pcap.cc.orig 2016-07-02 18:06:10 UTC ++++ packetsource_pcap.cc +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include Property changes on: head/net-mgmt/kismet/files/patch-packetsource__pcap.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-restricted-plugin-autowep_Makefile =================================================================== --- head/net-mgmt/kismet/files/patch-restricted-plugin-autowep_Makefile (nonexistent) +++ head/net-mgmt/kismet/files/patch-restricted-plugin-autowep_Makefile (revision 417965) @@ -0,0 +1,22 @@ +--- restricted-plugin-autowep/Makefile.orig 2016-07-02 18:06:10 UTC ++++ restricted-plugin-autowep/Makefile +@@ -9,8 +9,8 @@ top_builddir = $(BLDHOME) + + PLUGINLDFLAGS += -shared -rdynamic + LIBS += -lstdc++ +-CFLAGS += -I$(KIS_INC_DIR) -g -fPIC +-CXXFLAGS += -I$(KIS_INC_DIR) -g -fPIC ++CFLAGS += -I$(KIS_INC_DIR) -fPIC ++CXXFLAGS += -I$(KIS_INC_DIR) -fPIC + + PLUGOBJS = autowep-kismet.o + PLUGOUT = autowep-kismet.so +@@ -22,7 +22,7 @@ $(PLUGOUT): $(PLUGOBJS) + + install: $(PLUGOUT) + mkdir -p $(DESTDIR)/$(plugindir) +- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)/$(plugindir)/$^ ++ $(INSTALL) -m 644 $(PLUGOUT) $(DESTDIR)/$(plugindir)/$(PLUGOUT) + + userinstall: $(PLUGOUT) + mkdir -p ${HOME}/.kismet/plugins/ Property changes on: head/net-mgmt/kismet/files/patch-restricted-plugin-autowep_Makefile ___________________________________________________________________ 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-restricted-plugin-ptw_Makefile =================================================================== --- head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_Makefile (nonexistent) +++ head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_Makefile (revision 417965) @@ -0,0 +1,22 @@ +--- restricted-plugin-ptw/Makefile.orig 2016-07-02 18:06:10 UTC ++++ restricted-plugin-ptw/Makefile +@@ -9,8 +9,8 @@ top_builddir = $(BLDHOME) + + PLUGINLDFLAGS += -shared -rdynamic + LIBS += -lstdc++ -lssl -lpthread -lcrypto +-CFLAGS += -I$(KIS_INC_DIR) -g -fPIC +-CXXFLAGS += -I$(KIS_INC_DIR) -g -fPIC ++CFLAGS += -I$(KIS_INC_DIR) -fPIC ++CXXFLAGS += -I$(KIS_INC_DIR) -fPIC + + PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o + PLUGOUT = aircrack-kismet.so +@@ -22,7 +22,7 @@ $(PLUGOUT): $(PLUGOBJS) + + install: $(PLUGOUT) + mkdir -p $(DESTDIR)/$(plugindir) +- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)/$(plugindir)/$^ ++ $(INSTALL) -m 644 $(PLUGOUT) $(DESTDIR)/$(plugindir)/$(PLUGOUT) + + userinstall: $(PLUGOUT) + mkdir -p ${HOME}/.kismet/plugins/ Property changes on: head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_Makefile ___________________________________________________________________ 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-restricted-plugin-ptw_aircrack-crypto.cc =================================================================== --- head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc (nonexistent) +++ head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc (revision 417965) @@ -0,0 +1,10 @@ +--- restricted-plugin-ptw/aircrack-crypto.cc.orig 2016-07-02 18:06:10 UTC ++++ restricted-plugin-ptw/aircrack-crypto.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "aircrack-crypto.h" + #include "aircrack-crctable.h" + #include "aircrack-ptw2-lib.h" Property changes on: head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.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