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

3 files changed, 17 insertions, 14 deletions

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() {