Skip to content

Commit

Permalink
Merge branch 'main' into gmp-doc-get-aggregates-overall-text-col-2
Browse files Browse the repository at this point in the history
  • Loading branch information
a-h-abdelsalam authored Sep 4, 2024
2 parents 91f4f5a + 3390f9f commit 6224b0a
Show file tree
Hide file tree
Showing 26 changed files with 2,766 additions and 602 deletions.
16 changes: 14 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
message ("-- Configuring Greenbone Vulnerability Manager...")

project (gvm
VERSION 23.7.1
VERSION 23.9.1
LANGUAGES C)

if (POLICY CMP0005)
Expand Down Expand Up @@ -247,13 +247,25 @@ if (NOT CVSS3_RATINGS)
endif (NOT CVSS3_RATINGS)
add_definitions (-DCVSS3_RATINGS=${CVSS3_RATINGS})

if (NOT COMPLIANCE_REPORTS)
set (COMPLIANCE_REPORTS 0)
endif (NOT COMPLIANCE_REPORTS)
add_definitions (-DCOMPLIANCE_REPORTS=${COMPLIANCE_REPORTS})

message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}")

## Version

set (GVMD_VERSION "${PROJECT_VERSION_STRING}")

if (COMPLIANCE_REPORTS EQUAL 1)
set(IF_COMPLIANCE_REPORTS "")
set(ENDIF_COMPLIANCE_REPORTS "")
elseif (COMPLIANCE_REPORTS EQUAL 0)
set(IF_COMPLIANCE_REPORTS "<!--")
set(ENDIF_COMPLIANCE_REPORTS "-->")
endif()

# Configure Doxyfile with version number
configure_file (doc/Doxyfile.in doc/Doxyfile)
configure_file (doc/Doxyfile_full.in doc/Doxyfile_full)
Expand Down Expand Up @@ -402,7 +414,7 @@ install (FILES src/alert_methods/vFire/alert
DESTINATION ${GVMD_DATA_DIR}/global_alert_methods/159f79a5-fce8-4ec5-aa49-7d17a77739a3/
PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (CODE "file (MAKE_DIRECTORY \$ENV{DESTDIR}${GVMD_DATA_DIR}/wizards)")
install (CODE "file (MAKE_DIRECTORY \$ENV{DESTDIR}${GVMD_DATA_DIR}/wizards)")

install (FILES src/wizards/quick_first_scan.xml
src/wizards/get_tasks_deep.xml
Expand Down
9 changes: 9 additions & 0 deletions doc/gvmd.8
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ File mode of the unix socket
\fB--listen-owner=\fISTRING\fB\f1
Owner of the unix socket
.TP
\fB--max-concurrent-scan-updates=\fINUMBER\fB\f1
Maximum number of scan updates that can run at the same time. Default: 0 (unlimited).
.TP
\fB--max-email-attachment-size=\fINUMBER\fB\f1
Maximum size of alert email attachments, in bytes.
.TP
Expand All @@ -121,9 +124,15 @@ Maximum size of user-defined message text in alert emails, in bytes.
\fB--max-ips-per-target=\fINUMBER\fB\f1
Maximum number of IPs per target.
.TP
\fB--mem-wait-retries=\fINUMBER\fB\f1
How often to try waiting for available memory. Default: 30. Each retry will wait for 10 seconds.
.TP
\fB-m, --migrate\f1
Migrate the database and exit.
.TP
\fB--min-mem-feed-update=\fINUMBER\fB\f1
Minimum memory in MiB for feed updates. Default: 0. Feed updates are skipped if less physical memory is available.
.TP
\fB--modify-scanner=\fISCANNER-UUID\fB\f1
Modify scanner SCANNER-UUID and exit.
.TP
Expand Down
27 changes: 27 additions & 0 deletions doc/gvmd.8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p>Owner of the unix socket</p>
</optdesc>
</option>
<option>
<p><opt>--max-concurrent-scan-updates=<arg>NUMBER</arg></opt></p>
<optdesc>
<p>
Maximum number of scan updates that can run at the same time.
Default: 0 (unlimited).
</p>
</optdesc>
</option>
<option>
<p><opt>--max-email-attachment-size=<arg>NUMBER</arg></opt></p>
<optdesc>
Expand All @@ -287,12 +296,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p>Maximum number of IPs per target.</p>
</optdesc>
</option>
<option>
<p><opt>--mem-wait-retries=<arg>NUMBER</arg></opt></p>
<optdesc>
<p>
How often to try waiting for available memory. Default: 30.
Each retry will wait for 10 seconds.
</p>
</optdesc>
</option>
<option>
<p><opt>-m, --migrate</opt></p>
<optdesc>
<p>Migrate the database and exit.</p>
</optdesc>
</option>
<option>
<p><opt>--min-mem-feed-update=<arg>NUMBER</arg></opt></p>
<optdesc>
<p>
Minimum memory in MiB for feed updates. Default: 0.
Feed updates are skipped if less physical memory is available.
</p>
</optdesc>
</option>
<option>
<p><opt>--modify-scanner=<arg>SCANNER-UUID</arg></opt></p>
<optdesc>
Expand Down
27 changes: 27 additions & 0 deletions doc/gvmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,15 @@ <h2>Options</h2>



<p><b>--max-concurrent-scan-updates=<em>NUMBER</em></b></p>

<p>
Maximum number of scan updates that can run at the same time.
Default: 0 (unlimited).
</p>



<p><b>--max-email-attachment-size=<em>NUMBER</em></b></p>

<p>Maximum size of alert email attachments, in bytes.</p>
Expand All @@ -242,12 +251,30 @@ <h2>Options</h2>



<p><b>--mem-wait-retries=<em>NUMBER</em></b></p>

<p>
How often to try waiting for available memory. Default: 30.
Each retry will wait for 10 seconds.
</p>



<p><b>-m, --migrate</b></p>

<p>Migrate the database and exit.</p>



<p><b>--min-mem-feed-update=<em>NUMBER</em></b></p>

<p>
Minimum memory in MiB for feed updates. Default: 0.
Feed updates are skipped if less physical memory is available.
</p>



<p><b>--modify-scanner=<em>SCANNER-UUID</em></b></p>

<p>Modify scanner SCANNER-UUID and exit.</p>
Expand Down
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ add_executable (manage-utils-test

debug_utils.c
gvmd.c gmpd.c
ipc.c
manage.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down Expand Up @@ -140,6 +141,7 @@ add_executable (manage-test

debug_utils.c
gvmd.c gmpd.c
ipc.c
manage_utils.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down Expand Up @@ -171,6 +173,7 @@ add_executable (manage-sql-test

debug_utils.c
gvmd.c gmpd.c
ipc.c
manage_utils.c manage.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down Expand Up @@ -202,6 +205,7 @@ add_executable (gmp-tickets-test

debug_utils.c
gvmd.c gmpd.c
ipc.c
manage_utils.c manage.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down Expand Up @@ -233,6 +237,7 @@ add_executable (utils-test

debug_utils.c
gvmd.c gmpd.c
ipc.c
manage_utils.c manage.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down Expand Up @@ -281,6 +286,7 @@ add_executable (gvmd
main.c gvmd.c
debug_utils.c
gmpd.c
ipc.c
manage_utils.c manage.c sql.c
manage_acl.c manage_configs.c manage_get.c
manage_license.c
Expand Down
Loading

0 comments on commit 6224b0a

Please sign in to comment.