From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26E63138334 for ; Tue, 4 Dec 2018 16:42:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 181C0E093E; Tue, 4 Dec 2018 16:42:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3026E093E for ; Tue, 4 Dec 2018 16:42:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33272335CCD for ; Tue, 4 Dec 2018 16:42:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27AAA42E for ; Tue, 4 Dec 2018 16:42:15 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1543941721.d2d34cf8ef9adf4920d34feb052444ac157d1eb0.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild net-wireless/kismet/kismet-9999.ebuild net-wireless/kismet/metadata.xml X-VCS-Directories: net-wireless/kismet/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: d2d34cf8ef9adf4920d34feb052444ac157d1eb0 X-VCS-Branch: master Date: Tue, 4 Dec 2018 16:42:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 969291cf-e0cb-429e-9f1f-99b2d908d8dd X-Archives-Hash: bc3578dbc78ac2cb86828009beebe9e0 commit: d2d34cf8ef9adf4920d34feb052444ac157d1eb0 Author: Rick Farina gentoo org> AuthorDate: Tue Dec 4 16:41:44 2018 +0000 Commit: Rick Farina gentoo org> CommitDate: Tue Dec 4 16:42:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d34cf8 net-wireless/kismet: correct fix for bug #662726 use newly added configure flags Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina gentoo.org> ...a1-r3.ebuild => kismet-2018.08_beta1-r4.ebuild} | 8 +++--- net-wireless/kismet/kismet-9999.ebuild | 31 +++++++--------------- net-wireless/kismet/metadata.xml | 1 + 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild similarity index 93% rename from net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild rename to net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild index 9f06e02bc4d..69055f3a8ae 100644 --- a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild +++ b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild @@ -74,22 +74,20 @@ src_prepare() { fi if ! use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure + sed -i "s#sensors.h#totally-not-sensors.h#" configure fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die if use networkmanager; then sed -i "s#havelibnm\=no#havelibnm\=yes#" configure else sed -i "s#havelibnm\=yes#havelibnm\=no#" configure fi - sed -i 's#-O3##' configure } src_configure() { econf \ - $(use_enable pcre) + $(use_enable pcre) \ + --disable-optimization } src_install() { diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 9bd91454798..9eecff37a2f 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net" LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="lm_sensors networkmanager +pcre selinux +suid" +IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid" CDEPEND=" ${PYTHON_DEPS} @@ -42,7 +42,7 @@ CDEPEND=" dev-libs/libnl:3 net-libs/libpcap ) - dev-libs/libusb:= + mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= sys-libs/ncurses:= @@ -67,32 +67,21 @@ src_prepare() { sed -i -e 's| -s||g' \ -e 's|@mangrp@|root|g' Makefile.in - epatch "${FILESDIR}"/fix-setuptools3.patch + eapply "${FILESDIR}"/fix-setuptools3.patch eapply_user - if use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=0#HAVE_LMSENSORS_H=1#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=0#HAVE_LMSENSORS=1#" configure.ac || die - else - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=1#HAVE_LMSENSORS=0#" configure.ac || die + if [ "${PV}" = "9999" ]; then + eautoreconf fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die - - if use networkmanager; then - sed -i "s#havelibnm\=no#havelibnm\=yes#" configure.ac || die - else - sed -i "s#havelibnm\=yes#havelibnm\=no#" configure.ac || die - fi - sed -i 's#-O3##' configure.ac || die - - eautoreconf } src_configure() { econf \ - $(use_enable pcre) + $(use_enable pcre) \ + $(use_enable lm_sensors lmsensors) \ + $(use_enable mousejack libusb) \ + $(use_enable networkmanager libnm) \ + --disable-optimization } src_install() { diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index 3e3c9a3551a..e5158f5c107 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -12,6 +12,7 @@ this allows running kismet as a normal user, significantly reducing security risks + Add support for mousejack hardware using dev-libs/libusb Build with pcre support Audio support using app-accessibility/flite Build the autowep plugin