From fccc8747b767900ab57af4d8f04c7805ae212528 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Mon, 23 Nov 2015 09:28:10 +0100
Subject: net-analyzer/openvas-manager: Update to daemon flag changes

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566336

Unify whitespaces in aux files

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 .../openvas-manager/files/openvasmd-daemon.conf    |  4 +-
 .../openvas-manager/files/openvasmd.logrotate      | 12 ++---
 .../openvas-manager-6.0.6-r1.ebuild                | 62 ++++++++++++++++++++++
 .../openvas-manager/openvas-manager-6.0.6.ebuild   | 62 ----------------------
 4 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild
 delete mode 100644 net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild

(limited to 'net-analyzer')

diff --git a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
index d69698eecbb9..2393c83f04b3 100644
--- a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
+++ b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
@@ -7,9 +7,9 @@ MANAGER_PORT=--port=9390
 MANAGER_EXTRA_ARGS=""
 
 #Contact scanner on given address
-SCANNER_LISTEN=--slisten=127.0.0.1
+SCANNER_LISTEN="--scanner-host=127.0.0.1"
 
 #Scanner listens on given port - by default 9391
-SCANNER_PORT=--sport=9391
+SCANNER_PORT="--scanner-port=9391"
 
 
diff --git a/net-analyzer/openvas-manager/files/openvasmd.logrotate b/net-analyzer/openvas-manager/files/openvasmd.logrotate
index 69cfa26b196a..c302b5f34ea9 100644
--- a/net-analyzer/openvas-manager/files/openvasmd.logrotate
+++ b/net-analyzer/openvas-manager/files/openvasmd.logrotate
@@ -1,11 +1,11 @@
 # logrotate for openvas-manager
 /var/log/openvas/openvasmd.log {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
+	rotate 4
+	weekly
+	compress
+	delaycompress
+	missingok
 	postrotate
-	    /bin/kill -HUP `pidof openvasmd`
+	/bin/kill -HUP `pidof openvasmd`
 	endscript
 }
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild
new file mode 100644
index 000000000000..c860d16a9166
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DL_ID=2195
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.5
+	>=dev-db/sqlite-3
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild
deleted file mode 100644
index c860d16a9166..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2195
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.5
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
-- 
cgit v1.2.3-65-gdbad