From nobody Mon Oct 02 17:18:22 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RznjB3BBmz4wHqR; Mon, 2 Oct 2023 17:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RznjB2tcwz4Sjr; Mon, 2 Oct 2023 17:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696267102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25o3sUxTeGhyQRqdSNcHCk1r+EX0cKKWEqCBdI+dO4g=; b=lU8gww/vcB91j+10I3gIQmyQiMd3TphvSww71FMWMFoFNHNB1YRuqY9+J5T+W9n/9eVVYF PIJm9ndtAoQHFT/ztgijvJV6OKn6GpjCy/sviBUaztjYLBRtkNZcwGq1n6Q7C3iYYGYgeH m3Ca+pxiCVz52myNB8wflTNPOFXGuigplEpz6dNDi+pUNtxNsx06Qe6CYfKZLxv0CJ+cA0 47oV/INO78M3128nsmlJNjfcl6Z7O9+9cxOHqWapSrMwIEMIYTNxriD2I1ZCyOqp8YWbP/ pQxpKPGakLi2nPaRp5GdB8sUQqTUNMzFdeCCBfW+X8RHtMhVyeCS5FFpmPuWdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696267102; a=rsa-sha256; cv=none; b=uXdlFIZUxVzS0vRUIFTYP2cf4d41ZxnRPlMF2VQkyvDM/5ZH6NuyB+NyUXnPbjCR3CdNuA 3yWmPjsWgwj3QmKHBBcUS5itJVjY5ALC/mr+1m6DIjOUUbOVOB6/Dv/eF3t9N1v2yHjM20 +Bp1Q+c+Uf/7W1BOf0DfqyTyCRybD9H4b3pBRGF5B7Ziqf+ikOmAKA7aixCulWeBEKssZk 4m/3jtdTy5ipZ/JGsBgK3Tzmh1CF7PWWHHn0ofjHqKFdu7aGAxuYQaCQa9Wf7zaU2dg9gb 5T87FGDP5PztgHFPYxvygt+W1i0bbu4gVQ9j3cLyXPBS6OFSMJ3PidwzikbiQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696267102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25o3sUxTeGhyQRqdSNcHCk1r+EX0cKKWEqCBdI+dO4g=; b=PHPY5t86CidE2+Eq5DlGdee+LY1B6CPlwKrp2nP9bDmRqCwUR/4sgAhk/4aFGm15MEw5s2 0V4r0VWiPJthAyU1PXM/cJDRGKoXxNxNg3mWBRphjfdJAIhZ0jhFmBII1lzMp/x7ftNPtJ iIPt89orIl0S+j/Qf7QoEa7n0nDEDTWAnuVJ5pNJhDFxjUvigYCMsasP2+uOr+8b5EqLiW zQHHH+k159G8y7HWhAdpVxT50xo4HDbTe3wMuW4KwccHaYqDZvMlTR/UeWj3S2fAypAhJ3 m08t/RipDIMl6PNPSvgmW8OB4Vir1hRHJnSfbiQPM5QM8agT1kS+c6XrgZwWQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RznjB1v6tz5m4; Mon, 2 Oct 2023 17:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 392HIMkn069898; Mon, 2 Oct 2023 17:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392HIMPj069895; Mon, 2 Oct 2023 17:18:22 GMT (envelope-from git) Date: Mon, 2 Oct 2023 17:18:22 GMT Message-Id: <202310021718.392HIMPj069895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 11e2887006db - main - security/gvm: update to 22.9.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11e2887006dbf3cfd9326a3d98bd89f308043c28 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=11e2887006dbf3cfd9326a3d98bd89f308043c28 commit 11e2887006dbf3cfd9326a3d98bd89f308043c28 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-02 17:13:21 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-10-02 17:18:12 +0000 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 --- databases/pg-gvm/Makefile | 3 +- databases/pg-gvm/distinfo | 6 +-- databases/pg-gvm/pkg-plist | 7 +++- security/gsa/Makefile | 26 +++++++++--- security/gsa/distinfo | 10 ++--- security/gsad/Makefile | 3 +- security/gsad/distinfo | 6 +-- security/gvm-libs/Makefile | 4 +- security/gvm-libs/distinfo | 6 +-- security/gvm-libs/pkg-plist | 10 ++--- security/gvm/Makefile | 5 ++- security/gvm/files/pkg-message.in | 1 + security/gvmd/Makefile | 3 +- security/gvmd/distinfo | 6 +-- security/gvmd/files/patch-src_gvmd.c | 55 ++++++++++++++++--------- security/gvmd/pkg-plist | 8 +--- security/openvas/Makefile | 11 +++-- security/openvas/distinfo | 6 +-- security/openvas/files/patch-nasl_md4.h | 10 ++--- security/openvas/files/patch-src_CMakeLists.txt | 2 +- security/openvas/files/patch-src_main.c | 6 +-- security/openvas/files/patch-src_openvas.h | 12 +++--- security/openvas/pkg-plist | 6 +-- security/py-gvm-tools/Makefile | 4 +- security/py-gvm-tools/distinfo | 6 +-- security/py-notus-scanner/Makefile | 4 +- security/py-notus-scanner/distinfo | 6 +-- security/py-ospd-openvas/Makefile | 2 +- security/py-ospd-openvas/distinfo | 6 +-- security/py-python-gvm/Makefile | 2 +- security/py-python-gvm/distinfo | 6 +-- 31 files changed, 140 insertions(+), 108 deletions(-) diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile index 1eada3b1340d..f7b76bda5d7c 100644 --- 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 index 1b734e5ebcfa..44ac0414db0c 100644 --- 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 index 27730293442a..d14524a07c56 100644 --- 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 index e517b74fba30..dd950a73ed0d 100644 --- a/security/gsa/Makefile +++ b/security/gsa/Makefile @@ -1,10 +1,7 @@ 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 @@ -12,8 +9,6 @@ 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 index 098ca1db8d65..86ac645b05ef 100644 --- 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 index 7acb4791355c..b071d3e32f86 100644 --- 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 index c4520f64ee28..540175c0eac1 100644 --- 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 index beb2b2fcfd2a..16be6138d866 100644 --- 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 diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo index 55debc77e367..9ce47deecc8a 100644 --- 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 index 21e5f349b9ef..f095afdcae1a 100644 --- 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 index 2a3495182732..f3d65c9a0541 100644 --- 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 index 45d9eea2d5e5..28cac7be226f 100644 --- 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 index 09137110d128..59f681be8023 100644 --- 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 index 3e4c6ca3c264..4ab415dfe22d 100644 --- 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 index f126c86db8e7..d0b589c108be 100644 --- a/security/gvmd/files/patch-src_gvmd.c +++ b/security/gvmd/files/patch-src_gvmd.c @@ -1,35 +1,44 @@ ---- 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) { @@ -37,10 +46,11 @@ - 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 index 37931dd865e4..d2437df84a91 100644 --- 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 index ea7587ac9c1a..d7c25436dd29 100644 --- 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,11 +20,12 @@ 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 @@ -32,6 +33,8 @@ 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 index af2b4436e1a6..61656f1b44f6 100644 --- 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 index 9ef902ccb9ec..f593feefda0b 100644 --- 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 index 054b24b3335d..1f74b7c39c5d 100644 --- 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) diff --git a/security/openvas/files/patch-src_main.c b/security/openvas/files/patch-src_main.c index 0e0411d8035a..bf09062ee3fe 100644 --- a/security/openvas/files/patch-src_main.c +++ b/security/openvas/files/patch-src_main.c @@ -1,6 +1,6 @@ ---- src/main.c 2022-07-18 04:07:38.000000000 -0500 -+++ src/main.c 2022-07-31 21:37:38.265241000 -0500 -@@ -35,7 +35,13 @@ +--- src/main.c 2023-08-31 14:23:03.000000000 -0500 ++++ src/main.c 2023-09-20 23:54:36.721716000 -0500 +@@ -21,7 +21,13 @@ * @return EXIT_SUCCESS on success, EXIT_FAILURE on failure. */ int diff --git a/security/openvas/files/patch-src_openvas.h b/security/openvas/files/patch-src_openvas.h index f385cb98afee..a3cd586c5eec 100644 --- a/security/openvas/files/patch-src_openvas.h +++ b/security/openvas/files/patch-src_openvas.h @@ -1,13 +1,13 @@ ---- src/openvas.h 2022-07-31 21:28:34.160685000 -0500 -+++ src/openvas.h 2022-07-31 21:29:05.831561000 -0500 -@@ -26,6 +26,10 @@ - #define _OPENVAS_H +--- src/openvas.h 2023-08-31 14:23:03.000000000 -0500 ++++ src/openvas.h 2023-09-20 23:57:03.842529000 -0500 +@@ -12,6 +12,9 @@ + #define OPENVAS_H int +#if defined(__FreeBSD__) +openvas (int, char **); +#else openvas (int, char **, char **); +- +#endif - - #endif /* not _OPENVAS_H */ + #endif /* not OPENVAS_H */ diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist index b4d197fd8605..748a3b72dc38 100644 --- a/security/openvas/pkg-plist +++ b/security/openvas/pkg-plist @@ -1,17 +1,15 @@ -bin/greenbone-nvt-sync bin/openvas-nasl bin/openvas-nasl-lint @sample %%ETCDIR%%/openvas_log.conf.sample lib/libopenvas_misc.so lib/libopenvas_misc.so.22 -lib/libopenvas_misc.so.22.7.0 +lib/libopenvas_misc.so.22.7.5 lib/libopenvas_nasl.so lib/libopenvas_nasl.so.22 -lib/libopenvas_nasl.so.22.7.0 +lib/libopenvas_nasl.so.22.7.5 sbin/openvas share/man/man1/openvas-nasl-lint.1.gz share/man/man1/openvas-nasl.1.gz -share/man/man8/greenbone-nvt-sync.8.gz share/man/man8/openvas.8.gz @dir %%ETCDIR%%/gnupg @dir %%DATADIR%% diff --git a/security/py-gvm-tools/Makefile b/security/py-gvm-tools/Makefile index 6fb711043f37..a82b95f50d67 100644 --- a/security/py-gvm-tools/Makefile +++ b/security/py-gvm-tools/Makefile @@ -1,5 +1,5 @@ PORTNAME= gvm-tools -DISTVERSION= 23.4.0 +DISTVERSION= 23.9.0 DISTVERSIONPREFIX= v CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -27,7 +27,7 @@ post-extract: ${MV} ${WRKSRC}/scripts ${WRKSRC}/gvmtools/ post-patch: - ${REINPLACE_CMD} '32,33d' ${WRKSRC}/pyproject.toml + ${REINPLACE_CMD} '30,31d' ${WRKSRC}/pyproject.toml pre-configure: @cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py diff --git a/security/py-gvm-tools/distinfo b/security/py-gvm-tools/distinfo index 0874b9a29ab8..10b3f1d82335 100644 --- a/security/py-gvm-tools/distinfo +++ b/security/py-gvm-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684208856 -SHA256 (greenbone-gvm-tools-v23.4.0_GH0.tar.gz) = 1efb4ddca8594c21cc4f479a2654a9736dd3c3733619222309917e5e42f7b4b2 -SIZE (greenbone-gvm-tools-v23.4.0_GH0.tar.gz) = 219320 +TIMESTAMP = 1695319193 +SHA256 (greenbone-gvm-tools-v23.9.0_GH0.tar.gz) = d9fe2b150a8a114d52f216b8cb40bc0feefa050ecf8b7a3e8fab660463262a9c +SIZE (greenbone-gvm-tools-v23.9.0_GH0.tar.gz) = 221180 diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile index b5491ad35e81..ac28d53f49d2 100644 --- a/security/py-notus-scanner/Makefile +++ b/security/py-notus-scanner/Makefile @@ -1,5 +1,5 @@ PORTNAME= notus-scanner -DISTVERSION= 22.5.0 +DISTVERSION= 22.6.0 DISTVERSIONPREFIX= v CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -42,7 +42,7 @@ post-patch: ${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/notus/scanner/cli/parser.py ${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \ ${WRKSRC}/notus/scanner/loader/gpg_sha_verifier.py - ${REINPLACE_CMD} '38d' ${WRKSRC}/pyproject.toml + ${REINPLACE_CMD} '36d' ${WRKSRC}/pyproject.toml @${RM} ${WRKSRC}/notus/scanner/cli/parser.py.orig @${RM} ${WRKSRC}/notus/scanner/config.py.orig diff --git a/security/py-notus-scanner/distinfo b/security/py-notus-scanner/distinfo index 5b9075b819a2..53457b4b1036 100644 --- a/security/py-notus-scanner/distinfo +++ b/security/py-notus-scanner/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684208715 -SHA256 (greenbone-notus-scanner-v22.5.0_GH0.tar.gz) = 9ca9212924e3eecf5fdb7eab283bf81b17584bc488570034cf3b4f693eb0391d -SIZE (greenbone-notus-scanner-v22.5.0_GH0.tar.gz) = 320894 +TIMESTAMP = 1695320093 +SHA256 (greenbone-notus-scanner-v22.6.0_GH0.tar.gz) = 5c0f314731b512c9d7e17e4055b8837bab7fa03cc95806fc94215601262325d7 +SIZE (greenbone-notus-scanner-v22.6.0_GH0.tar.gz) = 324001 diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile index abc121a17635..89283220aa7c 100644 --- a/security/py-ospd-openvas/Makefile +++ b/security/py-ospd-openvas/Makefile @@ -1,5 +1,5 @@ PORTNAME= ospd-openvas -DISTVERSION= 22.5.1 +DISTVERSION= 22.6.0 DISTVERSIONPREFIX= v CATEGORIES= security python #MASTER_SITES= PYPI diff --git a/security/py-ospd-openvas/distinfo b/security/py-ospd-openvas/distinfo index ca85ee45a5e3..6c9da0432ea8 100644 --- a/security/py-ospd-openvas/distinfo +++ b/security/py-ospd-openvas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684208512 -SHA256 (greenbone-ospd-openvas-v22.5.1_GH0.tar.gz) = b7e2f73ca31fe9fa08d87615ca1453af2b83abb0a05af65366f80f241a92eda7 -SIZE (greenbone-ospd-openvas-v22.5.1_GH0.tar.gz) = 253605 +TIMESTAMP = 1695320132 +SHA256 (greenbone-ospd-openvas-v22.6.0_GH0.tar.gz) = dfddc5a91b04264e8131e083d46b69000c2f97e2dc00e2569bea2ef357f195ef +SIZE (greenbone-ospd-openvas-v22.6.0_GH0.tar.gz) = 248449 diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile index e4797cb4bd73..514dfcc854fa 100644 --- a/security/py-python-gvm/Makefile +++ b/security/py-python-gvm/Makefile @@ -1,5 +1,5 @@ PORTNAME= python-gvm -DISTVERSION= 23.5.0 +DISTVERSION= 23.5.1 DISTVERSIONPREFIX= v CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo index 7f9492307eb6..668f679af186 100644 --- a/security/py-python-gvm/distinfo +++ b/security/py-python-gvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684208918 -SHA256 (greenbone-python-gvm-v23.5.0_GH0.tar.gz) = 750563d044c9758dd362de318c33edcfee7010bf658dc5fd20fbe0d803d25cea -SIZE (greenbone-python-gvm-v23.5.0_GH0.tar.gz) = 291592 +TIMESTAMP = 1695319244 +SHA256 (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = c0933d1fd0a1c04ca88d6dcf74646ef2fed4aa5bb44132b1f60679cf580e99a7 +SIZE (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = 291456