Index: head/net-mgmt/kismet/Makefile =================================================================== --- head/net-mgmt/kismet/Makefile (revision 483398) +++ head/net-mgmt/kismet/Makefile (revision 483399) @@ -1,102 +1,109 @@ # Created by: Thomas Spreng # $FreeBSD$ PORTNAME= kismet DISTVERSION= 2016-07-R1 -PORTREVISION= 1 +PORTREVISION= 2 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 + +GNU_CONFIGURE= yes 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 +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 +EXTRA_PATCHES=${FILESDIR}/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc +.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 +.include 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 (revision 483398) +++ head/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc (nonexistent) @@ -1,10 +0,0 @@ ---- 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 ___________________________________________________________________ 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/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc =================================================================== --- head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc (nonexistent) +++ head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc (revision 483399) @@ -0,0 +1,66 @@ +--- restricted-plugin-ptw/aircrack-crypto.cc.orig 2018-10-10 00:29:38 UTC ++++ restricted-plugin-ptw/aircrack-crypto.cc +@@ -232,7 +232,7 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4 + // void calc_ptk (struct WPA_hdsk *wpa, unsigned char bssid[6], unsigned char pmk[32], unsigned char ptk[80]) { + // int i; + // uchar pke[100]; +-// HMAC_CTX ctx; ++// HMAC_CTX *ctx; + // + // memcpy( pke, "Pairwise key expansion", 23 ); + // +@@ -258,23 +258,23 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4 + // memcpy( pke + 67, wpa->snonce, 32 ); + // } + // +-// HMAC_CTX_init(&ctx); +-// HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL); ++// ctx = HMAC_CTX_new(); ++// HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL); + // for(i = 0; i < 4; i++ ) + // { + // pke[99] = i; + // //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL); +-// HMAC_Init_ex(&ctx, 0, 0, 0, 0); +-// HMAC_Update(&ctx, pke, 100); +-// HMAC_Final(&ctx, ptk + i*20, NULL); ++// HMAC_Init_ex(ctx, 0, 0, 0, 0); ++// HMAC_Update(ctx, pke, 100); ++// HMAC_Final(ctx, ptk + i*20, NULL); + // } +-// HMAC_CTX_cleanup(&ctx); ++// HMAC_CTX_free(ctx); + // } + + void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) { + int i; + uchar pke[100]; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + + memcpy( pke, "Pairwise key expansion", 23 ); + +@@ -300,17 +300,17 @@ void calc_mic (struct AP_info *ap, unsigned char pmk[3 + memcpy( pke + 67, ap->wpa.snonce, 32 ); + } + +- HMAC_CTX_init(&ctx); +- HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL); ++ ctx = HMAC_CTX_new(); ++ HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL); + for(i = 0; i < 4; i++ ) + { + pke[99] = i; + //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL); +- HMAC_Init_ex(&ctx, 0, 0, 0, 0); +- HMAC_Update(&ctx, pke, 100); +- HMAC_Final(&ctx, ptk + i*20, NULL); ++ HMAC_Init_ex(ctx, 0, 0, 0, 0); ++ HMAC_Update(ctx, pke, 100); ++ HMAC_Final(ctx, ptk + i*20, NULL); + } +- HMAC_CTX_cleanup(&ctx); ++ HMAC_CTX_free(ctx); + + if( ap->wpa.keyver == 1 ) + { Property changes on: head/net-mgmt/kismet/files/extra-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