From e6fd780bd6d94602cc9f3dd9d01a4dc1d578b057 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Tue, 9 Jul 2024 15:20:06 +0200
Subject: [PATCH 01/29] GMP doc: add details attribute to GET_CREDENTIALS

---
 src/schema_formats/XML/GMP.xml.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 5d7c32b94..2cd6d36b1 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10682,6 +10682,11 @@ END:VCALENDAR
         <summary>ID of filter to use to filter query</summary>
         <type>uuid</type>
       </attrib>
+      <attrib>
+        <name>details</name>
+        <summary>Whether to include certificate info</summary>
+        <type>boolean</type>
+      </attrib>
       <attrib>
         <name>scanners</name>
         <summary>Whether to include a list of scanners using the credentials</summary>

From 61914200fbbf914940c6948d88914b93ef076476 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:11:25 +0000
Subject: [PATCH 02/29] Bump docker/build-push-action from 5 to 6

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-container.yml | 2 +-
 .github/workflows/container.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index b927fd34d..3133f6ced 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 88aa3ef3e..e59303eff 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push Container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'main') }}

From 37e6cc5f551a12c27a26dc342e4adb34a1542107 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Tue, 9 Jul 2024 16:24:08 +0200
Subject: [PATCH 03/29] GMP doc: add GVMD_DATA to feed types

---
 src/schema_formats/XML/GMP.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 5d7c32b94..a8f4c3050 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -11342,7 +11342,7 @@ END:VCALENDAR
     <pattern>
       <attrib>
         <name>type</name>
-        <summary>Type of single feed to get: NVT, CERT or SCAP</summary>
+        <summary>Type of single feed to get: NVT, CERT, SCAP or GVMD_DATA</summary>
         <type>text</type>
       </attrib>
     </pattern>
@@ -11372,7 +11372,7 @@ END:VCALENDAR
         </pattern>
         <ele>
           <name>type</name>
-          <summary>The type of feed: NVT, CERT or SCAP</summary>
+          <summary>The type of feed: NVT, CERT, SCAP or GVMD_DATA</summary>
           <pattern>text</pattern>
         </ele>
         <ele>

From 86de30b7106761c22f8d302937c31d340df61520 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Tue, 9 Jul 2024 16:40:49 +0200
Subject: [PATCH 04/29] GMP doc: remove USER from CURRENTLY_SYNCING in
 GET_FEEDS

---
 src/schema_formats/XML/GMP.xml.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index a8f4c3050..54efe4a1a 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -11406,18 +11406,12 @@ END:VCALENDAR
           <summary>Present if a sync of this type is underway</summary>
           <pattern>
             <e>timestamp</e>
-            <e>user</e>
           </pattern>
           <ele>
             <name>timestamp</name>
             <summary>Time sync started</summary>
             <pattern>text</pattern>
           </ele>
-          <ele>
-            <name>user</name>
-            <summary>Name of user who is performing sync</summary>
-            <pattern>text</pattern>
-          </ele>
         </ele>
       </ele>
     </response>

From 2b79857ebce21731b72256824ad7f92bd447c891 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Tue, 9 Jul 2024 15:49:20 +0200
Subject: [PATCH 05/29] GMP doc: make key/package/cert element optional in
 GET_CREDENTIALS

---
 src/schema_formats/XML/GMP.xml.in | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 54efe4a1a..57b89d709 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10755,11 +10755,13 @@ END:VCALENDAR
           <o><e>certificate_info</e></o>
           <o><e>scanners</e></o>
           <o><e>targets</e></o>
-          <or>
-            <e>public_key</e>
-            <e>package</e>
-            <e>certificate</e>
-          </or>
+          <o>
+            <or>
+              <e>public_key</e>
+              <e>package</e>
+              <e>certificate</e>
+            </or>
+          </o>
         </pattern>
         <ele>
           <name>owner</name>

From 3a2030f80a231e7185ca189e9f42c54b3183a1ef Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 20:56:20 +0200
Subject: [PATCH 06/29] GMP doc: correct summary of IN_USE in GET_ASSETS

---
 src/schema_formats/XML/GMP.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 09195497c..a44b82c12 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -9150,7 +9150,7 @@ END:VCALENDAR
       </attrib>
       <attrib>
         <name>details</name>
-        <summary>Whether to include additional information (e.g., tags)</summary>
+        <summary>Whether to include additional information (e.g. tags)</summary>
         <type>boolean</type>
       </attrib>
     </pattern>
@@ -9515,7 +9515,7 @@ END:VCALENDAR
         </ele>
         <ele>
           <name>in_use</name>
-          <summary>Whether any tasks are using the asset</summary>
+          <summary>Whether the asset is in use</summary>
           <pattern><t>boolean</t></pattern>
         </ele>
         <ele>

From 2a1a18c47cc3c818aec321c8e234a6a89f74ce85 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 20:57:13 +0200
Subject: [PATCH 07/29] Remove out of date comment

