From 0763de80c3b751bba4c8b898f85cb95a645cca18 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 8 May 2022 18:59:08 +0200 Subject: net-analyzer/gvmd: fix systemd service Signed-off-by: Florian Schmaus --- net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild | 113 ------------------------------ net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild | 119 ++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 113 deletions(-) delete mode 100644 net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild create mode 100644 net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild deleted file mode 100644 index 4c49deefa350..000000000000 --- a/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2022 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="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/gvm - acct-user/gvm - app-crypt/gpgme:1= - dev-db/postgresql:*[uuid] - dev-libs/glib:2 - dev-libs/libical:= - >=net-analyzer/gvm-libs-21.4.4 - net-libs/gnutls:=[tools] - doc? ( - app-text/xmlstarlet - dev-texlive/texlive-latexextra ) -" -RDEPEND=" - ${DEPEND} - net-analyzer/ospd-openvas -" -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 - - # https://github.com/greenbone/gvmd/pull/1819 - sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die -} - -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)" - ) - 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 - doins "${FILESDIR}/${PN}-daemon.conf" - - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${P}.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm/gvmd - fowners -R gvm:gvm /var/lib/gvm - - rm -r "${D}/run" || die -} diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild new file mode 100644 index 000000000000..c1263553cba5 --- /dev/null +++ b/net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2022 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="GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-group/gvm + acct-user/gvm + app-crypt/gpgme:1= + dev-db/postgresql:*[uuid] + dev-libs/glib:2 + dev-libs/libical:= + >=net-analyzer/gvm-libs-21.4.4 + net-libs/gnutls:=[tools] + doc? ( + app-text/xmlstarlet + dev-texlive/texlive-latexextra ) +" +RDEPEND=" + ${DEPEND} + net-analyzer/ospd-openvas +" +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 + + # https://github.com/greenbone/gvmd/pull/1819 + sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die + + # Upstream 3ebab6044818f1710b73c04e94fd9bea148c9853 + sed -i \ + -e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \ + -e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \ + config/gvmd.service.in || die +} + +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)" + ) + 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 + doins "${FILESDIR}/${PN}-daemon.conf" + + fowners -R gvm:gvm /etc/gvm + + newinitd "${FILESDIR}/${P}.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + fowners -R gvm:gvm /var/lib/gvm + + rm -r "${D}/run" || die +} -- cgit v1.2.3-65-gdbad