gentoo auto-resync : 04:10:2023 - 11:51:15

11 files changed, 19 insertions, 187 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 97288979c5a7..22c4c956cc4d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/greenbone-feed-sync/Manifest b/net-analyzer/greenbone-feed-sync/Manifest
index f4933207ca1e..5bc3bd4ac400 100644
--- a/net-analyzer/greenbone-feed-sync/Manifest
+++ b/net-analyzer/greenbone-feed-sync/Manifest
@@ -1,8 +1,6 @@
 AUX greenbone-feed-sync.cron 222 BLAKE2B b4ebc765c293fbc8445c7506c882f67879cc64a75debda93d31e66fc270d8bf6457d9dca008582b81ac43629799f4d77ffe53fe4c08acfa26087665994ac8baf SHA512 ae3f3187fbe6a664a490b2a3ff6738869e97eb7eff324eba215569fde676d5a53d846cc86ce36a42929ea85d1d8cec88f3a9fe45f264446ae54baab727800391
 AUX greenbone-feed-sync.service 219 BLAKE2B 7f5d17b23b56a175115a4147e16d1e8636c961aaf40b24671d3a2e55701eb8bfd493dbda686fb9e56675fc6ac5c731721d53da2446cbcb1dbc6bf9ef279f44fe SHA512 0c2dce6ff3fd1837c69ee0899c2b1da98f8c7877fb140677ce4ff8c10cd140e7f3581008f26bdb119a3bf41f7f2a40fb2082d84060c830417faf4e4ed72dbb98
 AUX greenbone-feed-sync.timer 183 BLAKE2B f91b69c6b2a5024c6cd9d678676071f7d5e175a3b35e0e34ffc03be7630df7519948c6c3285c7b265c73c0b7b4485706bba5673f89234c478ad6cd43d7305ddc SHA512 3716c8057bab3926b57e5e9868f4e00ec95940e5a9ea0506e16a152a76cb9b388ba5f0c8404245dcba5ba26bc789f0670781c41568d53a82412cd19689aca2c6
-DIST greenbone-feed-sync-23.7.0.tar.gz 62500 BLAKE2B ff59b9d60159062d8dd1383368ccd54c946297d052d6b66c6cee8e61a1f2a7bdbf5d5a73d1442ae6bba68eda132c5eb0151bd13fbe963d0ac10de4885b8b9ec6 SHA512 b2357e400e1b8fccf64815ef80fb9800d06260d946a2aca946c887101a90833407c54f6e9b022fbb418fb08bfd5bc4a007a1b340f6deed143bb822ed1118fc64
 DIST greenbone-feed-sync-23.8.0.tar.gz 63822 BLAKE2B 01aa2f9dbea50049a6681cfe0c1335fd5de9f789fd2bd059410b56cdc8cff81211943fa56b8fd0f38ab58b91ed06516404ac9a5479724fedd75d0b10f7b627aa SHA512 36937bd9db10a40382ef2fedbe47a7acb5b7d4c7be41eb16e999e00757b40f54b614c75387acf997d10061b15b07b5bc3562d218109089a752496a4f346ae6be
-EBUILD greenbone-feed-sync-23.7.0.ebuild 1491 BLAKE2B 112b57a7d13e3bd1b6932155d7768564f62aad17960707a750e722058ba88f9c387c4d2a54cc661dc0a5ceec5f46ae3728a252ecddd7c802dcb209cfb31cc70e SHA512 156913f07bc86f427ff50e978ac80b67ddbdf87a3a2358e6ab851042892de4dcf6366471d296557260f1cf4eeb8fb3ec73d6285773cc7aa9141129cab09bc324
 EBUILD greenbone-feed-sync-23.8.0.ebuild 1491 BLAKE2B f9d29bcdad953fae6e4df785a2db57d7967e9ec69636da7aecd94acefc939e6b453173be543bfefb78ba13c05776f7aaab9fd3ea63d48a9a4d8db9d423e3f408 SHA512 9c7c38384d273e16a8bf9373862afe86a30ba9019a35ec095e7c4c364c6e16242919f7079544eedceeceec8b02dd8e862d14b83162f5052ea0bbe836cd78d2ae
 MISC metadata.xml 822 BLAKE2B 6e48caf48d652d7892292654b2b55a1b200fedae3b34d03ed237259fda8a8c8013cda2c3ac93b080658424a21a13e9a3d4eb92c677621c17c2309cf7f7467c32 SHA512 9457919c66737a70c7cc58aa576102c46c1d296a616baf53559eb04bd89a7cc315d59980e7150afea1f9010344952e73deeb215ec5f776075b638072badf5983
diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.7.0.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.7.0.ebuild
deleted file mode 100644
index dbbef48f42a7..000000000000
--- a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 systemd
-
-DESCRIPTION="New script for syncing the Greenbone Community Feed"
-HOMEPAGE="https://github.com/greenbone/greenbone-feed-sync"
-SRC_URI="https://github.com/greenbone/greenbone-feed-sync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron"
-RESTRICT="test"
-
-DEPEND="
-	acct-user/gvm
-	net-misc/rsync
-	>=net-analyzer/gvmd-22.5.0
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	${DEPEND}
-	cron? ( virtual/cron )
-"
-
-python_install() {
-	distutils-r1_python_install
-
-	#greenbone-feed-sync should not be run as root to avoid changing file permissions
-	insinto /etc/sudoers.d
-	newins - greenbone-feed-sync <<-EOF
-	gvm ALL = NOPASSWD: /usr/bin/greenbone-feed-sync
-EOF
-
-	if use cron; then
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/${PN}.cron ${PN}
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.timer" "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		return
-	fi
-
-	if use cron; then
-		elog
-		elog "Edit ${EROOT}/etc/cron.weekly/greenbone-feed-sync to activate daily feed update!"
-		elog
-	fi
-
-	if systemd_is_booted; then
-		elog
-		elog "To enable the systemd timer, run the following command:"
-		elog "   systemctl enable --now greenbone-feed-sync.timer"
-		elog
-	fi
-}
diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest
index 259df3ce565b..d8031d458253 100644
--- a/net-analyzer/gsa/Manifest
+++ b/net-analyzer/gsa/Manifest
@@ -1,13 +1,7 @@
 DIST gsa-21.4.2-node_modules.tar.gz 86572528 BLAKE2B 1aec3d8636241d7cd4ca591133cdadd26d349bf4342ee1595a678871617b4b3a763348a7a0e6d44b50780f330362131d7ba72953a40f53e79b1f9709775999fb SHA512 c44f3822864b9f68cbfe0e4052b2295ab74cb2c429cd9aa667b19b8cfb423c49dc65b1455f785abecdc4329f31b43fe368b0bd5276b4ad95d5fa2e208bb4a4ec
 DIST gsa-21.4.4.tar.gz 2471442 BLAKE2B b3ac937a87038d93e90223f7c33d087b0dbb043c4fcaa8a00c9d44148e686c064fdcc311899b7b3b4084658d23193bc128fb809f22621583898551f4348ece6f SHA512 5a7b45132a049adf608ccd8988d69a415290cc57d6e7537835a78e19aafb5dfdf204197576f69277726587efaccce189c1ccab55c43e5a0a7855c538b3bc4b67
