Diff ospd-openvas-21.4.4-r4 with a ospd-openvas-22.5.3-r2

/usr/portage/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r2.ebuild 2023-10-09 14:52:33.332368447 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
PYTHON_COMPAT=( python3_{9..10} )
6
PYTHON_COMPAT=( python3_{10..11} )
7 7
DISTUTILS_USE_PEP517=poetry
8 8
inherit distutils-r1 systemd
9 9

  
......
14 14
LICENSE="AGPL-3+ GPL-2+"
15 15
SLOT="0"
16 16
KEYWORDS="~amd64 ~x86"
17
IUSE="doc"
17
IUSE="doc +notus"
18 18

  
19 19
DEPEND="
20 20
	acct-user/gvm
......
25 25
	dev-python/paramiko[${PYTHON_USEDEP}]
26 26
	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
27 27
	>=dev-python/redis-3.5.3[${PYTHON_USEDEP}]
28
	!net-analyzer/ospd[${PYTHON_USEDEP}]
28
	>=dev-python/python-gnupg-0.5.0[${PYTHON_USEDEP}]
29
	net-libs/paho-mqtt-c
30
	app-misc/mosquitto
29 31
"
30 32
RDEPEND="
31 33
	${DEPEND}
32 34
	app-admin/sudo
33 35
	>=net-analyzer/openvas-scanner-${PV}
36
	notus? ( >=net-analyzer/notus-scanner-22.4 )
34 37
"
35 38

  
36 39
distutils_enable_tests unittest
37 40

  
38
src_prepare() {
39
	default
40

  
41
	# https://github.com/greenbone/ospd-openvas/pull/649
42
	sed -i '/^Group=gvm/d' config/ospd-openvas.service || die
43

  
44
	# https://github.com/greenbone/ospd-openvas/pull/653
45
	sed -i 's;/usr/local/bin/;/usr/bin/;' config/ospd-openvas.service || die
46
}
47

  
48 41
python_compile() {
49 42
	if use doc; then
50 43
		bash "${S}"/docs/generate || die
......
62 55
		fowners -R gvm:gvm /etc/gvm
63 56
	fi
64 57

  
65
	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
66
	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
58
	newinitd "${FILESDIR}/${PN}-22.initd" "${PN}"
59
	newconfd "${FILESDIR}/${PN}-22.confd" "${PN}"
67 60

  
68 61
	systemd_dounit config/${PN}.service
69 62

  
63
	if use notus; then
64
		systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \
65
			${PN}.service
66
	else
67
		systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \
68
			${PN}.service
69
	fi
70

  
71
	insinto /etc/logrotate.d
72
	newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas
73

  
70 74
	# OSPD OpenVAS attempts to call openvas via sudo as network security
71 75
	# scanning often requires priviliged operations.
72 76
	insinto /etc/sudoers.d
Thank you!