WRITABLE is 0 for OS assets.
---
 src/gmp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gmp.c b/src/gmp.c
index 1587fe6e3..f98cc69f6 100644
--- a/src/gmp.c
+++ b/src/gmp.c
@@ -11719,7 +11719,6 @@ handle_get_assets (gmp_parser_t *gmp_parser, GError **error)
       gchar *routes_xml;
 
       asset = get_iterator_resource (&assets);
-      /* Assets are currently always writable. */
       if (send_get_common ("asset", &get_assets_data->get, &assets,
                            gmp_parser->client_writer,
                            gmp_parser->client_writer_data,

From dd403a928cd9b4fc5b98d5ed9a4c4301f96cb08a Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 21:11:38 +0200
Subject: [PATCH 08/29] GMP doc: add NAME to SOURCE in GET_ASSETS response

---
 src/schema_formats/XML/GMP.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index a44b82c12..3e5e38672 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -9276,6 +9276,7 @@ END:VCALENDAR
                 <e>type</e>
                 <e>data</e>
                 <e>deleted</e>
+                <e>name</e>
               </pattern>
               <ele>
                 <name>type</name>
@@ -9292,6 +9293,11 @@ END:VCALENDAR
                 <summary>Whether the source has been deleted</summary>
                 <pattern>boolean</pattern>
               </ele>
+              <ele>
+                <name>name</name>
+                <summary>User name when source type is User, else empty</summary>
+                <pattern>boolean</pattern>
+              </ele>
             </ele>
             <ele>
               <name>os</name>

From 0eaef8fe36dbfca72433d1c4b85d5e28021ed33f Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 21:20:34 +0200
Subject: [PATCH 09/29] GMP doc: add TYPE to GET_ASSETS response

---
 src/schema_formats/XML/GMP.xml.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 3e5e38672..0beea5e20 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -9190,6 +9190,7 @@ END:VCALENDAR
           <e>permissions</e>
           <o><e>user_tags</e></o>
           <o><e>identifiers</e></o>
+          <e>type</e>
           <or>
             <e>host</e>
             <e>os</e>
@@ -9317,6 +9318,13 @@ END:VCALENDAR
             </ele>
           </ele>
         </ele>
+        <ele>
+          <name>type</name>
+          <summary>Either "host" or "os"</summary>
+          <pattern>
+            xsd:token { pattern = "host|os" }
+          </pattern>
+        </ele>
         <ele>
           <name>host</name>
           <summary>A host</summary>

From bb5000af3d09111b6534fe676ed4dd9d5694cab5 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 21:27:19 +0200
Subject: [PATCH 10/29] GMP doc: Make ROUTES optional in GET_ASSETS response

---
 src/schema_formats/XML/GMP.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 0beea5e20..c5b2585be 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -9331,7 +9331,7 @@ END:VCALENDAR
           <pattern>
             <e>severity</e>
             <any><e>detail</e></any>
-            <e>routes</e>
+            <o><e>routes</e></o>
           </pattern>
           <ele>
             <name>severity</name>

From 98fe33de4896c7029fd8adbf2dbd6f91b55de5d5 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Mon, 8 Jul 2024 21:29:30 +0200
Subject: [PATCH 11/29] GMP doc: HOSTS in GET_ASSETS can have many ASSETS

---
 src/schema_formats/XML/GMP.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index c5b2585be..dcd4ab731 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -9494,7 +9494,7 @@ END:VCALENDAR
               Hosts on which this OS has been detected as the best match
             </summary>
             <pattern>
-              <e>asset</e>
+              <any><e>asset</e></any>
             </pattern>
             <ele>
               <name>asset</name>

From 430a01f473bcb15588e94ab40f487aac2b64232f Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Sat, 6 Jul 2024 19:40:02 +0200
Subject: [PATCH 12/29] GMP doc: add alert fields to element CERTIFICATE_INFO

---
 src/schema_formats/XML/GMP.xml.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index dcd4ab731..46a130fb4 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -523,6 +523,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <e>expiration_time</e>
       <e>issuer</e>
       <e>md5_fingerprint</e>
+      <o><e>sha256_fingerprint</e></o>
+      <o><e>subject</e></o>
+      <o><e>serial</e></o>
     </pattern>
     <ele>
       <name>time_status</name>
@@ -558,6 +561,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <summary>MD5 fingerprint of the certificate</summary>
       <pattern>text</pattern>
     </ele>
+    <ele>
+      <name>sha256_fingerprint</name>
+      <summary>SHA-256 fingerprint of the certificate</summary>
+      <pattern>text</pattern>
+    </ele>
+    <ele>
+      <name>subject</name>
+      <summary>Name of the certificate</summary>
+      <pattern>text</pattern>
+    </ele>
+    <ele>
+      <name>serial</name>
+      <summary>Serial number of certificate</summary>
+      <pattern>text</pattern>
+    </ele>
   </element>
   <element>
     <name>nvt</name>

From f3f3f726c62d2d410313c25fe895298843a59ce1 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Sat, 6 Jul 2024 19:48:56 +0200
Subject: [PATCH 13/29] GMP doc: add ACTIVE to GET_ALERTS response

---
 src/schema_formats/XML/GMP.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 46a130fb4..5f11daca1 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8519,6 +8519,7 @@ END:VCALENDAR
           <e>method</e>
           <e>filter</e>
           <o><e>tasks</e></o>
+          <e>active</e>
         </pattern>
         <ele>
           <name>owner</name>
@@ -8785,6 +8786,11 @@ END:VCALENDAR
             </ele>
           </ele>
         </ele>
+        <ele>
+          <name>active</name>
+          <summary>Whether the alert is active</summary>
+          <pattern><t>boolean</t></pattern>
+        </ele>
       </ele>
       <ele>
         <name>filters</name>

From 130e45764d20c6f5ed04fc62f76320e2cd6c04fd Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Sat, 6 Jul 2024 20:48:21 +0200
Subject: [PATCH 14/29] GMP doc: typo in summary

---
 src/schema_formats/XML/GMP.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 5f11daca1..42ce44154 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8679,7 +8679,7 @@ END:VCALENDAR
         </ele>
         <ele>
           <name>method</name>
-          <summary>The method by which he alert must occur</summary>
+          <summary>The method by which the alert must occur</summary>
           <pattern>
             text
             <any><e>data</e></any>

From d1266493744a9a51e05e7ee0a64718761584c783 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Thu, 4 Jul 2024 12:15:40 +0200
Subject: [PATCH 15/29] GMP doc: update GET_CONFIGS examples

---
 src/schema_formats/XML/GMP.xml.in | 79 +++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 42ce44154..653899d1c 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10539,20 +10539,31 @@ END:VCALENDAR
       <response>
         <get_configs_response status="200" status_text="OK">
           <config id="daba56c8-73ec-11df-a475-002264764cea">
+            <owner>
+              <name>mabel</name>
+            </owner>
             <name>Full and fast</name>
-            <comment>All NVT's; optimized by using previously collected information.</comment>
-            <creation_time>2012-11-23T10:44:00+01:00</creation_time>
-            <modification_time>2013-01-23T10:44:00+01:00</modification_time>
+            <comment>Most NVT's; optimized by using previously collected information. Version 20201215.</comment>
+            <creation_time>2023-03-06T11:26:30-05:00</creation_time>
+            <modification_time>2024-01-23T10:02:26-05:00</modification_time>
+            <writable>0</writable>
+            <in_use>1</in_use>
+            <permissions>
+              <permission>
+                <name>Everything</name>
+              </permission>
+            </permissions>
             <family_count>
-              4
+              56
               <growing>1</growing>
             </family_count>
             <nvt_count>
-              12
+              88005
               <growing>1</growing>
             </nvt_count>
-            <in_use>1</in_use>
-            <writable>0</writable>
+            <type>0</type>
+            <usage_type>scan</usage_type>
+            <predefined>0</predefined>
           </config>
           <truncated>...</truncated>
         </get_configs_response>
@@ -10567,44 +10578,64 @@ END:VCALENDAR
       <response>
         <get_configs_response status="200" status_text="OK">
           <config id="daba56c8-73ec-11df-a475-002264764cea">
+            <owner>
+              <name>mabel</name>
+            </owner>
             <name>Full and fast</name>
-            <comment>All NVT's; optimized by using previously collected information.</comment>
+            <comment>
+              Most NVT's; optimized by using previously collected information. Version 20201215.
+            </comment>
+            <creation_time>2023-03-06T11:26:30-05:00</creation_time>
+            <modification_time>2024-01-23T10:02:26-05:00</modification_time>
+            <writable>0</writable>
+            <in_use>1</in_use>
+            <permissions>
+              <permission>
+                <name>Everything</name>
+              </permission>
+            </permissions>
             <family_count>
-              4
+              56
               <growing>1</growing>
             </family_count>
             <nvt_count>
-              12
+              88005
               <growing>1</growing>
             </nvt_count>
-            <in_use>1</in_use>
-            <tasks>
-              <task id="13bb418a-4220-4575-b35b-ec398bff7417">
-                <name>Web Servers</name>
-              </task>
-              <truncated>...</truncated>
-            </tasks>
+            <type>0</type>
+            <usage_type>scan</usage_type>
+            <predefined>0</predefined>
             <families>
               <family>
-                <name>Credentials</name>
-                <nvt_count>8</nvt_count>
-                <max_nvt_count>8</max_nvt_count>
+                <name>AIX Local Security Checks</name>
+                <nvt_count>1</nvt_count>
+                <max_nvt_count>1</max_nvt_count>
                 <growing>1</growing>
               </family>
               <truncated>...</truncated>
             </families>
+            <max_nvt_count>88014</max_nvt_count>
+            <known_nvt_count>88005</known_nvt_count>
             <preferences>
               <preference>
-                <nvt oid="1.3.6.1.4.1.25623.1.0.10330">
-                  <name>Services</name>
+                <nvt oid="1.3.6.1.4.1.25623.1.0.100151">
+                  <name>PostgreSQL Detection (TCP)</name>
                 </nvt>
                 <id>1</id>
-                <name>Network connection timeout :</name>
+                <hr_name>Postgres Username:</hr_name>
+                <name>Postgres Username:</name>
                 <type>entry</type>
-                <value>5</value>
+                <value>postgres</value>
+                <default>postgres</default>
               </preference>
               <truncated>...</truncated>
             </preferences>
+            <tasks>
+              <task id="1d5c5fc8-937e-41f1-b52f-49887c386b12">
+                <name>Web Servers</name>
+              </task>
+              <truncated>...</truncated>
+            </tasks>
           </config>
           <truncated>...</truncated>
         </get_configs_response>

From 9571f0a4f79d5a4253d015bfac6f81952bdc0235 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Thu, 4 Jul 2024 11:14:24 +0200
Subject: [PATCH 16/29] GMP doc: make DEFAULT optional in PREFERENCE in
 GET_CONFIGS response

---
 src/schema_formats/XML/GMP.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 653899d1c..65f28badc 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10310,7 +10310,7 @@ END:VCALENDAR
               <e>id</e>
               <e>type</e>
               <e>value</e>
-              <e>default</e>
+              <o><e>default</e></o>
               <any><e>alt</e></any>
             </pattern>
             <ele>

From db66056b9288f799eedc43f826d5614cdc240714 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Thu, 4 Jul 2024 11:17:18 +0200
Subject: [PATCH 17/29] GMP doc: add HR_NAME to PREFERENCE in GET_CONFIGS
 response

---
 src/schema_formats/XML/GMP.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 65f28badc..413b88b02 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10307,6 +10307,7 @@ END:VCALENDAR
             <pattern>
               <e>nvt</e>
               <e>name</e>
+              <o><e>hr_name</e></o>
               <e>id</e>
               <e>type</e>
               <e>value</e>
@@ -10335,6 +10336,11 @@ END:VCALENDAR
               <summary>The compact name of the preference as used by the scanner</summary>
               <pattern><t>name</t></pattern>
             </ele>
+            <ele>
+              <name>hr_name</name>
+              <summary>The human readable name of the preference</summary>
+              <pattern><t>name</t></pattern>
+            </ele>
             <ele>
               <name>id</name>
               <summary>The ID of the preference</summary>

From 4f378db40055b2faf1430dfc28e1b76e794d5316 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Sat, 29 Jun 2024 07:55:40 +0200
Subject: [PATCH 18/29] GMP doc: simplify summary of
 GET_CONFIGS/CONFIG/WRITABLE

---
 src/schema_formats/XML/GMP.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 413b88b02..6d3241b5d 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -10156,7 +10156,7 @@ END:VCALENDAR
         <ele>
           <name>writable</name>
           <summary>
-            Whether any tasks are using the config, including trashcan tasks
+            Whether the config may be modified
           </summary>
           <pattern><t>boolean</t></pattern>
         </ele>

From 156028af4b80cde10ba5ffed8f73e9a0ab834d84 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Wed, 26 Jun 2024 01:53:28 +0200
Subject: [PATCH 19/29] GMP doc: add C_COUNT to AGGREGATE/OVERALL in
 GET_AGGREGATES

---
 src/schema_formats/XML/GMP.xml.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 6d3241b5d..22221b195 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8107,6 +8107,7 @@ END:VCALENDAR
           <summary>Aggregate data for all resources of the selected type</summary>
           <pattern>
             <e>count</e>
+            <e>c_count</e>
             <e>min</e>
             <e>max</e>
             <e>mean</e>
@@ -8117,6 +8118,12 @@ END:VCALENDAR
             <summary>Overall number of resources</summary>
             <pattern><t>integer</t></pattern>
           </ele>
+          <ele>
+            <name>c_count</name>
+            <summary>Cumulative number of resources</summary>
+            <description>For overall this is always the same as count.</description>
+            <pattern><t>integer</t></pattern>
+          </ele>
           <ele>
             <name>min</name>
             <summary>Overall minimum value of the data column</summary>

From c8c397fc8ca8ee3b4ea4d205d3554947b72502a7 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Wed, 26 Jun 2024 02:24:57 +0200
Subject: [PATCH 20/29] GMP doc: add STATS to AGGREGATE/OVERALL in
 GET_AGGREGATES

---
 src/schema_formats/XML/GMP.xml.in | 63 ++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 22221b195..96c32a796 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8108,10 +8108,7 @@ END:VCALENDAR
           <pattern>
             <e>count</e>
             <e>c_count</e>
-            <e>min</e>
-            <e>max</e>
-            <e>mean</e>
-            <e>sum</e>
+            <any><e>stats</e></any>
           </pattern>
           <ele>
             <name>count</name>
@@ -8125,24 +8122,46 @@ END:VCALENDAR
             <pattern><t>integer</t></pattern>
           </ele>
           <ele>
-            <name>min</name>
-            <summary>Overall minimum value of the data column</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>max</name>
-            <summary>Overall maximum value of the data column</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>mean</name>
-            <summary>Overall arithmetic mean of the numeric values of the data</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>sum</name>
-            <summary>Overall sum of the numeric values of the data column</summary>
-            <pattern><t>text</t></pattern>
+            <name>stats</name>
+            <summary>Statistics of a data column</summary>
+            <pattern>
+              <attrib>
+                <name>column</name>
+                <summary>Name of the column the stats apply to</summary>
+                <type>text</type>
+              </attrib>
+              <e>min</e>
+              <e>max</e>
+              <e>mean</e>
+              <e>sum</e>
+              <e>c_sum</e>
+            </pattern>
+            <ele>
+              <name>min</name>
+              <summary>Overall minimum value of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>max</name>
+              <summary>Overall maximum value of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>mean</name>
+              <summary>Overall arithmetic mean of the numeric values of the data</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>sum</name>
+              <summary>Overall sum of the numeric values of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>c_sum</name>
+              <summary>Cumulative sum of the numeric values of the data column</summary>
+              <description>For overall this is always the same as sum.</description>
+              <pattern><t>text</t></pattern>
+            </ele>
           </ele>
         </ele>
         <ele>

From 537c354857da94074d7b1608e2575d47aee22f7e Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Fri, 21 Jun 2024 16:45:11 +0200
Subject: [PATCH 21/29] GMP doc: add missing SUBGROUP_COLUMN to GET_AGGREGATES
 response

---
 src/schema_formats/XML/GMP.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 96c32a796..770120a01 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -7928,6 +7928,7 @@ END:VCALENDAR
           <e>data_type</e>
           <any><e>data_column</e></any>
           <o><e>group_column</e></o>
+          <o><e>subgroup_column</e></o>
           <any><e>text_column</e></any>
           <or>
             <any><e>group</e></any>
@@ -7951,6 +7952,11 @@ END:VCALENDAR
           <summary>The column the data is grouped by</summary>
           <pattern><t>text</t></pattern>
         </ele>
+        <ele>
+          <name>subgroup_column</name>
+          <summary>The column to further group the resources by</summary>
+          <pattern><t>text</t></pattern>
+        </ele>
         <ele>
           <name>text_column</name>
           <summary>A simple text column</summary>

From a477a0f08522e18e7b40b5abe2b5e8d8153acbca Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Wed, 26 Jun 2024 02:41:24 +0200
Subject: [PATCH 22/29] Doc: correct init_aggregate_iterator return

---
 src/manage_sql.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/manage_sql.c b/src/manage_sql.c
index c9f1a68d8..100030655 100644
--- a/src/manage_sql.c
+++ b/src/manage_sql.c
@@ -5266,7 +5266,7 @@ append_column (GArray *columns, const gchar *column_name,
  *                                resource.
  *
  * @return 0 success, 1 failed to find resource, 2 failed to find filter,
- *         3 invalid stat_column, 4 invalid group_column, 5 invalid type,
+ *         3 invalid data_column, 4 invalid group_column, 5 invalid type,
  *         6 trashcan not used by type, 7 invalid text column, 8 invalid
  *         subgroup_column, -1 error.
  */

From 56d8f86e389b8538ea5021e9f2acebb5891a5440 Mon Sep 17 00:00:00 2001
From: Timo Pollmeier <timo.pollmeier@greenbone.net>
Date: Mon, 22 Jul 2024 14:28:16 +0200
Subject: [PATCH 23/29] Add: New --min-mem-feed-update option

A new option is added which will make the automatic feed update wait
until a minimum amount of physical memory is available.

Additionally, the --mem-wait-retries can be used to set the number of
retries waiting for memory to be available in each process.
---
 doc/gvmd.8     |   6 +++
 doc/gvmd.8.xml |  18 +++++++
 doc/gvmd.html  |  18 +++++++
 src/gvmd.c     |  18 +++++++
 src/manage.c   | 143 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/manage.h   |  15 ++++++
 src/utils.c    |  23 ++++++++
 src/utils.h    |   6 +++
 8 files changed, 245 insertions(+), 2 deletions(-)

diff --git a/doc/gvmd.8 b/doc/gvmd.8
index 7972955c6..7179be5d4 100644
--- a/doc/gvmd.8
+++ b/doc/gvmd.8
@@ -121,9 +121,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
diff --git a/doc/gvmd.8.xml b/doc/gvmd.8.xml
index 7c2165808..8e4bca59a 100644
--- a/doc/gvmd.8.xml
+++ b/doc/gvmd.8.xml
@@ -287,12 +287,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>
diff --git a/doc/gvmd.html b/doc/gvmd.html
index 68913b68a..60ba46fe4 100644
--- a/doc/gvmd.html
+++ b/doc/gvmd.html
@@ -242,12 +242,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>
diff --git a/src/gvmd.c b/src/gvmd.c
index 4ffdab4e8..05bc8c43c 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -1895,6 +1895,8 @@ gvmd (int argc, char** argv, char *env[])
   static gchar *broker_address = NULL;
   static gchar *feed_lock_path = NULL;
   static int feed_lock_timeout = 0;
+  static int mem_wait_retries = 30;
+  static int min_mem_feed_update = 0;
   static int vt_ref_insert_size = VT_REF_INSERT_SIZE_DEFAULT;
   static int vt_sev_insert_size = VT_SEV_INSERT_SIZE_DEFAULT;
   static gchar *vt_verification_collation = NULL;
@@ -2088,10 +2090,20 @@ gvmd (int argc, char** argv, char *env[])
           &max_ips_per_target,
           "Maximum number of IPs per target.",
           "<number>" },
+        { "mem-wait-retries", '\0', 0, G_OPTION_ARG_INT,
+          &mem_wait_retries,
+          "How often to try waiting for available memory. Default: 30."
+          " Each retry will wait for 10 seconds.",
+          "<number>" },
         { "migrate", 'm', 0, G_OPTION_ARG_NONE,
           &migrate_database,
           "Migrate the database and exit.",
           NULL },
+        { "min-mem-feed-update", '\0', 0, G_OPTION_ARG_INT,
+          &min_mem_feed_update,
+          "Minimum memory in MiB for feed updates. Default: 0."
+          " Feed updates are skipped if less physical memory is available.",
+          "<number>" },
         { "modify-scanner", '\0', 0, G_OPTION_ARG_STRING,
           &modify_scanner,
           "Modify scanner <scanner-uuid> and exit.",
@@ -2447,6 +2459,12 @@ gvmd (int argc, char** argv, char *env[])
       }
   }
 
+  /* Set number of retries waiting for memory */
+  set_mem_wait_retries (mem_wait_retries);
+  
+  /* Set minimum memory for feed updates */
+  set_min_mem_feed_update (min_mem_feed_update);
+
   /* Set relay mapper */
   if (relay_mapper)
     {
diff --git a/src/manage.c b/src/manage.c
index 0af8a5486..1465ca279 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -184,6 +184,16 @@ static gchar *feed_lock_path = NULL;
  */
 static int feed_lock_timeout = 0;
 
+/**
+ * @brief Retries for waiting for memory to be available.
+ */
+static int mem_wait_retries = 0;
+
+/**
+ * @brief Minimum available memory in MiB for running a feed update.
+ */
+static int min_mem_feed_update = 0;
+
 /**
  * @brief Path to the relay mapper executable, NULL to disable relays.
  */
@@ -5050,7 +5060,52 @@ feed_sync_required ()
   return FALSE;
 }
 
+/**
+ * @brief Wait for memory
+ * 
+ * @param[in]  check_func  Function to check memory, should return 1 if enough.
+ * @param[in]  retries     Number of retries.
+ * @param[in]  min_mem     Minimum memory in MiB, for logging only
+ * @param[in]  action      Short descriptor of action waiting for memory.
+ * 
+ * @return 0 if enough memory is available, 1 gave up
+ */
+static int
+wait_for_mem (int check_func(),
+              int retries,
+              int min_mem,
+              const char *action)
+{
+  int retry_number = 0;
+  while (check_func () == 0)
+    {
+      if (retry_number == 0)
+        {
+          g_info ("%s: not enough memory for %s"
+                  " (%lld / %d) MiB",
+                  __func__,
+                  action,
+                  phys_mem_available () / 1048576llu,
+                  min_mem);
+        }
+      else
+        {
+          g_debug ("%s: waiting for memory for %s"
+                   " (%lld / %d) MiB",
+                   __func__,
+                   action,
+                   phys_mem_available () / 1048576llu,
+                   min_mem);
+        }
+
+      retry_number ++;
+      if (retry_number > retries)
+        return 1;
 
+      sleep (SCHEDULE_PERIOD);
+    }
+  return 0;
+}
 
 /**
  * @brief Perform any syncing that is due.
@@ -5074,7 +5129,11 @@ manage_sync (sigset_t *sigmask_current,
 
   if (feed_sync_required ())
     {
-      if (feed_lockfile_lock (&lockfile) == 0)
+      if (wait_for_mem (check_min_mem_feed_update,
+                        mem_wait_retries,
+                        min_mem_feed_update,
+                        "SecInfo feed sync") == 0
+          && feed_lockfile_lock (&lockfile) == 0)
         {
           pid_t nvts_pid, scap_pid, cert_pid;
           nvts_pid = manage_sync_nvts (fork_update_nvt_cache);
@@ -5096,7 +5155,11 @@ manage_sync (sigset_t *sigmask_current,
           || should_sync_port_lists ()
           || should_sync_report_formats ()))
     {
-      if (feed_lockfile_lock (&lockfile) == 0)
+      if (wait_for_mem (check_min_mem_feed_update,
+                        mem_wait_retries,
+                        min_mem_feed_update,
+                        "data objects feed sync") == 0
+          && feed_lockfile_lock (&lockfile) == 0)
         {
           manage_sync_configs ();
           manage_sync_port_lists ();
@@ -6352,6 +6415,82 @@ set_feed_lock_timeout (int new_timeout)
     feed_lock_timeout = new_timeout;
 }
 
+/**
+ * @brief Get the number of retries when waiting for memory to be available.
+ *
+ * @return The current number of retries.
+ */
+int
+get_mem_wait_retries()
+{
+  return mem_wait_retries;
+}
+
+/**
+ * @brief Set the number of retries when waiting for memory to be available.
+ *
+ * @param[in]  new_retries The new number of retries.
+ */
+void
+set_mem_wait_retries (int new_retries)
+{
+  if (new_retries < 0)
+    min_mem_feed_update = 0;
+  else
+    min_mem_feed_update = new_retries;
+}
+
+/**
+ * @brief Check if the minimum memory for feed updates is available
+ * 
+ * @return 1 if minimum memory amount is available, 0 if not
+ */
+int
+check_min_mem_feed_update ()
+{
+  if (min_mem_feed_update)
+    {
+      guint64 min_mem_bytes = (guint64)min_mem_feed_update * 1048576llu;
+      return phys_mem_available () >= min_mem_bytes ? 1 : 0;
+    }
+  return 1;
+}
+
+/**
+ * @brief Get the minimum memory for feed updates.
+ *
+ * @return The current minimum memory for feed updates in MiB.
+ */
+int
+get_min_mem_feed_update ()
+{
+  return min_mem_feed_update;
+}
+
+/**
+ * @brief Get the minimum memory for feed updates.
+ *
+ * @param[in]  new_min_mem The new minimum memory for feed updates in MiB.
+ */
+void
+set_min_mem_feed_update (int new_min_mem)
+{
+  guint64 min_mem_bytes = (guint64)new_min_mem * 1048576llu;
+  if (new_min_mem < 0)
+    min_mem_feed_update = 0;
+  else if (min_mem_bytes > phys_mem_total ())
+    {
+      g_warning ("%s: requested feed minimum memory limit (%d MiB)"
+                 " exceeds total physical memory (%lld MiB)."
+                 " The setting is ignored.",
+                 __func__,
+                 new_min_mem,
+                 phys_mem_total () / 1048576llu);
+    }
+  else
+    min_mem_feed_update = new_min_mem;
+}
+
 /**
  * @brief Write start time to sync lock file.
  *
diff --git a/src/manage.h b/src/manage.h
index 9e7bbbce9..b60939d56 100644
--- a/src/manage.h
+++ b/src/manage.h
@@ -3870,6 +3870,21 @@ get_feed_lock_timeout ();
 void
 set_feed_lock_timeout (int);
 
+int
+get_mem_wait_retries ();
+
+void
+set_mem_wait_retries (int);
+
+int
+check_min_mem_feed_update ();
+
+int
+get_min_mem_feed_update ();
+
+void
+set_min_mem_feed_update (int);
+
 void
 write_sync_start (int);
 
diff --git a/src/utils.c b/src/utils.c
index 9c7ceb7cc..38455f2c4 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -959,3 +959,26 @@ wait_for_pid (pid_t pid, const char *context)
         }
     }
 }
+
+/**
+ * @brief Get the available physical memory in bytes.
+ * 
+ * @return The available memory
+ */
+guint64
+phys_mem_available ()
+{
+  return (unsigned long long)(sysconf(_SC_AVPHYS_PAGES))
+    * sysconf(_SC_PAGESIZE);
+}
+
+/**
+ * @brief Get the total physical memory in bytes.
+ * 
+ * @return The total memory
+ */
+guint64
+phys_mem_total ()
+{
+  return sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
+}
diff --git a/src/utils.h b/src/utils.h
index 1054dc0ca..8c3e53ff9 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -103,4 +103,10 @@ fork_with_handlers ();
 void
 wait_for_pid (pid_t, const char *);
 
+guint64
+phys_mem_available ();
+
+guint64
+phys_mem_total ();
+
 #endif /* not _GVMD_UTILS_H */

From fd961c080c3355abac1e056a0c35a83e6bafbd03 Mon Sep 17 00:00:00 2001
From: Greenbone Bot <github-bot@greenbone.net>
Date: Tue, 23 Jul 2024 08:39:16 +0000
Subject: [PATCH 24/29] Automatic release to 23.8.0

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf44b15e4..ddd2c677b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
 message ("-- Configuring Greenbone Vulnerability Manager...")
 
 project (gvm
-         VERSION 23.7.1
+         VERSION 23.8.0
          LANGUAGES C)
 
 if (POLICY CMP0005)
@@ -58,7 +58,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 1)
+set (PROJECT_DEV_VERSION 0)
 
 # If PROJECT_DEV_VERSION is set, the version string will be set to:
 #   "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"

