From owner-svn-ports-all@FreeBSD.ORG Thu Apr 18 11:19:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D83EE59B; Thu, 18 Apr 2013 11:19:14 +0000 (UTC) (envelope-from bf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BB20B285; Thu, 18 Apr 2013 11:19:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3IBJEOe024213; Thu, 18 Apr 2013 11:19:14 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3IBJDLv024204; Thu, 18 Apr 2013 11:19:13 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201304181119.r3IBJDLv024204@svn.freebsd.org> From: Brendan Fabeny Date: Thu, 18 Apr 2013 11:19:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316036 - in head/net-mgmt/kismet: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Apr 2013 11:19:14 -0000 Author: bf Date: Thu Apr 18 11:19:13 2013 New Revision: 316036 URL: http://svnweb.freebsd.org/changeset/ports/316036 Log: update to 2013-03-R1b Feature safe: yes Modified: head/net-mgmt/kismet/Makefile (contents, props changed) head/net-mgmt/kismet/distinfo (contents, props changed) head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile (contents, props changed) head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile (contents, props changed) head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc (contents, props changed) head/net-mgmt/kismet/pkg-plist (contents, props changed) Modified: head/net-mgmt/kismet/Makefile ============================================================================== --- head/net-mgmt/kismet/Makefile Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/Makefile Thu Apr 18 11:19:13 2013 (r316036) @@ -1,13 +1,8 @@ -# New ports collection makefile for: kismet -# Date created: 3 May 2004 -# Whom: Thomas Spreng -# +# Created by: Thomas Spreng # $FreeBSD$ -# PORTNAME= kismet -DISTVERSION= 2011-03-R2 -PORTREVISION= 1 +DISTVERSION= 2013-03-R1b PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/:1 \ @@ -19,6 +14,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bf@FreeBSD.org COMMENT= 802.11 layer2 wireless network detector, sniffer, and IDS +LICENSE= GPLv2 + GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -27,30 +24,32 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= kismet.1 kismet_drone.1 MAN5= kismet.conf.5 kismet_drone.conf.5 -OPTIONS= PCRE "Build kismet with PCRE regex filters" on \ - PLUGINS "Build and install plugins" off \ - SETUID "Build kismet with privilege separation" on +OPTIONS_DEFINE= PCRE PLUGINS SETUID +OPTIONS_DEFAULT= PCRE PLUGINS SETUID +SETUID_DESC= Use privilege separation + +WRKSRC= ${WRKDIR}/${DISTNAME:S/a$$//} .include -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= README manuf DISTFILES+= manuf:2 IGNOREFILES= manuf .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= * .endif -.ifdef(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+=--enable-pcre LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre .else CONFIGURE_ARGS+=--disable-pcre .endif -.ifdef(WITH_SETUID) +.if ${PORT_OPTIONS:MSETUID} GROUPS = kismet CONFIGURE_ARGS+=--with-suidgroup=${GROUPS} INSTALL_TARGET = suidinstall @@ -63,9 +62,9 @@ CONFIGURE_ARGS+=--without-suidgroup PLIST_SUB+= SUID="@comment " .endif -.ifdef(WITH_PLUGINS) -ALL_TARGET= depend all-with-plugins -INSTALL_TARGET+= plugins-install +.if ${PORT_OPTIONS:MPLUGINS} +ALL_TARGET= depend all all-plugins +INSTALL_TARGET+= all-plugins-install PLIST_SUB+= PLUGINS="" .else PLIST_SUB+= PLUGINS="@comment " @@ -80,16 +79,19 @@ post-patch: -e "s/make/${GMAKE}/" \ -e "s/\$$(MAKE)/${GMAKE}/" \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "/PLUGINLDFLAGS/d" \ - ${WRKSRC}/Makefile.inc.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 / /' post-install: -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manuf ${DOCSDIR} .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/ruby/* ${EXAMPLESDIR} .endif Modified: head/net-mgmt/kismet/distinfo ============================================================================== --- head/net-mgmt/kismet/distinfo Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/distinfo Thu Apr 18 11:19:13 2013 (r316036) @@ -1,3 +1,3 @@ -SHA256 (kismet/kismet-2011-03-R2.tar.gz) = 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 -SIZE (kismet/kismet-2011-03-R2.tar.gz) = 924988 +SHA256 (kismet/kismet-2013-03-R1b.tar.gz) = c0bb8a8f47061e2ffc965b0557bab9a1b3d63b5a50b744663f66518aec7fbc77 +SIZE (kismet/kismet-2013-03-R1b.tar.gz) = 935437 SHA256 (kismet/manuf) = IGNORE Modified: head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile ============================================================================== --- head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/files/patch-plugin-autowep-Makefile Thu Apr 18 11:19:13 2013 (r316036) @@ -1,11 +1,11 @@ ---- plugin-autowep/Makefile.orig 2010-09-04 12:31:22.000000000 -0400 -+++ plugin-autowep/Makefile 2010-09-04 12:32:10.000000000 -0400 +--- 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)$(prefix)/lib/kismet/ -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/lib/kismet/$^ -+ install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(PLUGOUT) $(DESTDIR)$(prefix)/lib/kismet/$(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/ Modified: head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile ============================================================================== --- head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/files/patch-plugin-ptw-Makefile Thu Apr 18 11:19:13 2013 (r316036) @@ -1,12 +1,11 @@ ---- plugin-ptw/Makefile.orig 2010-05-24 19:53:16.000000000 +0200 -+++ plugin-ptw/Makefile 2010-05-24 19:53:19.000000000 +0200 -@@ -22,8 +22,7 @@ +--- 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)$(prefix)/lib/kismet/ -- -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/lib/kismet/$^ -+ install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(PLUGOUT) $(DESTDIR)$(prefix)/lib/kismet/$(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/ Modified: head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc ============================================================================== --- head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/files/patch-plugin-ptw-aircrack-crypto.cc Thu Apr 18 11:19:13 2013 (r316036) @@ -1,5 +1,5 @@ ---- plugin-ptw/aircrack-crypto.cc.orig 2010-05-24 11:40:15.000000000 +0200 -+++ plugin-ptw/aircrack-crypto.cc 2010-05-24 11:39:34.000000000 +0200 +--- 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 Modified: head/net-mgmt/kismet/pkg-plist ============================================================================== --- head/net-mgmt/kismet/pkg-plist Thu Apr 18 10:34:25 2013 (r316035) +++ head/net-mgmt/kismet/pkg-plist Thu Apr 18 11:19:13 2013 (r316036) @@ -8,7 +8,9 @@ etc/kismet.conf.sample @unexec if cmp -s %D/etc/kismet_drone.conf %D/etc/kismet_drone.conf.sample; then rm -f %D/etc/kismet_drone.conf; fi etc/kismet_drone.conf.sample %%PLUGINS%%lib/kismet/aircrack-kismet.so +%%PLUGINS%%lib/kismet/alertsyslog.so %%PLUGINS%%lib/kismet/autowep-kismet.so +%%PLUGINS%%lib/kismet/kismet-syslog.so %%PLUGINS%%lib/kismet/spectool_net.so %%PLUGINS%%lib/kismet_client/spectools_ui.so %%DATADIR%%/wav/alert.wav