From nobody Sun May 22 05:44: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 2A8D01B3E33D; Sun, 22 May 2022 05:44:28 +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 4L5TtM6h4dz4VCH; Sun, 22 May 2022 05:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653198268; 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=cjssdPZoWOn+7iPL9jr3YNLymKpF0O763peCUpoQM/E=; b=Em/8TJheEHYdl7NfBSistC4f8FX+6boCfZ8XtOyKxuKwplhXgMZv5N35FoZOrMhRbOihxF NLBbKqZWlabpkn6ZplswUKvjDTilR7rFKZuqrnlPWniC4VLQsBYzzjLhTb/hhF2UnnWc6H oRWAEpkn7anY8grKBrEIJdm7IIl7Tc8a5CbdcYBRR7laQonYZtxTji6134PQD0rs8itwRx DiXcUAg59CSNRbLYUVqLPFIll0DoxuidT6QQG5YwTRXMeiSsJzpgCQ0zi/Wc9OeyVQqwHH vQ4spPIiKkdTFZzh9XzHbygvM2zy54g1mL0qBC5A7TdBNTgKrL5ewNMpY26vZg== 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 C6040153FC; Sun, 22 May 2022 05:44: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 24M5iRx1005505; Sun, 22 May 2022 05:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M5iRVU005504; Sun, 22 May 2022 05:44:27 GMT (envelope-from git) Date: Sun, 22 May 2022 05:44:27 GMT Message-Id: <202205220544.24M5iRVU005504@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: d6d354da1562 - main - security/gvmd: update to 21.4.5 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: d6d354da156205334bf1aa786efd3b737bc8bf46 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653198268; 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=cjssdPZoWOn+7iPL9jr3YNLymKpF0O763peCUpoQM/E=; b=XkxaFSjOn566Sru1yy2JAdYXnLh7QpTMvEWx90YWs6sHlHDd7iuHF1BKcRsLGdgYphlGrC A/XumUaP3+CqqLh2mxZUD+sZDdFZldoSFT6Z2CiwiXweKf/meapKS4xeLoAI42hWZDZ5Tf UR6lm6JLkFRxHXIN/pmQgw/Tj1UNok9SiLF82he0QFDnrEuUrMlJ7GJxiOo0giFX7RPSc0 kalMC3s3kXuEIzHlS+ad++n93/CXLgUOqJ9XoUWq1tHSCzOZS6BlA/XYc5igYKWy2Z384C MehA3RhkyYnfZesXDR5fpL0gR4cdC9eyDMK7EuyIn1NZOKCxSra5meFYA/kxKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653198268; a=rsa-sha256; cv=none; b=SBIfZIKhSOyRhEbahLRx3wyiKn653ry6mdCkm8BsbB59tmsn9BNz5L0C7ERjM5/EhEgVpu 2Rghtl1Pdxr3e03QoVx9xnJxccT6EDyrW3FTW0TuLMsT4D/L6YHIhv2Z9nBCGTdJJ738Nf nY0JFZcvEWzjz5Io0/Kf6Am5xnF6CStrTjFOz/bENdgQ4fNe1zeR5Zs1YCzA0heXszGbQj jZW62tdm+eI1ups8mwgdKN1ThV0g7UQBedvk6Yi+3pjVfqztZ5sIF5lWpMNBvZFKqBhyY2 Ic4cutBkC2fa3kqk5wsnlBeQxA6lmdeppHfHMdhYE/Wx3K3oLJWyRXihFGtWbQ== 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=d6d354da156205334bf1aa786efd3b737bc8bf46 commit d6d354da156205334bf1aa786efd3b737bc8bf46 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-05-22 05:31:32 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-05-22 05:42:12 +0000 security/gvmd: update to 21.4.5 ChangeLog at: https://github.com/greenbone/gvmd/releases/tag/v21.4.5 --- security/gvmd/Makefile | 5 ++--- security/gvmd/distinfo | 6 +++--- security/gvmd/files/gvmd.in | 4 ++-- security/gvmd/files/patch-CMakeLists.txt | 26 +++++++++++++------------- security/gvmd/pkg-plist | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index e1c3e67f6f26..e7b51ec56d65 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,6 +1,5 @@ PORTNAME= gvmd -DISTVERSION= 21.4.4 -PORTREVISION= 2 +DISTVERSION= 21.4.5 DISTVERSIONPREFIX= v CATEGORIES= security @@ -51,6 +50,6 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg @${MKDIR} ${STAGEDIR}/var/log/gvm - @${MKDIR} ${STAGEDIR}/var/run/gvm + @${MKDIR} ${STAGEDIR}/var/run/gvmd .include diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index a7c9e71d86f0..5a8fa1e04d40 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635998903 -SHA256 (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 90809302c605744bdab4474f445f80523ce466fc02beed850b5f7b3f17de3cd3 -SIZE (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 1031202 +TIMESTAMP = 1651424657 +SHA256 (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 6329838fd70ba6e9fc8e649fe4e552e05b3711497df8343494da8537cae48635 +SIZE (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 1041186 diff --git a/security/gvmd/files/gvmd.in b/security/gvmd/files/gvmd.in index 5e2a6d1375c7..6fc265b18a44 100644 --- a/security/gvmd/files/gvmd.in +++ b/security/gvmd/files/gvmd.in @@ -19,12 +19,12 @@ rcvar=${name}_enable load_rc_config $name : ${gvmd_enable=NO} -: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd-openvas.sock --unix-socket=/var/run/gvm/gvmd.sock"} +: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd-openvas.sock --unix-socket=/var/run/gvmd/gvmd.sock"} command="%%PREFIX%%/sbin/gvmd" command_args="${gmvd_flags}" gvmd_user="gvm" gvmd_group="gvm" -pidfile=/var/run/gvm/gvmd.pid +pidfile=/var/run/gvmd/gvmd.pid run_rc_command "$1" diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt index 2026ea5523ab..e1798ca3cb50 100644 --- a/security/gvmd/files/patch-CMakeLists.txt +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2021-11-03 23:09:27.602060000 -0500 -+++ CMakeLists.txt 2021-11-03 23:17:41.187707000 -0500 +--- CMakeLists.txt.orig 2022-02-22 05:52:13.000000000 -0500 ++++ CMakeLists.txt 2022-05-02 18:07:40.263764000 -0500 @@ -110,7 +110,7 @@ endif (SYSCONF_INSTALL_DIR) @@ -12,13 +12,13 @@ @@ -181,7 +181,7 @@ set (GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem") - if (NOT GVM_RUN_DIR) -- set (GVM_RUN_DIR "/run/gvm") -+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm") - endif (NOT GVM_RUN_DIR) + if (NOT GVMD_RUN_DIR) +- set (GVMD_RUN_DIR "/run/gvmd") ++ set (GVMD_RUN_DIR "${LOCALSTATEDIR}/run/gvmd") + endif (NOT GVMD_RUN_DIR) - if (NOT GVM_FEED_LOCK_PATH) -@@ -190,7 +190,7 @@ + if (NOT GVMD_PID_PATH) +@@ -194,7 +194,7 @@ add_definitions (-DGVM_FEED_LOCK_PATH="${GVM_FEED_LOCK_PATH}") if (NOT OPENVAS_DEFAULT_SOCKET) @@ -27,7 +27,7 @@ endif (NOT OPENVAS_DEFAULT_SOCKET) add_definitions (-DOPENVAS_DEFAULT_SOCKET="${OPENVAS_DEFAULT_SOCKET}") -@@ -238,7 +238,7 @@ +@@ -242,7 +242,7 @@ configure_file (doc/Doxyfile_xml.in doc/Doxyfile_xml) configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-certs.conf @ONLY) configure_file (VERSION.in VERSION) @@ -36,18 +36,18 @@ configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY) configure_file (tools/greenbone-feed-sync.in tools/greenbone-feed-sync @ONLY) configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY) -@@ -280,7 +280,7 @@ +@@ -284,7 +284,7 @@ ## Configs (e.g. systemd service file) -add_subdirectory (config) -+#add_subdirectory (config) ++# add_subdirectory (config) ## Documentation -@@ -290,10 +290,10 @@ +@@ -296,10 +296,10 @@ - install (DIRECTORY DESTINATION ${GVMD_STATE_DIR}) + install (DIRECTORY DESTINATION ${GVMD_RUN_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/pkg-plist b/security/gvmd/pkg-plist index 01125dd6df73..59aaed41179a 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -52,6 +52,6 @@ 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/gvm +@dir(gvm,gvm,750) /var/run/gvmd @dir(gvm,gvm,750) /var/log/gvm @dir /var/lib