From f99a1b718ef479527fc25993cf98a2aa85963be4 Mon Sep 17 00:00:00 2001
From: Greenbone Bot <github-bot@greenbone.net>
Date: Tue, 23 Jul 2024 08:39:18 +0000
Subject: [PATCH 25/29] Automatic adjustments after release [skip ci]

* Update to version 23.8.1-dev1
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddd2c677b..af0127d25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
 message ("-- Configuring Greenbone Vulnerability Manager...")
 
 project (gvm
-         VERSION 23.8.0
+         VERSION 23.8.1
          LANGUAGES C)
 
 if (POLICY CMP0005)
@@ -58,7 +58,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}"

From 336ccf989d78761999f432e2b8b2e49e39fb1394 Mon Sep 17 00:00:00 2001
From: Ahmed Abdelsalam <ahmed.abdelsalam@greenbone.net>
Date: Wed, 24 Jul 2024 11:32:18 +0200
Subject: [PATCH 26/29] Fix: Drop result_vt_epss view when rebuilding nvt
 related tables.

---
 src/manage_sql_nvts.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/manage_sql_nvts.c b/src/manage_sql_nvts.c
index a740fea5e..d43e4b5ae 100644
--- a/src/manage_sql_nvts.c
+++ b/src/manage_sql_nvts.c
@@ -1979,6 +1979,7 @@ update_nvts_from_vts (element_t *get_vts_response,
   if (rebuild) {
     sql ("DROP VIEW IF EXISTS results_autofp;");
     sql ("DROP VIEW vulns;");
+    sql ("DROP MATERIALIZED VIEW IF EXISTS result_vt_epss;");
     sql ("DROP TABLE nvts, nvt_preferences, vt_refs, vt_severities;");
 
     sql ("ALTER TABLE vt_refs_rebuild RENAME TO vt_refs;");

From f9c1baf22389113fc58618e1d4d3da3f7171d996 Mon Sep 17 00:00:00 2001
From: Timo Pollmeier <timo.pollmeier@greenbone.net>
Date: Mon, 29 Jul 2024 12:00:44 +0200
Subject: [PATCH 27/29] Fix: Add missing EPSS columns for "no CVEs" case

The materialized view result_vt_epss now also has the columns
epss_severity and max_epss_severity in case there are no CVEs present
when the view is created.

This fixes SQL errors resulting from those missing columns.
---
 src/manage_pg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/manage_pg.c b/src/manage_pg.c
index 8c691994e..8f2bcad21 100644
--- a/src/manage_pg.c
+++ b/src/manage_pg.c
@@ -1849,9 +1849,11 @@ create_view_result_vt_epss ()
          "    epss_score,"
          "    epss_percentile,"
          "    epss_cve,"
+         "    epss_severity,"
          "    max_epss_score,"
          "    max_epss_percentile,"
-         "    max_epss_cve"
+         "    max_epss_cve,"
+         "    max_epss_severity"
          "  FROM nvts);");
 
   sql ("SELECT create_index ('result_vt_epss_by_vt_id',"

From de34f19c4a585d0992d89e33af7031636ad6eb5c Mon Sep 17 00:00:00 2001
From: Greenbone Bot <github-bot@greenbone.net>
Date: Mon, 29 Jul 2024 10:18:49 +0000
Subject: [PATCH 28/29] Automatic release to 23.8.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af0127d25..b88b57fa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,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 1)
+set (PROJECT_DEV_VERSION 0)
 
 # If PROJECT_DEV_VERSION is set, the version string will be set to:
 #   "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"

From 5ce67ca0635589f66b5cac1dbda7341d0911a976 Mon Sep 17 00:00:00 2001
From: Greenbone Bot <github-bot@greenbone.net>
Date: Mon, 29 Jul 2024 10:18:50 +0000
Subject: [PATCH 29/29] Automatic adjustments after release [skip ci]

* Update to version 23.8.2-dev1
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b88b57fa2..945272c27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
 message ("-- Configuring Greenbone Vulnerability Manager...")
 
 project (gvm
-         VERSION 23.8.1
+         VERSION 23.8.2
          LANGUAGES C)
 
 if (POLICY CMP0005)
@@ -58,7 +58,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}"