-DIST gsa-22.5.0-node_modules.tar.xz 26394052 BLAKE2B 77e74ccacecd681e846884af463ee0605eb46c21dd0cd001f3240d4cfd97b91d3ce241bda50996e3ec047824e937383f8c80e0b8014b93bf3d6d067a9afec929 SHA512 221dde765497e6c97773d18b04b3d381b2f003c42995e935661ac7e35c9b18984a92336259d803174ad62387a5d653df12c0899c495334561f71df6d4290f0c8
-DIST gsa-22.5.0.tar.gz 3586703 BLAKE2B 33d9f5e32ccc33e4c1d24665bd7ba0819dc22281772c7ebba24d8c82f93bcc21e8b90f3e0666b9ed8846e2a88417f8bf5999619577c15c307485a7ce3243d104 SHA512 2f119f3d8b213cb10abc7b2a25052e943518f8a2c5950f6eb6e5227bf30f7467ddbcf78bbed5f499b96a0bb517c5033f38477f332a14f449b7b04e7b7902843b
-DIST gsa-22.5.3-node_modules.tar.xz 23161212 BLAKE2B 4bd48e37034cbe8b142392247f7c3231d97bea3d2327833f5d9fbe6b964b5a8f0f61a7d8db0750291fd750fb24bf401e0a6691123e876d76da68810662779df6 SHA512 2863e937bdfad8207a57d03d67f0fb573435845823ce2533fab4002ac25e37903ab21d6e53f272d39bfb900d4793c907d33d56dfe1b88469ad5a4ffcd3201613
-DIST gsa-22.5.3.tar.gz 3620562 BLAKE2B 1b2104bea4d5cb39d9faab05e0e6b1ac0b15c6d342f2066808b3b00fb9e4a07efd8d792eeb2ec1507172e3188770ba428ff5d2a913d00db40d28f899bea23d9f SHA512 fb7ee8b65cfac67789fe392c5734ef2267f80a9f6ac42272e02f21b266f7933c06d5aef33bfa1bedf2782016e26ca849a764f7150ecc8cc6fa8d206c6dd1ae71
 DIST gsa-22.7.0.tar.gz 3593214 BLAKE2B 9a9b4969735c8c05c67f490c98a008816ad6602c6a7a7cceaa611783087da63bde5fbeebe42f171e917820f5c7a79b1a486b41f0c945749c737aa3f4f47ec94c SHA512 e9832666c6218b5d8af9e7af5e088f3dc1e12eac0cbc06c1ccaf268e34a377a5892761dc6a41278c5342a30b008a58c10a36a5b10ee955a77bd55d9dfecfbd44
 DIST gsa-node-modules-22.7.0.tar.xz 27964004 BLAKE2B cbc7120763124deb79ddbcb12037ad8a031ef4de972086866a8393fef39c109a30e90d5f6d7948a55aca518c1ebc3ae46c12ad5440bc89002254bec64f5253e7 SHA512 594f0ffce70514bae8334d749f4e690cdb040b81c8a91238e5bbac18088a0866fe8a78be8a323b813cb5c751e69419c80da611ba7f619797dd9b502c320529b4
 EBUILD gsa-21.4.4.ebuild 1036 BLAKE2B 9b929e395348dd2ab4eb93a377d23feb32689be41a95df04bde261860081f981349f122256e9f1133e277ed5b9c2e995100ee2e8c5cb4e692f4333877bb3b6d7 SHA512 9fe0def0a89ad904eeb9fe729e4a260ce186e6de1ef1f8cba36700b14bad32c2d37bb8f0f6d857146700dd84dce15747033cec93649b7bbdb3582e7da5be796e
-EBUILD gsa-22.5.0.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
-EBUILD gsa-22.5.3.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
 EBUILD gsa-22.7.0.ebuild 1275 BLAKE2B 6c1d9d0ee047059ec1aa4d25d1acec8473905dd88d7f7e55eb06259cd0df857a2676be3cc31f892dd5b3169e99b3f600d961bb8dd454827475ecd0e6861ca0c5 SHA512 63dd71d381c4650ce2ee4b62ae5d6cfbf793731ca5c397df7261a6ed6c80ea63f912a1d49dc3b5bd238d963eb5a7fce9b75e839624b0d27d280c153e6bf3b923
 MISC metadata.xml 971 BLAKE2B 92a5deb08a91782bb2de586d1aa5dde2365748bfab065b310c369cbdab1e468d6ea4ab57df8e0a97a02f8b96613302cd8ec9c878c2ddacdf922fd5973f759643 SHA512 623adaaee62c9c2e27be7a6741edab7a770ab49902eb094bc71711fc822e3108d851fe0420c6744ed9ef91c8da7c57e518c884381e6f3952387c6e2636e46f5e
