Merge branch 'master' into gvmd-9.0-into-master

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add setting "BPM Data" [#915](https://github.com/greenbone/gvmd/pull/915)
 - Automatically load predefined configs from the feed [#931](https://github.com/greenbone/gvmd/pull/931) [#933](https://github.com/greenbone/gvmd/pull/933) [#934](https://github.com/greenbone/gvmd/pull/934)
 - Automatically load predefined port lists from the feed [#950](https://github.com/greenbone/gvmd/pull/950) [#952](https://github.com/greenbone/gvmd/pull/952)
+- Automatically load predefined report formats from the feed [#968](https://github.com/greenbone/gvmd/pull/968)
 
 ### Changed
 - Update SCAP and CERT feed info in sync scripts [#810](https://github.com/greenbone/gvmd/pull/810)

src/CMakeLists.txt

@@ -106,7 +106,8 @@ add_executable (manage-utils-test
                 sql_pg.c manage_pg.c
                 lsc_user.c lsc_crypt.c utils.c
                 gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
-                gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)
+                gmp_port_lists.c gmp_report_formats.c gmp_tickets.c
+                gmp_tls_certificates.c)
 
 add_test (manage-utils-test manage-utils-test)
 
@@ -128,7 +129,8 @@ add_executable (manage-test
                 sql_pg.c manage_pg.c
                 lsc_user.c lsc_crypt.c utils.c
                 gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
-                gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)
+                gmp_port_lists.c gmp_report_formats.c gmp_tickets.c
+                gmp_tls_certificates.c)
 
 add_test (manage-test manage-test)
 
@@ -150,7 +152,7 @@ add_executable (gmp-tickets-test
                 sql_pg.c manage_pg.c
                 lsc_user.c lsc_crypt.c utils.c
                 gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
-                gmp_port_lists.c gmp_tls_certificates.c)
+                gmp_port_lists.c gmp_report_formats.c gmp_tls_certificates.c)
 
 add_test (gmp-tickets-test gmp-tickets-test)
 
@@ -179,7 +181,8 @@ add_executable (gvmd
                 sql_pg.c manage_pg.c
                 lsc_user.c lsc_crypt.c utils.c
                 gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
-                gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)
+                gmp_port_lists.c gmp_report_formats.c gmp_tickets.c
+                gmp_tls_certificates.c)
 
 target_link_libraries (gvmd m
                        ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
@@ -361,6 +364,7 @@ set (C_FILES "${CMAKE_CURRENT_SOURCE_DIR}/gvmd.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/gmp_get.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/gmp_configs.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/gmp_port_lists.c"
+  "${CMAKE_CURRENT_SOURCE_DIR}/gmp_report_formats.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/gmp_tickets.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/gmp_tls_certificates.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/manage.c"