From 2b5c1cc27b676b8444e5495056d14d82ac1135ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 4 Feb 2025 15:51:14 +0100 Subject: [PATCH 01/13] Fix: Load service files after all files are installed `systemctl daemon-reload` has to be called **after all** service files are installed. --- src/22.4/source-build/systemd.md | 16 ++++++++-------- src/changelog.md | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/22.4/source-build/systemd.md b/src/22.4/source-build/systemd.md index ccb9c32e..d9a841e8 100644 --- a/src/22.4/source-build/systemd.md +++ b/src/22.4/source-build/systemd.md @@ -103,14 +103,6 @@ EOF sudo cp -v $BUILD_DIR/gsad.service /etc/systemd/system/ ``` -Afterwards, the services need to be activated and started. - -```{code-block} -:caption: Making systemd aware of the new service files - -sudo systemctl daemon-reload -``` - ```{code-block} :caption: Systemd service file for openvasd cat << EOF > $BUILD_DIR/openvasd.service @@ -136,3 +128,11 @@ EOF :caption: Install systemd service file for openvasd sudo cp -v $BUILD_DIR/openvasd.service /etc/systemd/system/ ``` + +Afterwards, the services need to be activated and started. + +```{code-block} +:caption: Making systemd aware of the new service files + +sudo systemctl daemon-reload +``` diff --git a/src/changelog.md b/src/changelog.md index 542eec73..37e2fcc6 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -13,6 +13,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Update openvas-scanner and openvasd to 23.15.3 * Remove fedora in openvas-smb. * Fix openvasd path to binaries after file path structure changes. +* Call `systemctl daemon-reload` after all service files are installed ## 25.1.0 - 2025-01-09 From 20cef19c460cfb2a51ceb4b6784c9f2560527534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 4 Feb 2025 15:53:02 +0100 Subject: [PATCH 02/13] Fix typos --- src/changelog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/changelog.md b/src/changelog.md index 37e2fcc6..338ddc9f 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -8,8 +8,8 @@ and this project adheres to [Calendar Versioning](https://calver.org). ## Latest * Fix file path to compose file in setup and start script -* Update openvas-smb dependecy from heimdal-dev to heimdal-multidev -* Update openvas-scanner dependecy from libkrb5-dev to krb5-multidev +* Update openvas-smb dependency from heimdal-dev to heimdal-multidev +* Update openvas-scanner dependency from libkrb5-dev to krb5-multidev * Update openvas-scanner and openvasd to 23.15.3 * Remove fedora in openvas-smb. * Fix openvasd path to binaries after file path structure changes. From 16f3a539e24430aa45d8a42db5ad3298f4a8ddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:11:22 +0100 Subject: [PATCH 03/13] Change: Update versions of gvm-libs, gvmd, pg-gvm, gsad and GSA Use newest releases. --- src/22.4/source-build/index.md | 10 +++++----- src/changelog.md | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/22.4/source-build/index.md b/src/22.4/source-build/index.md index 59994034..d87a2623 100644 --- a/src/22.4/source-build/index.md +++ b/src/22.4/source-build/index.md @@ -26,7 +26,7 @@ The components should be build and installed in the listed order. ```{code-block} :caption: Setting the gvm-libs version to use -export GVM_LIBS_VERSION=22.10.0 +export GVM_LIBS_VERSION=22.17.0 ``` ```{include} /22.4/source-build/gvm-libs/dependencies.md @@ -48,7 +48,7 @@ Afterwards, gvm-libs can be build and installed. ```{code-block} :caption: Setting the gvmd version to use -export GVMD_VERSION=23.8.1 +export GVMD_VERSION=25.0.0 ``` ```{include} /22.4/source-build/gvmd/dependencies.md @@ -71,7 +71,7 @@ Details about the optional dependencies can be found at ```{code-block} :caption: Setting the pg-gvm version to use -export PG_GVM_VERSION=22.6.5 +export PG_GVM_VERSION=22.6.7 ``` ```{include} /22.4/source-build/pg-gvm/dependencies.md @@ -100,7 +100,7 @@ The Greenbone Security Assistant (GSA) sources consist of two parts: ```{code-block} :caption: Setting the GSA version to use -export GSA_VERSION=23.2.1 +export GSA_VERSION=24.2.0 ``` ```{include} /22.4/source-build/gsa/download.md @@ -117,7 +117,7 @@ export GSA_VERSION=23.2.1 ```{code-block} :caption: Setting the GSAd version to use -export GSAD_VERSION=22.11.0 +export GSAD_VERSION=24.2.0 ``` ```{include} /22.4/source-build/gsad/dependencies.md diff --git a/src/changelog.md b/src/changelog.md index 338ddc9f..0de842d9 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -14,6 +14,11 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Remove fedora in openvas-smb. * Fix openvasd path to binaries after file path structure changes. * Call `systemctl daemon-reload` after all service files are installed +* Update gvm-libs to 22.17.0 +* Update gvmd to 25.0.0 +* Update pg-gvm to 22.6.7 +* Update gsad to 24.2.0 +* Update GSA to 24.2.0 ## 25.1.0 - 2025-01-09 From d4750d6eb1360c5bafc0ad4901322339875213eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:12:33 +0100 Subject: [PATCH 04/13] Change: Add brotli compression for gsad Install libbrotli when building on Debian or Ubuntu. --- src/22.4/source-build/gsad/dependencies.md | 7 ++++--- src/changelog.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/22.4/source-build/gsad/dependencies.md b/src/22.4/source-build/gsad/dependencies.md index 73329b63..ae8bfefa 100644 --- a/src/22.4/source-build/gsad/dependencies.md +++ b/src/22.4/source-build/gsad/dependencies.md @@ -5,10 +5,11 @@ :caption: Required dependencies for gsad sudo apt install -y \ - libmicrohttpd-dev \ - libxml2-dev \ + libbrotli-dev \ libglib2.0-dev \ - libgnutls28-dev + libgnutls28-dev \ + libmicrohttpd-dev \ + libxml2-dev .. tab:: Fedora/CentOS .. code-block:: diff --git a/src/changelog.md b/src/changelog.md index 0de842d9..f197e86d 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -17,7 +17,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Update gvm-libs to 22.17.0 * Update gvmd to 25.0.0 * Update pg-gvm to 22.6.7 -* Update gsad to 24.2.0 +* Update gsad to 24.2.0 and support brotli compression * Update GSA to 24.2.0 ## 25.1.0 - 2025-01-09 From 4877d3d0c014213aef077452331ac4397a892760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:13:28 +0100 Subject: [PATCH 05/13] Change: Update description of GSA We don't use yarn anymore and only rely on npm. --- src/22.4/source-build/gsa/description.md | 10 +++++----- src/changelog.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/22.4/source-build/gsa/description.md b/src/22.4/source-build/gsa/description.md index a733a09c..2840f15c 100644 --- a/src/22.4/source-build/gsa/description.md +++ b/src/22.4/source-build/gsa/description.md @@ -1,7 +1,7 @@ The web application is written in JavaScript and relies on the [react framework](https://reactjs.org/). It uses [nodejs](https://nodejs.org/) -for building the application and [yarn](https://classic.yarnpkg.com/lang/en/) -for maintaining the JavaScript dependencies. Because the installation of yarn -and the specific nodejs version requires a setup of external package -repositories and the build process takes a lot of time, pre-built distributable -files are available. These pre-built distributable files are used in this docs. +for building the application and maintaining the JavaScript dependencies. +Because the installation of a specific nodejs version requires a setup of +external package repositories and the build process takes a lot of time, +pre-built distributable files are available. These pre-built distributable files +are used in this docs. diff --git a/src/changelog.md b/src/changelog.md index f197e86d..4e352e27 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -18,7 +18,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Update gvmd to 25.0.0 * Update pg-gvm to 22.6.7 * Update gsad to 24.2.0 and support brotli compression -* Update GSA to 24.2.0 +* Update GSA to 24.2.0 and the description ## 25.1.0 - 2025-01-09 From 5cd559e1354725451c5f52b34a8600bb22174f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:15:52 +0100 Subject: [PATCH 06/13] Change: Set an log dir for gsad and gvmd explicitly Both should still log to a file. --- src/22.4/source-build/gsad/build.md | 1 + src/22.4/source-build/gvmd/build.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/22.4/source-build/gsad/build.md b/src/22.4/source-build/gsad/build.md index a4657d98..35952618 100644 --- a/src/22.4/source-build/gsad/build.md +++ b/src/22.4/source-build/gsad/build.md @@ -10,6 +10,7 @@ cmake $SOURCE_DIR/gsad-$GSAD_VERSION \ -DLOCALSTATEDIR=/var \ -DGVMD_RUN_DIR=/run/gvmd \ -DGSAD_RUN_DIR=/run/gsad \ + -DGVM_LOG_DIR=/var/log/gvm \ -DLOGROTATE_DIR=/etc/logrotate.d make -j$(nproc) diff --git a/src/22.4/source-build/gvmd/build.md b/src/22.4/source-build/gvmd/build.md index 067e397d..3f45efc3 100644 --- a/src/22.4/source-build/gvmd/build.md +++ b/src/22.4/source-build/gvmd/build.md @@ -12,6 +12,7 @@ -DLOCALSTATEDIR=/var \ -DSYSCONFDIR=/etc \ -DGVM_DATA_DIR=/var \ + -DGVM_LOG_DIR=/var/log/gvm \ -DGVMD_RUN_DIR=/run/gvmd \ -DOPENVAS_DEFAULT_SOCKET=/run/ospd/ospd-openvas.sock \ -DGVM_FEED_LOCK_PATH=/var/lib/gvm/feed-update.lock \ @@ -32,6 +33,7 @@ -DLOCALSTATEDIR=/var \ -DSYSCONFDIR=/etc \ -DGVM_DATA_DIR=/var \ + -DGVM_LOG_DIR/var/log/gvm \ -DGVMD_RUN_DIR=/run/gvmd \ -DOPENVAS_DEFAULT_SOCKET=/run/ospd/ospd-openvas.sock \ -DGVM_FEED_LOCK_PATH=/var/lib/gvm/feed-update.lock \ From c83279c8e7a190e412978dd7072bad603f05bacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:19:48 +0100 Subject: [PATCH 07/13] Change: Use newer cmake syntax to build our software components --- src/22.4/source-build/gsad/build.md | 10 ++++++---- src/22.4/source-build/gvm-libs/build.md | 12 +++++++----- src/22.4/source-build/gvmd/build.md | 10 ++++++---- src/22.4/source-build/openvas-scanner/build.md | 11 ++++++----- src/22.4/source-build/openvas-smb.md | 10 ++++++---- src/22.4/source-build/pg-gvm/build.md | 10 ++++++---- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/22.4/source-build/gsad/build.md b/src/22.4/source-build/gsad/build.md index 35952618..cb54801b 100644 --- a/src/22.4/source-build/gsad/build.md +++ b/src/22.4/source-build/gsad/build.md @@ -1,9 +1,11 @@ ```{code-block} :caption: Building gsad -mkdir -p $BUILD_DIR/gsad && cd $BUILD_DIR/gsad +mkdir -p $BUILD_DIR/gsad -cmake $SOURCE_DIR/gsad-$GSAD_VERSION \ +cmake \ + -S $SOURCE_DIR/gsad-$GSAD_VERSION \ + -B $BUILD_DIR/gsad \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ -DSYSCONFDIR=/etc \ @@ -13,13 +15,13 @@ cmake $SOURCE_DIR/gsad-$GSAD_VERSION \ -DGVM_LOG_DIR=/var/log/gvm \ -DLOGROTATE_DIR=/etc/logrotate.d -make -j$(nproc) +cmake --build $BUILD_DIR/gsad -j$(nproc) ``` ```{code-block} :caption: Installing gsad -mkdir -p $INSTALL_DIR/gsad +mkdir -p $INSTALL_DIR/gsad && cd $BUILD_DIR/gsad make DESTDIR=$INSTALL_DIR/gsad install diff --git a/src/22.4/source-build/gvm-libs/build.md b/src/22.4/source-build/gvm-libs/build.md index c8ac9f0f..53977402 100644 --- a/src/22.4/source-build/gvm-libs/build.md +++ b/src/22.4/source-build/gvm-libs/build.md @@ -4,19 +4,21 @@ .. code-block:: :caption: Building gvm-libs - mkdir -p $BUILD_DIR/gvm-libs && cd $BUILD_DIR/gvm-libs + mkdir -p $BUILD_DIR/gvm-libs - cmake $SOURCE_DIR/gvm-libs-$GVM_LIBS_VERSION \ + cmake \ + -S $SOURCE_DIR/gvm-libs-$GVM_LIBS_VERSION \ + -B $BUILD_DIR/gvm-libs \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ -DSYSCONFDIR=/etc \ -DLOCALSTATEDIR=/var - make -j$(nproc) + cmake --build $BUILD_DIR/gvm-libs -j$(nproc) .. tab:: Fedora/CentOS .. code-block:: :caption: Building gvm-libs - + mkdir -p $BUILD_DIR/gvm-libs && cd $BUILD_DIR/gvm-libs cmake $SOURCE_DIR/gvm-libs-$GVM_LIBS_VERSION \ @@ -33,7 +35,7 @@ ```{code-block} :caption: Installing gvm-libs -mkdir -p $INSTALL_DIR/gvm-libs +mkdir -p $INSTALL_DIR/gvm-libs && cd $BUILD_DIR/gvm-libs make DESTDIR=$INSTALL_DIR/gvm-libs install diff --git a/src/22.4/source-build/gvmd/build.md b/src/22.4/source-build/gvmd/build.md index 3f45efc3..9915b0cf 100644 --- a/src/22.4/source-build/gvmd/build.md +++ b/src/22.4/source-build/gvmd/build.md @@ -4,9 +4,11 @@ .. code-block:: :caption: Building gvmd - mkdir -p $BUILD_DIR/gvmd && cd $BUILD_DIR/gvmd + mkdir -p $BUILD_DIR/gvmd - cmake $SOURCE_DIR/gvmd-$GVMD_VERSION \ + cmake \ + -S $SOURCE_DIR/gvmd-$GVMD_VERSION \ + -B $BUILD_DIR/gvmd \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ -DLOCALSTATEDIR=/var \ @@ -19,7 +21,7 @@ -DSYSTEMD_SERVICE_DIR=/lib/systemd/system \ -DLOGROTATE_DIR=/etc/logrotate.d - make -j$(nproc) + cmake --build $BUILD_DIR/gvmd -j$(nproc) .. tab:: Fedora/CentOS .. code-block:: @@ -52,7 +54,7 @@ .. code-block:: :caption: Installing gvmd - mkdir -p $INSTALL_DIR/gvmd + mkdir -p $INSTALL_DIR/gvmd && cd $BUILD_DIR/gvmd make DESTDIR=$INSTALL_DIR/gvmd install diff --git a/src/22.4/source-build/openvas-scanner/build.md b/src/22.4/source-build/openvas-scanner/build.md index 3f54c872..47fe607d 100644 --- a/src/22.4/source-build/openvas-scanner/build.md +++ b/src/22.4/source-build/openvas-scanner/build.md @@ -1,24 +1,25 @@ ```{code-block} :caption: Building openvas-scanner -mkdir -p $BUILD_DIR/openvas-scanner && cd $BUILD_DIR/openvas-scanner +mkdir -p $BUILD_DIR/openvas-scanner -cmake $SOURCE_DIR/openvas-scanner-$OPENVAS_SCANNER_VERSION \ +cmake \ + -S $SOURCE_DIR/openvas-scanner-$OPENVAS_SCANNER_VERSION \ + -B $BUILD_DIR/openvas-scanner \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DINSTALL_OLD_SYNC_SCRIPT=OFF \ -DSYSCONFDIR=/etc \ -DLOCALSTATEDIR=/var \ -DOPENVAS_FEED_LOCK_PATH=/var/lib/openvas/feed-update.lock \ -DOPENVAS_RUN_DIR=/run/ospd -make -j$(nproc) +cmake --build $BUILD_DIR/openvas-scanner -j$(nproc) ``` ```{code-block} :caption: Installing openvas-scanner -mkdir -p $INSTALL_DIR/openvas-scanner +mkdir -p $INSTALL_DIR/openvas-scanner && cd $BUILD_DIR/openvas-scanner make DESTDIR=$INSTALL_DIR/openvas-scanner install diff --git a/src/22.4/source-build/openvas-smb.md b/src/22.4/source-build/openvas-smb.md index 58e1e717..7ad2b7c1 100644 --- a/src/22.4/source-build/openvas-smb.md +++ b/src/22.4/source-build/openvas-smb.md @@ -61,19 +61,21 @@ tar -C $SOURCE_DIR -xvzf $SOURCE_DIR/openvas-smb-$OPENVAS_SMB_VERSION.tar.gz ```{code-block} :caption: Building openvas-smb -mkdir -p $BUILD_DIR/openvas-smb && cd $BUILD_DIR/openvas-smb +mkdir -p $BUILD_DIR/openvas-smb -cmake $SOURCE_DIR/openvas-smb-$OPENVAS_SMB_VERSION \ +cmake \ + -S $SOURCE_DIR/openvas-smb-$OPENVAS_SMB_VERSION \ + -B $BUILD_DIR/openvas-smb \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_BUILD_TYPE=Release -make -j$(nproc) +cmake --build $BUILD_DIR/openvas-smb -j$(nproc) ``` ```{code-block} :caption: Installing openvas-smb -mkdir -p $INSTALL_DIR/openvas-smb +mkdir -p $INSTALL_DIR/openvas-smb && cd $BUILD_DIR/openvas-smb make DESTDIR=$INSTALL_DIR/openvas-smb install diff --git a/src/22.4/source-build/pg-gvm/build.md b/src/22.4/source-build/pg-gvm/build.md index 8af2339e..29a58150 100644 --- a/src/22.4/source-build/pg-gvm/build.md +++ b/src/22.4/source-build/pg-gvm/build.md @@ -4,12 +4,14 @@ .. code-block:: :caption: Building pg-gvm - mkdir -p $BUILD_DIR/pg-gvm && cd $BUILD_DIR/pg-gvm + mkdir -p $BUILD_DIR/pg-gvm - cmake $SOURCE_DIR/pg-gvm-$PG_GVM_VERSION \ + cmake \ + -S $SOURCE_DIR/pg-gvm-$PG_GVM_VERSION \ + -B $BUILD_DIR/pg-gvm \ -DCMAKE_BUILD_TYPE=Release - make -j$(nproc) + cmake --build $BUILD_DIR/pg-gvm -j$(nproc) .. tab:: Fedora/CentOS .. code-block:: @@ -26,7 +28,7 @@ ```{code-block} :caption: Installing pg-gvm -mkdir -p $INSTALL_DIR/pg-gvm +mkdir -p $INSTALL_DIR/pg-gvm && cd $BUILD_DIR/pg-gvm make DESTDIR=$INSTALL_DIR/pg-gvm install From 708a0ade084d26f9f3bd8e8f08984de70ce9c1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:21:06 +0100 Subject: [PATCH 08/13] Change: Update and sort dependencies of gvm-libs libcurl is required for building current versions of gvm-libs --- .../source-build/gvm-libs/dependencies.md | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/22.4/source-build/gvm-libs/dependencies.md b/src/22.4/source-build/gvm-libs/dependencies.md index dc9d6103..6ddfeaec 100644 --- a/src/22.4/source-build/gvm-libs/dependencies.md +++ b/src/22.4/source-build/gvm-libs/dependencies.md @@ -5,16 +5,18 @@ :caption: Required dependencies for gvm-libs sudo apt install -y \ - libglib2.0-dev \ - libgpgme-dev \ - libgnutls28-dev \ - uuid-dev \ - libssh-gcrypt-dev \ - libhiredis-dev \ - libxml2-dev \ - libpcap-dev \ - libnet1-dev \ - libpaho-mqtt-dev + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libgpgme-dev \ + libhiredis-dev \ + libnet1-dev \ + libpaho-mqtt-dev \ + libpcap-dev \ + libssh-dev \ + libxml2-dev \ + uuid-dev .. code-block:: :caption: Optional dependencies for gvm-libs @@ -28,16 +30,18 @@ :caption: Required dependencies for gvm-libs sudo dnf install -y \ + cjson-devel \ glib2-devel \ - gpgme-devel \ gnutls-devel \ + gpgme-devel \ + hiredis-devel \ + libcurl-devel \ libgcrypt-devel \ - libuuid-devel \ + libnet-devel \ + libpcap-devel \ libssh-devel \ - hiredis-devel \ + libuuid-devel \ libxml2-devel \ - libpcap-devel \ - libnet-devel \ paho-c-devel .. code-block:: @@ -52,16 +56,18 @@ :caption: Required dependencies for gvm-libs sudo dnf install -y \ + cjson-devel \ glib2-devel \ - gpgme-devel \ gnutls-devel \ + gpgme-devel \ + hiredis-devel \ + libcurl-devel \ libgcrypt-devel \ - libuuid-devel \ + libnet-devel \ + libpcap-devel \ libssh-devel \ - hiredis-devel \ + libuuid-devel \ libxml2-devel \ - libpcap-devel \ - libnet-devel \ uuid-devel .. code-block:: From d953438b37b152f45653fc235270a49614128942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:22:51 +0100 Subject: [PATCH 09/13] Change: Use generic postgresql-server-dev-all package Using the generic postgresql-server-dev-all package allows to make the installation of the debian and ubuntu dependencies independent of the actual available postgres version. --- src/22.4/source-build/gvmd/dependencies.md | 77 +++++--------------- src/22.4/source-build/pg-gvm/dependencies.md | 19 ++--- 2 files changed, 24 insertions(+), 72 deletions(-) diff --git a/src/22.4/source-build/gvmd/dependencies.md b/src/22.4/source-build/gvmd/dependencies.md index 9460f546..e1b91f18 100644 --- a/src/22.4/source-build/gvmd/dependencies.md +++ b/src/22.4/source-build/gvmd/dependencies.md @@ -1,84 +1,45 @@ ```{eval-rst} .. tabs:: - .. tab:: Debian + .. tab:: Debian/Ubuntu .. code-block:: :caption: Required dependencies for gvmd sudo apt install -y \ + lcov \ + libbsd-dev \ + libcjson-dev \ libglib2.0-dev \ libgnutls28-dev \ - libpq-dev \ - postgresql-server-dev-15 \ + libgpgme-dev \ libical-dev \ - xsltproc \ + libpq-dev \ + postgresql-server-dev-all \ rsync \ - libbsd-dev \ - libgpgme-dev - + xsltproc .. code-block:: :caption: Optional dependencies for gvmd sudo apt install -y --no-install-recommends \ - texlive-latex-extra \ - texlive-fonts-recommended \ - xmlstarlet \ - zip \ - rpm \ - fakeroot \ dpkg \ - nsis \ + fakeroot \ gnupg \ + gnutls-bin \ gpgsm \ - wget \ - sshpass \ + nsis \ openssh-client \ - socat \ - snmp \ python3 \ - smbclient \ python3-lxml \ - gnutls-bin - - .. tab:: Ubuntu - .. code-block:: - :caption: Required dependencies for gvmd - - sudo apt install -y \ - libglib2.0-dev \ - libgnutls28-dev \ - libpq-dev \ - postgresql-server-dev-14 \ - libical-dev \ - xsltproc \ - rsync \ - libbsd-dev \ - libgpgme-dev - - - .. code-block:: - :caption: Optional dependencies for gvmd - - sudo apt install -y --no-install-recommends \ - texlive-latex-extra \ - texlive-fonts-recommended \ - xmlstarlet \ - zip \ rpm \ - fakeroot \ - dpkg \ - nsis \ - gnupg \ - gpgsm \ - wget \ - sshpass \ - openssh-client \ - socat \ - snmp \ - python3 \ smbclient \ - python3-lxml \ - gnutls-bin + snmp \ + socat \ + sshpass \ + texlive-fonts-recommended \ + texlive-latex-extra \ + wget \ + xmlstarlet \ + zip .. tab:: Fedora .. code-block:: diff --git a/src/22.4/source-build/pg-gvm/dependencies.md b/src/22.4/source-build/pg-gvm/dependencies.md index e1be1f79..c5db13bb 100644 --- a/src/22.4/source-build/pg-gvm/dependencies.md +++ b/src/22.4/source-build/pg-gvm/dependencies.md @@ -1,22 +1,13 @@ ```{eval-rst} .. tabs:: - .. tab:: Debian + .. tab:: Debian/Ubuntu .. code-block:: :caption: Required dependencies for pg-gvm sudo apt install -y \ libglib2.0-dev \ - postgresql-server-dev-15 \ - libical-dev - - .. tab:: Ubuntu - .. code-block:: - :caption: Required dependencies for pg-gvm - - sudo apt install -y \ - libglib2.0-dev \ - postgresql-server-dev-14 \ - libical-dev + libical-dev \ + postgresql-server-dev-all .. tab:: Fedora/CentOS .. code-block:: @@ -25,6 +16,6 @@ sudo dnf install -y \ glib2-devel \ gnutls-devel \ - postgresql-server-devel \ - libical-devel + libical-devel \ + postgresql-server-devel ``` From b4691eb231a96bef48827eb03581287c01bf6e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:24:12 +0100 Subject: [PATCH 10/13] Update docs dependencies to their latest releases --- poetry.lock | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index 19fe0bb3..57de3692 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. [[package]] name = "alabaster" @@ -6,6 +6,7 @@ version = "0.7.16" description = "A light, configurable Sphinx theme" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "alabaster-0.7.16-py3-none-any.whl", hash = "sha256:b46733c07dce03ae4e150330b975c75737fa60f0a7c591b6c8bf4928a28e2c92"}, {file = "alabaster-0.7.16.tar.gz", hash = "sha256:75a8b99c28a5dad50dd7f8ccdd447a121ddb3892da9e53d1ca5cca3106d58d65"}, @@ -17,6 +18,7 @@ version = "4.8.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "anyio-4.8.0-py3-none-any.whl", hash = "sha256:b5011f270ab5eb0abf13385f851315585cc37ef330dd88e27ec3d34d651fd47a"}, {file = "anyio-4.8.0.tar.gz", hash = "sha256:1d9fe889df5212298c0c0723fa20479d1b94883a2df44bd3897aa91083316f7a"}, @@ -39,6 +41,7 @@ version = "2.17.0" description = "Internationalization utilities" optional = false python-versions = ">=3.8" +groups = ["main", "dev"] files = [ {file = "babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2"}, {file = "babel-2.17.0.tar.gz", hash = "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d"}, @@ -53,6 +56,7 @@ version = "4.13.3" description = "Screen-scraping library" optional = false python-versions = ">=3.7.0" +groups = ["main"] files = [ {file = "beautifulsoup4-4.13.3-py3-none-any.whl", hash = "sha256:99045d7d3f08f91f0d656bc9b7efbae189426cd913d830294a15eefa0ea4df16"}, {file = "beautifulsoup4-4.13.3.tar.gz", hash = "sha256:1bd32405dacc920b42b83ba01644747ed77456a65760e285fbc47633ceddaf8b"}, @@ -75,6 +79,7 @@ version = "2025.1.31" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" +groups = ["main", "dev"] files = [ {file = "certifi-2025.1.31-py3-none-any.whl", hash = "sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe"}, {file = "certifi-2025.1.31.tar.gz", hash = "sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651"}, @@ -86,6 +91,7 @@ version = "3.4.1" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = false python-versions = ">=3.7" +groups = ["main", "dev"] files = [ {file = "charset_normalizer-3.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de"}, {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176"}, @@ -187,6 +193,7 @@ version = "8.1.8" description = "Composable command line interface toolkit" optional = false python-versions = ">=3.7" +groups = ["dev"] files = [ {file = "click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"}, {file = "click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"}, @@ -201,10 +208,12 @@ version = "0.4.6" description = "Cross-platform colored terminal text." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +groups = ["main", "dev"] files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] +markers = {main = "sys_platform == \"win32\""} [[package]] name = "docutils" @@ -212,6 +221,7 @@ version = "0.21.2" description = "Docutils -- Python Documentation Utilities" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "docutils-0.21.2-py3-none-any.whl", hash = "sha256:dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2"}, {file = "docutils-0.21.2.tar.gz", hash = "sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f"}, @@ -223,6 +233,8 @@ version = "1.2.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" +groups = ["dev"] +markers = "python_version < \"3.11\"" files = [ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, @@ -237,6 +249,7 @@ version = "2024.8.6" description = "A clean customisable Sphinx documentation theme." optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "furo-2024.8.6-py3-none-any.whl", hash = "sha256:6cd97c58b47813d3619e63e9081169880fbe331f0ca883c871ff1f3f11814f5c"}, {file = "furo-2024.8.6.tar.gz", hash = "sha256:b63e4cee8abfc3136d3bc03a3d45a76a850bada4d6374d24c1716b0e01394a01"}, @@ -254,6 +267,7 @@ version = "0.14.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" optional = false python-versions = ">=3.7" +groups = ["dev"] files = [ {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"}, {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"}, @@ -265,6 +279,7 @@ version = "3.10" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.6" +groups = ["main", "dev"] files = [ {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"}, {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"}, @@ -279,6 +294,7 @@ version = "1.4.1" description = "Getting image size from png/jpeg/jpeg2000/gif file" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +groups = ["main", "dev"] files = [ {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"}, {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, @@ -290,6 +306,8 @@ version = "8.6.1" description = "Read metadata from Python packages" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] +markers = "python_version < \"3.10\"" files = [ {file = "importlib_metadata-8.6.1-py3-none-any.whl", hash = "sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e"}, {file = "importlib_metadata-8.6.1.tar.gz", hash = "sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580"}, @@ -313,6 +331,7 @@ version = "3.1.5" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" +groups = ["main", "dev"] files = [ {file = "jinja2-3.1.5-py3-none-any.whl", hash = "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"}, {file = "jinja2-3.1.5.tar.gz", hash = "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb"}, @@ -330,6 +349,7 @@ version = "3.0.0" description = "Python port of markdown-it. Markdown parsing, done right!" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"}, {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"}, @@ -354,6 +374,7 @@ version = "3.0.2" description = "Safely add untrusted strings to HTML/XML markup." optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "MarkupSafe-3.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8"}, {file = "MarkupSafe-3.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158"}, @@ -424,6 +445,7 @@ version = "0.4.2" description = "Collection of plugins for markdown-it-py" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "mdit_py_plugins-0.4.2-py3-none-any.whl", hash = "sha256:0c673c3f889399a33b95e88d2f0d111b4447bdfea7f237dab2d488f459835636"}, {file = "mdit_py_plugins-0.4.2.tar.gz", hash = "sha256:5f2cd1fdb606ddf152d37ec30e46101a60512bc0e5fa1a7002c36647b09e26b5"}, @@ -443,6 +465,7 @@ version = "0.1.2" description = "Markdown URL utilities" optional = false python-versions = ">=3.7" +groups = ["main"] files = [ {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, @@ -454,6 +477,7 @@ version = "3.0.1" description = "An extended [CommonMark](https://spec.commonmark.org/) compliant parser," optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "myst_parser-3.0.1-py3-none-any.whl", hash = "sha256:6457aaa33a5d474aca678b8ead9b3dc298e89c68e67012e73146ea6fd54babf1"}, {file = "myst_parser-3.0.1.tar.gz", hash = "sha256:88f0cb406cb363b077d176b51c476f62d60604d68a8dcdf4832e080441301a87"}, @@ -480,6 +504,7 @@ version = "24.2" description = "Core utilities for Python packages" optional = false python-versions = ">=3.8" +groups = ["main", "dev"] files = [ {file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"}, {file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"}, @@ -491,6 +516,7 @@ version = "2.19.1" description = "Pygments is a syntax highlighting package written in Python." optional = false python-versions = ">=3.8" +groups = ["main", "dev"] files = [ {file = "pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"}, {file = "pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f"}, @@ -505,6 +531,7 @@ version = "6.0.2" description = "YAML parser and emitter for Python" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "PyYAML-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086"}, {file = "PyYAML-6.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf"}, @@ -567,6 +594,7 @@ version = "2.32.3" description = "Python HTTP for Humans." optional = false python-versions = ">=3.8" +groups = ["main", "dev"] files = [ {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, @@ -588,6 +616,7 @@ version = "1.3.1" description = "Sniff out which async library your code is running under" optional = false python-versions = ">=3.7" +groups = ["dev"] files = [ {file = "sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2"}, {file = "sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"}, @@ -599,6 +628,7 @@ version = "2.2.0" description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." optional = false python-versions = "*" +groups = ["main", "dev"] files = [ {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, @@ -610,6 +640,7 @@ version = "2.6" description = "A modern CSS selector implementation for Beautiful Soup." optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "soupsieve-2.6-py3-none-any.whl", hash = "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"}, {file = "soupsieve-2.6.tar.gz", hash = "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb"}, @@ -621,6 +652,7 @@ version = "7.4.7" description = "Python documentation generator" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinx-7.4.7-py3-none-any.whl", hash = "sha256:c2419e2135d11f1951cd994d6eb18a1835bd8fdd8429f9ca375dc1f3281bd239"}, {file = "sphinx-7.4.7.tar.gz", hash = "sha256:242f92a7ea7e6c5b406fdc2615413890ba9f699114a9c09192d7dfead2ee9cfe"}, @@ -657,6 +689,7 @@ version = "2024.10.3" description = "Rebuild Sphinx documentation on changes, with hot reloading in the browser." optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "sphinx_autobuild-2024.10.3-py3-none-any.whl", hash = "sha256:158e16c36f9d633e613c9aaf81c19b0fc458ca78b112533b20dafcda430d60fa"}, {file = "sphinx_autobuild-2024.10.3.tar.gz", hash = "sha256:248150f8f333e825107b6d4b86113ab28fa51750e5f9ae63b59dc339be951fb1"}, @@ -679,6 +712,7 @@ version = "1.0.0b2" description = "A modern skeleton for Sphinx themes." optional = false python-versions = ">=3.7" +groups = ["main"] files = [ {file = "sphinx_basic_ng-1.0.0b2-py3-none-any.whl", hash = "sha256:eb09aedbabfb650607e9b4b68c9d240b90b1e1be221d6ad71d61c52e29f7932b"}, {file = "sphinx_basic_ng-1.0.0b2.tar.gz", hash = "sha256:9ec55a47c90c8c002b5960c57492ec3021f5193cb26cebc2dc4ea226848651c9"}, @@ -696,6 +730,7 @@ version = "0.5.2" description = "Add a copy button to each of your code cells." optional = false python-versions = ">=3.7" +groups = ["main"] files = [ {file = "sphinx-copybutton-0.5.2.tar.gz", hash = "sha256:4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd"}, {file = "sphinx_copybutton-0.5.2-py3-none-any.whl", hash = "sha256:fb543fd386d917746c9a2c50360c7905b605726b9355cd26e9974857afeae06e"}, @@ -714,6 +749,7 @@ version = "3.4.7" description = "Tabbed views for Sphinx" optional = false python-versions = ">=3.7" +groups = ["main"] files = [ {file = "sphinx-tabs-3.4.7.tar.gz", hash = "sha256:991ad4a424ff54119799ba1491701aa8130dd43509474aef45a81c42d889784d"}, {file = "sphinx_tabs-3.4.7-py3-none-any.whl", hash = "sha256:c12d7a36fd413b369e9e9967a0a4015781b71a9c393575419834f19204bd1915"}, @@ -734,6 +770,7 @@ version = "2.0.0" description = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib_applehelp-2.0.0-py3-none-any.whl", hash = "sha256:4cd3f0ec4ac5dd9c17ec65e9ab272c9b867ea77425228e68ecf08d6b28ddbdb5"}, {file = "sphinxcontrib_applehelp-2.0.0.tar.gz", hash = "sha256:2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1"}, @@ -750,6 +787,7 @@ version = "2.0.0" description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib_devhelp-2.0.0-py3-none-any.whl", hash = "sha256:aefb8b83854e4b0998877524d1029fd3e6879210422ee3780459e28a1f03a8a2"}, {file = "sphinxcontrib_devhelp-2.0.0.tar.gz", hash = "sha256:411f5d96d445d1d73bb5d52133377b4248ec79db5c793ce7dbe59e074b4dd1ad"}, @@ -766,6 +804,7 @@ version = "2.1.0" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib_htmlhelp-2.1.0-py3-none-any.whl", hash = "sha256:166759820b47002d22914d64a075ce08f4c46818e17cfc9470a9786b759b19f8"}, {file = "sphinxcontrib_htmlhelp-2.1.0.tar.gz", hash = "sha256:c9e2916ace8aad64cc13a0d233ee22317f2b9025b9cf3295249fa985cc7082e9"}, @@ -782,6 +821,7 @@ version = "1.0.1" description = "A sphinx extension which renders display math in HTML via JavaScript" optional = false python-versions = ">=3.5" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, @@ -796,6 +836,7 @@ version = "2.0.0" description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib_qthelp-2.0.0-py3-none-any.whl", hash = "sha256:b18a828cdba941ccd6ee8445dbe72ffa3ef8cbe7505d8cd1fa0d42d3f2d5f3eb"}, {file = "sphinxcontrib_qthelp-2.0.0.tar.gz", hash = "sha256:4fe7d0ac8fc171045be623aba3e2a8f613f8682731f9153bb2e40ece16b9bbab"}, @@ -812,6 +853,7 @@ version = "2.0.0" description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "sphinxcontrib_serializinghtml-2.0.0-py3-none-any.whl", hash = "sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331"}, {file = "sphinxcontrib_serializinghtml-2.0.0.tar.gz", hash = "sha256:e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d"}, @@ -828,6 +870,7 @@ version = "0.9.1" description = "Sphinx Extension to enable OGP support" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "sphinxext-opengraph-0.9.1.tar.gz", hash = "sha256:dd2868a1e7c9497977fbbf44cc0844a42af39ca65fe1bb0272518af225d06fc5"}, {file = "sphinxext_opengraph-0.9.1-py3-none-any.whl", hash = "sha256:b3b230cc6a5b5189139df937f0d9c7b23c7c204493b22646273687969dcb760e"}, @@ -842,6 +885,7 @@ version = "0.45.3" description = "The little ASGI library that shines." optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "starlette-0.45.3-py3-none-any.whl", hash = "sha256:dfb6d332576f136ec740296c7e8bb8c8a7125044e7c6da30744718880cdd059d"}, {file = "starlette-0.45.3.tar.gz", hash = "sha256:2cbcba2a75806f8a41c722141486f37c28e30a0921c5f6fe4346cb0dcee1302f"}, @@ -860,6 +904,8 @@ version = "2.2.1" description = "A lil' TOML parser" optional = false python-versions = ">=3.8" +groups = ["main", "dev"] +markers = "python_version < \"3.11\"" files = [ {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"}, {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"}, @@ -901,10 +947,12 @@ version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" +groups = ["main", "dev"] files = [ {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] +markers = {dev = "python_version < \"3.13\""} [[package]] name = "urllib3" @@ -912,6 +960,7 @@ version = "2.3.0" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.9" +groups = ["main", "dev"] files = [ {file = "urllib3-2.3.0-py3-none-any.whl", hash = "sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df"}, {file = "urllib3-2.3.0.tar.gz", hash = "sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"}, @@ -929,6 +978,7 @@ version = "0.34.0" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "uvicorn-0.34.0-py3-none-any.whl", hash = "sha256:023dc038422502fa28a09c7a30bf2b6991512da7dcdb8fd35fe57cfc154126f4"}, {file = "uvicorn-0.34.0.tar.gz", hash = "sha256:404051050cd7e905de2c9a7e61790943440b3416f49cb409f965d9dcd0fa73e9"}, @@ -948,6 +998,7 @@ version = "1.0.4" description = "Simple, modern and high performance file watching and code reload in python." optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "watchfiles-1.0.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:ba5bb3073d9db37c64520681dd2650f8bd40902d991e7b4cfaeece3e32561d08"}, {file = "watchfiles-1.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9f25d0ba0fe2b6d2c921cf587b2bf4c451860086534f40c384329fb96e2044d1"}, @@ -1031,6 +1082,7 @@ version = "14.2" description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" optional = false python-versions = ">=3.9" +groups = ["dev"] files = [ {file = "websockets-14.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e8179f95323b9ab1c11723e5d91a89403903f7b001828161b480a7810b334885"}, {file = "websockets-14.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0d8c3e2cdb38f31d8bd7d9d28908005f6fa9def3324edb9bf336d7e4266fd397"}, @@ -1109,6 +1161,8 @@ version = "3.21.0" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.9" +groups = ["main", "dev"] +markers = "python_version < \"3.10\"" files = [ {file = "zipp-3.21.0-py3-none-any.whl", hash = "sha256:ac1bbe05fd2991f160ebce24ffbac5f6d11d83dc90891255885223d42b3cd931"}, {file = "zipp-3.21.0.tar.gz", hash = "sha256:2c9958f6430a2040341a52eb608ed6dd93ef4392e02ffe219417c1b28b5dd1f4"}, @@ -1123,6 +1177,6 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", type = ["pytest-mypy"] [metadata] -lock-version = "2.0" +lock-version = "2.1" python-versions = "^3.9" content-hash = "8c5b88bc565b1f2900ea8f9a3ddda86ca11ab8c447de911347096145e04d94cf" From 560eae58056575656d6c089dfa07dcf35df9892e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 7 Feb 2025 13:27:41 +0100 Subject: [PATCH 11/13] Change: Don't set systemd service dir for gvmd Instead use the default which should be `/usr/local/lib/systemd/system`. --- src/22.4/source-build/gvmd/build.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/22.4/source-build/gvmd/build.md b/src/22.4/source-build/gvmd/build.md index 9915b0cf..db956a3b 100644 --- a/src/22.4/source-build/gvmd/build.md +++ b/src/22.4/source-build/gvmd/build.md @@ -18,7 +18,6 @@ -DGVMD_RUN_DIR=/run/gvmd \ -DOPENVAS_DEFAULT_SOCKET=/run/ospd/ospd-openvas.sock \ -DGVM_FEED_LOCK_PATH=/var/lib/gvm/feed-update.lock \ - -DSYSTEMD_SERVICE_DIR=/lib/systemd/system \ -DLOGROTATE_DIR=/etc/logrotate.d cmake --build $BUILD_DIR/gvmd -j$(nproc) From d9bb946ae0994be65fe5a67feba14dbb9be163b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Mon, 10 Feb 2025 11:08:40 +0100 Subject: [PATCH 12/13] Drop: Remove defusedxml from gvm-tools dependencies The library is not used in gvm-tools anymore. It's still used in ospd-openvas nevertheless. --- .../source-build/gvm-tools/dependencies.md | 18 ++++++++---------- src/changelog.md | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/22.4/source-build/gvm-tools/dependencies.md b/src/22.4/source-build/gvm-tools/dependencies.md index c494939b..a1247e47 100644 --- a/src/22.4/source-build/gvm-tools/dependencies.md +++ b/src/22.4/source-build/gvm-tools/dependencies.md @@ -6,13 +6,12 @@ sudo apt install -y \ python3 \ + python3-lxml \ + python3-packaging \ + python3-paramiko \ python3-pip \ - python3-venv \ python3-setuptools \ - python3-packaging \ - python3-lxml \ - python3-defusedxml \ - python3-paramiko + python3-venv .. tab:: Fedora/CentOS .. code-block:: @@ -20,10 +19,9 @@ sudo dnf install -y \ python3 \ - python3-pip \ - python3-setuptools \ - python3-packaging \ python3-lxml \ - python3-defusedxml \ - python3-paramiko + python3-packaging \ + python3-paramiko \ + python3-pip \ + python3-setuptools ``` diff --git a/src/changelog.md b/src/changelog.md index 4e352e27..b1fd7e9c 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -19,6 +19,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Update pg-gvm to 22.6.7 * Update gsad to 24.2.0 and support brotli compression * Update GSA to 24.2.0 and the description +* Drop python3-defusedxml from dependencies of gvm-tools ## 25.1.0 - 2025-01-09 From 759572db719223aac3d3f818c68af49e6b381ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Mon, 10 Feb 2025 11:11:03 +0100 Subject: [PATCH 13/13] Change: Simplify instructions for setting up sudo Create an own sudoers file which allows for getting rid of using visudo. --- src/22.4/source-build/sudo-scanning.md | 20 +++----------------- src/changelog.md | 1 + 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/22.4/source-build/sudo-scanning.md b/src/22.4/source-build/sudo-scanning.md index 5b7899df..1dd16936 100644 --- a/src/22.4/source-build/sudo-scanning.md +++ b/src/22.4/source-build/sudo-scanning.md @@ -15,25 +15,11 @@ be used for exploits. See ```{eval-rst} .. tabs:: - .. tab:: Debian/Ubuntu + .. tab:: Debian/Ubuntu/Fedora .. code-block:: none - sudo visudo - - ... - - # allow users of the gvm group run openvas - %gvm ALL = NOPASSWD: /usr/local/sbin/openvas - - .. tab:: Fedora - .. code-block:: none - - sudo visudo - - ... - - # allow users of the gvm group run openvas - %gvm ALL = NOPASSWD: /usr/local/sbin/openvas + echo "%gvm ALL = NOPASSWD: /usr/local/sbin/openvas" | sudo tee /etc/sudoers.d/gvm \ + && sudo chmod 0440 /etc/sudoers.d/gvm .. tab:: CentOS .. code-block:: none diff --git a/src/changelog.md b/src/changelog.md index b1fd7e9c..f07d226d 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -20,6 +20,7 @@ and this project adheres to [Calendar Versioning](https://calver.org). * Update gsad to 24.2.0 and support brotli compression * Update GSA to 24.2.0 and the description * Drop python3-defusedxml from dependencies of gvm-tools +* Simplify instructions for setting up sudo ## 25.1.0 - 2025-01-09