From 19a176db4c3a5a637e6175036cef3d090dc48868 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus@seznam.cz>
Date: May 28 2014 18:55:14 +0000
Subject: fix the startup scripts due to missing option -q (quiet)


---

diff --git a/openvas-scanner.initd b/openvas-scanner.initd
index 4a529b5..a49aff9 100644
--- a/openvas-scanner.initd
+++ b/openvas-scanner.initd
@@ -72,7 +72,7 @@ start() {
 
 
 	echo "Starting $progname:"
-	daemon --pidfile=/var/run/$prog.pid $prog -q $PARAMS
+	daemon --pidfile=/var/run/$prog.pid $prog $PARAMS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile
diff --git a/openvas-scanner.service b/openvas-scanner.service
index e1bc45a..816988d 100644
--- a/openvas-scanner.service
+++ b/openvas-scanner.service
@@ -6,7 +6,7 @@ Before=openvas-manager.service
 [Service]
 Type=forking
 EnvironmentFile=-/etc/sysconfig/openvas-scanner
-ExecStart=/usr/sbin/openvassd $SCANNER_QUIET $SCANNER_PORT $SCANNER_LISTEN $SCANNER_SRCIP
+ExecStart=/usr/sbin/openvassd $SCANNER_PORT $SCANNER_LISTEN $SCANNER_SRCIP
 Restart=always
 RestartSec=1
 User=root
diff --git a/openvas-scanner.spec b/openvas-scanner.spec
index 0c4c5aa..201bf8b 100644
--- a/openvas-scanner.spec
+++ b/openvas-scanner.spec
@@ -1,8 +1,8 @@
-#%global         tar_version 3.4+beta2
+#%global         tar_version 4.0.0+beta1
 
 Name:		openvas-scanner
 Version:	4.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Vulnerability Assessment (OpenVAS) Scanner
 
 License:	GPLv2
@@ -99,6 +99,8 @@ It needs to be installed only if systemd is not used as the system init process.
 %patch1 -p 1 -b .pkipath
 %patch2 -p 1 -b .mkcert
 %patch3 -p 1 -b .rules
+
+#Patch for bsdsource seems to be needed only in 21/devel branch
 %if 0%{?fedora} >= 21
 %patch4 -p 1 -b .bsdsource
 %endif
@@ -230,6 +232,9 @@ fi
 %{_initddir}/openvas-scanner
 
 %changelog
+* Wed May 28 2014 Michal Ambroz <rebus at, seznam.cz> - 4.0.1-2
+- fix startscripts due to -q (quiet) option removed
+
 * Mon May 26 2014 Fabian Affolter <mail@fabian-affolter.ch> - 4.0.1-1
 - Spec file update
 - Update to lastest upstream release 4.0.1
diff --git a/openvas-scanner.sysconfig b/openvas-scanner.sysconfig
index 5086f9f..7260b0a 100644
--- a/openvas-scanner.sysconfig
+++ b/openvas-scanner.sysconfig
@@ -1,6 +1,3 @@
-#Do not list loading information to syslog when starting
-SCANNER_QUIET=-q
-
 #Listen on given address - by default scanner listens on all addresses
 #SCANNER_LISTEN=--listen=127.0.0.1