From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-analyzer/openvas-scanner/Manifest | 13 +-- .../files/openvas-scanner-5.1.3-cachedir.patch | 42 ---------- .../files/openvas-scanner-5.1.3-gcc8.patch | 42 ---------- .../files/openvas-scanner-5.1.3-nvt.patch | 93 ---------------------- .../files/openvas-scanner-daemon.conf | 9 --- .../openvas-scanner/files/openvas-scanner.init | 25 ------ .../files/openvas-scanner.logrotate | 11 --- .../openvas-scanner/files/openvas-scanner.service | 21 ----- .../files/openvas-scanner.tmpfiles.d | 1 - net-analyzer/openvas-scanner/files/openvassd.conf | 53 ------------ .../openvas-scanner/openvas-scanner-5.1.3.ebuild | 93 ---------------------- .../openvas-scanner/openvas-scanner-6.0.1.ebuild | 22 +++-- 12 files changed, 11 insertions(+), 414 deletions(-) delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner.init delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner.logrotate delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner.service delete mode 100644 net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d delete mode 100644 net-analyzer/openvas-scanner/files/openvassd.conf delete mode 100644 net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild (limited to 'net-analyzer/openvas-scanner') diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 184c0e4075bb..117009f24dda 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,23 +1,12 @@ AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0 AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a -AUX openvas-scanner-5.1.3-cachedir.patch 1605 BLAKE2B d5e54d1196000fe9f8a65efcf3d71f3ef29af1cfff5fedbfe7cd753a731e6bd4be6c1f24534b87a2194dcfa146d156ed0ddae076e72bfd229e1e01497985d7a1 SHA512 27efb9e318137390592652db1444141910ddf7975ada760bc6914c21c4eb11e4ded1aa377c37f5c7a67dfd145ec723fd77bbdd9b8ac0af6bf317a07d54642d11 -AUX openvas-scanner-5.1.3-gcc8.patch 1253 BLAKE2B ef876d70238b3b0fdaea320fdb9bcffc520bbe6762f220678a39bd99853fcabb27ed3bd44a0e02a7e1e8b93d3af530e4d4b33baaf1060c8b0589593ef5b30e8e SHA512 817e27de3b2d16bce81d3c1abbc6ced63cd6f272762ac00a8bc9ab6c5ccb765c81df1158caed58c64f897712c78fb7f0a02dcb2137dd859c3d48725e6e2699d6 -AUX openvas-scanner-5.1.3-nvt.patch 2576 BLAKE2B fed6211a6c4e9f1bed4abedf218e17f0d863e59de869424398d845e479d037f96758486fc03727c14e036814c2efa4e9dab940e032507339a1b6f2f2cda4c4c6 SHA512 b3f6b8cba51fb6c6d0eab189391a848e8f33d24f3b59bcd8f48b562812b1f79a46f3b92b01a8f231a765616fde6c0b37634f9845a5e4ba453c4aeeafed0ce8c1 AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05 -AUX openvas-scanner-daemon.conf 176 BLAKE2B 9e0a248736617d3d0a163f3586db92da4a5f273b354a472977b411d29ace507977228407a57cf11378af6ce95275a3d72518ba1b069bdc7293c2fe20d7e29e0b SHA512 3b5dcae3d2770769e627e28064e73746f9ad22aca5c9927e04583bfc3907fa538c2010bd0e5de3737979cede63d44175a645adb55391a5e2a71e96e6d31dd1f9 -AUX openvas-scanner.init 620 BLAKE2B a32349eed21d71e4968ee09fdff007aab532943e093e6b1aed9c26c474c2ab419dc5eb2e382300be85d6d34c57a521b3ac67dc1a44dd3c8045bd94aac19ea6e4 SHA512 e77c5e383504817e9ab0a98517f3e5553458b482f576f1f1965d26c5808ec7f2eac836dff0248f0f6be8dfb22aa188232c9df85af4104cc5730ad587dd52a2b0 -AUX openvas-scanner.logrotate 222 BLAKE2B 264e3b0fa47f7d933ee1f9c5d120e267a8387df8c8e5cfb8b09b23d28b983c666684430dc9aa389938dac71bef69480d74ab24fd393134ed33d9a3518314c91e SHA512 1c8b50626de9bcd7d26323d82d28ae4d25f5ce0382cfb0b16b91e58e75c05f565c7cdf19fe441647b5cd3c2ebc312b171eb6fa22c310fac1f76a0629544f030c -AUX openvas-scanner.service 455 BLAKE2B be6f94c3d383ea1c647effc462aeddac384e4c2507a9f1145d4dc39badcb810cbca7d4c8eba74e64942d2a5895b058cad7ac3fdcfaa4c5de7335cefcb70db366 SHA512 108a13b9cbbb86acc99a4271fa5b1a051022e42f30866bd490ae606c1ffac202c61aa5bf5a1f7ee10b276484135f8f868625debbb142a802c0ff2a4c011a8206 -AUX openvas-scanner.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754 AUX openvassd-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82 -AUX openvassd.conf 1288 BLAKE2B d1ae7db928d797014e0382d8be3a08793efbcaa3663629c0d1c6c2d871ccf16588605fa4be21d71556893092b21ecfef72c31d40411d35dd97f8652eca6232c0 SHA512 5bb499fcd03aac4de981a64a17fa760b29b1f83d0afcdb73cdfdeb0f492b02bc383d32544fd133c6b953e73ea9ff0dc042e8dba76c22def3ee00d6f3bdd980b8 AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181 AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c92274a2fea1e44efe3f96bd3e7016740f4dcabff034173b541058d18f99081bd232a098a56d8e572 SHA512 1b0f13ab77f332708e9efb9cad06c47e61e47f68597c797e3f5140a921acaa2b856c10003938f737a20b534caaee7d3bb446d427373d8be8ef3fe7c83ee11b82 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-5.1.3.tar.gz 254159 BLAKE2B d90fa15e143ead53abce66f933a3a4cac327176cca0f23bd88fe771ed7726b1891784ae980644c8335e560d348753115e43cfae83af9704e2d1d02827163563f SHA512 5712ab275058877cfd656e268ed09c81db6617ae247c17092f1fcd037f692f2018daf21b09b82401f99a7361bb485f0e0f7d63f8ff2387839cfdd5a3aaf8424e DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 -EBUILD openvas-scanner-5.1.3.ebuild 2142 BLAKE2B 5984c99659d1a41c3739a1de5077f5ca8dd25c668e97c7a1f59a6efceb95fed25daceb8c8f6b5971c842e016d1843dff8527d253d1347ea0d91a67d633c2d859 SHA512 d66a67f3803c071f20e6a1c9132ca771e9286f9c6446e781b6077323ae32417d2061169543c34de91f3a9ca1ec7a4bfaf9472aead66b983a46d163ea88137480 -EBUILD openvas-scanner-6.0.1.ebuild 3324 BLAKE2B bc10da8ad9cdef4cc124f0e50879c07120a49cff1ea37d7b99462209104e1a252dc1808033cb1c69bc8010b4cf7620aef3852c9bbae424f90673892042240ad9 SHA512 7d6daa1c624ce54f5b5d683d764d972648289d4837b2f927ad9d39c5fd9149b3db4c267cb2b0d6d3032d4419d57a9881f34ef97ee66f2aefe9f2a1a1f088b1a9 +EBUILD openvas-scanner-6.0.1.ebuild 3200 BLAKE2B f6b5b723f4946e4ad05fcf18b5355c9e6b3c1c268ebad6f0bb6dbfa2f54ac979321cdb75e86688b3304a5879aa29b5ae126d26c8e9217b6fdbdf882a03464bbc SHA512 84d003b3a6f0fa44dae6a7cefa3d154d750b81bbff392d6df7f7df6ae5587f4bf964c3ac1331bedc7ade2e13255c58536f2a4ae1272f4a69025d6ee2bdbac606 MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1 diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch deleted file mode 100644 index 98c657250197..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- openvas-scanner-5.1.3/src/openvassd.c 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/openvassd.c 2019-02-04 03:28:24.635539266 +0300 -@@ -103,7 +103,6 @@ - */ - static openvassd_option openvassd_defaults[] = { - {"plugins_folder", OPENVAS_NVT_DIR}, -- {"cache_folder", OPENVAS_CACHE_DIR}, - {"include_folders", OPENVAS_NVT_DIR}, - {"max_hosts", "30"}, - {"max_checks", "10"}, ---- openvas-scanner-5.1.3/src/CMakeLists.txt 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/CMakeLists.txt 2019-02-04 03:22:20.078824664 +0300 -@@ -68,10 +68,6 @@ - add_definitions (-DOPENVAS_NVT_DIR=\\\"${OPENVAS_NVT_DIR}\\\") - endif (OPENVAS_NVT_DIR) - --if (OPENVAS_CACHE_DIR) -- add_definitions (-DOPENVAS_CACHE_DIR=\\\"${OPENVAS_CACHE_DIR}\\\") --endif (OPENVAS_CACHE_DIR) -- - if (OPENVAS_LOG_DIR) - add_definitions (-DOPENVAS_LOG_DIR=\\\"${OPENVAS_LOG_DIR}\\\") - endif (OPENVAS_LOG_DIR) ---- openvas-scanner-5.1.3/CMakeLists.txt 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/CMakeLists.txt 2019-02-04 03:18:37.889999639 +0300 -@@ -166,7 +166,6 @@ - set (OPENVAS_DATA_DIR "${DATADIR}/openvas") - set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas") - set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas") --set (OPENVAS_CACHE_DIR "${LOCALSTATEDIR}/cache/openvas") - set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas") - - if (NOT OPENVAS_NVT_DIR) -@@ -265,7 +264,6 @@ - DESTINATION ${DATADIR}/doc/openvas-scanner/ ) - - install (DIRECTORY DESTINATION ${OPENVAS_NVT_DIR}) --install (DIRECTORY DESTINATION ${OPENVAS_CACHE_DIR}) - - ## Tests - - diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch deleted file mode 100644 index 4ec2e786e125..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- openvas-scanner-5.1.3/src/ntp.c 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/ntp.c 2019-02-02 00:57:56.832878754 +0300 -@@ -361,9 +361,7 @@ - } - - /*---------------------------------------------------------- -- - Communication protocol: timestamps -- - ----------------------------------------------------------*/ - - -@@ -391,7 +389,7 @@ - static int - __ntp_timestamp_scan_host (int soc, char *msg, char *host) - { -- char timestr[1024]; -+ char timestr[64]; - char *tmp; - time_t t; - int len; ---- openvas-scanner-5.1.3/src/pluginload.c 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/pluginload.c 2019-02-02 00:59:24.494774959 +0300 -@@ -250,7 +250,7 @@ - g_slist_free_full (oids, g_free); - } - --static int -+static void - plugins_reload_from_dir (void *folder) - { - GSList *files = NULL, *f; ---- openvas-scanner-5.1.3/src/processes.h 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/processes.h 2019-02-02 01:06:42.772908314 +0300 -@@ -28,7 +28,7 @@ - #ifndef _OPENVAS_THREADS_H - #define _OPENVAS_THREADS_H - --typedef int (*process_func_t) (void *); -+typedef void (*process_func_t) (void *); - pid_t create_process (process_func_t, void *); - int terminate_process (pid_t); diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch deleted file mode 100644 index 67091fcf3e3b..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- openvas-scanner-5.1.3/src/attack.c 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/attack.c 2019-02-02 00:44:12.834888067 +0300 -@@ -97,9 +97,7 @@ - }; - - /******************************************************* -- - PRIVATE FUNCTIONS -- - ********************************************************/ - - /** -@@ -996,6 +994,14 @@ - sched = plugins_scheduler_init - (prefs_get ("plugin_set"), prefs_get_bool ("auto_enable_dependencies"), - network_phase); -+ if (sched == NULL) -+ { -+ error_message_to_client (global_socket, -+ "Failed to initialize the plugins scheduler.", -+ NULL, NULL); -+ return; -+ } -+ - - max_hosts = get_max_hosts_number (); - max_checks = get_max_checks_number (); ---- openvas-scanner-5.1.3/src/pluginscheduler.c 2018-08-29 19:27:26.000000000 +0300 -+++ openvas-scanner-5.1.3/src/pluginscheduler.c 2019-02-02 00:48:03.799598381 +0300 -@@ -486,7 +486,7 @@ - } - } - --static void -+static int - plugins_scheduler_fill (plugins_scheduler_t sched) - { - int i; -@@ -500,6 +500,15 @@ - int category; - - category = nvticache_get_category (element->data); -+ if (category < 0) -+ { -+ log_write ("The NVT with oid %s has not category assigned. This is " -+ "considered a fatal error, since the NVTI Cache " -+ "structure stored in Redis is out dated or corrupted.", -+ (char *) element->data); -+ g_slist_free_full (list, g_free); -+ return 1; -+ } - scheduler_plugin = g_malloc0 (sizeof (struct scheduler_plugin)); - scheduler_plugin->running_state = PLUGIN_STATUS_UNRUN; - scheduler_plugin->oid = g_strdup (element->data); -@@ -529,6 +538,7 @@ - } - } - -+ return 0; - } - - plugins_scheduler_t -@@ -540,7 +550,11 @@ - /* Fill our lists */ - ret = g_malloc0 (sizeof (*ret)); - ret->hash = hash_init (); -- plugins_scheduler_fill (ret); -+ if (plugins_scheduler_fill (ret)) -+ { -+ plugins_scheduler_free (ret); -+ return NULL; -+ } - - plugins_scheduler_enable (ret, plugins_list, autoload); - -@@ -729,9 +743,12 @@ - void - plugins_scheduler_free (plugins_scheduler_t sched) - { -- int i; -- hash_destroy (sched->hash); -- for (i = ACT_FIRST; i <= ACT_LAST; i++) -- list_destroy (sched->list[i]); -- g_free (sched); -+ if (sched) -+ { -+ int i; -+ hash_destroy (sched->hash); -+ for (i = ACT_FIRST; i <= ACT_LAST; i++) -+ list_destroy (sched->list[i]); -+ g_free (sched); -+ } - } diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf b/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf deleted file mode 100644 index f14b5aae6f12..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf +++ /dev/null @@ -1,9 +0,0 @@ -# OpenVAS Scanner command args - -# e.g --foreground -OPENVAS_SCANNER_OPTIONS="" - -# Scanner listen socket -OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock" - - diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.init b/net-analyzer/openvas-scanner/files/openvas-scanner.init deleted file mode 100644 index 757b5801f29b..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="OpenVAS Scanner" -command="/usr/sbin/openvassd" -command_args="${OPENVAS_SCANNER_OPTIONS} ${OPENVAS_SCANNER_LISTEN_SOCKET}" -pidfile="/var/run/openvassd.pid" -command_background="true" - -depend() { - after bootmisc - need localmount net redis -} - -start_pre() { - checkpath --directory --mode 0775 --quiet /var/cache/openvas -} - -create_cache() { - checkpath --directory --mode 0775 --quiet /var/cache/openvas - ebegin "Generating initial Cache" - /usr/sbin/openvassd --foreground --only-cache - eend $? -} diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate b/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate deleted file mode 100644 index 89f9e6d264df..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -# logrotate for openvas scanner -/var/log/openvas/openvassd.messages { - rotate 4 - weekly - compress - delaycompress - missingok - postrotate - /bin/kill -HUP `pidof openvassd` - endscript -} diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.service b/net-analyzer/openvas-scanner/files/openvas-scanner.service deleted file mode 100644 index 4f30586ab517..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=OpenVAS Scanner -After=network.target -After=redis.service -Before=gvmd.service -Requires=redis.service - -[Service] -Type=forking -EnvironmentFile=-/etc/openvas/sysconfig/openvas-scanner-daemon.conf -ExecStart=/usr/sbin/openvassd $OPENVAS_SCANNER_OPTIONS $OPENVAS_SCANNER_LISTEN_SOCKET -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure -RestartSec=10 -KillMode=mixed -User=root -Group=root -TimeoutSec=1200 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d b/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d deleted file mode 100644 index 18e820caec1b..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /var/cache/openvassd 0775 diff --git a/net-analyzer/openvas-scanner/files/openvassd.conf b/net-analyzer/openvas-scanner/files/openvassd.conf deleted file mode 100644 index b218a4a27b02..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.conf +++ /dev/null @@ -1,53 +0,0 @@ -#You can get detailed informations from https://linux.die.net/man/8/openvassd - -plugins_folder = /var/lib/openvas/plugins -include_folders = /var/lib/openvas/plugins -max_hosts = 30 -max_checks = 10 - -#Resource friendly -be_nice = no - -#Logfile -logfile = /var/log/openvas/openvassd.messages - -log_whole_attack = no -log_plugins_name_at_load = no -dumpfile = /var/log/openvas/openvassd.dump -cgi_path = /cgi-bin:/scripts - -#Turn off for push hard but increase false positive and slow down scans -optimize_test = yes - -checks_read_timeout = 5 -network_scan = no -non_simult_ports = 139, 445 -plugins_timeout = 320 -scanner_plugins_timeout = 36000 - -#Push harder to target -safe_checks = no - -auto_enable_dependencies = yes -use_mac_addr = no -nasl_no_signature_check = yes -drop_privileges = no -unscanned_closed = yes -unscanned_closed_udp = yes -vhosts = -vhosts_ip = -report_host_details = yes - -#Redis listening socket (must be same with redis socket) -kb_location = /tmp/redis.sock - -timeout_retry = 3 -time_between_request = 0 - -#Config File -config_file = /etc/openvas/openvassd.conf - -#Certificates (default these are not needed here but setup-check script looking for them) -cert_file = /var/lib/openvas/CA/servercert.pem -key_file = /var/lib/openvas/private/CA/serverkey.pem -ca_file = /var/lib/openvas/CA/cacert.pem diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild deleted file mode 100644 index ece8f93f9010..000000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake-utils systemd -MY_PN="openvas-scanner" - -DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)" -HOMEPAGE="http://www.openvas.org/" -SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -DEPEND=" - dev-db/redis - dev-libs/libgcrypt:0= - >=net-analyzer/openvas-libraries-9.0.3 - net-libs/gnutls:=[tools] - net-libs/libssh:= - extras? ( dev-perl/CGI )" - -RDEPEND=" - ${DEPEND} - !net-analyzer/openvas-tools" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/SQL-Translator - )" - -PATCHES=( - "${FILESDIR}/${P}-gcc8.patch" - "${FILESDIR}/${P}-nvt.patch" - "${FILESDIR}/${P}-cachedir.patch" -) - -src_prepare() { - cmake-utils_src_prepare - # Fix for correct FHS/Gentoo policy paths for 5.1.3 - sed -i "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/CMakeLists.txt || die - if use extras; then - doxygen -u "$S"/doc/Doxyfile_full.in || die - fi -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use extras; then - cmake-utils_src_make -C "${BUILD_DIR}" doc - cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi -} - -src_install() { - cmake-utils_src_install - - insinto /etc/openvas - doins "${FILESDIR}"/openvassd.conf "${FILESDIR}"/redis.conf.example - - insinto /etc/openvas/sysconfig - doins "${FILESDIR}"/${MY_PN}-daemon.conf - - newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN} - newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN} - - systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" ${MY_PN}.conf - systemd_dounit "${FILESDIR}"/${MY_PN}.service - - keepdir /var/lib/openvas/plugins -} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild index 1700d9421816..aeedaa6e04f9 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake-utils flag-o-matic systemd toolchain-funcs +inherit cmake flag-o-matic systemd toolchain-funcs MY_PN="openvas" MY_DN="openvassd" @@ -31,9 +31,7 @@ DEPEND=" " RDEPEND=" - ${DEPEND} - !~net-analyzer/openvas-scanner-5.1.3 - !net-analyzer/openvas-tools" + ${DEPEND}" BDEPEND=" sys-devel/bison @@ -55,7 +53,7 @@ PATCHES=( ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1 sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die # QA-Fix | Remove !CLANG doxygen warnings for 6.0.1 @@ -82,21 +80,21 @@ src_configure() { # Add release hardening flags for 6.0.1 append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector append-ldflags -Wl,-z,relro -Wl,-z,now - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use extras; then - cmake-utils_src_make -C "${BUILD_DIR}" doc - cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) fi - cmake-utils_src_make rebuild_cache + cmake_build rebuild_cache } src_install() { - cmake-utils_src_install + cmake_src_install dodir /etc/openvas insinto /etc/openvas -- cgit v1.2.3