From 75949673f38270397841d9c2322dbb774ac41554 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Aug 2023 15:35:17 +0100 Subject: gentoo auto-resync : 11:08:2023 - 15:35:17 --- net-analyzer/gvmd/Manifest | 6 +- net-analyzer/gvmd/files/gvmd-22.init | 15 +--- net-analyzer/gvmd/files/gvmd-daemon-22.conf | 3 + net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild | 126 +++++++++++++++++++++++++++ net-analyzer/gvmd/gvmd-22.6.0.ebuild | 129 ---------------------------- 5 files changed, 136 insertions(+), 143 deletions(-) create mode 100644 net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild delete mode 100644 net-analyzer/gvmd/gvmd-22.6.0.ebuild (limited to 'net-analyzer/gvmd') diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index a20c66640fe9..30b91c758cfa 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -2,8 +2,8 @@ AUX gvm-sync-all 727 BLAKE2B d92b004173747814bf063c5aa05fcfd5b37c04ab7eb9d044da2 AUX gvm-sync-all.service 170 BLAKE2B 31aa75ba8733c73a2db4afbaf49eb5c40da3aaf9d4f11aad4b06dc2dc07dc927a54d2c2c8397eaeb43318430063b69fe2d803f16613af88887f8aad2638ee2f1 SHA512 8d9b862f729c64394b8801d36fefe4dfab0e0a80b603a19ed112f7a37e77c5a5cf906abafdd819b79df8dabc089b846e463c53317b0803e96dc2a5878a5639f2 AUX gvm-sync-all.timer 183 BLAKE2B f91b69c6b2a5024c6cd9d678676071f7d5e175a3b35e0e34ffc03be7630df7519948c6c3285c7b265c73c0b7b4485706bba5673f89234c478ad6cd43d7305ddc SHA512 3716c8057bab3926b57e5e9868f4e00ec95940e5a9ea0506e16a152a76cb9b388ba5f0c8404245dcba5ba26bc789f0670781c41568d53a82412cd19689aca2c6 AUX gvmd-21.4.5.init 771 BLAKE2B ade6f5e9da956d430062c4af610a496e449d5958897493a4b64323c2a2c74a47c5caf1d273c9a1186ce091048b63f0f685b33da9beecd2e6adbc9dce4b9196e4 SHA512 c481fb8352b34f4035c258858ef61ca90e36761210527360db8cda4c8687b2cb6fa1130f4f8a1b0f6046b3f39066c89e34c2c3c00b2090c8bd60bed57bb92197 -AUX gvmd-22.init 881 BLAKE2B 112a26516731258abb1ff91fd8f81eb1f77bed2ff77540d10c416d18e580690f863fe4a7b0d87f22117c772e154ba5599c82ac6eaa595261a1cc29749f418914 SHA512 126cf722e6d087cf911794abb33c7468096d4f98725ff98d52db510d1e277f35d53397a19a35672304713fa09ac5fdc94ddd4321306900413f30ee42eab37062 -AUX gvmd-daemon-22.conf 818 BLAKE2B 15febb320cc0358beb6f2bb02c740f3ec3eb24f06154fe4f61afaf140e7b9a0a65288cd4c84c34b156c6129c1526eb8b0efc9668cc93aecbd50bdf7a7d5d3675 SHA512 9bd2b3dfd0f2417a2d575ef063cecb0d9f4babe6371eff5f94e38f3e8c61fe769b16d50d492c4564f0d9a702b4eb9207c004c94efec172f278ee088cae04b487 +AUX gvmd-22.init 743 BLAKE2B 7c2a20b96c0810c3b542d33e37dbdf874c61168287f4fcb22b151e2a12b65dd9d1586dfcc228c941136f4a204df5661f9547dcb3c440a57fd80e412a81cdfc6f SHA512 17da410edae524b28ae66fed6adc15cd553f2c7bac6d34eff06288e5ae476dffa88efbb484accbf25a5045fb36cf23bb5583ad0adcb3480f9450d5bf150dbb40 +AUX gvmd-daemon-22.conf 892 BLAKE2B 1b8c15d6c889e471d86d6a12f7795c0d126f905c55e2588937299868154ae402a8aeb4d71f0492920df738076d4dff41c372bef22432de69bf3f499da8f58028 SHA512 dcee0ad72e86b7822ca1dec11a60da9cfcfc7db50d1e179b3f819ed14e93b88e552b4b18a30fdac3423dfb913637e307e55da0aac73903ee6e736c41cde41454 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb AUX gvmd.service.conf 552 BLAKE2B f941faaa568d378d78c911e8c79b6d0cd384e042f6af2bd0d1d5f2ec1af432d86d548f1cc1e2ebed161b5f7c866b716fa1a456d51725e70ed513b55f62c647df SHA512 0e74bc4851c07ddfaf9cee361b466c1ae3eafa25b3d1722bd9cc925b2d648c62706ffd10504fa2a530bae72ba756f083388f570fad76835db3087eea2bd8573e DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec @@ -11,5 +11,5 @@ DIST gvmd-22.5.5.tar.gz 1034891 BLAKE2B 86382768133d18be08d5536ad02e501affa9c3c7 DIST gvmd-22.6.0.tar.gz 1039082 BLAKE2B 0e6e53ce990090e212e035f2224bfa84c906f130dd5a33f5e57a53b3a5b82afac725db4412c5d0f3de0abc2fada5120845eaf3b93db18aa1137c948a14964594 SHA512 de6688dfd19b9bb779a963b3f8607818dad13da4024b7e0a0e80649cb11bbcf0a65bf1b72eaf5408ead2dabff2e806a0f7dd8472c6f314774b82fcd01fb37b37 EBUILD gvmd-21.4.5-r5.ebuild 3198 BLAKE2B 9edf07dcf189b01b98e27aa2230e082d53bb5491da674fecd0d743475ba0bbb87cde73ea8fffe8b320aee002abd489b942ac34687e955a1c3818a9b347752581 SHA512 7eccbc904374ce4713e22c209e0ec3720e3c81e38b5d21391f6c84bde92b97f68c7f65a1af787e79cf97264b597ed112c793ac208f3d54234fbf821dd792d21a EBUILD gvmd-22.5.5.ebuild 3294 BLAKE2B 4e627afcc395ba8876e6d5200836f6582d4585c41506deada63736ecc0de3dcd42ef65c03fd12d96782a1c17921260db95833e30d498fb7a2fee023414d2f9b9 SHA512 88a01e213a2fadd2d77941fa4887bcefe177b21f49292b6f18a538891c4bb0d22960b2d5164d8e96efbf4e236ee48d30ab61ce13501fb1c1525bf088563f8e25 -EBUILD gvmd-22.6.0.ebuild 3294 BLAKE2B 4e627afcc395ba8876e6d5200836f6582d4585c41506deada63736ecc0de3dcd42ef65c03fd12d96782a1c17921260db95833e30d498fb7a2fee023414d2f9b9 SHA512 88a01e213a2fadd2d77941fa4887bcefe177b21f49292b6f18a538891c4bb0d22960b2d5164d8e96efbf4e236ee48d30ab61ce13501fb1c1525bf088563f8e25 +EBUILD gvmd-22.6.0-r1.ebuild 3199 BLAKE2B 4e0edb383313e7e908b0695696b7655de37559b68e1dd9921872c7dea31d7ecf7bf6491893d46cfdc6fa85908220dc789345712ad6a889ed3b11682955675a67 SHA512 9ba7d36a8c9159bf61fad884a08c0e321f5627eb1e7d9a5ad0828ab0fd6ce95e8892e89e6bccf20f61ac84460d5b74e04ba3ec2cba45cb3a16ba45591b8c066a MISC metadata.xml 1138 BLAKE2B 5abfda85605cdc2bacbfc1295b9b443ceecda1a3bd51423a1c35c4799d42f8aec6c4d5c8bc29293a800193016bc0065361ff55616859064c061b105b31fb0f18 SHA512 f09448bd5acd5ed22611ac455c94a3ae0a0531a9aeec6bad638c48cfeb627fef5214c0734d04951ef18ee96046b8e89b812c198e6147fb21f8d5dd495ed4bb67 diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init index f1ac6ddbac72..8fd1a0bfb335 100644 --- a/net-analyzer/gvmd/files/gvmd-22.init +++ b/net-analyzer/gvmd/files/gvmd-22.init @@ -3,14 +3,14 @@ # Distributed under the terms of the GNU General Public License v2 : ${GVMD_USER:=gvm} -: ${GVMD_GROUP:=gvm} +: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})} : ${GVMD_TIMEOUT:=30} name="Greenbone Vulnerability Manager" command=/usr/bin/gvmd -command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" +command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" command_user="${GVMD_USER}:${GVMD_GROUP}" -pidfile="/run/gvmd/gvmd.pid" +pidfile="/var/run/gvmd/gvmd.pid" retry="${GVMD_TIMEOUT}" depend() { @@ -19,12 +19,5 @@ depend() { } start_pre() { - mkdir /run/gvmd - for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do - touch /run/gvmd/${p} - done - chown -R gvm:gvm /run/gvmd/ - - touch /run/feed-update.lock - chown gvm:gvm /run/feed-update.lock + checkpath -d --owner ${GVMD_USER} /var/run/gvmd } diff --git a/net-analyzer/gvmd/files/gvmd-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf index e1a5482747fc..061609e1c45c 100644 --- a/net-analyzer/gvmd/files/gvmd-daemon-22.conf +++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf @@ -25,5 +25,8 @@ GVMD_LISTEN_MODE="--listen-mode=755" # Scanner listen address unix socket GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock" +# Update vt +GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock" + # TLS settings GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0" diff --git a/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild new file mode 100644 index 000000000000..d7a4a809642a --- /dev/null +++ b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0 + >=net-analyzer/gvm-libs-20.08.0 + >=net-libs/gnutls-3.2.15[tools] +" +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/gvmd/gvmd-22.6.0.ebuild b/net-analyzer/gvmd/gvmd-22.6.0.ebuild deleted file mode 100644 index 22ce3ef705d4..000000000000 --- a/net-analyzer/gvmd/gvmd-22.6.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake systemd toolchain-funcs - -DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" -HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" -SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="AGPL-3+" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/gvm - app-crypt/gpgme:1= - >=dev-db/postgresql-9.6:=[uuid] - >=dev-libs/glib-2.42:2 - >=dev-libs/libical-1.0.0 - >=net-analyzer/gvm-libs-20.08.0 - >=net-libs/gnutls-3.2.15[tools] -" -# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive -# and xmlstartlet are used for (PDF) report generator at runtime. -RDEPEND=" - ${DEPEND} - app-text/xmlstarlet - dev-perl/XML-Twig - dev-texlive/texlive-latexextra - >=net-analyzer/ospd-openvas-22.4 - >=dev-db/pg-gvm-22.4 -" -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-libs/libxslt - ) - test? ( dev-libs/cgreen ) -" - -src_prepare() { - cmake_src_prepare - # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 - sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die - sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die - # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 - if use doc; then - if ! tc-is-clang; then - local f - for f in doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" - "-DSBINDIR=${EPREFIX}/usr/bin" - "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" - "-DGVM_DEFAULT_DROP_USER=gvm" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - fi - if use test; then - cmake_build tests - fi - cmake_build rebuild_cache -} - -src_install() { - if use doc; then - local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_src_install - - insinto /etc/gvm/sysconfig - newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" - if ! use prefix; then - fowners -R gvm:gvm /etc/gvm - fi - - newinitd "${FILESDIR}/${PN}-22.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm/gvmd - if ! use prefix; then - fowners -R gvm:gvm /var/lib/gvm - fi - - dosbin "${FILESDIR}"/gvm-sync-all - systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer} - - systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ - ${PN}.service -} - -pkg_postinst() { - elog "If you are upgrading from a previous version, you need to update the database version." - elog "Please, create the running directory and give write permission to the database user" - elog "then run gvmd as the gvm user with --migrate option:" - elog "~# mkdir /run/gvmd" - elog "~# setfacl -m u:gvm:rwx /run/gvmd/" - elog "~# sudo -u gvm gvmd --migrate" -} -- cgit v1.2.3