diff --git a/net-analyzer/gsa/gsa-22.5.0.ebuild b/net-analyzer/gsa/gsa-22.5.0.ebuild
deleted file mode 100644
index 4c4f40abe0b8..000000000000
--- a/net-analyzer/gsa/gsa-22.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_NODE_N="node_modules"
-MY_NODE_PV="${PV}"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
-SRC_URI="
-	https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~flow/distfiles/${PN}/${P}-${MY_NODE_N}.tar.xz
-"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=net-libs/nodejs-14.0.0[ssl]
-	>=sys-apps/yarn-1.15.2
-"
-
-MY_NODE_DIR="${S}/${MY_NODE_N}/"
-
-src_prepare() {
-	default
-	# We will use pre-generated npm stuff.
-	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
-
-	# Make SVGR not traverse the path up to / looking for a
-	# configuration file. Fixes
-	# Error: EACCES: permission denied, open '/.config/svgrrc'
-	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
-	echo "runtimeConfig: false" > .svgrrc.yml || die
-}
-
-src_compile() {
-	# setting correct PATH for finding react-js
-	NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
-			yarn --offline build || die
-}
-
-src_install() {
-	insinto "usr/share/gvm/gsad/web"
-	doins -r build/*
-}
diff --git a/net-analyzer/gsa/gsa-22.5.3.ebuild b/net-analyzer/gsa/gsa-22.5.3.ebuild
deleted file mode 100644
index 4c4f40abe0b8..000000000000
--- a/net-analyzer/gsa/gsa-22.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_NODE_N="node_modules"
-MY_NODE_PV="${PV}"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
-SRC_URI="
-	https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~flow/distfiles/${PN}/${P}-${MY_NODE_N}.tar.xz
-"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=net-libs/nodejs-14.0.0[ssl]
-	>=sys-apps/yarn-1.15.2
-"
-
-MY_NODE_DIR="${S}/${MY_NODE_N}/"
-
-src_prepare() {
-	default
-	# We will use pre-generated npm stuff.
-	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
-
-	# Make SVGR not traverse the path up to / looking for a
-	# configuration file. Fixes
-	# Error: EACCES: permission denied, open '/.config/svgrrc'
-	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
-	echo "runtimeConfig: false" > .svgrrc.yml || die
-}
-
-src_compile() {
-	# setting correct PATH for finding react-js
-	NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
-			yarn --offline build || die
-}
-
-src_install() {
-	insinto "usr/share/gvm/gsad/web"
-	doins -r build/*
-}
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 804dc82a950f..044af1b5c205 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,9 +1,9 @@
-AUX gsad-22.init 611 BLAKE2B 0fed09e66154cd3311678e3c9cc0b62481607c7689f77ffa9c302df6c642be30a7a1839422deb32b8fe3a5499b5b4e9457e356b8d65211348a25c2aa712fbc25 SHA512 fb43ef452634989971204493679b4c35177698b6192274ca036524e05cdf4417f660467db23a7e7bbc34d53d112049fe91072084f2393913b6821189a5715e9d
+AUX gsad-22.init 733 BLAKE2B 53cca8b8cdf86ea094bc9f234425507caf46fe1b70c9bb5af84f60c0687e8c89bba1d8c891f5c6337002ed8454fbc65093f8457876a3419244f0014a132be8da SHA512 83677ad1a97870a5b10b88d56de65b2d0959cb594207538d9d781e1cb2249d6b1b255b9c78fe37ccda73718a683963d0dd7f1f53476f46473309006dfe2de1e4
 AUX gsad-daemon.conf 428 BLAKE2B 5fdd58c878769245535cb46e2715fb14253bfe303d302a6e5a0efb655a30e92250582e2cfe4043afac79a718d178f350c91507c069bdf40e80fd7c688d47e270 SHA512 8ee1aca3d3e7f154eb5db21e256f7be68eca66bee0931a84a8187c49bc557b93255a842050bebe29b197746291fb40553b6bcde10adc871fb9aac2b27fb02f3d
 AUX gsad.init 601 BLAKE2B 79b76f512904c55f235cc6ac1b3513f920dee9cbaaa06c115c93f7abb215302f544a8e021fe0e7a66f0d646807da75a3fc4ed68cf01e00eaaa003b1ff39c1c9e SHA512 610db173cf45de0ff907dacfabba0b6e03c6a83fda97f3b76d253a80e2353961f9ac61bfd9131561e34339075556d4930273dadef94d8f9e2f8f30f50266e44d
 AUX gsad.service.conf 25 BLAKE2B fb1972cc41f5f8970717136ef71c81b74cb1abb6c0419d3c8f7f51a9f54f933eb1c1551cfb56149bc7b5e2c68dd11d731b556a7ba2da678b02f24cf143810b4f SHA512 ece2d5838f743a820dd732a5e5b17d91e85ce07655173a0143740ef6bcd20156d6aebfcf8c43d53caa7713402607d88acc0328499326f6921e3b057bd0ef9d66
 DIST gsad-21.4.4.tar.gz 220618 BLAKE2B 276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd SHA512 092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
-DIST gsad-22.5.1.tar.gz 223290 BLAKE2B 24530f085c644895d5153929038d040fbcb0626b4b2df0ce3966d96fc8c756fbb2b78540b2a57affab2f2eb97cf868f09b7ac863f9a314cb1f74a829fbea48cc SHA512 52ec1377d57d90f64e949472f5f6d1f94e9cdce86d7a807451ed9f01ff36e392606d725461e416246b9e706f00aa536cbc5672fb977695b20d0c5957b67447aa
+DIST gsad-22.6.0.tar.gz 223879 BLAKE2B 7e1d55052ef255d92cf8fd3c32f5490e192dc5635e4d9be8804ff0a72677add70081d0fff882673ea7dfc70e97acfb8012e683fefa9e6307661a39697a89eaea SHA512 39393d9190281065978d7fdb4745daa5faa066b6cc97a81b442f989eb8d466be05d6af39585ea4649555b88db819a6ced909b2e3a8e640df4c500e37bb26f05f
 EBUILD gsad-21.4.4.ebuild 2329 BLAKE2B 35f607bb6ca44b9a42ad60bcda84c825251453a77ef146147b0f551f6b04968cc4a38c9a3f566bd0539436761ce6ed072b5b925e98f9db74faa0698c80ff1094 SHA512 4084d98b9893a037512fc0233a908ee1ec7afbe43f1e700a45627f40291da44b17f627ea731623ab1500e4f72ab31b4b5f846d84751185dbfde82c8f946fdcea
-EBUILD gsad-22.5.1-r2.ebuild 2479 BLAKE2B 2240548aa9db6b8818ef8dd6d80e9947c08c631176ebd30c0fba66d63b1f15c469c8e9c88a6004273d4e3604894bd3818dd0581357b56386c579cd66039d72ca SHA512 ddb159aa230f34d1b62ab1fb7d242b786cf5c6319eb691e514b65573ba981372d4c55a7d9a13001bfc405895a5e8898e0dd2ce2d9184eac5e137308a18590a4d
+EBUILD gsad-22.6.0.ebuild 2211 BLAKE2B 8d7c9d7d79eee9a3a0f3144e046ba5f1ea722747f2afb4071f2b805746fd3232500d04b054676bf5aa9776d4668c23cc9ed0daf34fb74212a18feff71898c403 SHA512 cb581441ed74d0569d97621d9759eb6cde404a1f8336e6ca364b064b8c4658c10db39b581b4badcc7c97677018589c7e1e76325dfe02a88bff4c45b1613a2ca8
 MISC metadata.xml 602 BLAKE2B d3c36459de572672fec6a1cd7d7c29c5b8be3a421455c8702a2bfbcf4d969c5783d5026024bbffe4b765a18b50852b534b9d2a1174f5586327ff13a4f704781f SHA512 e15e39148d80f4b6c8c6e14c18ae977d6ebcec98b201e4d9b58d83f4a183023f383d4c5ae986064b6a176b741d0ac923173cb4f78a30185ce341c642002e13d7
diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init
index f416990b19a4..aae78b2e1ab8 100644
--- a/net-analyzer/gsad/files/gsad-22.init
+++ b/net-analyzer/gsad/files/gsad-22.init
@@ -3,20 +3,29 @@
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GSAD_USER:=gvm}
-: ${GSAD_GROUP:=$(id -ng ${GSAD_USER})}
 : ${GSAD_TIMEOUT:=30}
+: ${GSAD_PIDFILE:="/run/gsad/gsad.pid"}
 
 name="Greenbone Security Assistant (GSA)"
 command="/usr/bin/gsad"
-command_user="${GSAD_USER}:${GSAD_GROUP}"
-command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}"
+command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES} --drop-privileges=${GSAD_USER}"
 retry="${GSAD_TIMEOUT}"
 
 depend() {
 	after bootmisc
-	need localmount net gvmd
+	need localmount net
+	want gvmd
 }
 
 start_pre() {
-        checkpath -d --owner ${GSAD_USER} /var/run/gsad
+        checkpath -d --mode 0755 --owner root /run/gsad
 }
+
+stop_post() {
+	if [ -f "${GSAD_PIDFILE}" ]; then
+		ebegin "Removing PID file"
+		rm --force "${GSAD_PIDFILE}"
+		eend $?
+	fi
+}
+
diff --git a/net-analyzer/gsad/gsad-22.5.1-r2.ebuild b/net-analyzer/gsad/gsad-22.6.0.ebuild
index 7055f5038584..f8fe3475bfda 100644
--- a/net-analyzer/gsad/gsad-22.5.1-r2.ebuild
+++ b/net-analyzer/gsad/gsad-22.6.0.ebuild
@@ -57,12 +57,6 @@ src_prepare() {
 		   done
 		fi
 	fi
-
-	# Do not install the empty /run/gsad run dir. https://github.com/greenbone/gsad/pull/54
-	sed -i "/^install.*GSAD_RUN_DIR/d" CMakeLists.txt || die
-
-	# Drop Group= directive. https://github.com/greenbone/gsad/pull/55
-	sed -i "/^Group=/d" config/gsad.service.in || die
 }
 
 src_configure() {
diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest
index 1d791ba979f2..15c6b286ab99 100644
--- a/net-analyzer/wtfis/Manifest
+++ b/net-analyzer/wtfis/Manifest
@@ -5,6 +5,6 @@ DIST wtfis-0.7.1.gh.tar.gz 548395 BLAKE2B fbcc19358a0a357fdc9f4b5f27d4bda60e20a1
 EBUILD wtfis-0.6.1-r2.ebuild 1059 BLAKE2B bd4098b65b6cf8859e0e98b334f0e5d6992d2e066fbe47498150aadda408bf94c1e6886ed0b9b9c28d9981312307c993d54ca683d4233b9a3a60056a98756849 SHA512 bfb43f0e750bbc742003157d66711eeba6749783d2cd10e3bdacd0d429d1fc5aad521c7919d24461c06a17b7aed87a1dcaa4449dc8679a267e5ccb1f69631275
 EBUILD wtfis-0.6.2-r1.ebuild 1012 BLAKE2B 837a19b9f97348af9612575e61a260353d03f1ec9b25b74bf91263e8e7f41de976b62ff7b61fd9c98d59fc92e5591f2523085f08006f03b6fffca09f25239c9f SHA512 697023c811754d0dc98d4545ce19d6227e5bcef79f7c6cc8528e8feee6f185b9e2d3c12031e873b0772ef6942f6b6366d76e92fffd2e951e147a6a1955da117f
 EBUILD wtfis-0.7.0-r1.ebuild 1011 BLAKE2B 02b82d8d1b0d7b598bb3bbe4969c74039d7fa7236aeabf7a017476a0e3d0b57eaeae972c296e36c6e84ecf46281c9074326dd6064233f8579226f40738aa57e2 SHA512 273e68c474b74d40d976f4b812f1e211559d0d0b9733da6f144d9c5f5c57ce962f489e694a3ae286c4d5cf27fac0cb5eb6b8be71f9521fa6438e68de8808df1e
-EBUILD wtfis-0.7.1.ebuild 1018 BLAKE2B c8ca943cc43fff7482c0b56cd64da6001cdd950913589bbff5f7800b81f2b08ce179878017494c717aac5826e0972eb3107eab659cb14f4b241ed27973b71a71 SHA512 0e14b8634cf6a2ec9392f02eabcc503acab6c50fa1c261ea433626f1c25700d13552c997cefdc0cc0300bf1959cc18fc256c6b1121eb69cda972b205d8d501a3
+EBUILD wtfis-0.7.1.ebuild 1016 BLAKE2B 868fb9ddffd571ebfae87227c825f3313a3e763a527790a4883f2b974d5167b8494a98d550b91d422430f6412799a411b790b9f09c9d164a9d92733009454554 SHA512 8f73cca3401a2d5b43ed7cdcd2e3eb1efa3473c4e6173e2754afc6520de95fd0f5e35aebe747a8770729d44830992fe32b8d8d4a55f533bfb7243d3546131007
 EBUILD wtfis-9999.ebuild 1018 BLAKE2B c8ca943cc43fff7482c0b56cd64da6001cdd950913589bbff5f7800b81f2b08ce179878017494c717aac5826e0972eb3107eab659cb14f4b241ed27973b71a71 SHA512 0e14b8634cf6a2ec9392f02eabcc503acab6c50fa1c261ea433626f1c25700d13552c997cefdc0cc0300bf1959cc18fc256c6b1121eb69cda972b205d8d501a3
 MISC metadata.xml 855 BLAKE2B 552b9998e0eada39d9a0f0e092c566e9a75c5ac2e2360df66d9b7334e663a9fb4a82be51f31623f31644e2863d78570405dc94e36769be7cbbcc3539cf49d920 SHA512 56593e8b58a019e4cdbf23946331c34f66fc72e318271916b33f3f63ccfb2d7a546dcbf05fcd0bd0bce9e5e0ce8f7b0cfd621b4b938c0eed135c34d025fdfc32
diff --git a/net-analyzer/wtfis/wtfis-0.7.1.ebuild b/net-analyzer/wtfis/wtfis-0.7.1.ebuild
index 2d1aacc2f992..b95434bd9279 100644
--- a/net-analyzer/wtfis/wtfis-0.7.1.ebuild
+++ b/net-analyzer/wtfis/wtfis-0.7.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git"
 else
 	SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong x86"
 fi
 
 LICENSE="MIT"