gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-wireless/kismet: fix bug #662726

Browse Source 
patch upstream issue disabling lmsensors
live fixups while I'm in there

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
This commit is contained in:
Zero_Chaos
2018-12-03 13:08:34 -05:00
parent 4da6962538
commit 2b53af8fbb
3 changed files with 87 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
net-wireless/kismet/files/fix-setuptools3.patch Normal file
View File

@@ -0,0 +1,65 @@
diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
index cfbf99b0..c2e68453 100644
--- a/capture_freaklabs_zigbee/Makefile.in
+++ b/capture_freaklabs_zigbee/Makefile.in
@@ -6,7 +6,7 @@ all:
$(PYTHON2) ./setup.py build
install:
- $(PYTHON2) ./setup.py install
+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
clean:
diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
index e33f7de5..e1be587d 100644
--- a/capture_sdr_rtl433/Makefile.in
+++ b/capture_sdr_rtl433/Makefile.in
@@ -7,7 +7,7 @@ all:
$(PYTHON2) ./setup.py build
install:
- $(PYTHON2) ./setup.py install
+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
# These are now part of the setup.py install
# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
index 036541a0..fc660dfe 100644
--- a/python_modules/KismetExternal/Makefile
+++ b/python_modules/KismetExternal/Makefile
@@ -4,7 +4,7 @@ all:
$(PYTHON2) ./setup.py build
install:
- $(PYTHON2) ./setup.py install
+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
protobuf:
$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
index d0d6f784..60e1eac1 100644
--- a/python_modules/KismetLog/Makefile
+++ b/python_modules/KismetLog/Makefile
@@ -4,7 +4,7 @@ all:
$(PYTHON2) ./setup.py build
install:
- $(PYTHON2) ./setup.py install
+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
clean:
@-$(PYTHON2) ./setup.py clean
diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
index d0d6f784..60e1eac1 100644
--- a/python_modules/KismetRest/Makefile
+++ b/python_modules/KismetRest/Makefile
@@ -4,7 +4,7 @@ all:
$(PYTHON2) ./setup.py build
install:
- $(PYTHON2) ./setup.py install
+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
clean:
@-$(PYTHON2) ./setup.py clean

3
net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild
View File

@@ -76,6 +76,9 @@ src_prepare() {
if ! use lm_sensors; then
sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" 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

32
net-wireless/kismet/kismet-9999.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python3_6 )
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils multilib user python-single-r1
@@ -42,6 +42,7 @@ CDEPEND="
dev-libs/libnl:3
net-libs/libpcap
)
dev-libs/libusb:=
dev-libs/protobuf-c:=
dev-libs/protobuf:=
sys-libs/ncurses:=
@@ -66,22 +67,27 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
epatch "${FILESDIR}"/fix-setuptools2.patch
epatch "${FILESDIR}"/fix-setuptools3.patch
eapply_user
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
if ! use lm_sensors; then
sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
fi
if use networkmanager; then
sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
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#havelibnm\=yes#havelibnm\=no#" configure
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
fi
sed -i 's#-O3##' configure
#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() {