From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA07615801B for ; Fri, 11 Aug 2023 09:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D19542BC01A; Fri, 11 Aug 2023 09:08:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA2292BC018 for ; Fri, 11 Aug 2023 09:08:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8543335DCA for ; Fri, 11 Aug 2023 09:08:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 540FEF5B for ; Fri, 11 Aug 2023 09:08:08 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1691744875.9faff04c392041e0536602a5cb543f9eb4956c2c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/files/, net-analyzer/gsad/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gsad/files/gsad-22.init net-analyzer/gsad/files/gsad-daemon.conf net-analyzer/gsad/gsad-22.5.1-r1.ebuild net-analyzer/gsad/gsad-22.5.1-r2.ebuild X-VCS-Directories: net-analyzer/gsad/ net-analyzer/gsad/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 9faff04c392041e0536602a5cb543f9eb4956c2c X-VCS-Branch: master Date: Fri, 11 Aug 2023 09:08:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5f364d8-1296-4bd4-b1c3-710d0828be89 X-Archives-Hash: 1d93f6ba9eb07bb7d4f0f52e92c5227c commit: 9faff04c392041e0536602a5cb543f9eb4956c2c Author: Giuseppe Foti gmail com> AuthorDate: Wed Aug 9 15:37:28 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Aug 11 09:07:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9faff04c net-analyzer/gsad: fix OpenRC script Signed-off-by: Giuseppe Foti gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32234 Signed-off-by: Florian Schmaus gentoo.org> net-analyzer/gsad/files/gsad-22.init | 8 +++----- net-analyzer/gsad/files/gsad-daemon.conf | 2 +- .../gsad/{gsad-22.5.1-r1.ebuild => gsad-22.5.1-r2.ebuild} | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init index 9a93713bd591..f416990b19a4 100644 --- a/net-analyzer/gsad/files/gsad-22.init +++ b/net-analyzer/gsad/files/gsad-22.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 : ${GSAD_USER:=gvm} @@ -8,10 +8,8 @@ name="Greenbone Security Assistant (GSA)" command="/usr/bin/gsad" -command_args="--foreground ${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" -command_background="true" command_user="${GSAD_USER}:${GSAD_GROUP}" -pidfile="/run/gsad/gsad.pid" +command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" retry="${GSAD_TIMEOUT}" depend() { @@ -20,5 +18,5 @@ depend() { } start_pre() { - checkpath -d /run/gsad + checkpath -d --owner ${GSAD_USER} /var/run/gsad } diff --git a/net-analyzer/gsad/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf index f7c7ee514e50..e74b409cc84a 100644 --- a/net-analyzer/gsad/files/gsad-daemon.conf +++ b/net-analyzer/gsad/files/gsad-daemon.conf @@ -1,7 +1,7 @@ # Greenbone Security Assistant command args # e.g. --foreground | e.g. --no-redirect -GSAD_OPTIONS="--no-redirect" +GSAD_OPTIONS="--no-redirect --http-only" # GSAD listen adress GSAD_LISTEN_ADDRESS="--listen=127.0.0.1" diff --git a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild similarity index 97% rename from net-analyzer/gsad/gsad-22.5.1-r1.ebuild rename to net-analyzer/gsad/gsad-22.5.1-r2.ebuild index 49e02618b234..7055f5038584 100644 --- a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild +++ b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild @@ -98,7 +98,7 @@ src_install() { ${PN}.service insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${PN}-daemon.conf" + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" newinitd "${FILESDIR}/${PN}-22.init" "${PN}" newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"