[gentoo-commits] gentoo-x86 commit in net-analyzer/openvas-scanner/files: openvassd.tmpfiles.d openvassd-daemon.conf openvassd.service openvassd.init openvas-scanner-4.0.3-run.patch

[Justin Lecher (jlec)]

jlec        14/09/30 16:03:10

  Modified:             openvassd.tmpfiles.d openvassd-daemon.conf
                        openvassd.service openvassd.init
  Added:                openvas-scanner-4.0.3-run.patch
  Log:
  net-analyzer/openvas-scanner: Correct pidfile location
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.2                  net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d?r1=1.1&r2=1.2

Index: openvassd.tmpfiles.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvassd.tmpfiles.d	28 Sep 2014 15:40:44 -0000	1.1
+++ openvassd.tmpfiles.d	30 Sep 2014 16:03:10 -0000	1.2
@@ -1 +1 @@
-d	/var/cache/openvassd
+d	/var/cache/openvassd 0775



1.2                  net-analyzer/openvas-scanner/files/openvassd-daemon.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd-daemon.conf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd-daemon.conf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd-daemon.conf?r1=1.1&r2=1.2

Index: openvassd-daemon.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd-daemon.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvassd-daemon.conf	28 Sep 2014 18:12:28 -0000	1.1
+++ openvassd-daemon.conf	30 Sep 2014 16:03:10 -0000	1.2
@@ -7,6 +7,9 @@
 #Send the packets with the source IP of IP1,IP2,IP3....
 #SCANNER_SRCIP=--src-ip=127.0.0.1,192.168.1.2
 
+# Extra Arguments
+# SCANNER_EXTRA_ARGS=""
+
 # Set to yes if plugins should be automatically updated via a cron job
 auto_plugin_update=no
 
@@ -21,4 +24,3 @@
 #NVT_DIR		where to extract plugins (absolute path)
 #OV_RSYNC_FEED		URL of rsync feed
 #OV_HTTP_FEED		URL of http feed
-



1.3                  net-analyzer/openvas-scanner/files/openvassd.service

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.service?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.service?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.service?r1=1.2&r2=1.3

Index: openvassd.service
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvassd.service	28 Sep 2014 18:12:28 -0000	1.2
+++ openvassd.service	30 Sep 2014 16:03:10 -0000	1.3
@@ -5,7 +5,7 @@
 
 [Service]
 EnvironmentFile=-/etc/openvas/openvassd-daemon.conf
-ExecStart=/usr/sbin/openvassd -f $SCANNER_PORT $SCANNER_LISTEN $SCANNER_SRCIP
+ExecStart=/usr/sbin/openvassd -f ${SCANNER_PORT} ${SCANNER_LISTEN} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}
 Restart=always
 RestartSec=1
 User=root



1.3                  net-analyzer/openvas-scanner/files/openvassd.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.init?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.init?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.init?r1=1.2&r2=1.3

Index: openvassd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/files/openvassd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvassd.init	28 Sep 2014 18:12:28 -0000	1.2
+++ openvassd.init	30 Sep 2014 16:03:10 -0000	1.3
@@ -5,8 +5,14 @@
 
 name="OpenVAS Scanner"
 command="/usr/sbin/openvassd"
-command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP}"
+command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}"
+pidfile="/run/openvassd.pid"
 
 depend() {
-	need net
+	after bootmisc
+	need localmount net
+}
+
+start_pre() {
+	checkpath --directory --mode 0775 --quiet /var/cache/openvas
 }



1.1                  net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch?rev=1.1&content-type=text/plain

Index: openvas-scanner-4.0.3-run.patch
===================================================================
 CMakeLists.txt           | 2 +-
 tools/greenbone-nvt-sync | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c691100..d78ffa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,7 @@ set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
 set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
 set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
 set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
-set (OPENVAS_PID_DIR     "${LOCALSTATEDIR}/run")
+set (OPENVAS_PID_DIR     "/run")
 set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
 
 set (OPENVAS_NVT_DIR     "${OPENVAS_STATE_DIR}/plugins")
diff --git a/tools/greenbone-nvt-sync b/tools/greenbone-nvt-sync
index 50bce8c..d773e4c 100755
--- a/tools/greenbone-nvt-sync
+++ b/tools/greenbone-nvt-sync
@@ -78,7 +78,7 @@ SELFTEST_FAIL=0
 PORT=24
 
 # Directory where pidfiles are located
-PIDFILEDIR="/var/run"
+PIDFILEDIR="/run"
 
 # If ENABLED is set to 0, the sync script will not perform a synchronization.
 ENABLED=1