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() {
