From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- net-analyzer/openvas-scanner/Manifest | 9 +- .../openvas-scanner/files/gvm-feed-sync-20.8.1.sh | 45 +++++++ .../openvas-scanner-20.8.1-rpath-qa-fix.patch | 14 +++ ...envas-scanner-7.0.1-disable-automagic-dep.patch | 33 ++++++ net-analyzer/openvas-scanner/metadata.xml | 1 + .../openvas-scanner/openvas-scanner-20.8.1.ebuild | 131 +++++++++++++++++++++ .../openvas-scanner/openvas-scanner-7.0.1.ebuild | 11 +- 7 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh create mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch create mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch create mode 100644 net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild (limited to 'net-analyzer/openvas-scanner') diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 3a3a9bf45c15..622b99feefd6 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,6 +1,9 @@ +AUX gvm-feed-sync-20.8.1.sh 1071 BLAKE2B e80f8e4bd72d3dd92b1bb15bdfcf1b90b3f4f7b86005c7387d39a8abbe2ed182f3c513b8658310d2838befaa19d7c2c50b650948aa629429114db99c52446736 SHA512 9cbfe6c0f264ab821a82029f6f8274cdd09ddbc73e886e36d07f3a3727a1b9d739c7c1458fca98d2ac6b65ea05681d227fb2a27c475b190d76ba2c9f2d447fb5 AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0 AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a +AUX openvas-scanner-20.8.1-rpath-qa-fix.patch 350 BLAKE2B f4179757f30a43da6fbff329f776a8173c95848f749052429804a4680d26740c6727f918b23517b2dea68a08a55294c9455bbc437f4bb44d0f06dcd056dd82bd SHA512 f873bed2df048fb60dc21665817f99cea6fa1e377f0a7d5c5163831dddbebd2b0ca4e5c94f1ca22ab54f3079ebd230882fc8a269ead21550780aea81b9c01476 AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05 +AUX openvas-scanner-7.0.1-disable-automagic-dep.patch 1100 BLAKE2B e5fe847c43636b883af91b34386a7d94bb1b088cddc3c95d8314c03dec25c1d071ed7562019abb5d31a75bb2c4fded63644552b411091889612ef6c5c1a837f4 SHA512 b6d678413ca2a4771dcd6833e19d754745f3a7530f227befdad745d30bf23862120cb18359c1088552db18fb13bf491ed4a47523f7326e628101c5ade4156c58 AUX openvas.conf 29 BLAKE2B 0cb02f4b349d996b07ca19a531b64a35692ce5afb0d1fd4b58b6c80ccce3caf82055b396b23fa14f561eb9b732afba0fdfccade4c33c5e300fa1aca41b3995b7 SHA512 7ae3c5eff9a63a5eaadee5886c80baa46ff123695a55e92f21178421bd69322b4c1c06615fd81ea461b61da12ff0e03f523ea3110105a58e709900a0e2d4eebc AUX openvassd-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82 AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181 @@ -8,8 +11,10 @@ AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c9 AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f31c31bfd43342beedab0bfe711f4e918aba5c7f8e5bb91430e251e270d0bc2e6f49e84ce98cdbbfe6d023 SHA512 397c9fd0d63ab66b463f65b6d235ec3e4e6ca52a3c811ddd4efcaeffc05fed8f9cd97605f439a628c144ecc1cfcfd31290d2a9dc6e57e8197d063b4aee63d73b AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64 +DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368 SHA512 6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571 +EBUILD openvas-scanner-20.8.1.ebuild 2984 BLAKE2B b3c5cd56b0e09f2cebf14b8cfa1cb0bede455af2dc36ad7d5f8b21c88931af20b86d6a7c1804ca0cb56926af2f4c97f48bcd77f7bac461aff71e178d8b72e1c5 SHA512 18d830098b3dfd0893896a8d44853213457cf848306e2d88bd20707923cf5db07a3fcdb89a4e2225ef1d1e0f0fd46ad480bf742edca33ea2e8f0b9391a247464 EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86 -EBUILD openvas-scanner-7.0.1.ebuild 2640 BLAKE2B f57aed40f1d1dbff974bb10678efd83217e80fe0f8338ff03f1d734db902756ceba435a31b89179b6cb991e0375359c6deccf306aa6f186ced2c7a78ba782918 SHA512 9e129a64e6da6772ac32dfd431fff961252474162fb07cd8d3c9974c0437c9558c83e6cc122b3938b2b31b154b9aa54e225292d659e7fb2bc1605afaf2208357 -MISC metadata.xml 973 BLAKE2B 390941ba04f59d58c28c94dbe8ba603019aa521050188c0bcdfbca46d6fd37d30930ad19393012dfd3c7d4cd4d06417e6d0e031b4c09d73fb9e785967edbf3e4 SHA512 2e5084edcb10d541a916c971d4182cd2c6609fc56ecf26197b1a5c1ec5523dc8f60c6f3c686f42f91ae90344d11ecc55b2bea7f01f28b46add830361ef60c894 +EBUILD openvas-scanner-7.0.1.ebuild 2753 BLAKE2B 6ccc736e47055f30eae052476e378a0777bfd6e074e032c95b093b50fbb202d07ab9ef0fbfa627a02aa875d1954771b6fdbf7e9e93262357df9a41f739704a64 SHA512 c90bcf71dc7d36e9a9f610e294c5d907a2bdd21258f35190fd72cde4fd1f626ddb5c08b8f7e7ee726c6683ecd65e6e538a01558e135da806c49a9abcebeedc4d +MISC metadata.xml 1064 BLAKE2B 4e41d122b933afb399f5e92933949b26010e62fa7ee8c7412f8c09bbdbe11a57cf21519069831e9f2414e51235c9756ca50a5700e0ba4eccb2e2b4009c9ac0f3 SHA512 00c74508df23503b717b1ca966203aa1904b48f1b08463219832436ed91d57a55aea34ba77189940cead04db01eef1db9ccc5d9eba52e00807e93414b260b25b diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh b/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh new file mode 100644 index 000000000000..178f49eb0493 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# GVM cron script that updates feed. + +# Start to update FEED & First NVT. +try=0 +until [ $try -ge 5 ]; do + greenbone-feed-sync --type GVMD_DATA --curl &>/dev/null && break + try=$[$try+1] + sleep 30 +done + +# Check status +if [ $? -eq 0 ]; then + # Avoid your IP temporary banned because of multiple connection + sleep 5 + # Try to update scapdata. + try=0 + until [ $try -ge 5 ]; do + greenbone-feed-sync --type SCAP &>/dev/null && break + try=$[$try+1] + sleep 30 + done + + # Check status + if [ $? -eq 0 ]; then + # Avoid your IP temporary banned because of multiple connection + sleep 5 + # Try to update certdata + try=0 + until [ $try -ge 5 ]; do + greenbone-feed-sync --type CERT &>/dev/null && break + try=$[$try+1] + sleep 30 + done + + # Check status + if [ $? -eq 0 ]; then + exit 0 + else + exit 1 + fi + fi +fi diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch new file mode 100644 index 000000000000..79e8692f4d6d --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69c68375..5bc000c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,8 @@ endif (NOT CMAKE_BUILD_TYPE) + + OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF) + ++set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) ++ + ## Retrieve git revision (at configure time) + include (GetGit) + + diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch new file mode 100644 index 000000000000..fd3e4610f8a4 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch @@ -0,0 +1,33 @@ +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index b594679c..81c5e4a9 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -100,14 +100,20 @@ execute_process (COMMAND gpgme-config --cflags + OUTPUT_VARIABLE GPGME_CFLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE) + +-message (STATUS "Looking for netsnmp...") +-find_library (SNMP netsnmp) +-message (STATUS "Looking for netsnmp... ${SNMP}") +-if (SNMP) +- execute_process (COMMAND net-snmp-config --libs +- OUTPUT_VARIABLE SNMP_LDFLAGS +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif (SNMP) ++option(BUILD_WITH_SNMP "Build with SNMP Support" ON) ++if (BUILD_WITH_SNMP) ++ message (STATUS "Looking for netsnmp...") ++ find_library (SNMP netsnmp) ++ message (STATUS "Looking for netsnmp... ${SNMP}") ++ if (SNMP) ++ execute_process (COMMAND net-snmp-config --libs ++ OUTPUT_VARIABLE SNMP_LDFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ endif (SNMP) ++ if (NOT SNMP) ++ message (SEND_ERROR " netsnmp not found") ++ endif(NOT SNMP) ++endif (BUILD_WITH_SNMP) + + message (STATUS "Looking for libgcrypt...") + find_library (GCRYPT gcrypt) diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml index 7e35c8db9689..35596363964d 100644 --- a/net-analyzer/openvas-scanner/metadata.xml +++ b/net-analyzer/openvas-scanner/metadata.xml @@ -12,6 +12,7 @@ Install a cron job to update GVM's feed daily. Html docs support + Build againts net-analyzer/net-snmp for "improved SNMP support" Open Vulnerability Assessment System (OpenVAS) Scanner is the Greenbone Vulnerability Management (GVM) Solution. diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild new file mode 100644 index 000000000000..22bdb9fec932 --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic toolchain-funcs + +MY_PN="openvas" +MY_DN="openvassd" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/openvas-scanner/" +SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2 GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="cron extras snmp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-group/gvm + acct-user/gvm + app-crypt/gpgme:= + dev-db/redis + dev-libs/glib + dev-libs/libgcrypt:= + dev-libs/libksba + >=net-analyzer/gvm-libs-20.8.0 + snmp? ( net-analyzer/net-snmp:= ) + net-libs/gnutls:= + net-libs/libpcap + net-libs/libssh:=" + +RDEPEND=" + ${DEPEND}" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + extras? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen )" + +PATCHES=( + "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch + #qa fix for rpath + "${FILESDIR}"/${P}-rpath-qa-fix.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0 + sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use extras; 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 + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DBUILD_WITH_SNMP=$(usex snmp)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use extras; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use extras; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + if use cron; then + # Install the cron job if they want it. + exeinto /etc/gvm + newexe "${FILESDIR}/gvm-feed-sync-${PV}.sh" gvm-feed-sync.sh + fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh + + insinto /etc/cron.d + newins "${FILESDIR}"/gvm-feed-sync.cron gvm + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + fowners gvm:gvm /var/log/gvm + keepdir /var/lib/openvas/{gnupg,plugins} + fowners -R gvm:gvm /var/lib/openvas + + insinto /etc/openvas + doins "${FILESDIR}/openvas.conf" +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild index 812b342a1ca3..1fc5a9111794 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> $ SLOT="0" LICENSE="GPL-2 GPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="cron extras test" +IUSE="cron extras snmp test" RESTRICT="!test? ( test )" DEPEND=" @@ -27,7 +27,7 @@ DEPEND=" dev-libs/libgcrypt:= dev-libs/libksba >=net-analyzer/gvm-libs-11.0.1 - net-analyzer/net-snmp + snmp? ( net-analyzer/net-snmp:= ) net-libs/gnutls:= net-libs/libpcap net-libs/libssh:=" @@ -48,6 +48,10 @@ BDEPEND=" ) test? ( dev-libs/cgreen )" +PATCHES=( + "${FILESDIR}"/${P}-disable-automagic-dep.patch +) + BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" S="${WORKDIR}/${MY_PN}-${PV}" @@ -75,6 +79,7 @@ src_configure() { "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" "-DSBINDIR=${EPREFIX}/usr/bin" + "-DBUILD_WITH_SNMP=$(usex snmp)" ) cmake_src_configure } -- cgit v1.2.3