Merge branch 'gvmd-20.08' into get-vulns-min-qod

greenbone · Aug 11, 2020 · 91c94e5 · 91c94e5
2 parents 6a1ad11 + 4e6d5a7
commit 91c94e5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -145,6 +145,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Check permissions when applying tag in filter [#1222](https://github.com/greenbone/gvmd/pull/1222)
 - Add missing min_qod to FILTERS in GET_VULNS response [#1224](https://github.com/greenbone/gvmd/pull/1224)
 - Improve EXE installer NSIS script generation [#1226](https://github.com/greenbone/gvmd/pull/1226)
+- Add qod as name in results columns, for sorting [#1243](https://github.com/greenbone/gvmd/pull/1243)
 
 ### Removed
 - Remove support for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)

diff --git a/INSTALL.md b/INSTALL.md
@@ -7,17 +7,19 @@ necessary to install dependent development packages.
 ## Prerequisites for Greenbone Vulnerability Manager
 
 Prerequisites:
-* cmake >= 3.0
-* glib-2.0 >= 2.42
-* gnutls >= 3.2.15
-* libgvm_base, libgvm_util, libgvm_osp, libgvm_gmp >= 20.4
-* PostgreSQL database >= 9.6
-* pkg-config
-* libical >= 1.0.0
-* xml_split (recommended, lowers sync RAM usage, Debian package: xml-twig-tools)
 
-Prerequisites for certificate generation:
-* GnuTLS certtool
+* GCC (Debian package: gcc)
+* cmake >= 3.0 (Debian package: cmake)
+* glib-2.0 >= 2.42 (Debian package: libglib2.0-dev)
+* gnutls >= 3.2.15 (Debian package: libgnutls28-dev)
+* libgvm_base, libgvm_util, libgvm_osp, libgvm_gmp >= 20.08 ([gvm-libs](https://github.com/greenbone/gvm-libs/tree/gvm-libs-20.08) component)
+* PostgreSQL database >= 9.6 (Debian packages: libpq-dev postgresql-server-dev-11)
+* pkg-config (Debian package: pkg-config)
+* libical >= 1.0.0 (Debian package: libical-dev)
+
+Install these prerequisites on Debian GNU/Linux 'Buster' 10:
+
+    apt-get install gcc cmake libglib2.0-dev libgnutls28-dev libpq-dev postgresql-server-dev-11 pkg-config libical-dev
 
 Prerequisites for building documentation:
 * Doxygen
@@ -640,7 +642,13 @@ Prerequisites for key generation on systems with low entropy:
 * haveged (or a similar tool)
 
 Prerequisites for S/MIME suport (e.g. email encryption):
-* GNU privacy guard - S/MIME version
+* GNU privacy guard - S/MIME version (Debian package: gpgsm)
+
+Prerequisites for certificate generation:
+* GnuTLS certtool (Debian package: gnutls-bin)
+
+Prerequisites (recommended) to lower sync RAM usage
+* xml_split (Debian package: xml-twig-tools)
 
 ## Static code analysis with the Clang Static Analyzer
 

diff --git a/src/manage_sql.c b/src/manage_sql.c
@@ -21869,7 +21869,7 @@ where_qod (int min_qod)
     { "nvts.solution_type",                                                   \
       "solution_type",                                                        \
       KEYWORD_TYPE_STRING },                                                  \
-    { "results.qod", NULL, KEYWORD_TYPE_INTEGER },                            \
+    { "results.qod", "qod", KEYWORD_TYPE_INTEGER },                           \
     { "results.qod_type", NULL, KEYWORD_TYPE_STRING },                        \
     { "(CASE WHEN (hostname IS NULL) OR (hostname = '')"                      \
       " THEN (SELECT value FROM report_host_details"                          \

diff --git a/src/manage_sql_nvts.c b/src/manage_sql_nvts.c
@@ -1522,9 +1522,12 @@ update_nvts_from_vts (entity_t *get_vts_response,
                       "  GROUP BY nvts.oid"
                       "  ORDER BY nvts.oid ASC"
                       " )"
-                      " SELECT encode(digest(string_agg(nvt_str.vt_string,''),"
-                      "                      'sha256'),"
-                      "               'hex')"
+                      " SELECT encode"
+                      "         (digest"
+                      "           (coalesce (string_agg (nvt_str.vt_string, ''),"
+                      "                      ''),"
+                      "            'sha256'),"
+                      "          'hex')"
                       " FROM nvt_str;");
 
       if (strcmp (osp_vt_hash, db_vts_hash ? db_vts_hash : ""))