diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile
index 34bd056f56d6..6d853b9d4b80 100644
--- a/databases/pg-gvm/Makefile
+++ b/databases/pg-gvm/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	pg-gvm
-DISTVERSION=	22.6.6
+DISTVERSION=	22.6.9
 DISTVERSIONPREFIX=v
 CATEGORIES=	databases devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Library for helper functions in PostgreSQL
 WWW=		https://github.com/greenbone/pg-gvm
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libical.so:devel/libical
 
 USES=		cmake gnome pkgconfig pgsql
 USE_GNOME=	glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	pg-gvm
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find -type f|find * -type f|g' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/databases/pg-gvm/distinfo b/databases/pg-gvm/distinfo
index bba8bb8234fc..7482dcbd1a7a 100644
--- a/databases/pg-gvm/distinfo
+++ b/databases/pg-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734854182
-SHA256 (greenbone-pg-gvm-v22.6.6_GH0.tar.gz) = a7c9351bb3951425c4bd56fdc982ae8f13c4f8a8be64b5fb502b57c6ceffa858
-SIZE (greenbone-pg-gvm-v22.6.6_GH0.tar.gz) = 39921
+TIMESTAMP = 1744672585
+SHA256 (greenbone-pg-gvm-v22.6.9_GH0.tar.gz) = 00b79da6847345c8523f83f6de0ee1cde53496fa268035c697115a8f0d5cf7d5
+SIZE (greenbone-pg-gvm-v22.6.9_GH0.tar.gz) = 41510
diff --git a/security/gsa/files/patch-package.json b/security/gsa/files/patch-package.json
deleted file mode 100644
index ea261d040395..000000000000
--- a/security/gsa/files/patch-package.json
+++ /dev/null
@@ -1,19 +0,0 @@
---- package.json.orig	2024-08-29 05:25:04.000000000 -0700
-+++ package.json	2024-09-19 16:57:38.217825000 -0700
-@@ -108,6 +108,9 @@
-     "vite-plugin-svgr": "^4.2.0",
-     "vitest": "^2.0.5"
-   },
-+  "overrides": {
-+    "rollup": "npm:@rollup/wasm-node"
-+  },
-   "husky": {
-     "hooks": {
-       "pre-commit": "lint-staged"
-@@ -118,4 +121,4 @@
-       "prettier --write"
-     ]
-   }
--}
-\ No newline at end of file
-+}
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index 66f4ddb2f812..11b83fcd5ae4 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	gvm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.15.0
+DISTVERSION=	22.21.0
 CATEGORIES=	security
 PKGNAMESUFFIX=	-libs
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Libraries module for the GVM solution
 WWW=		https://github.com/greenbone/gvm-libs
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	doxygen>0:devel/doxygen
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libcjson.so:devel/libcjson \
 		libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libgpgme.so:security/gpgme \
 		libgpg-error.so:security/libgpg-error \
 		libhiredis.so:databases/hiredis \
 		libnet.so:net/libnet \
 		libpaho-mqtt3a.so:net/libpaho-mqtt3 \
 		libssh.so:security/libssh \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libjson-glib-1.0.so:devel/json-glib \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	doxygen>0:devel/doxygen
 
 USES=		cmake gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	LDAP RADIUS
 
 LDAP_CMAKE_ON=		-DBUILD_WITH_LDAP=1
 LDAP_CMAKE_OFF=		-DBUILD_WITH_LDAP=0
 LDAP_USES=		ldap
 RADIUS_CMAKE_ON=	-DBUILD_WITH_RADIUS=1
 RADIUS_CMAKE_OFF=	-DBUILD_WITH_RADIUS=0
 RADIUS_LIB_DEPENDS=	libfreeradius-client.so:net/freeradius-client
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.25.0|1.45.6|g' ${WRKSRC}/util/libgvm_util.pc.in
 	@${REINPLACE_CMD} -e 's|uuid>=2.25.0|uuid>=1.45.6|g' ${WRKSRC}/util/CMakeLists.txt
 	@${REINPLACE_CMD} '17d' ${WRKSRC}/base/proctitle.c
 
 .include <bsd.port.mk>
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
index 674f3f4fe76c..e02ac5d7fd4c 100644
--- a/security/gvm-libs/distinfo
+++ b/security/gvm-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734853876
-SHA256 (greenbone-gvm-libs-v22.15.0_GH0.tar.gz) = e7bd3fc6e8e0c965ab51c09d319790eb44697a96953415bc2670b8dae5875664
-SIZE (greenbone-gvm-libs-v22.15.0_GH0.tar.gz) = 360090
+TIMESTAMP = 1744671888
+SHA256 (greenbone-gvm-libs-v22.21.0_GH0.tar.gz) = 064527e3a26c862f4cd69b132a640b6e3515f4bd03c973bc76678c9c0bf336fd
+SIZE (greenbone-gvm-libs-v22.21.0_GH0.tar.gz) = 370293
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
index bef7e49ef266..822a20a8b4b3 100644
--- a/security/gvm-libs/pkg-plist
+++ b/security/gvm-libs/pkg-plist
@@ -1,69 +1,76 @@
 include/gvm/base/array.h
 include/gvm/base/credentials.h
 include/gvm/base/cvss.h
 include/gvm/base/drop_privileges.h
 include/gvm/base/gvm_sentry.h
 include/gvm/base/hosts.h
 include/gvm/base/logging.h
+include/gvm/base/logging_domain.h
 include/gvm/base/networking.h
 include/gvm/base/nvti.h
 include/gvm/base/pidfile.h
 include/gvm/base/prefs.h
 include/gvm/base/proctitle.h
 include/gvm/base/pwpolicy.h
 include/gvm/base/settings.h
 include/gvm/base/strings.h
 include/gvm/base/version.h
 include/gvm/boreas/alivedetection.h
 include/gvm/boreas/arp.h
 include/gvm/boreas/boreas_error.h
 include/gvm/boreas/boreas_io.h
 include/gvm/boreas/cli.h
 include/gvm/boreas/ping.h
 include/gvm/boreas/sniffer.h
 include/gvm/boreas/util.h
 include/gvm/gmp/gmp.h
+include/gvm/http/httputils.h
 include/gvm/openvasd/openvasd.h
 include/gvm/osp/osp.h
 include/gvm/util/authutils.h
 include/gvm/util/compressutils.h
 include/gvm/util/cpeutils.h
 include/gvm/util/fileutils.h
 include/gvm/util/gpgmeutils.h
+include/gvm/util/json.h
 include/gvm/util/jsonpull.h
 include/gvm/util/kb.h
 include/gvm/util/ldaputils.h
 include/gvm/util/mqtt.h
 include/gvm/util/nvticache.h
 include/gvm/util/passwordbasedauthentication.h
 include/gvm/util/radiusutils.h
 include/gvm/util/serverutils.h
 include/gvm/util/sshutils.h
 include/gvm/util/uuidutils.h
 include/gvm/util/versionutils.h
 include/gvm/util/xmlutils.h
 lib/libgvm_base.so
 lib/libgvm_base.so.22
-lib/libgvm_base.so.22.15.0
+lib/libgvm_base.so.22.21.0
 lib/libgvm_boreas.so
 lib/libgvm_boreas.so.22
-lib/libgvm_boreas.so.22.15.0
+lib/libgvm_boreas.so.22.21.0
 lib/libgvm_gmp.so
 lib/libgvm_gmp.so.22
-lib/libgvm_gmp.so.22.15.0
+lib/libgvm_gmp.so.22.21.0
+lib/libgvm_http.so
+lib/libgvm_http.so.22
+lib/libgvm_http.so.22.21.0
 lib/libgvm_openvasd.so
 lib/libgvm_openvasd.so.22
-lib/libgvm_openvasd.so.22.15.0
+lib/libgvm_openvasd.so.22.21.0
 lib/libgvm_osp.so
 lib/libgvm_osp.so.22
-lib/libgvm_osp.so.22.15.0
+lib/libgvm_osp.so.22.21.0
 lib/libgvm_util.so
 lib/libgvm_util.so.22
-lib/libgvm_util.so.22.15.0
+lib/libgvm_util.so.22.21.0
 libdata/pkgconfig/libgvm_base.pc
 libdata/pkgconfig/libgvm_boreas.pc
 libdata/pkgconfig/libgvm_gmp.pc
+libdata/pkgconfig/libgvm_http.pc
 libdata/pkgconfig/libgvm_openvasd.pc
 libdata/pkgconfig/libgvm_osp.pc
 libdata/pkgconfig/libgvm_util.pc
 @dir /var/run/gvm
diff --git a/security/gvm/Makefile b/security/gvm/Makefile
index 33ba14295337..713929fbca6b 100644
--- a/security/gvm/Makefile
+++ b/security/gvm/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	gvm
-PORTVERSION=	24.1.2
+PORTVERSION=	25.2.1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone vulnerability management (metaport)
 WWW=		https://www.openvas.org/
 
 USES=		metaport python
 
 # Install GVM libraries
 RUN_DEPENDS+=	${LOCALBASE}/lib/libgvm_base.so:security/gvm-libs
 
 # Install GVM Manager
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gvmd:security/gvmd
 
 # Install Scanner wrapper for OSP
 RUN_DEPENDS+=	${LOCALBASE}/bin/ospd-openvas:security/py-ospd-openvas@${PY_FLAVOR}
 
 # Install OpenVAS Scanner
 RUN_DEPENDS+=   ${LOCALBASE}/sbin/openvas:security/openvas
 
 # Install Notus Scanner
 RUN_DEPENDS+=	${LOCALBASE}/bin/notus-scanner:security/py-notus-scanner
 
 # Install Greenbone Community Feed
 RUN_DEPENDS+=	greenbone-feed-sync:security/py-greenbone-feed-sync@${PY_FLAVOR}
 
 # Install GVM Web Interface
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gsad:security/gsad
 RUN_DEPENDS+=	${LOCALBASE}/share/gvm/gsad/web/index.html:security/gsa
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		PYTHON-GVM GVM-TOOLS
 OPTIONS_DEFAULT=	PYTHON-GVM GVM-TOOLS
 
 PYTHON-GVM_DESC=	Install GVM python API library
 GVM-TOOLS_DESC=		Install GVM tools
 
 PYTHON-GVM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gvm>=0:security/py-python-gvm@${PY_FLAVOR}
 GVM-TOOLS_RUN_DEPENDS=	gvm-cli:security/py-gvm-tools@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index e0aecb3738f1..e6b9a5c85f9e 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,59 +1,58 @@
 PORTNAME=	gvmd
-DISTVERSION=	24.1.2
+DISTVERSION=	25.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Vulnerability Manager central management service
 WWW=		https://github.com/greenbone/gvmd
 
 LICENSE=	AGPLv3+
 
 BUILD_DEPENDS=	doxygen>0:devel/doxygen
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgnutls.so:security/gnutls \
 		libgpgme.so:security/gpgme \
 		libical.so:devel/libical
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${LOCALBASE}/lib/postgresql/libpg-gvm.so:databases/pg-gvm \
 		doxygen>0:devel/doxygen \
 		p5-XML-Twig>=0:textproc/p5-XML-Twig \
 		snmpget:net-mgmt/net-snmp \
 		rsync:net/rsync \
 		wget:ftp/wget \
 		gpg:security/gnupg \
 		xml:textproc/xmlstarlet \
 		sshpass:security/sshpass \
 		socat:net/socat \
 		zip:archivers/zip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 
 USES=		cmake gnome pkgconfig pgsql python samba:run shebangfix
 USE_GNOME=	glib20 libxslt:build
 USE_LDCONFIG=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	gvmd
 
 SHEBANG_FILES=	tools/gvm-lsc-rpm-creator \
 		tools/gvm-lsc-deb-creator \
 		src/alert_methods/TippingPoint/report-convert.py \
 		src/alert_methods/SCP/alert \
 		src/alert_methods/SMB/alert
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/manage_sql.c
-	${REINPLACE_CMD} -e 's|+660|660|g' ${WRKSRC}/tools/greenbone-feed-sync.in
 	${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/manage.c \
 		${WRKSRC}/src/gvmd.c ${WRKSRC}/src/manage_sql_secinfo.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg
 	@${MKDIR} ${STAGEDIR}/var/log/gvm
 	@${MKDIR} ${STAGEDIR}/var/run/gvmd
 
 .include <bsd.port.mk>
diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo
index 24c9573e5b6c..5bf28bf601bd 100644
--- a/security/gvmd/distinfo
+++ b/security/gvmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734854305
-SHA256 (greenbone-gvmd-v24.1.2_GH0.tar.gz) = 3ecc01592af55d81f83dd49a616f63c80827e6b9e27c1a6b1d459c70812a6391
-SIZE (greenbone-gvmd-v24.1.2_GH0.tar.gz) = 1095448
+TIMESTAMP = 1744679865
+SHA256 (greenbone-gvmd-v25.2.1_GH0.tar.gz) = de0156058ea2fb2abdf96ed73f69f506bcf63e80574f6440a782366f2e5fbc4b
+SIZE (greenbone-gvmd-v25.2.1_GH0.tar.gz) = 1123704
diff --git a/security/gvmd/files/patch-src_CMakeLists.txt b/security/gvmd/files/patch-src_CMakeLists.txt
index 5afd6d919d93..d17a7fd1955a 100644
--- a/security/gvmd/files/patch-src_CMakeLists.txt
+++ b/security/gvmd/files/patch-src_CMakeLists.txt
@@ -1,29 +1,29 @@
---- src/CMakeLists.txt	2022-07-21 02:20:24.000000000 -0500
-+++ src/CMakeLists.txt	2022-07-31 19:00:06.378204000 -0500
-@@ -32,7 +32,9 @@
- pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=22.4)
+--- src/CMakeLists.txt	2025-04-08 00:29:30.000000000 -0700
++++ src/CMakeLists.txt	2025-04-14 18:23:00.165064000 -0700
+@@ -39,7 +39,9 @@
+ endif (OPENVASD)
  pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
  pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
 +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  pkg_check_modules (LIBBSD REQUIRED libbsd)
 +endif()
  pkg_check_modules (LIBICAL REQUIRED libical>=1.00)
+ pkg_check_modules (GPGME REQUIRED gpgme)
  
- message (STATUS "Looking for PostgreSQL...")
-@@ -271,7 +273,7 @@
+@@ -338,7 +340,7 @@
                         ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
-                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
-                        ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_GMP_LDFLAGS}
--                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT})
-+                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT} -lexecinfo)
+                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${CJSON_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
+                        ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_OPENVASD_LDFLAGS}
+-                       ${LIBGVM_GMP_LDFLAGS} ${LIBGVM_HTTP_LDFLAGS} ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT})
++                       ${LIBGVM_GMP_LDFLAGS} ${LIBGVM_HTTP_LDFLAGS} ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT} -lexecinfo)
  target_link_libraries (manage-test cgreen m
                         ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
-                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
-@@ -489,5 +491,7 @@
+                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${CJSON_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
+@@ -555,5 +557,7 @@
                     COMMAND ctags ${C_FILES})
  add_custom_target (tags COMMENT "Building tags files...")
  add_dependencies (tags etags ctags)
 +
 +file(RENAME "pwpolicy.conf" "pwpolicy.conf.sample")
  
  ## End
diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist
index 608c356aa9bf..b7349a16468c 100644
--- a/security/gvmd/pkg-plist
+++ b/security/gvmd/pkg-plist
@@ -1,52 +1,52 @@
 bin/gvm-manage-certs
 @sample etc/gvm/gvmd_log.conf.sample
 @sample etc/gvm/pwpolicy.conf.sample
 lib/libgvm-pg-server.so
-lib/libgvm-pg-server.so.24
-lib/libgvm-pg-server.so.24.1.2
+lib/libgvm-pg-server.so.25
+lib/libgvm-pg-server.so.25.2.1
 sbin/gvmd
 share/doc/gvm/example-gvm-manage-certs.conf
 share/doc/gvm/html/gmp.html
 share/gvm/cert/cert_bund_getbyname.xsl
 share/gvm/cert/dfn_cert_getbyname.xsl
 share/gvm/gvm-lsc-deb-creator
 share/gvm/gvm-lsc-exe-creator
 share/gvm/gvm-lsc-rpm-creator
 share/gvm/gvmd/global_alert_methods/159f79a5-fce8-4ec5-aa49-7d17a77739a3/alert
 share/gvm/gvmd/global_alert_methods/2db07698-ec49-11e5-bcff-28d24461215b/alert
 share/gvm/gvmd/global_alert_methods/4a398d42-87c0-11e5-a1c0-28d24461215b/alert
 share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/alert
 share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/report-convert.py
 share/gvm/gvmd/global_alert_methods/9d435134-15d3-11e6-bf5c-28d24461215b/alert
 share/gvm/gvmd/global_alert_methods/c427a688-b653-40ab-a9d0-d6ba842a9d63/alert
 share/gvm/gvmd/global_alert_methods/cd1f5a34-6bdc-11e0-9827-002264764cea/alert
 share/gvm/gvmd/global_alert_methods/f9d97653-f89b-41af-9ba1-0f6ee00e9c1a/alert
 share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/HTML.xsl
 share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/generate
 share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/rnc.xsl
 share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/GMP.xml
 share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/generate
 share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/RNC.xsl
 share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/generate
 share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/rnc.xsl
 share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/GMP.xsl
 share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/generate
 share/gvm/gvmd/global_schema_formats/rnc.xsl
 share/gvm/gvmd/template.nsis
 share/gvm/gvmd/wizards/delete_task_deep.xml
 share/gvm/gvmd/wizards/get_tasks_deep.xml
 share/gvm/gvmd/wizards/modify_task.xml
 share/gvm/gvmd/wizards/quick_auth_scan.xml
 share/gvm/gvmd/wizards/quick_first_scan.xml
 share/gvm/gvmd/wizards/quick_task.xml
 share/gvm/gvmd/wizards/reset_task.xml
 share/gvm/scap/cpe_getbyname.xsl
 share/gvm/scap/cve_getbyname.xsl
 share/man/man1/gvm-manage-certs.1.gz
 share/man/man8/gvmd.8.gz
 @dir(gvm,gvm,750) /var/lib/gvm/gvmd/gnupg
 @dir(gvm,gvm,750) /var/lib/gvm/gvmd
 @dir(gvm,gvm,750) /var/lib/gvm
 @dir(gvm,gvm,750) /var/run/gvmd
 @dir(gvm,gvm,750) /var/log/gvm
 @dir /var/lib
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index 66aa8eda7d75..34e9452a0b61 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -1,63 +1,62 @@
 PORTNAME=	openvas
-DISTVERSION=	23.14.0
-PORTREVISION=	1
+DISTVERSION=	23.16.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Open vulnerability assessment scanner
 WWW=		https://github.com/greenbone/openvas
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	flex:textproc/flex
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libpcap.so.1:net/libpcap \
 		libksba.so:security/libksba \
 		libgpgme.so:security/gpgme \
 		libssh.so:security/libssh \
 		libgnutls.so:security/gnutls \
 		libnetsnmp.so:net-mgmt/net-snmp \
 		libjson-glib-1.0.so:devel/json-glib \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenbone-feed-sync>0:security/py-greenbone-feed-sync@${PY_FLAVOR} \
 		redis-server:databases/redis \
 		snmpget:net-mgmt/net-snmp \
 		rsync:net/rsync \
 		nmap:security/nmap
 
 USES=		bison cmake gnome gssapi:mit pkgconfig python ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}-scanner
 USE_GNOME=	glib20
 
 CMAKE_ARGS+=	-DINSTALL_OLD_SYNC_SCRIPT=OFF
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8 -Wno-implicit-function-declaration
 .endif
 
 # The struct this error is about is only ever accessed using bcopy() and memset(),
 # so the unaligned structure doesn't matter.  Disable the error, but keep it as a
 # warning so we can see where it is.
 CFLAGS_armv6=	-Wno-error=unaligned-access
 CFLAGS_armv7=	-Wno-error=unaligned-access
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/nasl_plugins.c
-	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c
+	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}/src/pluginload.c
 	@${REINPLACE_CMD} -e 's|vendor_version_get ()|vendor_version_get (void)|g' ${WRKSRC}/misc/vendorversion.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
 .include <bsd.port.post.mk>
diff --git a/security/openvas/distinfo b/security/openvas/distinfo
index 062ba1405684..fe1fd27dc51e 100644
--- a/security/openvas/distinfo
+++ b/security/openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734854438
-SHA256 (greenbone-openvas-scanner-v23.14.0_GH0.tar.gz) = 01937ea70dd4e9eb73e4ccb2044dcf2c175e7c56a47fea988d40aafe08742976
-SIZE (greenbone-openvas-scanner-v23.14.0_GH0.tar.gz) = 1515371
+TIMESTAMP = 1744680509
+SHA256 (greenbone-openvas-scanner-v23.16.1_GH0.tar.gz) = 6ef32eab6fe19d3b37589705f9b2e4539a0572cd70bc8b16d217078080dad827
+SIZE (greenbone-openvas-scanner-v23.16.1_GH0.tar.gz) = 1550974
diff --git a/security/openvas/files/patch-src_CMakeLists.txt b/security/openvas/files/patch-src_CMakeLists.txt
index 1f74b7c39c5d..da49b07a44c6 100644
--- a/security/openvas/files/patch-src_CMakeLists.txt
+++ b/security/openvas/files/patch-src_CMakeLists.txt
@@ -1,23 +1,23 @@
---- src/CMakeLists.txt	2022-07-18 04:07:38.000000000 -0500
-+++ src/CMakeLists.txt	2022-07-31 19:53:15.521197000 -0500
-@@ -30,7 +30,9 @@
+--- src/CMakeLists.txt	2025-03-03 04:49:55.000000000 -0800
++++ src/CMakeLists.txt	2025-04-14 20:15:02.381958000 -0700
+@@ -16,7 +16,9 @@
  pkg_check_modules (LIBGVM_BOREAS REQUIRED libgvm_boreas>=22.4)
  pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.4)
  pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
 +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  pkg_check_modules (LIBBSD REQUIRED libbsd)
 +endif()
  
  message (STATUS "Looking for libgcrypt...")
- find_library (GCRYPT gcrypt)
-@@ -230,8 +232,8 @@
+ pkg_check_modules (GCRYPT REQUIRED libgcrypt)
+@@ -198,8 +200,8 @@
           PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
           GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  
 -install (FILES ${CMAKE_BINARY_DIR}/src/openvas_log.conf
 -         DESTINATION ${OPENVAS_SYSCONF_DIR})
 +install (FILES ${CMAKE_BINARY_DIR}/src/openvas_log.conf.sample
 +         DESTINATION "${OPENVAS_SYSCONF_DIR}")
  
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync
-          DESTINATION ${BINDIR}
+ install (FILES ${CMAKE_BINARY_DIR}/doc/man/openvas.8
+          DESTINATION ${DATADIR}/man/man8 )
diff --git a/security/openvas/files/patch-src_attack.c b/security/openvas/files/patch-src_attack.c
index 7606ee921360..af15212b9768 100644
--- a/security/openvas/files/patch-src_attack.c
+++ b/security/openvas/files/patch-src_attack.c
@@ -1,28 +1,29 @@
---- src/attack.c	2024-04-24 02:59:35.930683000 -0500
-+++ src/attack.c	2024-04-24 03:02:33.794371000 -0500
+--- src/attack.c	2025-03-03 04:49:55.000000000 -0800
++++ src/attack.c	2025-04-14 20:09:40.968033000 -0700
 @@ -31,7 +31,6 @@
  #include "utils.h"
  
  #include <arpa/inet.h> /* for inet_ntoa() */
 -#include <bsd/unistd.h>
  #include <errno.h> /* for errno() */
  #include <fcntl.h>
  #include <glib.h>
-@@ -1541,13 +1540,13 @@
- 
+@@ -1555,14 +1554,14 @@
    gettimeofday (&now, NULL);
    if (test_alive_hosts_only)
--    g_message ("Vulnerability scan %s finished in %ld seconds: "
-+    g_message ("Vulnerability scan %s finished in %lld seconds: "
-                "%d alive hosts of %d",
--               globals->scan_id, now.tv_sec - then.tv_sec,
-+               globals->scan_id, (long long)now.tv_sec - then.tv_sec,
-                gvm_hosts_count (alive_hosts_list), gvm_hosts_count (hosts));
+     {
+-      g_message ("Vulnerability scan %s finished in %ld seconds: "
++      g_message ("Vulnerability scan %s finished in %lld seconds: "
+                  "%d alive hosts of %d",
+-                 globals->scan_id, now.tv_sec - then.tv_sec,
++                 globals->scan_id, (long long)now.tv_sec - then.tv_sec,
+                  gvm_hosts_count (alive_hosts_list), gvm_hosts_count (hosts));
+     }
    else
 -    g_message ("Vulnerability scan %s finished in %ld seconds: %d hosts",
 -               globals->scan_id, now.tv_sec - then.tv_sec,
 +    g_message ("Vulnerability scan %s finished in %lld seconds: %d hosts",
 +               globals->scan_id, (long long)now.tv_sec - then.tv_sec,
                 gvm_hosts_count (hosts));
  
-   gvm_hosts_free (hosts);
+   if (prefs_get ("report_scripts"))
diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist
index 10cc04f5e924..c7634dde26f2 100644
--- a/security/openvas/pkg-plist
+++ b/security/openvas/pkg-plist
@@ -1,21 +1,21 @@
 bin/openvas-nasl
 bin/openvas-nasl-lint
 @sample %%ETCDIR%%/openvas_log.conf.sample
 lib/libopenvas_misc.so
 lib/libopenvas_misc.so.23
-lib/libopenvas_misc.so.23.14.0
+lib/libopenvas_misc.so.23.16.1
 lib/libopenvas_nasl.so
 lib/libopenvas_nasl.so.23
-lib/libopenvas_nasl.so.23.14.0
+lib/libopenvas_nasl.so.23.16.1
 sbin/openvas
 share/man/man1/openvas-nasl-lint.1.gz
 share/man/man1/openvas-nasl.1.gz
 share/man/man8/openvas.8.gz
 @dir %%ETCDIR%%/gnupg
 @dir %%DATADIR%%
 @dir /var/lib
 @dir(gvm,gvm,750) /var/lib/openvas/gnupg
 @dir(gvm,gvm,750) /var/lib/openvas/plugins
 @dir(gvm,gvm,750) /var/lib/openvas
 @dir(gvm,gvm,750) /var/log/gvm
 @dir(gvm,gvm,750) /var/run/ospd
diff --git a/security/py-gvm-tools/Makefile b/security/py-gvm-tools/Makefile
index 12173d1e2bd1..9f5874b1f32f 100644
--- a/security/py-gvm-tools/Makefile
+++ b/security/py-gvm-tools/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gvm-tools
-DISTVERSION=	24.12.1
+DISTVERSION=	25.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The Greenbone Vulnerability Management Tools
 WWW=		https://github.com/greenbone/gvm-tools
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gvm>=0:security/py-python-gvm@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 post-extract:
 	${MV} ${WRKSRC}/tests ${WRKSRC}/gvmtools/
 	${MV} ${WRKSRC}/scripts ${WRKSRC}/gvmtools/
 
 post-patch:
 	${REINPLACE_CMD} '31,32d' ${WRKSRC}/pyproject.toml
 
 .include <bsd.port.mk>
diff --git a/security/py-gvm-tools/distinfo b/security/py-gvm-tools/distinfo
index c300c2b3b898..d33dd9268515 100644
--- a/security/py-gvm-tools/distinfo
+++ b/security/py-gvm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734856086
-SHA256 (greenbone-gvm-tools-v24.12.1_GH0.tar.gz) = 385426400c34b883b71c2c5e0c4a0034431d7385200e601031b91e8f28cfb364
-SIZE (greenbone-gvm-tools-v24.12.1_GH0.tar.gz) = 243110
+TIMESTAMP = 1744687887
+SHA256 (greenbone-gvm-tools-v25.3.0_GH0.tar.gz) = 24f8385a00dc909f1862a48f063126f8f51094b8f93c5d29e6b1438e424ed538
+SIZE (greenbone-gvm-tools-v25.3.0_GH0.tar.gz) = 260850
diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile
index 80e2ae494b99..9b39491cd018 100644
--- a/security/py-ospd-openvas/Makefile
+++ b/security/py-ospd-openvas/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	ospd-openvas
-DISTVERSION=	22.7.1
+DISTVERSION=	22.8.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	security python
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Scanner wrapper for OSP (Open Scanner Protocol)
 WWW=		https://github.com/greenbone/ospd-openvas
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \
 		openvas:security/openvas
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	pep517
 
 NO_ARCH=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 post-patch:
 	${REINPLACE_CMD} -i "" '38d' ${WRKSRC}/pyproject.toml
 	${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \
 		${WRKSRC}/ospd_openvas/gpg_sha_verifier.py
 	${REINPLACE_CMD} -i "" -e 's|/run/ospd|/var/run/ospd|g' \
 		${WRKSRC}/ospd/parser.py ${WRKSRC}/config/ospd-openvas.conf
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gvm
 	@${INSTALL_DATA} ${WRKSRC}/config/ospd-openvas.conf ${STAGEDIR}${PREFIX}/etc/gvm/ospd-openvas.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
 .include <bsd.port.mk>
diff --git a/security/py-ospd-openvas/distinfo b/security/py-ospd-openvas/distinfo
index aebe476687f7..9eef5f99a23a 100644
--- a/security/py-ospd-openvas/distinfo
+++ b/security/py-ospd-openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713946111
-SHA256 (greenbone-ospd-openvas-v22.7.1_GH0.tar.gz) = 1adaccfc765a2f61d668888514823af40f967a9057ff9e33aeea65a70c2af211
-SIZE (greenbone-ospd-openvas-v22.7.1_GH0.tar.gz) = 250148
+TIMESTAMP = 1744687624
+SHA256 (greenbone-ospd-openvas-v22.8.2_GH0.tar.gz) = a545d617e228da4a0328dd4ef13882b7e34ee3324f730a7de4708e51d313ece8
+SIZE (greenbone-ospd-openvas-v22.8.2_GH0.tar.gz) = 250151
diff --git a/security/py-ospd-openvas/pkg-plist b/security/py-ospd-openvas/pkg-plist
index 05de27a50cc5..0bda1ec1a2bf 100644
--- a/security/py-ospd-openvas/pkg-plist
+++ b/security/py-ospd-openvas/pkg-plist
@@ -1,141 +1,141 @@
 bin/ospd-openvas
 @sample etc/gvm/ospd-openvas.conf.sample
 %%PYTHON_SITELIBDIR%%/ospd/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/cvss%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/cvss%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/datapickler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/datapickler%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/logger%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/logger%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/misc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/misc%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/network%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/network%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/protocol%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/protocol%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/resultlist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/resultlist%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/scan%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/scan%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/server%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/timer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/timer%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/vtfilter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/vtfilter%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/vts%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/vts%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xml%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xmlvt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xmlvt%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/command%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/command%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/initsubclass%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/initsubclass%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/registry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/registry%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/command.py
 %%PYTHON_SITELIBDIR%%/ospd/command/initsubclass.py
 %%PYTHON_SITELIBDIR%%/ospd/command/registry.py
 %%PYTHON_SITELIBDIR%%/ospd/config.py
 %%PYTHON_SITELIBDIR%%/ospd/cvss.py
 %%PYTHON_SITELIBDIR%%/ospd/datapickler.py
 %%PYTHON_SITELIBDIR%%/ospd/errors.py
 %%PYTHON_SITELIBDIR%%/ospd/logger.py
 %%PYTHON_SITELIBDIR%%/ospd/main.py
 %%PYTHON_SITELIBDIR%%/ospd/misc.py
 %%PYTHON_SITELIBDIR%%/ospd/network.py
 %%PYTHON_SITELIBDIR%%/ospd/ospd.py
 %%PYTHON_SITELIBDIR%%/ospd/parser.py
 %%PYTHON_SITELIBDIR%%/ospd/protocol.py
 %%PYTHON_SITELIBDIR%%/ospd/resultlist.py
 %%PYTHON_SITELIBDIR%%/ospd/scan.py
 %%PYTHON_SITELIBDIR%%/ospd/server.py
 %%PYTHON_SITELIBDIR%%/ospd/timer.py
 %%PYTHON_SITELIBDIR%%/ospd/vtfilter.py
 %%PYTHON_SITELIBDIR%%/ospd/vts.py
 %%PYTHON_SITELIBDIR%%/ospd/xml.py
 %%PYTHON_SITELIBDIR%%/ospd/xmlvt.py
-%%PYTHON_SITELIBDIR%%/ospd_openvas-22.7.1.dist-info/COPYING
-%%PYTHON_SITELIBDIR%%/ospd_openvas-22.7.1.dist-info/METADATA
-%%PYTHON_SITELIBDIR%%/ospd_openvas-22.7.1.dist-info/RECORD
-%%PYTHON_SITELIBDIR%%/ospd_openvas-22.7.1.dist-info/WHEEL
-%%PYTHON_SITELIBDIR%%/ospd_openvas-22.7.1.dist-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/ospd_openvas-22.8.2.dist-info/COPYING
+%%PYTHON_SITELIBDIR%%/ospd_openvas-22.8.2.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/ospd_openvas-22.8.2.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/ospd_openvas-22.8.2.dist-info/WHEEL
+%%PYTHON_SITELIBDIR%%/ospd_openvas-22.8.2.dist-info/entry_points.txt
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/dryrun%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/dryrun%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/notus%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/notus%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__version__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/daemon.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/db.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/dryrun.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/errors.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/gpg_sha_verifier.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/lock.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/message.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messages/result.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/mqtt.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/publisher.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/subscriber.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/notus.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/nvticache.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/openvas.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/preferencehandler.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/vthelper.py
 @dir(gvm,gvm,750) /var/run/ospd
 @dir etc/gvm
diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile
index 5ade13b6fe6d..11ff7da0b5a6 100644
--- a/security/py-python-gvm/Makefile
+++ b/security/py-python-gvm/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	python-gvm
-DISTVERSION=	24.12.0
+DISTVERSION=	26.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The Greenbone Vulnerability Management Python API library
 WWW=		https://github.com/greenbone/python-gvm
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 post-extract:
 	${MV} ${WRKSRC}/tests ${WRKSRC}/gvm/
 
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|/run/gvmd/|/var/run/gvmd/|g' \
 		${WRKSRC}/gvm/connections/_unix.py
 	${REINPLACE_CMD} -e 's|, { include = "tests", format = "sdist" }||g' \
 		${WRKSRC}/pyproject.toml
 
 .include <bsd.port.mk>
diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo
index 5692f916b1c3..9645696c0ac3 100644
--- a/security/py-python-gvm/distinfo
+++ b/security/py-python-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734856127
-SHA256 (greenbone-python-gvm-v24.12.0_GH0.tar.gz) = a0943eb3de9caeaa1b9ff9206565e11bda250b08a0d2c52545aaf0ce5763568d
-SIZE (greenbone-python-gvm-v24.12.0_GH0.tar.gz) = 291652
+TIMESTAMP = 1744687931
+SHA256 (greenbone-python-gvm-v26.1.1_GH0.tar.gz) = f2a121083324004e7c486cf8b0ce219677d636bfa0c731903063bd97e6eddb07
+SIZE (greenbone-python-gvm-v26.1.1_GH0.tar.gz) = 318501