From nobody Mon Oct 23 19:00:11 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 4SDkyz6c3pz4yNT0; Mon, 23 Oct 2023 19:00:11 +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 4SDkyz4xY5z3Jfh; Mon, 23 Oct 2023 19:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698087611; 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=hBBIbmPYJXox8stGpFAApc3YicrfUxVXdDv4L2WEXZU=; b=arM/15Kve2vWmbkRchXqwRgiJOgm/AG6ylAKdWToTeouNvZm3F8OBVhmJsww0QYScx0P4R Se7s5DCppX2NGXj2b01y0gMshkZCK1wFJgOQpG3TckBmdlfsMcRjeOQuVz74iwDivxCXMV PRVWqXYRdZEa5mkZHrAHDCXqt9lupbzVjo+jNGIfYBg08zh2Dxguy7zkV171Dx0ZZ8c1Br C9xfuZRp2a4VniES4yJmNbRGr8Z6rgIpLLjaaZYiFZNza9gjXvR4qGYF72SxRhyt+7I9h5 90XJmZSVMAMDhQmdm9rnScaV21K839DhLzg/OGjlP5H4vVpU9j7C35nAiyp1kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698087611; a=rsa-sha256; cv=none; b=P86hu0lB7+4TzoiTsqVRlH1rSrUsllmNxBxz0/YhJ2ZWDwfU8UQSrucquCgwpo4eAZG0Cd bIockYCSptrgGYoM9cqAJ+rT1CXNd66Q1H8BGatBQhRndlgzSaRFqv0dZzd2ohGxKKdyO3 TVKhedB43IX0rOP2yLvZYzLw0WTWejLhqcqe0f0WA8omyWFaesNtTUyOWxZlGhjj2+jrPT IflwIjKixmIiQaEDAS3D5h92zT067NyOaWakS7xNWEuMZC+5cMbHHuPgW93XKdOy3OHZzf FJkmBRopM0+3kyZg36C5eWqfZBAccCneftdBeDTCH6OjY5WMc9GmjL2Siq7h3w== 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=1698087611; 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=hBBIbmPYJXox8stGpFAApc3YicrfUxVXdDv4L2WEXZU=; b=mbNFErXSpuqIl9Ticd/YE/vo0jnmdNjZme1aJdPbuzNjCeQt64pIXnjOjL2a72w/v4jC3y VZzRb82Sm7cHbsedKIJftxKupxof4pl2jFTTmOZIayf6E+zWVH/gcG6DeZvPtUd3jzcBhS T+BU7k8ctPx27WiZhRWQGHB5YCwr1uR7RcqO990XFkp0AbY3Hh/hy6sK+6Gh4XZ71G31WH pEEUaEdgkosWOLrbqg1wq4Ai2eFxgPa+2Iw/4uLhIo4g3OCA0k9ztFsp98MNP1a38xxL9b esJ2TgC+LycV7slBnQr753bTXz68WeZIhC2Pvn9JVCxEGBf07OWGHUfbGDTKYw== 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 4SDkyz406vzrGZ; Mon, 23 Oct 2023 19:00:11 +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 39NJ0BLT021196; Mon, 23 Oct 2023 19:00:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NJ0Bx5021187; Mon, 23 Oct 2023 19:00:11 GMT (envelope-from git) Date: Mon, 23 Oct 2023 19:00:11 GMT Message-Id: <202310231900.39NJ0Bx5021187@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: aa316ba7d209 - 2023Q4 - security/gsa: Fix build 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: aa316ba7d20994e0f78395f5ee3780692b510206 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa316ba7d20994e0f78395f5ee3780692b510206 commit aa316ba7d20994e0f78395f5ee3780692b510206 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-20 07:05:11 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-10-23 18:59:49 +0000 security/gsa: Fix build - Move from yarn to npm PR: 274276 Reported by: Trond Endrestøl (cherry picked from commit 3d5bec0e07b8106bc02a875b7efb27dc7438723f) --- security/gsa/Makefile | 25 ++++++++++++------------- security/gsa/distinfo | 6 +++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/security/gsa/Makefile b/security/gsa/Makefile index dd950a73ed0d..e0dfa1405e9e 100644 --- a/security/gsa/Makefile +++ b/security/gsa/Makefile @@ -1,6 +1,7 @@ PORTNAME= gsa DISTVERSIONPREFIX= v DISTVERSION= 22.7.1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= acm@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://github.com/greenbone/gsa LICENSE= AGPLv3+ -BUILD_DEPENDS= yarn:www/yarn +BUILD_DEPENDS= npm-node18>0:www/npm-node18 RUN_DEPENDS= ${LOCALBASE}/sbin/gsad:security/gsad USES= nodejs:build @@ -18,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= gsa -YARN_BIN= ${LOCALBASE}/bin/yarn +NPM_BIN= ${LOCALBASE}/bin/npm # to rebuild the deps archive: # 1. set DEV_UPDATE_MODE=yes @@ -28,27 +29,25 @@ YARN_BIN= ${LOCALBASE}/bin/yarn # 5. make clean makesum DEV_UPDATE_MODE= no -DEPS_CACHE_DIR= ${WRKDIR} +DEPS_CACHE_DIR= ${WRKSRC} .if (${DEV_UPDATE_MODE} == "yes") +NPM_ARGS= install post-build: - @cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache + @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/:yarn_cache -DISTFILES+= ${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache -YARN_ARGS= --offline +MASTER_SITES+= LOCAL/acm/gsa/:npm_cache +DISTFILES+= ${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache +NPM_ARGS= run build .endif -post-patch: - ${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \ - ${WRKSRC}/.yarnrc +post-extract: + @${MV} ${WRKDIR}/node_modules ${WRKSRC} do-build: @cd ${WRKSRC} && \ - ${YARN_BIN} ${YARN_ARGS} - @cd ${WRKSRC} && \ - ${YARN_BIN} ${YARN_ARGS} build + ${NPM_BIN} ${NPM_ARGS} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/gvm/gsad/web diff --git a/security/gsa/distinfo b/security/gsa/distinfo index 86ac645b05ef..96842f914306 100644 --- a/security/gsa/distinfo +++ b/security/gsa/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1696261026 -SHA256 (gsa-cache-22.7.1.tar.gz) = 5b03e1e5f8e1afcc1d23567f044eaa60994495a9558a6a3a2a8555df0886a91d -SIZE (gsa-cache-22.7.1.tar.gz) = 47165900 +TIMESTAMP = 1697784180 +SHA256 (gsa-cache-22.7.1.tar.gz) = cdb0a815e3069eb24f43012ad16a51a9d171a35b04ddae7da769f09651f6d4ed +SIZE (gsa-cache-22.7.1.tar.gz) = 67963784 SHA256 (greenbone-gsa-v22.7.1_GH0.tar.gz) = 89c159db61df19fe21713fa02c0454e730653673e7ef9b4dc30485666a631a05 SIZE (greenbone-gsa-v22.7.1_GH0.tar.gz) = 3607415