gentoo resync : 16.06.2019

4 files changed, 45 insertions, 3 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 67d268228eb8..806709e9a18f 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,9 +1,11 @@
 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.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
+AUX kismet.initd-r1 597 BLAKE2B 07adebfd969a7f7f7ed4868049ec9d40470cee0b1158ff4dd934f68ef335f1e07fe128c40f02f92b432e43690590165cd62fb97c3a73ac996edacaaf9a5fbf5f SHA512 15df53b4e42dc71527d05f3243606b521b6700cd2e97f56a9ede77cd4e2cc2eeacc5089fbc5735da970e0e3ae9cb65d93d267c7069c72f6ffb2cd417f7550e4a
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
 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 3429 BLAKE2B df2b377fbec665bd26deebe0162ca9861e2f228c497bf3da1c3e6b37a74c6da0e0d7776f1fb9ca1d2b072575a89a446a48d1ee0101666117f808fcadd27c07fc SHA512 76bdb921dbb8d8af6c38ac2fa6399ee77d62b52c30afa69f217f09f872292bc24104b1caceb9e19be54220c69d92cc11f1e5f561d1c5113c07542bf2fdf3b72e
+EBUILD kismet-9999.ebuild 3435 BLAKE2B 5a0b61d4074417391e8d4712a4d49c4728071e861ed3453f17bca81386e143bb5d3dd30467cd9fe34dc81ec23e7518092df509cdc94e5802ebaba62c120333ed SHA512 a16498604c8f363607522dae3dea555d732fa7462f00cc83fc8a24f72ec4751b0565b8de1013d7ce0d543de144057358608681bd1ab3392cca03b830c360e3e6
 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
new file mode 100644
index 000000000000..42f617372ff5
--- /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 000000000000..4c1891611967
--- /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 2ddf82ae347d..ec7ea7c64b4e 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() {