1 |
commit: d2d34cf8ef9adf4920d34feb052444ac157d1eb0 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 4 16:41:44 2018 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 4 16:42:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d34cf8 |
7 |
|
8 |
net-wireless/kismet: correct fix for bug #662726 |
9 |
|
10 |
use newly added configure flags |
11 |
|
12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
13 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
14 |
|
15 |
...a1-r3.ebuild => kismet-2018.08_beta1-r4.ebuild} | 8 +++--- |
16 |
net-wireless/kismet/kismet-9999.ebuild | 31 +++++++--------------- |
17 |
net-wireless/kismet/metadata.xml | 1 + |
18 |
3 files changed, 14 insertions(+), 26 deletions(-) |
19 |
|
20 |
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild |
21 |
similarity index 93% |
22 |
rename from net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild |
23 |
rename to net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild |
24 |
index 9f06e02bc4d..69055f3a8ae 100644 |
25 |
--- a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild |
26 |
+++ b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild |
27 |
@@ -74,22 +74,20 @@ src_prepare() { |
28 |
fi |
29 |
|
30 |
if ! use lm_sensors; then |
31 |
- sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure |
32 |
+ sed -i "s#sensors.h#totally-not-sensors.h#" configure |
33 |
fi |
34 |
- #fix for bug #662726 |
35 |
- sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die |
36 |
|
37 |
if use networkmanager; then |
38 |
sed -i "s#havelibnm\=no#havelibnm\=yes#" configure |
39 |
else |
40 |
sed -i "s#havelibnm\=yes#havelibnm\=no#" configure |
41 |
fi |
42 |
- sed -i 's#-O3##' configure |
43 |
} |
44 |
|
45 |
src_configure() { |
46 |
econf \ |
47 |
- $(use_enable pcre) |
48 |
+ $(use_enable pcre) \ |
49 |
+ --disable-optimization |
50 |
} |
51 |
|
52 |
src_install() { |
53 |
|
54 |
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild |
55 |
index 9bd91454798..9eecff37a2f 100644 |
56 |
--- a/net-wireless/kismet/kismet-9999.ebuild |
57 |
+++ b/net-wireless/kismet/kismet-9999.ebuild |
58 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0/${PV}" |
62 |
-IUSE="lm_sensors networkmanager +pcre selinux +suid" |
63 |
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid" |
64 |
|
65 |
CDEPEND=" |
66 |
${PYTHON_DEPS} |
67 |
@@ -42,7 +42,7 @@ CDEPEND=" |
68 |
dev-libs/libnl:3 |
69 |
net-libs/libpcap |
70 |
) |
71 |
- dev-libs/libusb:= |
72 |
+ mousejack? ( dev-libs/libusb:= ) |
73 |
dev-libs/protobuf-c:= |
74 |
dev-libs/protobuf:= |
75 |
sys-libs/ncurses:= |
76 |
@@ -67,32 +67,21 @@ src_prepare() { |
77 |
sed -i -e 's| -s||g' \ |
78 |
-e 's|@mangrp@|root|g' Makefile.in |
79 |
|
80 |
- epatch "${FILESDIR}"/fix-setuptools3.patch |
81 |
+ eapply "${FILESDIR}"/fix-setuptools3.patch |
82 |
eapply_user |
83 |
|
84 |
- if use lm_sensors; then |
85 |
- sed -i "s#HAVE_LMSENSORS_H=0#HAVE_LMSENSORS_H=1#" configure.ac || die |
86 |
- sed -i "s#HAVE_LIBLMSENSORS=0#HAVE_LMSENSORS=1#" configure.ac || die |
87 |
- else |
88 |
- sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure.ac || die |
89 |
- sed -i "s#HAVE_LIBLMSENSORS=1#HAVE_LMSENSORS=0#" configure.ac || die |
90 |
+ if [ "${PV}" = "9999" ]; then |
91 |
+ eautoreconf |
92 |
fi |
93 |
- #fix for bug #662726 |
94 |
- sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die |
95 |
- |
96 |
- if use networkmanager; then |
97 |
- sed -i "s#havelibnm\=no#havelibnm\=yes#" configure.ac || die |
98 |
- else |
99 |
- sed -i "s#havelibnm\=yes#havelibnm\=no#" configure.ac || die |
100 |
- fi |
101 |
- sed -i 's#-O3##' configure.ac || die |
102 |
- |
103 |
- eautoreconf |
104 |
} |
105 |
|
106 |
src_configure() { |
107 |
econf \ |
108 |
- $(use_enable pcre) |
109 |
+ $(use_enable pcre) \ |
110 |
+ $(use_enable lm_sensors lmsensors) \ |
111 |
+ $(use_enable mousejack libusb) \ |
112 |
+ $(use_enable networkmanager libnm) \ |
113 |
+ --disable-optimization |
114 |
} |
115 |
|
116 |
src_install() { |
117 |
|
118 |
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml |
119 |
index 3e3c9a3551a..e5158f5c107 100644 |
120 |
--- a/net-wireless/kismet/metadata.xml |
121 |
+++ b/net-wireless/kismet/metadata.xml |
122 |
@@ -12,6 +12,7 @@ |
123 |
this allows running kismet as a normal user, significantly |
124 |
reducing security risks |
125 |
</flag> |
126 |
+ <flag name="mousejack">Add support for mousejack hardware using <pkg>dev-libs/libusb</pkg></flag> |
127 |
<flag name="pcre">Build with pcre support</flag> |
128 |
<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag> |
129 |
<flag name="plugin-autowep">Build the autowep plugin</flag> |