From nobody Mon Aug 01 21:00:27 2022 X-Original-To: dev-commits-ports-main@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 4LxVrW2x1Lz4XwbP; Mon, 1 Aug 2022 21:00:27 +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 4LxVrW2QLbz41fh; Mon, 1 Aug 2022 21:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659387627; 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=X9zgSiJNA87VAX5o41XxL+G3hEw8iwRCSrKQqC71pls=; b=ZFfPVG2Avbns1C59kqvUxnJ2vWcjvXga13wvRD/yzsSljJQfTQcZ9ubO+6opKCYccbkv/Z LgFAi1OyffZ+LH7V34bR58jcD5BtopPdUmjZxM1QjjQSqDCK7iiVWlrXAeiuH1Aky229Qe v1/Icrc8dqyq9faZ+WpLq74hWwi7ol4LPtNopCdzrnC+LCrIEFMpE/e49Or4TrPt/6sr64 XUnuWZw4G5PM15xXeKRYcmtFWqSXQMBlaKJ8uCCrhhbo0BvpsRVVWjiiKgbcI/vuBuTXTq SL8snMMS6Eco5Ao4PQCJUbFeiaj7MBPcTcraPTJLxQVQdyL1hOfplmIRS/ilpQ== 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 4LxVrW1SC8znFC; Mon, 1 Aug 2022 21:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 271L0RMl076211; Mon, 1 Aug 2022 21:00:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271L0RjF076210; Mon, 1 Aug 2022 21:00:27 GMT (envelope-from git) Date: Mon, 1 Aug 2022 21:00:27 GMT Message-Id: <202208012100.271L0RjF076210@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: 5f35bc58a18f - main - security/gvmd: update to 22.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 5f35bc58a18fababea079891628bfa1a7bade4ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659387627; 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=X9zgSiJNA87VAX5o41XxL+G3hEw8iwRCSrKQqC71pls=; b=jfK3Q6GAOvB7LF/o/BiulcYYJjQU/GJdoVmE60wq47nYTE06tpdztNspyHfwxH7I1tI9TJ I4G60KuQnhlcif442O9z78P8TYXakGAlL9F2w8eVCtSdb50C2ze+d/uJVpR6uiiRALQb1d yyre8LXGksKT3wBTe4HPRnkbhdLlXLUQtQ9cR6ZXWdn8VfS36WAII3KA++1tdH/VVC/93F jQE1IMKMR8fcIDnf6fdIOoe8R/yq4FM1+6ttcAHV3Uw7fsog/mxrMxJ5VGwpDuFzf3ZR3B cRK7b28IrihjhVA0e0Hf2GPw/3SvMiyOUNnfyjE+b3DdvtdTN9eaWy/TbZE1bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659387627; a=rsa-sha256; cv=none; b=xpPI/C8+2Ouh4Y4o1poXTuX5WbqHkJX3fB0Vsn/jZzBiW7PptEUyoBJsNVzsAtCABkuCjT A5r4UEmPmtwQc8wvQfESvhRCwfNF/Q4+p6LBhbRwzvKcQSSeZkMJNGUh2kHGOjx9YPjV5S AIpbL/1Rd8TirpWxy1S515aFdoWkI1iI0cjtTInmy5GCJYmejYXalDfZ/1T9qfVP8HDMk1 AfvHJPdLiGzKXY/U0/VdC/MYvYqR65lzYuXYY923pRRV2HHgqGMfgTzphLmQA7JUX8Zrvb GuULIlkFLuoCk8hQFw/QeSJpBcp6T1/WdasqhWjMWZ9y9kxrEuvkvbxNpFq5bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f35bc58a18fababea079891628bfa1a7bade4ae commit 5f35bc58a18fababea079891628bfa1a7bade4ae Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-08-01 20:46:24 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-08-01 20:46:24 +0000 security/gvmd: update to 22.4.0 ChangeLog: https://github.com/greenbone/gvmd/releases/tag/v22.4.0 --- security/gvmd/Makefile | 6 +++++- security/gvmd/distinfo | 6 +++--- security/gvmd/files/patch-CMakeLists.txt | 17 +++++++++++++---- security/gvmd/files/patch-src_CMakeLists.txt | 26 ++++++++++++++++++-------- security/gvmd/files/patch-src_gvmd.c | 26 ++++++++++++++++++-------- security/gvmd/pkg-plist | 5 ++--- 6 files changed, 59 insertions(+), 27 deletions(-) diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index e7b51ec56d65..8a5d8da317dc 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,5 +1,5 @@ PORTNAME= gvmd -DISTVERSION= 21.4.5 +DISTVERSION= 22.4.0 DISTVERSIONPREFIX= v CATEGORIES= security @@ -14,6 +14,7 @@ LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ 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 \ @@ -46,6 +47,9 @@ SHEBANG_FILES= tools/gvm-lsc-rpm-creator \ 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 \ + ${WRKSRC}/src/manage_sql.c ${WRKSRC}/src/manage_sql_report_formats.c post-install: @${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index 5a8fa1e04d40..412a519fe987 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651424657 -SHA256 (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 6329838fd70ba6e9fc8e649fe4e552e05b3711497df8343494da8537cae48635 -SIZE (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 1041186 +TIMESTAMP = 1659310415 +SHA256 (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 227e7ed383a5a51b1af54d8b848eaf101458bb64d3392bbc7ef56397c3474b69 +SIZE (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 1024867 diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt index e1798ca3cb50..eb62a6e33d5f 100644 --- a/security/gvmd/files/patch-CMakeLists.txt +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-02-22 05:52:13.000000000 -0500 -+++ CMakeLists.txt 2022-05-02 18:07:40.263764000 -0500 +--- CMakeLists.txt 2022-07-21 02:20:24.000000000 -0500 ++++ CMakeLists.txt 2022-07-31 19:24:14.544647000 -0500 +@@ -53,7 +53,7 @@ + + # Set dev version if this is a development version and not a full release, + # unset (put value 0 or delete line) before a full release and reset after. +-set (PROJECT_DEV_VERSION 1) ++set (PROJECT_DEV_VERSION 0) + + # If PROJECT_DEV_VERSION is set, the version string will be set to: + # "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}" @@ -110,7 +110,7 @@ endif (SYSCONF_INSTALL_DIR) @@ -45,9 +54,9 @@ ## Documentation -@@ -296,10 +296,10 @@ +@@ -294,10 +294,10 @@ - install (DIRECTORY DESTINATION ${GVMD_RUN_DIR}) + install (DIRECTORY DESTINATION ${GVMD_STATE_DIR}) -install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf +install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf.sample diff --git a/security/gvmd/files/patch-src_CMakeLists.txt b/security/gvmd/files/patch-src_CMakeLists.txt index 5e6801a41ca9..5afd6d919d93 100644 --- a/security/gvmd/files/patch-src_CMakeLists.txt +++ b/security/gvmd/files/patch-src_CMakeLists.txt @@ -1,15 +1,25 @@ ---- src/CMakeLists.txt 2020-08-11 10:05:36.000000000 -0500 -+++ src/CMakeLists.txt 2021-01-04 19:53:06.893137000 -0500 -@@ -227,7 +227,7 @@ +--- src/CMakeLists.txt 2022-07-21 02:20:24.000000000 -0500 ++++ src/CMakeLists.txt 2022-07-31 19:00:06.378204000 -0500 +@@ -32,7 +32,9 @@ + pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=22.4) + pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15) + pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42) ++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + pkg_check_modules (LIBBSD REQUIRED libbsd) ++endif() + pkg_check_modules (LIBICAL REQUIRED libical>=1.00) + + message (STATUS "Looking for PostgreSQL...") +@@ -271,7 +273,7 @@ ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS} - ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} + ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_GMP_LDFLAGS} -- ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS}) -+ ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} -lexecinfo) +- ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT}) ++ ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT} -lexecinfo) target_link_libraries (manage-test cgreen m ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS} - ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} -@@ -441,5 +441,7 @@ + ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} +@@ -489,5 +491,7 @@ COMMAND ctags ${C_FILES}) add_custom_target (tags COMMENT "Building tags files...") add_dependencies (tags etags ctags) diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c index 49ea71bfe998..f126c86db8e7 100644 --- a/security/gvmd/files/patch-src_gvmd.c +++ b/security/gvmd/files/patch-src_gvmd.c @@ -1,6 +1,6 @@ ---- src/gvmd.c 2020-08-11 10:05:36.000000000 -0500 -+++ src/gvmd.c 2021-01-03 16:50:30.707314000 -0500 -@@ -1362,6 +1362,7 @@ +--- 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 @@ struct sockaddr_un address_unix; struct sockaddr_storage address_tls; int address_size; @@ -8,7 +8,7 @@ memset (&address_tls, 0, sizeof (struct sockaddr_storage)); memset (&address_unix, 0, sizeof (struct sockaddr_un)); -@@ -1375,9 +1376,8 @@ +@@ -1571,9 +1572,8 @@ /* UNIX file socket. */ address_unix.sun_family = AF_UNIX; @@ -20,7 +20,7 @@ g_debug ("%s: address_unix.sun_path: %s", __func__, -@@ -1398,7 +1398,7 @@ +@@ -1594,7 +1594,7 @@ } address = (struct sockaddr *) &address_unix; @@ -29,7 +29,7 @@ /* Ensure the path of the socket exists. */ -@@ -1414,8 +1414,8 @@ +@@ -1610,8 +1610,8 @@ } else if (address_str_tls) { @@ -40,7 +40,7 @@ int port, optval; /* TLS TCP socket. */ -@@ -1440,17 +1440,17 @@ +@@ -1636,17 +1636,17 @@ port = htons (GVMD_PORT); } @@ -60,7 +60,7 @@ } else { -@@ -1491,7 +1491,7 @@ +@@ -1687,7 +1687,7 @@ return -1; } @@ -69,3 +69,13 @@ { g_warning ("Failed to bind manager socket: %s", strerror (errno)); return -1; +@@ -2326,7 +2326,9 @@ + + /* Set process title. */ + ++#if !defined(__FreeBSD__) + setproctitle_init (argc, argv, env); ++#endif + setproctitle ("gvmd: Initializing"); + + /* Setup initial signal handlers. */ diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist index 880fa1a4ef9d..298bf2d2a0fe 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -2,8 +2,8 @@ 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.21 -lib/libgvm-pg-server.so.21.4.5 +lib/libgvm-pg-server.so.22 +lib/libgvm-pg-server.so.22.4.0 sbin/greenbone-certdata-sync sbin/greenbone-feed-sync sbin/greenbone-scapdata-sync @@ -44,7 +44,6 @@ 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/gvm/scap/ovaldef_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