summaryrefslogtreecommitdiff
path: root/net-wireless/kismet
diff options
context:
space:
mode:
Diffstat (limited to 'net-wireless/kismet')
-rw-r--r--net-wireless/kismet/Manifest11
-rw-r--r--net-wireless/kismet/files/kismet.confd-r114
-rw-r--r--net-wireless/kismet/files/kismet.confd-r211
-rw-r--r--net-wireless/kismet/files/kismet.initd-r2 (renamed from net-wireless/kismet/files/kismet.initd-r1)16
-rw-r--r--net-wireless/kismet/files/kismet.initd-r311
-rw-r--r--net-wireless/kismet/kismet-2019.08.1.ebuild (renamed from net-wireless/kismet/kismet-2019.05.1.ebuild)40
-rw-r--r--net-wireless/kismet/kismet-9999.ebuild41
7 files changed, 104 insertions, 40 deletions
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 4b32401aecf9..2ddcd2a8376a 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,11 +1,12 @@
AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
-AUX kismet.confd-r1 516 BLAKE2B ece6cb105b23a69f2a00e934bbb43c9e8b68dd0704111c54eeb011be8c202cf5e2e533281b4a59a789886838ce7c9192c506823a397f7ab2ee95bc3237397159 SHA512 25c3cc550c53a1798fe4330c716d5c5e933f016c1b29b2ff1d79683254798cf75ef818bf5feb3a84c7e7ef10de4dd15254529e558005acf6ccdf69d9a324d209
+AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
-AUX kismet.initd-r1 597 BLAKE2B 07adebfd969a7f7f7ed4868049ec9d40470cee0b1158ff4dd934f68ef335f1e07fe128c40f02f92b432e43690590165cd62fb97c3a73ac996edacaaf9a5fbf5f SHA512 15df53b4e42dc71527d05f3243606b521b6700cd2e97f56a9ede77cd4e2cc2eeacc5089fbc5735da970e0e3ae9cb65d93d267c7069c72f6ffb2cd417f7550e4a
+AUX kismet.initd-r2 495 BLAKE2B 6d495c1fe5582921a67acf411fc65f6f3b3d832017e9354e09a3b39b8af67193e519a9da838cd26e80e80a6e145cde879089adb56ea34810a2d42c588fac7d28 SHA512 4066adc3b5ae455fb1305f4d5ac71604e90b2e1e6210fef10036229f4917dbf40dd8853f8e9dc2accc1457e4fd95f28f13ba39b56e066df365d7d186b3ea25b6
+AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
+DIST kismet-2019-08-R1.tar.xz 3030764 BLAKE2B bf9db5d7a35c3426832def9c1f974644f325a6714084b1dc2fabdf7b8155d767419683a39ce34f390dc8c9de2adf047d1f8016b9b48a789765294ec4aed0ea2f SHA512 2a512af192e153fbc361fdb0e83c40feb98c4905bf6556010191d04e5f2c5d290c0545f756b67100a63de6bc2995c9e15b56f5ca38fd1220031c25d87a27db7a
EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.05.1.ebuild 3426 BLAKE2B 411ab8cb5c085ea6031df9dd1abeeae2693826a096f914474aa02f3a84a442f180962b09ef933b16b496dcde8a04f8304d4ce8c5a1ab09eeaea151e1328ebf2e SHA512 34a1e6c9d617bf5bcedf2d56f28311ecead912db0d6ace211198a14c7dc79f86ace08973e40b9cf762051ccac4c81f948a1c6352a77855cd4f08ebc9bcc9b00c
-EBUILD kismet-9999.ebuild 3474 BLAKE2B fb18e8bba589b80ea7f6f557da68a59090767f584ee9959e53db1fdaf6b96db52b359b1d2da8dc51142ff8924733c2235a169cc6cf570de930a39b03aefd4441 SHA512 ffdd06ce01efccee7e869ae9aad50247c70d3a8a5e6955f785fa3ef5d3445f7e8b24b957b0dd1a02c2a3a3349702047e9530b55d6c8aba4dfac3e7d94bd72aae
+EBUILD kismet-2019.08.1.ebuild 4659 BLAKE2B 1ce31f04f1f23944d18dc7d84bca3b1ff636fbb409382c52d7009cec3415b8917aa06ba4599dcbf4cebdc5b157d487d6ce8bf6bcdb8fad482ddb53921ec714ad SHA512 eccd26e64e69a7b3d6c0f9943554e1c4726603f800d3eb78feaa0ff066e8bb1ae1fdba1eac9ae85cf85b639d46360737f338173078530f05bbb4b4e813a8bf21
+EBUILD kismet-9999.ebuild 4659 BLAKE2B 1ce31f04f1f23944d18dc7d84bca3b1ff636fbb409382c52d7009cec3415b8917aa06ba4599dcbf4cebdc5b157d487d6ce8bf6bcdb8fad482ddb53921ec714ad SHA512 eccd26e64e69a7b3d6c0f9943554e1c4726603f800d3eb78feaa0ff066e8bb1ae1fdba1eac9ae85cf85b639d46360737f338173078530f05bbb4b4e813a8bf21
MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
deleted file mode 100644
index 42f617372ff5..000000000000
--- 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 000000000000..40da851cbf00
--- /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/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r2
index 4c1891611967..bc4374e68016 100644
--- a/net-wireless/kismet/files/kismet.initd-r1
+++ b/net-wireless/kismet/files/kismet.initd-r2
@@ -2,25 +2,17 @@
# 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"
+ ebegin "Starting kismet"
start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
--background --make-pidfile --exec /usr/bin/kismet \
- -- ${KISMET_SERVER_OPTIONS}
+ -1 /var/log/kismet.log -2 /var/log/kismet.log \
+ -- --no-ncurses ${KISMET_SERVER_OPTIONS}
eend ${?}
}
stop() {
- ebegin "Stopping kismet server"
+ ebegin "Stopping kismet"
start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
eend ${?}
}
diff --git a/net-wireless/kismet/files/kismet.initd-r3 b/net-wireless/kismet/files/kismet.initd-r3
new file mode 100644
index 000000000000..dce3158973f7
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r3
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="kismet"
+command="/usr/bin/kismet"
+command_args="--no-ncurses ${KISMET_SERVER_OPTIONS}"
+supervisor="supervise-daemon"
+output_log="/var/log/kismet.log"
+error_log="${output_log}"
+pidfile="/run/kismet.pid"
diff --git a/net-wireless/kismet/kismet-2019.05.1.ebuild b/net-wireless/kismet/kismet-2019.08.1.ebuild
index a4d105b452e9..72387056e698 100644
--- a/net-wireless/kismet/kismet-2019.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2019.08.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit autotools eutils multilib user python-single-r1
@@ -62,6 +62,7 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
+ dev-python/pyserial[${PYTHON_USEDEP}]
selinux? ( sec-policy/selinux-kismet )
"
@@ -90,6 +91,7 @@ src_configure() {
$(use_enable lm_sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
+ --sysconfdir=/etc/kismet \
--disable-optimization
}
@@ -102,8 +104,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-r3 kismet
+ newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
}
pkg_preinst() {
@@ -127,3 +129,33 @@ pkg_preinst() {
ewarn "your user to the kismet group."
fi
}
+
+migrate_config() {
+ einfo "Kismet Configuration files are now read from /etc/kismet/"
+ if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+ ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+ ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+ 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
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9361c44b1797..72387056e698 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit autotools eutils multilib user python-single-r1
@@ -25,7 +25,7 @@ else
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${COMMIT}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc x86"
fi
DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
$(use_enable lm_sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
+ --sysconfdir=/etc/kismet \
--disable-optimization
}
@@ -103,8 +104,8 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
- newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+ newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+ newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
}
pkg_preinst() {
@@ -128,3 +129,33 @@ pkg_preinst() {
ewarn "your user to the kismet group."
fi
}
+
+migrate_config() {
+ einfo "Kismet Configuration files are now read from /etc/kismet/"
+ if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+ ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+ ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+ 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
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 14:53:12 +0000