* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2016-03-14 18:12 Richard Farina
0 siblings, 0 replies; 11+ messages in thread
From: Richard Farina @ 2016-03-14 18:12 UTC (permalink / raw
To: gentoo-commits
commit: bbdf11c13e8f40b8791d7aed9a4f144bdb89cd85
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 18:11:12 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:11:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdf11c1
net-wireless/kismet: add tinfo patch to 2016.01.1
Package-Manager: portage-2.2.27
net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch | 11 +++++++++++
net-wireless/kismet/kismet-2016.01.1.ebuild | 2 ++
2 files changed, 13 insertions(+)
diff --git a/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch b/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch
new file mode 100644
index 0000000..6294c80
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,6 +423,8 @@
+ foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
+ fi
+
++ AC_SEARCH_LIBS([stdscr], tinfo ncurses,curseaux="$curseaux $ac_res")
++
+ if test "$foundlcurses" != "yes"; then
+ AC_MSG_ERROR(Failed to find libcurses or libncurses. Install them or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)
+ fi
diff --git a/net-wireless/kismet/kismet-2016.01.1.ebuild b/net-wireless/kismet/kismet-2016.01.1.ebuild
index 403a75f..596d8ab 100644
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.01.1.ebuild
@@ -51,6 +51,8 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
conf/kismet.conf.in
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2017-01-08 23:52 Richard Farina
0 siblings, 0 replies; 11+ messages in thread
From: Richard Farina @ 2017-01-08 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 6bece96d957ca624343c5c582b40647341d099f0
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 23:50:05 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 23:50:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bece96d
net-wireless/kismet: backport the ruby fixes from master that were not put in the release branch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-wireless/kismet/Manifest | 1 -
.../kismet/files/kismet-2016.07.1-ruby-fixes.patch | 78 ++++++++++
...2016.01.1.ebuild => kismet-2016.07.1-r1.ebuild} | 5 +-
net-wireless/kismet/kismet-2016.07.1.ebuild | 170 ---------------------
4 files changed, 80 insertions(+), 174 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 1a66178..713fb4a 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,3 +1,2 @@
DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
-DIST kismet-2016-01-R1.tar.xz 703308 SHA256 162f1796996836b2d44126ccbe877a88a7f4a0e50f6729da897fc5a8ec4776b9 SHA512 cfbfb2cefd8df4a4fd09333eb6b0becd56cd7c3a1804d555d28b1d55379186e51804334560531d05e760d31e446c4b89d32ce2bd2c0705473f67f04611c0434e WHIRLPOOL 7ba136a9a138a43768c07668f92b6836d4345bb382935527e0576d5d4aedceb6135bc5b2a38fdfe5b7c488fadc17d759b0960c8cc8a461338adb3417024cb491
DIST kismet-2016-07-R1.tar.xz 709364 SHA256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 WHIRLPOOL 33bbe6e3353c87907e2a58326ccd84ff973e474a884c29f01c29439de673d2050c50348bf001799da25f0b156c3527d3c5f93cdcdccfd830c9e2eb40cce9aa8b
diff --git a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
new file mode 100644
index 00000000..bdfde9f
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
@@ -0,0 +1,78 @@
+diff --git a/ruby/kismet.rb b/ruby/kismet.rb
+index 5b18b23..7eab708 100755
+--- a/ruby/kismet.rb
++++ b/ruby/kismet.rb
+@@ -61,8 +61,6 @@ class Kismet
+ rescue Exception => e
+ pp e
+
+- break if @die
+-
+ puts "write error: #{$!}"
+ end
+ end
+diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
+index 057a514..d3ae968 100755
+--- a/ruby/kismet_addsource.rb
++++ b/ruby/kismet_addsource.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+
+diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
+index 6969247..27373a9 100755
+--- a/ruby/kismet_alert_syslog.rb
++++ b/ruby/kismet_alert_syslog.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require 'syslog'
+diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
+index ec8f0f9..7adffe6 100755
+--- a/ruby/kismet_list.rb
++++ b/ruby/kismet_list.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+
+ def bssidcb(proto, fields)
+ puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
+diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
+index 25021b9..61f70b0 100755
+--- a/ruby/kismet_shootout.rb
++++ b/ruby/kismet_shootout.rb
+@@ -21,7 +21,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+
+diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
+index 9fe581d..b878979 100755
+--- a/ruby/kismet_sql.rb
++++ b/ruby/kismet_sql.rb
+@@ -22,7 +22,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require "sqlite3"
diff --git a/net-wireless/kismet/kismet-2016.01.1.ebuild b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
similarity index 98%
rename from net-wireless/kismet/kismet-2016.01.1.ebuild
rename to net-wireless/kismet/kismet-2016.07.1-r1.ebuild
index 01dd3f3..fc5aa42 100644
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -51,8 +51,6 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
- epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
-
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
conf/kismet.conf.in
@@ -60,6 +58,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
+ epatch "${FILESDIR}/${P}-ruby-fixes.patch"
epatch_user
eautoreconf
}
diff --git a/net-wireless/kismet/kismet-2016.07.1.ebuild b/net-wireless/kismet/kismet-2016.07.1.ebuild
deleted file mode 100644
index 18490cf..00000000
--- a/net-wireless/kismet/kismet-2016.07.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
- SRC_URI=""
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
-
-CDEPEND="net-wireless/wireless-tools
- kernel_linux? ( sys-libs/libcap
- dev-libs/libnl:3
- net-libs/libpcap
- )
- pcre? ( dev-libs/libpcre )
- suid? ( sys-libs/libcap )
- client? ( sys-libs/ncurses:0= )
- !arm? ( speech? ( app-accessibility/flite ) )
- plugin-btscan? ( net-wireless/bluez )
- plugin-dot15d4? ( virtual/libusb:0 )
- plugin-spectools? ( net-wireless/spectools )
-"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
- ruby? ( dev-lang/ruby:* )
- selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet.conf.in
-
- # Don't strip and set correct mangrp
- sed -i -e 's| -s||g' \
- -e 's|@mangrp@|root|g' Makefile.in
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable client) \
- $(use_enable pcre)
-}
-
-src_compile() {
- emake
-
- if use plugin-autowep; then
- cd "${S}"/restricted-plugin-autowep
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-btscan; then
- cd "${S}"/plugin-btscan
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-dot15d4; then
- cd "${S}"/plugin-dot15d4
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-ptw; then
- cd "${S}"/restricted-plugin-ptw
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-spectools; then
- cd "${S}"/plugin-spectools
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-syslog; then
- cd "${S}"/plugin-syslog
- KIS_SRC_DIR="${S}" emake
- fi
-}
-
-src_install() {
- if use plugin-autowep; then
- cd "${S}"/restricted-plugin-autowep
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-btscan; then
- cd "${S}"/plugin-btscan
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-dot15d4; then
- cd "${S}"/plugin-dot15d4
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-ptw; then
- cd "${S}"/restricted-plugin-ptw
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-spectools; then
- cd "${S}"/plugin-spectools
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-syslog; then
- cd "${S}"/plugin-syslog
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use ruby; then
- cd "${S}"/ruby
- dobin *.rb
- fi
-
- cd "${S}"
- emake DESTDIR="${D}" commoninstall
-
- ##dragorn would prefer I set fire to my head than do this, but it works
- ##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
- ##is there an automatic way to force this?
- # install headers for external plugins
- insinto /usr/include/kismet
- doins *.h
- doins Makefile.inc
- #todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
- dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
- newinitd "${FILESDIR}"/${PN}.initd kismet
- newconfd "${FILESDIR}"/${PN}.confd kismet
-
- insinto /etc
- doins conf/kismet{,_drone}.conf
-
- if use suid; then
- dobin kismet_capture
- fi
-}
-
-pkg_preinst() {
- if use suid; then
- enewgroup kismet
- fowners root:kismet /usr/bin/kismet_capture
- # Need to set the permissions after chowning.
- # See chown(2)
- fperms 4550 /usr/bin/kismet_capture
- elog "Kismet has been installed with a setuid-root helper binary"
- elog "to enable minimal-root operation. Users need to be part of"
- elog "the 'kismet' group to perform captures from physical devices."
- fi
- if ! use suid; then
- ewarn "It is highly discouraged to run a sniffer as root,"
- ewarn "Please consider enabling the suid use flag and adding"
- ewarn "your user to the kismet group."
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2018-04-24 15:49 Richard Farina
0 siblings, 0 replies; 11+ messages in thread
From: Richard Farina @ 2018-04-24 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 3d4a17a9afd328cbd49998124cb919409263060b
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 24 15:48:37 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 15:48:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4a17a9
net-wireless/kismet: add mostly required python support
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-wireless/kismet/files/fix-setuptools.patch | 73 ++++++++++++++++++++++++++
net-wireless/kismet/kismet-9999.ebuild | 12 +++--
2 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
new file mode 100644
index 00000000000..a86f66b4447
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools.patch
@@ -0,0 +1,73 @@
+commit e31263b50acd960f7bb0c34c0396383319d7da30
+Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
+Date: Tue Apr 24 11:38:17 2018 -0400
+
+ make setuptools respect DESTDIR
+
+ thanks to mgorny for pointint it out
+
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 75c85da9..980c417a 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 23446edc..babc63f4 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)
+ $(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
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2b1292aff57..60b19468d9e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,9 @@
EAPI=6
-inherit autotools eutils multilib user
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
MY_P=${P/\./-}
MY_P=${MY_P/./-R}
@@ -28,6 +30,7 @@ SLOT="0/${PV}"
IUSE="+pcre speech selinux +suid"
CDEPEND="
+ ${PYTHON_DEPS}
net-misc/networkmanager:=
dev-libs/glib:=
dev-libs/elfutils:=
@@ -64,14 +67,15 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
+ eapply "${FILESDIR}/fix-setuptools.patch"
eapply_user
eautoreconf
}
src_configure() {
econf \
- $(use_enable pcre) \
- --disable-python-tools
+ $(use_enable pcre)
+ #--disable-python-tools
}
src_compile() {
@@ -133,7 +137,7 @@ src_install() {
# dobin *.rb
#fi
- cd "${S}"
+ #cd "${S}"
emake DESTDIR="${D}" commoninstall
emake DESTDIR="${D}" forceconfigs
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2018-11-06 1:56 Richard Farina
0 siblings, 0 replies; 11+ messages in thread
From: Richard Farina @ 2018-11-06 1:56 UTC (permalink / raw
To: gentoo-commits
commit: bf067039d6f74e08f8d627391d2daa0823b01277
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 01:56:29 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 01:56:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf067039
net-wireless/kismet: live ebuild update
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/fix-setuptools2.patch | 65 +++++++++++++++++++++++++
net-wireless/kismet/kismet-9999.ebuild | 4 +-
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/net-wireless/kismet/files/fix-setuptools2.patch b/net-wireless/kismet/files/fix-setuptools2.patch
new file mode 100644
index 00000000000..2f72b258af9
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools2.patch
@@ -0,0 +1,65 @@
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 97fb50b7..492f6a90 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./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 2e82ac5f..fa4314b2 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./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 4dc83d11..4bf912b3 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./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 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON3) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON3) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 1964da67d1e..4ef4ac444dd 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit autotools eutils multilib user python-single-r1
@@ -66,7 +66,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
- epatch "${FILESDIR}"/fix-setuptools.patch
+ epatch "${FILESDIR}"/fix-setuptools2.patch
eapply_user
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2018-12-03 18:08 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2018-12-03 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 2b53af8fbb1f5710abdd9cbf24ee8c450d2b5bd4
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 3 18:08:34 2018 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Dec 3 18:08:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b53af8f
net-wireless/kismet: fix bug #662726
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 <AT> gentoo.org>
net-wireless/kismet/files/fix-setuptools3.patch | 65 ++++++++++++++++++++++
net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild | 3 +
net-wireless/kismet/kismet-9999.ebuild | 26 +++++----
3 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/net-wireless/kismet/files/fix-setuptools3.patch b/net-wireless/kismet/files/fix-setuptools3.patch
new file mode 100644
index 00000000000..4e9787d8aa9
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools3.patch
@@ -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
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild
index 1964da67d1e..9f06e02bc4d 100644
--- a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild
+++ b/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild
@@ -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
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 4ef4ac444dd..9bd91454798 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -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
+ 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
fi
+ #fix for bug #662726
+ sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die
- 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
+ sed -i "s#havelibnm\=no#havelibnm\=yes#" configure.ac || die
else
- sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
+ sed -i "s#havelibnm\=yes#havelibnm\=no#" configure.ac || die
fi
- sed -i 's#-O3##' configure
+ sed -i 's#-O3##' configure.ac || die
+
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2019-06-13 3:03 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2019-06-13 3:03 UTC (permalink / raw
To: gentoo-commits
commit: 9e4c3dfe23b6221c79571dde05b0f4c5e9e981e7
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 03:03:29 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 03:03:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4c3dfe
net-wireless/kismet: fix service
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/kismet.confd-r1 | 14 ++++++++++++++
net-wireless/kismet/files/kismet.initd-r1 | 26 ++++++++++++++++++++++++++
net-wireless/kismet/kismet-9999.ebuild | 4 ++--
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
new file mode 100644
index 00000000000..42f617372ff
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.confd-r1
@@ -0,0 +1,14 @@
+# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
+
+# Kismet configuration is done in /etc/kismet*.conf
+# It is recommended to put user config in /etc/kismet_site.conf
+# where kismet updates won't try to overwrite it.
+
+# To use the kismet init script, you must have "logtemplate" set to a location
+# that is writable by the user assigned by "suiduser".
+# e.g.
+# suiduser=foo
+# logtemplate=%h/kismet_log/%n-%d-%i.%l
+
+# Options to pass to kismet, see `kismet --help`
+KISMET_SERVER_OPTIONS="--no-ncurses"
diff --git a/net-wireless/kismet/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r1
new file mode 100644
index 00000000000..4c189161196
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+ if [ ! -e /etc/kismet.conf ]; then
+ eerror "Configuration file /etc/kismet.conf not found"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting kismet server"
+ start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
+ --background --make-pidfile --exec /usr/bin/kismet \
+ -- ${KISMET_SERVER_OPTIONS}
+ eend ${?}
+}
+
+stop() {
+ ebegin "Stopping kismet server"
+ start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
+ eend ${?}
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2ddf82ae347..ec7ea7c64b4 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -102,8 +102,8 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd kismet
- newconfd "${FILESDIR}"/${PN}.confd kismet
+ newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
+ newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
}
pkg_preinst() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2019-07-22 1:46 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2019-07-22 1:46 UTC (permalink / raw
To: gentoo-commits
commit: 2d668ca9977ed60e1de98134aaa9ef6458761de5
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 01:46:31 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 01:46:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d668ca9
net-wireless/kismet: fix confd file
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/kismet.confd-r1 | 14 --------------
net-wireless/kismet/files/kismet.confd-r2 | 11 +++++++++++
...{kismet-2019.07.2.ebuild => kismet-2019.07.2-r1.ebuild} | 2 +-
net-wireless/kismet/kismet-9999.ebuild | 2 +-
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
deleted file mode 100644
index 42f617372ff..00000000000
--- a/net-wireless/kismet/files/kismet.confd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet*.conf
-# It is recommended to put user config in /etc/kismet_site.conf
-# where kismet updates won't try to overwrite it.
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet, see `kismet --help`
-KISMET_SERVER_OPTIONS="--no-ncurses"
diff --git a/net-wireless/kismet/files/kismet.confd-r2 b/net-wireless/kismet/files/kismet.confd-r2
new file mode 100644
index 00000000000..40da851cbf0
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.confd-r2
@@ -0,0 +1,11 @@
+# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
+
+# Kismet configuration is done in /etc/kismet/kismet_site.conf
+
+# To use the kismet init script, you must have "logtemplate" set to a location
+# e.g.
+# log_template=%h/kismet_log/%n-%d-%i.%l
+
+# Options to pass to kismet_server, see `kismet --help`
+# --no-ncurses is passed unconditionally
+KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/kismet-2019.07.2.ebuild b/net-wireless/kismet/kismet-2019.07.2-r1.ebuild
similarity index 99%
rename from net-wireless/kismet/kismet-2019.07.2.ebuild
rename to net-wireless/kismet/kismet-2019.07.2-r1.ebuild
index 67e7039b561..2b3fa83481e 100644
--- a/net-wireless/kismet/kismet-2019.07.2.ebuild
+++ b/net-wireless/kismet/kismet-2019.07.2-r1.ebuild
@@ -105,7 +105,7 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
- newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+ newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
}
pkg_preinst() {
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index c436f6bff40..77ae6098f3e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -105,7 +105,7 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
- newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+ newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
}
pkg_preinst() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2021-05-07 15:14 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2021-05-07 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 5d8e83dfd92ca0dc966183ed0b4a3b86e126d7fc
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri May 7 15:13:49 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri May 7 15:14:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8e83df
net-wireless/kismet: add gdb scripts
live debugging can be a pain, so add some helpers which follow
upstream's instructions for gdb usage
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/gdb | 14 ++++++++++++++
net-wireless/kismet/files/kismet-gdb | 1 +
net-wireless/kismet/kismet-9999.ebuild | 4 ++++
3 files changed, 19 insertions(+)
diff --git a/net-wireless/kismet/files/gdb b/net-wireless/kismet/files/gdb
new file mode 100644
index 00000000000..de8dea91fa0
--- /dev/null
+++ b/net-wireless/kismet/files/gdb
@@ -0,0 +1,14 @@
+set pagination off
+handle SIGPIPE nostop noprint pass
+handle SIGINT nostop noprint pass
+set logging file kismet-gdb.txt
+set logging on
+
+run --debug --no-ncurses
+
+catch throw
+ bt
+ info threads
+ thread apply all bt full
+ quit
+end
diff --git a/net-wireless/kismet/files/kismet-gdb b/net-wireless/kismet/files/kismet-gdb
new file mode 100644
index 00000000000..bf57dcba8b8
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-gdb
@@ -0,0 +1 @@
+gdb kismet --command=/usr/share/kismet/gdb
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index cf499ef55e4..d75e2d98572 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -140,6 +140,10 @@ src_install() {
insinto /usr/share/${PN}
doins Makefile.inc
+ if [ "${PV}" = "9999" ];then
+ doins "${FILESDIR}"/gdb
+ dobin "${FILESDIR}"/kismet-gdb
+ fi
dodoc CHANGELOG README*
newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2022-01-20 17:04 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2022-01-20 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 7205aade998ac0640b282a3304381484363f6049
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 16:30:32 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 17:04:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7205aade
net-wireless/kismet: fix USE=-pcre
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Closes: https://bugs.gentoo.org/830743
.../kismet/files/kismet-2021.08.1-nopcre.patch | 24 ++++++++++++++++++++++
net-wireless/kismet/kismet-2021.08.1-r1.ebuild | 4 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
new file mode 100644
index 000000000000..c3b648464ff5
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
@@ -0,0 +1,24 @@
+From e28c407f612877e750e6e5e1b92a8949275b7df0 Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Thu, 16 Dec 2021 20:35:43 -0500
+Subject: [PATCH] Fix compiling when pcre is not available
+
+Fix compiling when pcre is not available
+---
+ log_tools/kismetdb_to_wiglecsv.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/log_tools/kismetdb_to_wiglecsv.cc b/log_tools/kismetdb_to_wiglecsv.cc
+index 8d4a8db68..5c79680c7 100644
+--- a/log_tools/kismetdb_to_wiglecsv.cc
++++ b/log_tools/kismetdb_to_wiglecsv.cc
+@@ -239,6 +239,9 @@ int main(int argc, char *argv[]) {
+
+ pcre *re;
+ pcre_extra *study;
++#else
++ pcre_filter(const std::string& in_regex) {}
++ bool match(const std::string& target) {return false;}
+ #endif
+ };
+
diff --git a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
index e82c719234ad..9e9ec7789539 100644
--- a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
@@ -85,6 +85,8 @@ PDEPEND="
net-wireless/rtl-sdr
)"
+PATCHES=( "${FILESDIR}"/kismet-2021.08.1-nopcre.patch )
+
src_prepare() {
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
conf/kismet_logging.conf || die
@@ -110,7 +112,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in || die
- eapply_user
+ default
#just use set to fix setup.py
find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2022-01-28 3:22 Rick Farina
0 siblings, 0 replies; 11+ messages in thread
From: Rick Farina @ 2022-01-28 3:22 UTC (permalink / raw
To: gentoo-commits
commit: 3aa0fa7962be895ca30fe3b0029d225949d52521
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 28 03:21:31 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 03:22:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa0fa79
net-wireless/kismet: add 2022.01.3, drop 2022.01.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/Manifest | 2 +-
.../kismet/files/kismet-2022-01-3-wardrive.patch | 23 ++++++++++++++++++++++
...et-2022.01.2.ebuild => kismet-2022.01.3.ebuild} | 2 ++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 3ec7b9557827..ce0d8239baf8 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1,2 @@
DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a
-DIST kismet-2022-01-R2.tar.xz 10700972 BLAKE2B 8dcc90beac3f3b9404162bde9e624225bfdccb573d45de4f45ccbc0d46c9fb6ae1c870b878da796fd7e0d672211fa06c5c76315294a235f97bd8b47e7355f542 SHA512 6a2dfdc66160f72857409cc28c4d9666711a5cda8694e13a76fc738ca665a8ab3c3359951bd93777cf83eda22533d4d6b4ba632c81738a4d7a9981b3a687b1ff
+DIST kismet-2022-01-R3.tar.xz 10694148 BLAKE2B dee1c71922909990cc847cd8253cefdb303d383e2521ed91a3b7144f7004373c1aae8d5673f919caf046ad20a6d2b5d1d8b6c5344fdd5c30bd81787cf3ae7404 SHA512 2f41da4ff835c6d560f2f1f901844a8b88d3e34aec789ebb281ebdcb2e76c589d77394e2eb3b33a5a8bdb28e6e7f68ccd28cc9d68d273e3de0c345d57094f692
diff --git a/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch b/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch
new file mode 100644
index 000000000000..2f45ecbd68e1
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch
@@ -0,0 +1,23 @@
+From 2186630f4f4fb3ded5df56d67e88ef1fae36ee5b Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Thu, 27 Jan 2022 16:46:22 -0500
+Subject: [PATCH] Actually install kismet_wardrive.conf via make install
+
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3544ea711..c1aac51d7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -8,7 +8,8 @@ CONFIGFILES = \
+ kismet_logging.conf \
+ kismet_filter.conf \
+ kismet_uav.conf \
+- kismet_80211.conf
++ kismet_80211.conf \
++ kismet_wardrive.conf
+
+ # Parsers (modeled on former Kaitai model)
+ PARSERS = \
diff --git a/net-wireless/kismet/kismet-2022.01.2.ebuild b/net-wireless/kismet/kismet-2022.01.3.ebuild
similarity index 98%
rename from net-wireless/kismet/kismet-2022.01.2.ebuild
rename to net-wireless/kismet/kismet-2022.01.3.ebuild
index e82c719234ad..57d82e0c98d1 100644
--- a/net-wireless/kismet/kismet-2022.01.2.ebuild
+++ b/net-wireless/kismet/kismet-2022.01.3.ebuild
@@ -110,6 +110,8 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in || die
+ #remove this patch on bump
+ eapply "${FILESDIR}/kismet-2022-01-3-wardrive.patch"
eapply_user
#just use set to fix setup.py
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/
@ 2023-02-18 13:18 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-02-18 13:18 UTC (permalink / raw
To: gentoo-commits
commit: db0a0a0f6487318a6df2e777d7fd7d4c7efa0ea7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 12:48:22 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 13:11:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0a0a0f
net-wireless/kismet: drop 2021.08.1-r1
Broken by current stable dev-libs/libfmt version.
Bug: https://bugs.gentoo.org/887031
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-wireless/kismet/Manifest | 1 -
.../kismet/files/kismet-2021.08.1-nopcre.patch | 24 ---
net-wireless/kismet/kismet-2021.08.1-r1.ebuild | 205 ---------------------
3 files changed, 230 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index bd206161efff..9c4df342cb7b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1 @@
-DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a
DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
diff --git a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
deleted file mode 100644
index c3b648464ff5..000000000000
--- a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e28c407f612877e750e6e5e1b92a8949275b7df0 Mon Sep 17 00:00:00 2001
-From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
-Date: Thu, 16 Dec 2021 20:35:43 -0500
-Subject: [PATCH] Fix compiling when pcre is not available
-
-Fix compiling when pcre is not available
----
- log_tools/kismetdb_to_wiglecsv.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/log_tools/kismetdb_to_wiglecsv.cc b/log_tools/kismetdb_to_wiglecsv.cc
-index 8d4a8db68..5c79680c7 100644
---- a/log_tools/kismetdb_to_wiglecsv.cc
-+++ b/log_tools/kismetdb_to_wiglecsv.cc
-@@ -239,6 +239,9 @@ int main(int argc, char *argv[]) {
-
- pcre *re;
- pcre_extra *study;
-+#else
-+ pcre_filter(const std::string& in_regex) {}
-+ bool match(const std::string& target) {return false;}
- #endif
- };
-
diff --git a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
deleted file mode 100644
index b7ec430af772..000000000000
--- a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit autotools python-single-r1 udev systemd
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
- inherit git-r3
- RESTRICT="strip"
-else
- MY_P=${P/\./-}
- MY_P=${MY_P/_beta/-BETA}
- MY_P=${MY_P/./-R}
- S=${WORKDIR}/${MY_P/BETA/beta}
-
- #normally we want an official release
- SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
- #but sometimes we want a git commit
- #COMMIT="9ca7e469cf115469f392db7436816151867e1654"
- #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- #S="${WORKDIR}/${PN}-${COMMIT}"
-
- KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
- ${PYTHON_DEPS}
- acct-user/kismet
- acct-group/kismet
- networkmanager? ( net-misc/networkmanager:= )
- dev-libs/glib:=
- dev-libs/elfutils:=
- sys-libs/zlib:=
- dev-db/sqlite:=
- net-libs/libmicrohttpd:=
- net-libs/libwebsockets:=[client,lejp]
- kernel_linux? ( sys-libs/libcap
- dev-libs/libnl:3
- net-libs/libpcap
- )
- libusb? ( virtual/libusb:1 )
- dev-libs/protobuf-c:=
- dev-libs/protobuf:=
- $(python_gen_cond_dep '
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/websockets[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:=
- lm-sensors? ( sys-apps/lm-sensors )
- pcre? ( dev-libs/libpcre )
- suid? ( sys-libs/libcap )
- ubertooth? ( net-wireless/ubertooth:= )
- "
-
-DEPEND="${CDEPEND}
- dev-libs/boost
- dev-libs/libfmt
- virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
- $(python_gen_cond_dep '
- dev-python/pyserial[${PYTHON_USEDEP}]
- ')
- selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
- rtlsdr? (
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- net-wireless/rtl-sdr
- )"
-
-PATCHES=( "${FILESDIR}"/kismet-2021.08.1-nopcre.patch )
-
-src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet_logging.conf || die
-
- #this was added to quiet macosx builds but it makes gcc builds noisier
- sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
-
- #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
-
- rm -r boost || die
- rm -r fmt || die
-
- #dev-libs/jsoncpp
- #rm -r json || die
- #sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \
- # log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \
- # log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \
- # log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \
- # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
- # trackedelement.h trackedelement_workers.h
-
- # Don't strip and set correct mangrp
- sed -i -e 's| -s||g' \
- -e 's|@mangrp@|root|g' Makefile.in || die
-
- default
-
- #just use set to fix setup.py
- find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
- find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
- if [ "${PV}" = "9999" ]; then
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable libusb libusb) \
- $(use_enable pcre) \
- $(use_enable lm-sensors lmsensors) \
- $(use_enable networkmanager libnm) \
- $(use_enable ubertooth) \
- --sysconfdir=/etc/kismet \
- --disable-optimization
-}
-
-src_install() {
- emake DESTDIR="${D}" commoninstall
- python_optimize
- emake DESTDIR="${D}" forceconfigs
- use udev && udev_dorules packaging/udev/*.rules
-
- insinto /usr/share/${PN}
- doins Makefile.inc
- if [ "${PV}" = "9999" ];then
- doins "${FILESDIR}"/gdb
- dobin "${FILESDIR}"/kismet-gdb
- fi
-
- dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
- newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
- systemd_dounit packaging/systemd/kismet.service
-}
-
-pkg_preinst() {
- if use suid; then
- fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
- fowners root:kismet /usr/bin/kismet_cap_linux_wifi
- fowners root:kismet /usr/bin/kismet_cap_pcapfile
- # Need to set the permissions after chowning.
- # See chown(2)
- fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
- fperms 4550 /usr/bin/kismet_cap_linux_wifi
- fperms 4550 /usr/bin/kismet_cap_pcapfile
- elog "Kismet has been installed with a setuid-root helper binary"
- elog "to enable minimal-root operation. Users need to be part of"
- elog "the 'kismet' group to perform captures from physical devices."
- fi
- if ! use suid; then
- ewarn "It is highly discouraged to run a sniffer as root,"
- ewarn "Please consider enabling the suid use flag and adding"
- ewarn "your user to the kismet group."
- fi
-}
-
-migrate_config() {
- einfo "Kismet Configuration files are now read from /etc/kismet/"
- ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
- if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
- ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
- fi
- if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
- mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
- ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
- elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
- ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
- ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
- fi
-}
-
-pkg_postinst() {
- if [ -n "${REPLACING_VERSIONS}" ]; then
- for v in ${REPLACING_VERSIONS}; do
- if ver_test ${v} -lt 2019.07.2 ; then
- migrate_config
- break
- fi
- if ver_test ${v} -eq 9999 ; then
- migrate_config
- break
- fi
- done
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-02-18 13:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-28 3:22 [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/ Rick Farina
-- strict thread matches above, loose matches on Subject: below --
2023-02-18 13:18 Andreas Sturmlechner
2022-01-20 17:04 Rick Farina
2021-05-07 15:14 Rick Farina
2019-07-22 1:46 Rick Farina
2019-06-13 3:03 Rick Farina
2018-12-03 18:08 Rick Farina
2018-11-06 1:56 Richard Farina
2018-04-24 15:49 Richard Farina
2017-01-08 23:52 Richard Farina
2016-03-14 18:12 Richard Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox