security/gvm: update to 22.9.0

- databases/pg-gvm: update to 22.6.1 - security/gsa: update to 22.7.1 - security/gsad: update to 22.6.0 - security/gvm-libs: update to 22.7.1 - security/gvmd: update to 22.9.0 - security/openvas: update to 22.7.5 - security/py-gvm-tools: update to 23.9.0 - security/py-notus-scanner: update to 22.6.0 - security/py-ospd-openvas: update to 22.6.0 - security/py-python-gvm: update to 23.5.1
freebsd · Oct 2, 2023 · 11e2887 · 11e2887
1 parent d1a9d29
commit 11e2887
Show file tree

Hide file tree

Showing 31 changed files with 140 additions and 108 deletions.
diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	pg-gvm
-DISTVERSION=	22.4.0
+DISTVERSION=	22.6.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
 CATEGORIES=	databases devel
 
 MAINTAINER=	acm@FreeBSD.org

diff --git a/databases/pg-gvm/distinfo b/databases/pg-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659322387
-SHA256 (greenbone-pg-gvm-v22.4.0_GH0.tar.gz) = f5f578f255fc24bc7ce594ccd1d4f6679d4729b1eef17200a1ed189f3c2f6a94
-SIZE (greenbone-pg-gvm-v22.4.0_GH0.tar.gz) = 37619
+TIMESTAMP = 1695258148
+SHA256 (greenbone-pg-gvm-v22.6.1_GH0.tar.gz) = 5717489b80492ebb3d4aa53216cc2dc6d12ef1d4d6d251cb9bb40c2e9af1f53b
+SIZE (greenbone-pg-gvm-v22.6.1_GH0.tar.gz) = 39378
diff --git a/databases/pg-gvm/pkg-plist b/databases/pg-gvm/pkg-plist
@@ -1,4 +1,7 @@
 lib/postgresql/libpg-gvm.so
-share/postgresql/extension/pg-gvm--1.0--22.4.0.sql
-share/postgresql/extension/pg-gvm--22.4.0.sql
+share/postgresql/extension/pg-gvm--1.0--1.1.sql
+share/postgresql/extension/pg-gvm--1.1--22.4.0.sql
+share/postgresql/extension/pg-gvm--22.4.0--22.5.sql
+share/postgresql/extension/pg-gvm--22.5--22.6.sql
+share/postgresql/extension/pg-gvm--22.6.sql
 share/postgresql/extension/pg-gvm.control
diff --git a/security/gsa/Makefile b/security/gsa/Makefile
@@ -1,19 +1,14 @@
 PORTNAME=	gsa
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.4.1
-PORTREVISION=	1
+DISTVERSION=	22.7.1
 CATEGORIES=	security
-MASTER_SITES=	LOCAL/acm/gsa/:yarn_cache
-DISTFILES=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Security Assistant webpage written in React
 WWW=		https://github.com/greenbone/gsa
 
 LICENSE=	AGPLv3+
 
-BROKEN_FreeBSD_14=	fails to build: 0308010C:digital envelope routines::unsupported
-
 BUILD_DEPENDS=	yarn:www/yarn
 RUN_DEPENDS=	${LOCALBASE}/sbin/gsad:security/gsad
 
@@ -24,7 +19,26 @@ GH_ACCOUNT=	greenbone
 GH_PROJECT=	gsa
 
 YARN_BIN=	${LOCALBASE}/bin/yarn
+
+# to rebuild the deps archive:
+#   1. set DEV_UPDATE_MODE=yes
+#   2. make makesum build
+#   3. upload the *-cache archive
+#   4. set DEV_UPDATE_MODE=no
+#   5. make clean makesum
+
+DEV_UPDATE_MODE=	no
+DEPS_CACHE_DIR=		${WRKDIR}
+
+.if (${DEV_UPDATE_MODE} == "yes")
+post-build:
+	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
+	@${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}"
+.else
+MASTER_SITES+=	LOCAL/acm/gsa/:yarn_cache
+DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
 YARN_ARGS=	--offline
+.endif
 
 post-patch:
 	${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \

diff --git a/security/gsa/distinfo b/security/gsa/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1680415901
-SHA256 (gsa-cache-22.4.1.tar.gz) = 4ea9c0e13e0cf7f39207cb1987043dc4a41b60fc0647f09a07e539e23a9f8dea
-SIZE (gsa-cache-22.4.1.tar.gz) = 65703301
-SHA256 (greenbone-gsa-v22.4.1_GH0.tar.gz) = 9e12f4c8259ab0712650266d8ef6205a799262231b5398a93d312180551be051
-SIZE (greenbone-gsa-v22.4.1_GH0.tar.gz) = 3860244
+TIMESTAMP = 1696261026
+SHA256 (gsa-cache-22.7.1.tar.gz) = 5b03e1e5f8e1afcc1d23567f044eaa60994495a9558a6a3a2a8555df0886a91d
+SIZE (gsa-cache-22.7.1.tar.gz) = 47165900
+SHA256 (greenbone-gsa-v22.7.1_GH0.tar.gz) = 89c159db61df19fe21713fa02c0454e730653673e7ef9b4dc30485666a631a05
+SIZE (greenbone-gsa-v22.7.1_GH0.tar.gz) = 3607415
diff --git a/security/gsad/Makefile b/security/gsad/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gsad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.4.1
-PORTREVISION=	1
+DISTVERSION=	22.6.0
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org

diff --git a/security/gsad/distinfo b/security/gsad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680415987
-SHA256 (greenbone-gsad-v22.4.1_GH0.tar.gz) = 762558dc837889b10ee1fcd0aac20c7a43fe13f0f3e6ae92825a2ea67adce5a3
-SIZE (greenbone-gsad-v22.4.1_GH0.tar.gz) = 224061
+TIMESTAMP = 1695319699
+SHA256 (greenbone-gsad-v22.6.0_GH0.tar.gz) = 202c7d7d2afc2e36e1de68733f0e51d1ef4c32aba754b832d1397463aa729b2b
+SIZE (greenbone-gsad-v22.6.0_GH0.tar.gz) = 223879
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gvm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.6.0
+DISTVERSION=	22.7.1
 CATEGORIES=	security
 PKGNAMESUFFIX=	-libs
 
@@ -42,6 +42,6 @@ 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} '31d' ${WRKSRC}/base/proctitle.c
+	@${REINPLACE_CMD} '17d' ${WRKSRC}/base/proctitle.c
 
 .include <bsd.port.mk>
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684281847
-SHA256 (greenbone-gvm-libs-v22.6.0_GH0.tar.gz) = e18f7d7c69c2adb4be22d6ce8e3cba0bb9ff2c6364f7a4911c9e6ad0e782ab40
-SIZE (greenbone-gvm-libs-v22.6.0_GH0.tar.gz) = 313140
+TIMESTAMP = 1695258196
+SHA256 (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = e016e9d16a2cf2cdd0c8b928c2d52be1468962870f93a1b82e4af737480644b5
+SIZE (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = 309225
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
@@ -40,19 +40,19 @@ include/gvm/util/uuidutils.h
 include/gvm/util/xmlutils.h
 lib/libgvm_base.so
 lib/libgvm_base.so.22
-lib/libgvm_base.so.22.6.0
+lib/libgvm_base.so.22.7.1
 lib/libgvm_boreas.so
 lib/libgvm_boreas.so.22
-lib/libgvm_boreas.so.22.6.0
+lib/libgvm_boreas.so.22.7.1
 lib/libgvm_gmp.so
 lib/libgvm_gmp.so.22
-lib/libgvm_gmp.so.22.6.0
+lib/libgvm_gmp.so.22.7.1
 lib/libgvm_osp.so
 lib/libgvm_osp.so.22
-lib/libgvm_osp.so.22.6.0
+lib/libgvm_osp.so.22.7.1
 lib/libgvm_util.so
 lib/libgvm_util.so.22
-lib/libgvm_util.so.22.6.0
+lib/libgvm_util.so.22.7.1
 libdata/pkgconfig/libgvm_base.pc
 libdata/pkgconfig/libgvm_boreas.pc
 libdata/pkgconfig/libgvm_gmp.pc

diff --git a/security/gvm/Makefile b/security/gvm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gvm
-PORTVERSION=	22.7.0
+PORTVERSION=	22.9.0
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
@@ -23,6 +23,9 @@ 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

diff --git a/security/gvm/files/pkg-message.in b/security/gvm/files/pkg-message.in
@@ -153,6 +153,7 @@ Basic instructions for configure your gvm infraestruture are following:
    https://github.com/greenbone/openvas/blob/master/INSTALL.md
    https://github.com/greenbone/ospd/blob/master/doc/INSTALL-ospd-scanner.md
    https://github.com/greenbone/gsa/blob/master/INSTALL.md
+   https://github.com/greenbone/greenbone-feed-sync/blob/main/README.md
    https://greenbone.github.io/docs/latest/index.html
 
    and

diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gvmd
-DISTVERSION=	22.4.2
+DISTVERSION=	22.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org

diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680418166
-SHA256 (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 14c76641af72e48874a730c4792ad76199165bb0518f59742609590cd420719e
-SIZE (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 1027009
+TIMESTAMP = 1695264047
+SHA256 (greenbone-gvmd-v22.9.0_GH0.tar.gz) = 5825ccc68385f2d51a0756a515afe5b15b3eeba19221e07ff16f894933d78cc9
+SIZE (greenbone-gvmd-v22.9.0_GH0.tar.gz) = 1040655
diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c
@@ -1,46 +1,56 @@
---- src/gvmd.c	2022-07-21 02:20:24.000000000 -0500
-+++ src/gvmd.c	2022-07-31 19:20:20.775975000 -0500
-@@ -1558,6 +1558,7 @@
+--- src/gvmd.c	2023-09-08 08:33:54.000000000 -0500
++++ src/gvmd.c	2023-09-20 22:04:48.265160000 -0500
+@@ -1558,6 +1558,9 @@
    struct sockaddr_un address_unix;
    struct sockaddr_storage address_tls;
    int address_size;
++#if defined(__FreeBSD__)
 +  socklen_t addrlen;
++#endif
 
    memset (&address_tls, 0, sizeof (struct sockaddr_storage));
    memset (&address_unix, 0, sizeof (struct sockaddr_un));
-@@ -1571,9 +1572,8 @@
+@@ -1571,10 +1574,14 @@
        /* UNIX file socket. */
 
        address_unix.sun_family = AF_UNIX;
--      strncpy (address_unix.sun_path,
--               address_str_unix,
--               sizeof (address_unix.sun_path) - 1);
-+      strcpy (address_unix.sun_path,
++#if defined(__FreeBSD__)
++      strcpy (address_unix.sun_path,                                    
 +               address_str_unix);
-
++#else
+       strncpy (address_unix.sun_path,
+                address_str_unix,
+                sizeof (address_unix.sun_path) - 1);
+-
++#endif
        g_debug ("%s: address_unix.sun_path: %s",
                 __func__,
-@@ -1594,7 +1594,7 @@
+                address_unix.sun_path);
+@@ -1594,7 +1601,11 @@
          }
 
        address = (struct sockaddr *) &address_unix;
--      address_size = sizeof (address_unix);
++#if defined(__FreeBSD__)
 +      addrlen = sizeof(struct sockaddr_un);
++#else
+       address_size = sizeof (address_unix);
++#endif
 
        /* Ensure the path of the socket exists. */
 
-@@ -1610,8 +1610,8 @@
+@@ -1610,8 +1621,9 @@
      }
    else if (address_str_tls)
      {
 -      struct sockaddr_in *addr4;
 -      struct sockaddr_in6 *addr6;
 +      struct sockaddr_in *addr4 = (struct sockaddr_in *) &address_tls;
 +      struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address_tls;
++
        int port, optval;
 
        /* TLS TCP socket. */
-@@ -1636,17 +1636,17 @@
+@@ -1636,17 +1648,21 @@
              port = htons (GVMD_PORT);
          }
 
@@ -50,32 +60,39 @@
          {
            address_tls.ss_family = AF_INET6;
            addr6->sin6_port = port;
-+	  addrlen = sizeof (*addr6);
++#if defined(__FreeBSD__)
++          addrlen = sizeof (*addr6);
++#endif
          }
        else if (inet_pton (AF_INET, address_str_tls, &addr4->sin_addr) > 0)
          {
            address_tls.ss_family = AF_INET;
            addr4->sin_port = port;
-+	  addrlen = sizeof (*addr4);
++#if defined(__FreeBSD__)
++          addrlen = sizeof (*addr4);
++#endif
          }
        else
          {
-@@ -1687,7 +1687,7 @@
+@@ -1687,7 +1703,11 @@
        return -1;
      }
 
--  if (bind (*soc, address, address_size) == -1)
++#if defined(__FreeBSD__)
 +  if (bind (*soc, address, addrlen) == -1)
++#else
+   if (bind (*soc, address, address_size) == -1)
++#endif
      {
        g_warning ("Failed to bind manager socket: %s", strerror (errno));
        return -1;
-@@ -2326,7 +2326,9 @@
+@@ -2378,7 +2398,9 @@
 
    /* Set process title. */
 
 +#if !defined(__FreeBSD__)
    setproctitle_init (argc, argv, env);
 +#endif
-   setproctitle ("gvmd: Initializing");
+   setproctitle ("Initializing");
 
    /* Setup initial signal handlers. */
diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist
@@ -3,10 +3,7 @@ bin/gvm-manage-certs
 @sample etc/gvm/pwpolicy.conf.sample
 lib/libgvm-pg-server.so
 lib/libgvm-pg-server.so.22
-lib/libgvm-pg-server.so.22.4.2
-sbin/greenbone-certdata-sync
-sbin/greenbone-feed-sync
-sbin/greenbone-scapdata-sync
+lib/libgvm-pg-server.so.22.9.0
 sbin/gvmd
 share/doc/gvm/example-gvm-manage-certs.conf
 share/doc/gvm/html/gmp.html
@@ -34,6 +31,7 @@ share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/genera
 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
@@ -45,8 +43,6 @@ 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/greenbone-certdata-sync.8.gz
-share/man/man8/greenbone-scapdata-sync.8.gz
 share/man/man8/gvmd.8.gz
 @dir(gvm,gvm,750) /var/lib/gvm/gvmd/gnupg
 @dir(gvm,gvm,750) /var/lib/gvm/gvmd

diff --git a/security/openvas/Makefile b/security/openvas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openvas
-DISTVERSION=	22.7.0
+DISTVERSION=	22.7.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -20,18 +20,21 @@ LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgnutls.so:security/gnutls \
 		libnetsnmp.so:net-mgmt/net-snmp \
 		libjson-glib-1.0.so:devel/json-glib
-RUN_DEPENDS=	redis-server:databases/redis \
+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 \
-		${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR}
+		nmap:security/nmap
 
 USES=		bison cmake gnome 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}
 

diff --git a/security/openvas/distinfo b/security/openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684428125
-SHA256 (greenbone-openvas-scanner-v22.7.0_GH0.tar.gz) = 8159e3a753f5b8595c9af7ef6711503297f4a47dc17d987970bd0cf70dd02407
-SIZE (greenbone-openvas-scanner-v22.7.0_GH0.tar.gz) = 899455
+TIMESTAMP = 1695269107
+SHA256 (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 7ac193c18097742ba8b7360802a10c3b3a9a9c742dbe788eaa34e6fcad1405b4
+SIZE (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 976268
diff --git a/security/openvas/files/patch-nasl_md4.h b/security/openvas/files/patch-nasl_md4.h
@@ -1,10 +1,10 @@
---- nasl/md4.h	2023-04-02 01:42:54.408984000 -0500
-+++ nasl/md4.h	2023-04-02 01:43:11.470498000 -0500
-@@ -28,5 +28,4 @@
-
+--- nasl/md4.h	2023-08-31 14:23:03.000000000 -0500
++++ nasl/md4.h	2023-09-21 00:00:17.238876000 -0500
+@@ -16,4 +16,5 @@
  void
  mdfour_ntlmssp (unsigned char *out, const unsigned char *in, int n);
--
+ 
 -#endif
 \ No newline at end of file
 +#endif
++
diff --git a/security/openvas/files/patch-src_CMakeLists.txt b/security/openvas/files/patch-src_CMakeLists.txt
@@ -1,5 +1,5 @@
 --- src/CMakeLists.txt	2022-07-18 04:07:38.000000000 -0500
-+++ sc/CMakeLists.txt	2022-07-31 19:53:15.521197000 -0500
++++ src/CMakeLists.txt	2022-07-31 19:53:15.521197000 -0500
 @@ -30,7 +30,9 @@
  pkg_check_modules (LIBGVM_BOREAS REQUIRED libgvm_boreas>=22.4)
  pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.4)