community/ospd-openvas: fixes and improvements

- Add missing dependency py3-deprecated so it can start properly
- Remove init conf file and set default values in init
- Adjust init dependencies
- Add gvm user into redis group so it can read/write from/to socket and start properly
- Move socket from /tmp into rundir

community/ospd-openvas/APKBUILD

@@ -1,20 +1,22 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=ospd-openvas
 pkgver=20.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ospd-openvas is an OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"
 url="https://github.com/greenbone/ospd-openvas"
 arch="noarch"
 license="AGPL-3.0-or-later"
 pkgusers="gvm"
 pkggroups="gvm"
-depends="py3-psutil py3-redis py3-setuptools py3-packaging ospd"
+depends="py3-psutil py3-redis py3-setuptools py3-packaging py3-deprecated ospd"
 subpackages="$pkgname-openrc"
+install="$pkgname.post-install"
 source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/ospd-openvas/archive/v$pkgver.tar.gz
 	$pkgname.initd
-	$pkgname.confd
 	ospd.conf"
+
 build() {
 	python3 setup.py build
 }
@@ -25,14 +27,11 @@ check() {
 
 package() {
 	python3 setup.py install --root="$pkgdir" --optimize=1
-	mkdir -p "$pkgdir"/run/ospd
-	chown -R $pkgusers:$pkggroups "$pkgdir"/run/ospd
+	install -d -o $pkgusers -g $pkggroups "$pkgdir"/run/ospd
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -Dm644 "$srcdir"/ospd.conf "$pkgdir"/etc/openvas/ospd.conf
 }
 
 sha512sums="804372b5f72684b764e463c25fa0a442fd7fa1b21f6abed16cdd5ea28811aea157b40d5add35f99d599eba2f4856d245e95b7a9d249ef934e5fc7a22f47bf66b  ospd-openvas-20.8.0.tar.gz
-af576db115f85e80d7e2e8a91508c0ce70e911002ab97ccd4ebb089c487b515ca393ae9fd284ecc9d3f533a2ab4a741faa1dcc4f2047b7f1ca541832ce8b6b09  ospd-openvas.initd
-ef07f02c3900ee431785b2c2e53f04f4fd114f502526ec509c869dcd3a95e4284fc65f05f5ec85280cc05a29a46fba9c74ef3b0b0d618b9c9c1e62d9bb3fc6fa  ospd-openvas.confd
-cca4e7d9d0ed299e43d748337c8a848056c9125bb3fea32d42409f50852422cc8409388c7b5e275e3d4b78d6f86f11c64adddaa9e3dd622bbf9e09579f4ea3be  ospd.conf"
+e18d286f78af0ec0116d8bff150eadf283ad2896ca5efb8cae0326fcb541217442770b10a83b887ce1211983ecb07f8c39ab76bf26f718b6de4ee2ed125c6d60  ospd-openvas.initd
+c3714d1555dac2b557e8faa1dba7bd3d4b27930b0a18ec644f3bd4ef4e02d598eaca012651b105899d2ca192196cbbdb2eeef1d70a514222bbe2698c1874ae19  ospd.conf"

community/ospd-openvas/ospd-openvas.confd

@@ -1,10 +0,0 @@
-# OpenVAS Scanner command args
-
-# e.g --foreground
-OSPD_OPENVAS_OPTIONS=""
-
-# Scanner listen socket
-OSPD_OPENVAS_UNIX_SOCKET="--unix-socket=/tmp/ospd.sock"
-
-# Scanner listen mode
-OSPD_OPENVAS_SOCKET_MODE="--socket-mode=0o777"

community/ospd-openvas/ospd-openvas.initd

@@ -1,17 +1,19 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
 
 name="Remotely control an OpenVAS Scanner"
 command="/usr/bin/ospd-openvas"
 pidfile="/run/ospd/${RC_SVCNAME}.pid"
+
+: ${OSPD_OPENVAS_UNIX_SOCKET:=$(dirname $pidfile)/ospd.sock}
+: ${OSPD_OPENVAS_SOCKET_MODE:=0o777}
+
 command_args="${OSPD_OPENVAS_OPTIONS} \
-        ${OSPD_OPENVAS_UNIX_SOCKET} \
-        ${OSPD_OPENVAS_SOCKET_MODE} \
-        --pid-file ${pidfile} \
-        --config /etc/openvas/ospd.conf"
+	--unix-socket=${OSPD_OPENVAS_UNIX_SOCKET} \
+	--socket-mode=${OSPD_OPENVAS_SOCKET_MODE} \
+	--pid-file ${pidfile} \
+	--config /etc/openvas/ospd.conf"
 
 depend() {
-        after bootmisc
-        need localmount redis
+	after firewall
+	need redis
 }

community/ospd-openvas/ospd-openvas.post-install

@@ -0,0 +1,2 @@
+#!/bin/sh
+addgroup gvm redis 2>/dev/null

community/ospd-openvas/ospd.conf

@@ -1,7 +1,7 @@
 [OSPD - openvas]
 
 #required by gvmd
-unix_socket = /tmp/ospd.sock
+unix_socket = /run/ospd/ospd.sock
 
 #socket_mode = 0o770
 pid_file = /run/ospd/ospd-openvas.pid