Merge branch 'gvmd-21.04' of github.com:greenbone/gvmd into ssh_eleva…

…te_credential_different_to_ssh_credential
greenbone · Jun 24, 2021 · 51ec7f6 · 51ec7f6
2 parents fc25a57 + 6fe7052
commit 51ec7f6
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 17 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -66,8 +66,8 @@ jobs:
       - name: Install coverxygen and codecov
         run: |
             apt-get update && apt-get --assume-yes install python3-venv curl
-            python3 -m venv venv
-            . venv/bin/activate
+            python3 -m venv .venv
+            . .venv/bin/activate
             pip install setuptools --upgrade
             pip install 'coverxygen>=1.3.1' codecov
       - name: Download XML documentation artifact
@@ -78,7 +78,7 @@ jobs:
           path: /tmp/xml-doc
       - name: Establish documentation coverage
         run: |
-            . venv/bin/activate
+            . .venv/bin/activate
             python -m coverxygen --src-dir ${{ github.workspace }}      \
             --xml-dir ${{steps.xml-doc-download.outputs.download-path}} \
             --output lcov.info

diff --git a/.github/workflows/release-pontos-patch.yml b/.github/workflows/release-pontos-patch.yml
@@ -1,4 +1,4 @@
-name: Release Python package with pontos
+name: Release patch version with pontos
 
 on:
   pull_request:
@@ -26,8 +26,8 @@ jobs:
     - name: Install pontos
       run: |
         apt-get update && apt-get --assume-yes install python3-venv
-        python3 -m venv venv
-        . venv/bin/activate
+        python3 -m venv .venv
+        . .venv/bin/activate
         python -m pip install --upgrade pip
         python -m pip install --upgrade pontos
     - name: Tell git who I am
@@ -41,9 +41,9 @@ jobs:
       run: echo "Current Branch is $GITHUB_BASE_REF"
     - name: Prepare patch release with pontos
       run: |
-        . venv/bin/activate
+        . .venv/bin/activate
         pontos-release prepare --patch
     - name: Release with pontos
       run: |
-        . venv/bin/activate
+        . .venv/bin/activate
         pontos-release release
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 build/
 tags
 .ccls
+.venv
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [21.4.1] (unreleased)
+## [Unreleased]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+[Unreleased]: https://github.com/greenbone/gvmd/compare/v21.4.1...HEAD
+
+
+## [21.4.1] - 2021-06-23
 
 ### Added
 - Add NVT tag "deprecated" [#1536](https://github.com/greenbone/gvmd/pull/1536)
@@ -22,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix whole-only config family selection [#1517](https://github.com/greenbone/gvmd/pull/1517)
 - Migrate GMP Scanners to OSP Sensors [#1533](https://github.com/greenbone/gvmd/pull/1533)
 - Solved a peformance problem for tasks after scanning lots of hosts [#1567](https://github.com/greenbone/gvmd/pull/1567)
+- Solved a performance problem when filtering results by tags [#1579](https://github.com/greenbone/gvmd/pull/1579)
 
 [21.4.0]: https://github.com/greenbone/gvmd/compare/v21.4.0...gvmd-21.04
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
 message ("-- Configuring Greenbone Vulnerability Manager...")
 
 project (gvm
-         VERSION 21.4.0
+         VERSION 21.4.2
          LANGUAGES C)
 
 if (POLICY CMP0005)
@@ -53,7 +53,7 @@ endif (NOT CMAKE_BUILD_TYPE MATCHES "Release")
 
 # Set dev version if this is a development version and not a full release,
 # unset (put value 0 or delete line) before a full release and reset after.
-set (PROJECT_DEV_VERSION 0)
+set (PROJECT_DEV_VERSION 1)
 
 # If PROJECT_DEV_VERSION is set, the version string will be set to:
 #   "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"

diff --git a/INSTALL.md b/INSTALL.md
@@ -11,7 +11,7 @@ Prerequisites:
 * 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.0 ([gvm-libs](https://github.com/greenbone/gvm-libs/tree/gvm-libs-20.08) component)
+* libgvm_base, libgvm_util, libgvm_osp, libgvm_gmp >= 20.4.1 ([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)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,10 +26,10 @@ find_package (Threads)
 ## list and throw an error, otherwise long install-cmake-install-cmake cycles
 ## might occur.
 
-pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.04.0)
-pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.04.0)
-pkg_check_modules (LIBGVM_OSP REQUIRED libgvm_osp>=21.04.0)
-pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=21.04.0)
+pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4.1)
+pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4.1)
+pkg_check_modules (LIBGVM_OSP REQUIRED libgvm_osp>=21.4.1)
+pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=21.4.1)
 pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
 pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
 pkg_check_modules (LIBICAL REQUIRED libical>=1.00)

diff --git a/src/manage_pg.c b/src/manage_pg.c
@@ -868,7 +868,8 @@ manage_create_sql_functions ()
        "            AND (is_get OR name = arg_permission)) > 0;"
        "  RETURN ret;"
        " END;"
-       "$$ LANGUAGE plpgsql;");
+       "$$ LANGUAGE plpgsql"
+       " STABLE COST 1000;");
 
   /* Functions in SQL. */
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     build/
     tags
     .ccls
+    .venv