diff --git a/security/gsa/Makefile b/security/gsa/Makefile index c036282b6a01..9540b1d05494 100644 --- a/security/gsa/Makefile +++ b/security/gsa/Makefile @@ -1,65 +1,67 @@ PORTNAME= gsa DISTVERSIONPREFIX= v -DISTVERSION= 23.0.0 -PORTREVISION= 1 +DISTVERSION= 23.3.0 CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Greenbone Security Assistant webpage written in React WWW= https://github.com/greenbone/gsa LICENSE= AGPLv3+ BUILD_DEPENDS= npm-node18>0:www/npm-node18 RUN_DEPENDS= ${LOCALBASE}/sbin/gsad:security/gsad USES= nodejs:build USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= gsa NPM_BIN= ${LOCALBASE}/bin/npm # 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= ${WRKSRC} .if (${DEV_UPDATE_MODE} == "yes") NPM_ARGS= install +post-patch: + @${RM} ${WKRSRC}/package-lock.json + post-build: @cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} node_modules @${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}" .else MASTER_SITES+= LOCAL/acm/gsa/:npm_cache DISTFILES+= ${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache NPM_ARGS= run build post-extract: @${MV} ${WRKDIR}/node_modules ${WRKSRC} .endif do-build: @cd ${WRKSRC} && \ ${NPM_BIN} ${NPM_ARGS} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/gvm/gsad/web (cd ${WRKSRC}/build && ${COPYTREE_SHARE} . \ ${STAGEDIR}/${PREFIX}/share/gvm/gsad/web) post-install: @${ECHO_CMD} "share/gvm/gsad/web/index.html" >> ${TMPPLIST} @${ECHO_CMD} "share/gvm/gsad/web/robots.txt" >> ${TMPPLIST} @cd ${WRKSRC}/build && \ - ${FIND} -s img locales static -not -type d \ + ${FIND} -s img locales assets -not -type d \ -exec ${ECHO_CMD} "share/gvm/gsad/web/{}" \; >> ${TMPPLIST} .include diff --git a/security/gsa/distinfo b/security/gsa/distinfo index 3ee480652e5f..1dc0f5bc68ca 100644 --- a/security/gsa/distinfo +++ b/security/gsa/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1706310242 -SHA256 (gsa-cache-23.0.0.tar.gz) = 15efab9554056057c58d8c94b303fa7484618a639db6815ccab9844f4ba89b93 -SIZE (gsa-cache-23.0.0.tar.gz) = 63563565 -SHA256 (greenbone-gsa-v23.0.0_GH0.tar.gz) = 28d22b6fab7534d0446e989881b38bfeca51c3696743380760f8fef884a06706 -SIZE (greenbone-gsa-v23.0.0_GH0.tar.gz) = 3605974 +TIMESTAMP = 1726791008 +SHA256 (gsa-cache-23.3.0.tar.gz) = 2ad85d544ff62c3a58a6b4d26725e451b3b0a5b12d30e138a6ca5e6bcad5d4d9 +SIZE (gsa-cache-23.3.0.tar.gz) = 46528450 +SHA256 (greenbone-gsa-v23.3.0_GH0.tar.gz) = 0dc631d23b9e431a17fee315a374eaace59884b531fb6a34fb9f65cdcc0cd846 +SIZE (greenbone-gsa-v23.3.0_GH0.tar.gz) = 3508732 diff --git a/security/gsa/files/patch-package.json b/security/gsa/files/patch-package.json new file mode 100644 index 000000000000..ea261d040395 --- /dev/null +++ b/security/gsa/files/patch-package.json @@ -0,0 +1,19 @@ +--- 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/gsad/Makefile b/security/gsad/Makefile index 77952740c55c..8e5a31cf6cfa 100644 --- a/security/gsad/Makefile +++ b/security/gsad/Makefile @@ -1,54 +1,54 @@ PORTNAME= gsad DISTVERSIONPREFIX= v -DISTVERSION= 22.9.1 +DISTVERSION= 22.12.0 CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Greenbone Security Assistant HTTP server WWW= https://github.com/greenbone/gsad LICENSE= AGPLv3+ LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libmicrohttpd.so:www/libmicrohttpd RUN_DEPENDS= doxygen>0:devel/doxygen \ ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} USES= cmake gettext-runtime gnome pkgconfig python USE_GNOME= glib20 libxml2 USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= gsad USERS= gvm GROUPS= ${USERS} USE_RC_SUBR= gsad LDFLAGS+= -lm ETCDIR= ${PREFIX}/etc/gvm post-extract: @${MV} ${WRKSRC}/src/gsad_log_conf.cmake_in ${WRKSRC}/src/gsad_log.conf.sample post-patch: ${REINPLACE_CMD} -e 's|$${GVM_LOG_DIR}|/var/log/gvm|g' ${WRKSRC}/src/gsad_log.conf.sample post-install: @${MKDIR} ${STAGEDIR}/var/run/gsad @${MKDIR} ${STAGEDIR}/var/run/gvm @${MKDIR} ${STAGEDIR}${ETCDIR} @${INSTALL_DATA} ${WRKSRC}/src/gsad_log.conf.sample ${STAGEDIR}${ETCDIR} @${ECHO_CMD} "@sample etc/gvm/gsad_log.conf.sample" >> ${TMPPLIST} @${ECHO_CMD} "sbin/gsad" >> ${TMPPLIST} >> ${TMPPLIST} @${ECHO_CMD} "share/man/man8/gsad.8.gz" >> ${TMPPLIST} @${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gsad" >> ${TMPPLIST} @${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gvm" >> ${TMPPLIST} .include diff --git a/security/gsad/distinfo b/security/gsad/distinfo index a293c5155360..9072e3e192a6 100644 --- a/security/gsad/distinfo +++ b/security/gsad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713946376 -SHA256 (greenbone-gsad-v22.9.1_GH0.tar.gz) = 23c2549321d8a489e134fae2735575b82d1cc1d2251385ec2b85861c4b5e84df -SIZE (greenbone-gsad-v22.9.1_GH0.tar.gz) = 222663 +TIMESTAMP = 1726786033 +SHA256 (greenbone-gsad-v22.12.0_GH0.tar.gz) = 1edb62a5f79e874f36c0b5fc91d19e725fd19d81c53d096ab3e8db21e49b1899 +SIZE (greenbone-gsad-v22.12.0_GH0.tar.gz) = 225704 diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile index 6e76af292eb4..520e916db317 100644 --- a/security/gvm-libs/Makefile +++ b/security/gvm-libs/Makefile @@ -1,48 +1,47 @@ PORTNAME= gvm DISTVERSIONPREFIX= v -DISTVERSION= 22.9.1 -PORTREVISION= 1 +DISTVERSION= 22.12.1 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 \ libgpgme.so:security/gpgme \ libgpg-error.so:security/libgpg-error \ libgnutls.so:security/gnutls \ libuuid.so:misc/e2fsprogs-libuuid \ libssh.so:security/libssh \ libhiredis.so:databases/hiredis \ libnet.so:net/libnet \ libgcrypt.so:security/libgcrypt \ libpaho-mqtt3a.so:net/libpaho-mqtt3 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 diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo index f379080d6072..253a7fdcb63c 100644 --- a/security/gvm-libs/distinfo +++ b/security/gvm-libs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713939710 -SHA256 (greenbone-gvm-libs-v22.9.1_GH0.tar.gz) = 7f20356fed2c5287f1fb58e88ba028e108d61fd3f6e53c3f110ef0c7c53f8a7b -SIZE (greenbone-gvm-libs-v22.9.1_GH0.tar.gz) = 314228 +TIMESTAMP = 1726776996 +SHA256 (greenbone-gvm-libs-v22.12.1_GH0.tar.gz) = b0fbda0aa03dec0a16310c11b61e406895a8b2d6cd03988b0995a3bfe99aab3f +SIZE (greenbone-gvm-libs-v22.12.1_GH0.tar.gz) = 343536 diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist index d2ccba0004cd..98354734a4a1 100644 --- a/security/gvm-libs/pkg-plist +++ b/security/gvm-libs/pkg-plist @@ -1,61 +1,64 @@ 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/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/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/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.9.1 +lib/libgvm_base.so.22.12.1 lib/libgvm_boreas.so lib/libgvm_boreas.so.22 -lib/libgvm_boreas.so.22.9.1 +lib/libgvm_boreas.so.22.12.1 lib/libgvm_gmp.so lib/libgvm_gmp.so.22 -lib/libgvm_gmp.so.22.9.1 +lib/libgvm_gmp.so.22.12.1 lib/libgvm_osp.so lib/libgvm_osp.so.22 -lib/libgvm_osp.so.22.9.1 +lib/libgvm_osp.so.22.12.1 lib/libgvm_util.so lib/libgvm_util.so.22 -lib/libgvm_util.so.22.9.1 +lib/libgvm_util.so.22.12.1 libdata/pkgconfig/libgvm_base.pc libdata/pkgconfig/libgvm_boreas.pc libdata/pkgconfig/libgvm_gmp.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 db7da59dd3dc..31079ff29551 100644 --- a/security/gvm/Makefile +++ b/security/gvm/Makefile @@ -1,45 +1,44 @@ PORTNAME= gvm -PORTVERSION= 23.5.2 -PORTREVISION= 1 +PORTVERSION= 23.10.0 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 diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index 9e2a83de50d8..f153237a1d00 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,59 +1,59 @@ PORTNAME= gvmd -DISTVERSION= 23.5.2 +DISTVERSION= 23.10.0 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 ||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 diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index 6f6f4d5e2179..581366ab16b9 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713944840 -SHA256 (greenbone-gvmd-v23.5.2_GH0.tar.gz) = 9ac3e58ef191259c0f047794f83b36bd5bba61f6c6ebe6d5a63d067707131899 -SIZE (greenbone-gvmd-v23.5.2_GH0.tar.gz) = 1064064 +TIMESTAMP = 1726777082 +SHA256 (greenbone-gvmd-v23.10.0_GH0.tar.gz) = db985852636ee13328bd5f17a8c4b7f2b0c935bd84b23df06678e791a31d23fb +SIZE (greenbone-gvmd-v23.10.0_GH0.tar.gz) = 1086858 diff --git a/security/gvmd/files/patch-src_ipc.c b/security/gvmd/files/patch-src_ipc.c new file mode 100644 index 000000000000..655f0a588239 --- /dev/null +++ b/security/gvmd/files/patch-src_ipc.c @@ -0,0 +1,159 @@ +--- src/ipc.c 2024-09-11 02:00:14.000000000 -0700 ++++ src/ipc.c 2024-09-19 23:21:42.837138000 -0700 +@@ -30,6 +30,9 @@ + + #include + #include ++#if defined(__FreeBSD__) ++#include ++#endif + + #include "ipc.h" + #include "manage.h" +@@ -60,7 +63,134 @@ + struct seminfo *__buf; ///< Buffer for IPC_INFO (Linux-specific) + }; + ++#if defined(__FreeBSD__) + /** ++ * FreeBSD not support semtimedop function. I have added here an old implementation ++ * shared at FreeBSD mail list by Michael B Allen : ++ * https://lists.freebsd.org/pipermail/freebsd-hackers/2008-July/025483.html ++ */ ++void ++_timeval_diff(struct timeval * tv1, struct timeval * tv2, struct timeval * tvd) { ++ tvd -> tv_sec = tv1 -> tv_sec - tv2 -> tv_sec; ++ tvd -> tv_usec = tv1 -> tv_usec - tv2 -> tv_usec; ++ if (tvd -> tv_usec < 0) { ++ tvd -> tv_usec = 1000000 - tvd -> tv_usec; ++ tvd -> tv_sec--; ++ } ++} ++ ++void ++signal_ignore(int s, siginfo_t * si, void * ctx) {} ++ ++int ++_semtimedop(int semid, struct sembuf * array, size_t nops, struct timespec * _timeout) { ++ struct timeval timeout, before, after; ++ struct itimerval value, ovalue; ++ struct sigaction sa, osa; ++ int ret; ++ ++ if (_timeout) { ++ timeout.tv_sec = _timeout -> tv_sec; ++ timeout.tv_usec = _timeout -> tv_nsec / 1000; ++ ++ if (gettimeofday( & before, NULL) == -1) { ++ errno = EFAULT; ++ return -1; ++ } ++ ++ if (timeout.tv_sec == 0 && timeout.tv_usec < 5000) { ++ struct timeval tsleep, tend; ++ struct sembuf wait; ++ ++ wait = * array; ++ wait.sem_flg |= IPC_NOWAIT; ++ ++ tsleep.tv_sec = 0; ++ tsleep.tv_usec = 1; ++ ++ timeradd( & before, & timeout, & tend); ++ ++ for (;;) { ++ struct timeval tnow, tleft; ++ struct timespec ts; ++ ++ ret = semop(semid, & wait, nops); ++ ++ if (ret == 0) { ++ return 0; ++ } else if (errno != EAGAIN) { ++ break; ++ } ++ ++ if (gettimeofday( & tnow, NULL) == -1) { ++ errno = EFAULT; ++ break; ++ } ++ ++ if (timercmp( & tnow, & tend, >= )) { ++ errno = EAGAIN; ++ break; ++ } ++ ++ timersub( & tend, & tnow, & tleft); ++ ++ if (tsleep.tv_usec > tleft.tv_usec) ++ tsleep.tv_usec = tleft.tv_usec; ++ ++ ts.tv_sec = 0; ++ ts.tv_nsec = tsleep.tv_usec * 1000; ++ nanosleep( & ts, NULL); ++ ++ tsleep.tv_usec *= 10; ++ } ++ ++ return -1; ++ } ++ ++ memset( & value, 0, sizeof value); ++ value.it_value = timeout; ++ ++ memset( & sa, 0, sizeof sa); ++ sa.sa_sigaction = signal_ignore; ++ sa.sa_flags = SA_SIGINFO; ++ sigemptyset( & sa.sa_mask); ++ sigaction(SIGALRM, & sa, & osa); ++ ++ if (setitimer(ITIMER_REAL, & value, & ovalue) == -1) { ++ sigaction(SIGALRM, & osa, NULL); ++ return -1; ++ } ++ } ++ ++ ret = semop(semid, array, nops); ++ ++ if (_timeout) { ++ ret = setitimer(ITIMER_REAL, & ovalue, NULL); ++ if (ret < 0) ++ errno = EFAULT; ++ ++ sigaction(SIGALRM, & osa, NULL); ++ } ++ ++ if (ret == -1) { ++ if (_timeout) { ++ struct timeval elapsed; ++ ++ if (gettimeofday( & after, NULL) == -1) {} else { ++ _timeval_diff( & after, & before, & elapsed); ++ ++ if (timercmp( & elapsed, & timeout, >= )) ++ errno = EAGAIN; ++ } ++ } ++ return -1; ++ } ++ ++ return 0; ++} ++#endif ++ ++/** + * @brief Initializes the semaphore set for gvmd actions. + * + * Needs max_concurrent_scan_updates to be set. +@@ -148,7 +278,11 @@ + tv_sec: timeout, + }; + ++#if defined(__FreeBSD__) ++ ret = _semtimedop (semaphore_set, &op, 1, timeout > 0 ? &ts : NULL); ++#else + ret = semtimedop (semaphore_set, &op, 1, timeout > 0 ? &ts : NULL); ++#endif + if (ret) + { + if (errno == EAGAIN) diff --git a/security/gvmd/files/patch-src_utils.c b/security/gvmd/files/patch-src_utils.c index ad546f90de50..cf3e94bdf3ca 100644 --- a/security/gvmd/files/patch-src_utils.c +++ b/security/gvmd/files/patch-src_utils.c @@ -1,11 +1,48 @@ ---- src/utils.c 2023-01-13 03:21:14.000000000 -0500 -+++ src/utils.c 2023-04-02 02:05:00.969899000 -0500 +--- src/utils.c 2024-09-11 02:00:14.000000000 -0700 ++++ src/utils.c 2024-09-19 13:33:16.044626000 -0700 @@ -34,7 +34,7 @@ /** * @brief Needed for nanosleep. */ -#define _POSIX_C_SOURCE 199309L +//#define _POSIX_C_SOURCE 199309L #include "utils.h" +@@ -50,6 +50,11 @@ + #include + #include + ++#if defined(__FreeBSD__) ++#include ++#include ++#endif ++ + #include + + #undef G_LOG_DOMAIN +@@ -1035,8 +1040,23 @@ + guint64 + phys_mem_available () + { +- return (unsigned long long)(sysconf(_SC_AVPHYS_PAGES)) ++ uint64_t retval; ++ ++#if defined(__FreeBSD__) ++ uint64_t npages, pagesize; ++ size_t npages_len = sizeof(npages); ++ size_t pagesize_len = sizeof(pagesize); ++ ++ sysctlbyname("vm.stats.vm.v_free_count", &npages, &npages_len, NULL, 0); ++ sysctlbyname("vm.stats.vm.v_page_size", &pagesize, &pagesize_len, NULL, 0); ++ ++ retval = pagesize * npages; ++#else ++ retval=(unsigned long long)(sysconf(_SC_AVPHYS_PAGES)) + * sysconf(_SC_PAGESIZE); ++#endif ++ ++ return retval; + } + + /** diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist index 789a3b45fadb..61583d08c4d3 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.23 -lib/libgvm-pg-server.so.23.5.2 +lib/libgvm-pg-server.so.23.10.0 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 87a2aada0fc3..c07c29a6dfb3 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -1,62 +1,62 @@ PORTNAME= openvas -DISTVERSION= 23.0.1 +DISTVERSION= 23.9.0 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 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 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8 .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 ||g' ${WRKSRC}/src/nasl_plugins.c @${REINPLACE_CMD} -e 's|#include |#include |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 diff --git a/security/openvas/distinfo b/security/openvas/distinfo index ad656772eb49..204e736606a8 100644 --- a/security/openvas/distinfo +++ b/security/openvas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713945029 -SHA256 (greenbone-openvas-scanner-v23.0.1_GH0.tar.gz) = 26d43e7c24fc80a7b62ed757590f57c5c068bc7fd99b061052d83c36597ee927 -SIZE (greenbone-openvas-scanner-v23.0.1_GH0.tar.gz) = 1387550 +TIMESTAMP = 1726785254 +SHA256 (greenbone-openvas-scanner-v23.9.0_GH0.tar.gz) = aace6f28a62e5d088cebb2feceb0146f60ba85466fb5dc98a98d9376782e9102 +SIZE (greenbone-openvas-scanner-v23.9.0_GH0.tar.gz) = 1462868 diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist index 8d419055f39f..683d7c14b082 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.0.1 +lib/libopenvas_misc.so.23.9.0 lib/libopenvas_nasl.so lib/libopenvas_nasl.so.23 -lib/libopenvas_nasl.so.23.0.1 +lib/libopenvas_nasl.so.23.9.0 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 b812218f1145..a8156d765186 100644 --- a/security/py-gvm-tools/Makefile +++ b/security/py-gvm-tools/Makefile @@ -1,32 +1,32 @@ PORTNAME= gvm-tools -DISTVERSION= 24.3.0 +DISTVERSION= 24.8.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 diff --git a/security/py-gvm-tools/distinfo b/security/py-gvm-tools/distinfo index b4b0218419b4..ef79e5cdaeb0 100644 --- a/security/py-gvm-tools/distinfo +++ b/security/py-gvm-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713946265 -SHA256 (greenbone-gvm-tools-v24.3.0_GH0.tar.gz) = cdd7462b91f5a51c3282688adaed5a98fc657d1eeffee01297f907e9a258a24c -SIZE (greenbone-gvm-tools-v24.3.0_GH0.tar.gz) = 213334 +TIMESTAMP = 1726785352 +SHA256 (greenbone-gvm-tools-v24.8.0_GH0.tar.gz) = 4e1b5849de8a82e6c391bd31cd310c8767677d596b24f7acc4f8e283194a51eb +SIZE (greenbone-gvm-tools-v24.8.0_GH0.tar.gz) = 241845 diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile index 57fc872cff88..916699ba7a96 100644 --- a/security/py-notus-scanner/Makefile +++ b/security/py-notus-scanner/Makefile @@ -1,54 +1,54 @@ PORTNAME= notus-scanner -DISTVERSION= 22.6.3 +DISTVERSION= 22.6.4 DISTVERSIONPREFIX= v CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= acm@FreeBSD.org COMMENT= scanner for creating results from local security checks WWW= https://github.com/greenbone/notus-scanner LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR} \ mosquitto:net/mosquitto 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-extract: ${MV} ${WRKSRC}/tests ${WRKSRC}/notus/ 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} '37d' ${WRKSRC}/pyproject.toml @${RM} ${WRKSRC}/notus/scanner/cli/parser.py.orig @${RM} ${WRKSRC}/notus/scanner/config.py.orig post-install: @${MKDIR} ${STAGEDIR}/var/run/notus-scanner @${MKDIR} ${STAGEDIR}/var/lib/openvas/plugins/notus/products @${MKDIR} ${STAGEDIR}/var/lib/notus .include diff --git a/security/py-notus-scanner/distinfo b/security/py-notus-scanner/distinfo index 6a52e947b907..63457ba78b16 100644 --- a/security/py-notus-scanner/distinfo +++ b/security/py-notus-scanner/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713945994 -SHA256 (greenbone-notus-scanner-v22.6.3_GH0.tar.gz) = 8b46e30c579bea6149082e92e8e9ce8ddd54dfa8d4c82121b8d28b70effc9970 -SIZE (greenbone-notus-scanner-v22.6.3_GH0.tar.gz) = 293997 +TIMESTAMP = 1726785411 +SHA256 (greenbone-notus-scanner-v22.6.4_GH0.tar.gz) = 33745f6fd8788f55c85404e37e3e712adb827d281246b4e984a8d35c7acd474e +SIZE (greenbone-notus-scanner-v22.6.4_GH0.tar.gz) = 293607 diff --git a/security/py-notus-scanner/pkg-plist b/security/py-notus-scanner/pkg-plist index 786c509d8cb5..9c08934bfee5 100644 --- a/security/py-notus-scanner/pkg-plist +++ b/security/py-notus-scanner/pkg-plist @@ -1,188 +1,188 @@ bin/notus-scan-start bin/notus-scanner bin/notus-subscriber %%PYTHON_SITELIBDIR%%/notus/scanner/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/scanner%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/scanner%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/__version__.py %%PYTHON_SITELIBDIR%%/notus/scanner/cli/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/cli/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/cli/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/cli/parser.py %%PYTHON_SITELIBDIR%%/notus/scanner/config.py %%PYTHON_SITELIBDIR%%/notus/scanner/daemon.py %%PYTHON_SITELIBDIR%%/notus/scanner/errors.py %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/json%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/loader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/__pycache__/loader%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/loader/gpg_sha_verifier.py %%PYTHON_SITELIBDIR%%/notus/scanner/loader/json.py %%PYTHON_SITELIBDIR%%/notus/scanner/loader/loader.py %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/start%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/start%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/__pycache__/status%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messages/message.py %%PYTHON_SITELIBDIR%%/notus/scanner/messages/result.py %%PYTHON_SITELIBDIR%%/notus/scanner/messages/start.py %%PYTHON_SITELIBDIR%%/notus/scanner/messages/status.py %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/mqtt.py %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/publisher.py %%PYTHON_SITELIBDIR%%/notus/scanner/messaging/subscriber.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/__pycache__/vulnerability%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/__pycache__/vulnerability%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/deb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/deb%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/ebuild%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/ebuild%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/package%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/package%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/rpm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/rpm%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/slackware%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/__pycache__/slackware%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/deb.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/ebuild.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/package.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/rpm.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/packages/slackware.py %%PYTHON_SITELIBDIR%%/notus/scanner/models/vulnerability.py %%PYTHON_SITELIBDIR%%/notus/scanner/scanner.py %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__init__.py %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/scanstart%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/scanstart%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/scanner/tools/scanstart.py %%PYTHON_SITELIBDIR%%/notus/scanner/tools/subscriber.py %%PYTHON_SITELIBDIR%%/notus/scanner/utils.py %%PYTHON_SITELIBDIR%%/notus/tests/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/cli/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/cli/test_cli_parser.py %%PYTHON_SITELIBDIR%%/notus/tests/fakespecifier_os.notus %%PYTHON_SITELIBDIR%%/notus/tests/loader/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/loader/emptyos.notus %%PYTHON_SITELIBDIR%%/notus/tests/loader/euleros_v2.0sp1.notus %%PYTHON_SITELIBDIR%%/notus/tests/loader/invalid_package.notus %%PYTHON_SITELIBDIR%%/notus/tests/loader/test_gpg.py %%PYTHON_SITELIBDIR%%/notus/tests/loader/test_json.py %%PYTHON_SITELIBDIR%%/notus/tests/messages/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messages/test_message.py %%PYTHON_SITELIBDIR%%/notus/tests/messages/test_result.py %%PYTHON_SITELIBDIR%%/notus/tests/messages/test_start.py %%PYTHON_SITELIBDIR%%/notus/tests/messages/test_status.py %%PYTHON_SITELIBDIR%%/notus/tests/messaging/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/messaging/test_mqtt.py %%PYTHON_SITELIBDIR%%/notus/tests/models/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__init__.py %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_slackware%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_slackware%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/gentoo_examples.txt %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_deb.py %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_ebuild.py %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_package.py %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_rpm.py %%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_slackware.py %%PYTHON_SITELIBDIR%%/notus/tests/models/test_vulnerability.py %%PYTHON_SITELIBDIR%%/notus/tests/test_config.py %%PYTHON_SITELIBDIR%%/notus/tests/test_verifier.py -%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.3.dist-info/LICENSE -%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.3.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.3.dist-info/RECORD -%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.3.dist-info/WHEEL -%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.3.dist-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.4.dist-info/LICENSE +%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.4.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.4.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.4.dist-info/WHEEL +%%PYTHON_SITELIBDIR%%/notus_scanner-22.6.4.dist-info/entry_points.txt @dir(gvm,gvm,750) /var/run/notus-scanner @dir(gvm,gvm,750) /var/lib/openvas/plugins/notus/products @dir(gvm,gvm,750) /var/lib/openvas/plugins/notus @dir(gvm,gvm,750) /var/lib/notus @dir(gvm,gvm,750) /var/lib/openvas/plugins @dir(gvm,gvm,750) /var/lib/openvas @dir /var/lib diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile index b93c3cba5e03..0280569a3da6 100644 --- a/security/py-ospd-openvas/Makefile +++ b/security/py-ospd-openvas/Makefile @@ -1,54 +1,54 @@ PORTNAME= ospd-openvas DISTVERSION= 22.7.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 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 diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile index 48ee0aceb757..5116d76f5335 100644 --- a/security/py-python-gvm/Makefile +++ b/security/py-python-gvm/Makefile @@ -1,33 +1,33 @@ PORTNAME= python-gvm -DISTVERSION= 24.3.0 +DISTVERSION= 24.8.0 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.py + ${WRKSRC}/gvm/connections/_unix.py ${REINPLACE_CMD} -e 's|, { include = "tests", format = "sdist" }||g' \ ${WRKSRC}/pyproject.toml .include diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo index 220a91fcf385..12e0cccc2a85 100644 --- a/security/py-python-gvm/distinfo +++ b/security/py-python-gvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713946232 -SHA256 (greenbone-python-gvm-v24.3.0_GH0.tar.gz) = 6c078eaab668465dac3ab844a728c34914c0b10ad64c7014e3d3fe6f8b62b4fd -SIZE (greenbone-python-gvm-v24.3.0_GH0.tar.gz) = 278134 +TIMESTAMP = 1726785521 +SHA256 (greenbone-python-gvm-v24.8.0_GH0.tar.gz) = dae36b728dbaef4f895d23751b4fbd31f65269d305f857d6ab60f5e72ad22083 +SIZE (greenbone-python-gvm-v24.8.0_GH0.tar.gz) = 289907