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 C3B7F15800D for ; Mon, 3 Jul 2023 08:15:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 719C3E08A8; Mon, 3 Jul 2023 08:15:51 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C31FE08A8 for ; Mon, 3 Jul 2023 08:15:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7B0B33BE23 for ; Mon, 3 Jul 2023 08:15:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F599AD4 for ; Mon, 3 Jul 2023 08:15:47 +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: <1688372127.4ee6d9abdc473f216ea67c7cfffb2c56d12c4c13.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsa/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gsa/Manifest net-analyzer/gsa/gsa-22.4.1.ebuild net-analyzer/gsa/gsa-22.5.0.ebuild X-VCS-Directories: net-analyzer/gsa/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 4ee6d9abdc473f216ea67c7cfffb2c56d12c4c13 X-VCS-Branch: master Date: Mon, 3 Jul 2023 08:15:47 +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: fd5a9096-3e99-4b21-a36f-e0ba2077b76e X-Archives-Hash: f4a5f0be33ade96ef7692ea9b902a43b commit: 4ee6d9abdc473f216ea67c7cfffb2c56d12c4c13 Author: Florian Schmaus gentoo org> AuthorDate: Mon Jul 3 08:05:28 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon Jul 3 08:15:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee6d9ab net-analyzer/gsa: add 22.5.0, drop 22.4.1 and switch to non-dist Signed-off-by: Florian Schmaus gentoo.org> net-analyzer/gsa/Manifest | 3 ++- net-analyzer/gsa/gsa-22.4.1.ebuild | 29 -------------------------- net-analyzer/gsa/gsa-22.5.0.ebuild | 42 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest index 6f1aa937be08..c4d600dd19b4 100644 --- a/net-analyzer/gsa/Manifest +++ b/net-analyzer/gsa/Manifest @@ -1,3 +1,4 @@ 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.4.1.tar.gz 5878329 BLAKE2B 5ff22dd07dd6a562d463faeb07323cfa083380bfbb96b544345778484ae5cc6d213a029a2c59e25decfe72c81f32a8ac79132dfce7bd3d381a7fa92e10cd5ac6 SHA512 6de0eb910ea885681bbb4cff05cd5b34113bbd04bf775deed2e8de583f7756c46926ac9e620dca49a061bf9d8edc5da481a75e7db93ae982314cb5ef03b33eb7 +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 diff --git a/net-analyzer/gsa/gsa-22.4.1.ebuild b/net-analyzer/gsa/gsa-22.4.1.ebuild deleted file mode 100644 index d188b90c2e27..000000000000 --- a/net-analyzer/gsa/gsa-22.4.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Greenbone Security Assistant" -HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa" -SRC_URI=" - https://github.com/greenbone/${PN}/releases/download/v${PV}/gsa-dist-${PV}.tar.gz -> ${P}.tar.gz -" - -SLOT="0" -LICENSE="AGPL-3+" -KEYWORDS="~amd64 ~x86" - -src_unpack() { - default - mkdir ${P} - mv static/ "${WORKDIR}"/${P}/ - mv locales/ "${WORKDIR}"/${P}/ - mv img/ "${WORKDIR}"/${P}/ - mv robots.txt "${WORKDIR}"/${P}/ - mv index.html "${WORKDIR}"/${P}/ -} - -src_install() { - insinto "usr/share/gvm/gsad/web" - doins -r ./* -} diff --git a/net-analyzer/gsa/gsa-22.5.0.ebuild b/net-analyzer/gsa/gsa-22.5.0.ebuild new file mode 100644 index 000000000000..e25fbab90bcd --- /dev/null +++ b/net-analyzer/gsa/gsa-22.5.0.ebuild @@ -0,0 +1,42 @@ +# 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" +} + +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/* +}