From nobody Sun Oct 15 21:13:05 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 4S7tJ2029Xz4xQ2j; Sun, 15 Oct 2023 21:13:06 +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 4S7tJ15bldz3F9M; Sun, 15 Oct 2023 21:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697404385; 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=Ywb66NBQ8qJAkDpa6YtYE2eczy38b4CdC98OyYkQ4eI=; b=qMM8ARBjt2ZLKFioPZetCNxDme6KnlVUsWVjGzwKgNvWSN5ib8dchK4iBIU1pNTzO++JkN Hf52KjvIQCuUweb7LIZJcifDpNe4celqbOL1nBaoF2Trd+80zfvPxY50MrVhYC+bwx/JDd p7ZmjKJwuNfDuh4rSo5lciYsUT0TLJ2pRsttAkOfyGakXmfrEj4Dzrtg2zns3Ua2wiEkFZ SOMWJcdFr9S8sqXGCRv+0Yndbk5jZA9DDQIlYgFjr2aAQ54LObXjRDnPIh5R1epxkrsU2g eOx6zYkdTk1cO7T5FegwBnxUyus+uRmm54FlxiuNCFbs3ecEOGD/LuY4r5eOlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697404385; a=rsa-sha256; cv=none; b=L2mNMXIwZX1iLoJEbF21ag7r032Ck5fb73Xv3XYcD3BwDZ+YF9Q46+FonI8INGe0Vcd7OF CUfN6ScZe/mlzQ2ZH2mSrcI0oRmujCMdx4Ad4loy4fST8Kzz1XWhCArhfdVauXmAq6I3s3 2nPRKQjemjjrPCOeirDchim30pxWl7PRLsZpF2lYQWlAka7Fr3RZ0VQlNL5p7emH5KIwK8 KGO2Ph8GPNXYRTUapBE8hbpb7HA2xO6hI0pqECaZHFWxE9TWBbVaglZIy6MuuSt6pT6sh1 OromT2bLyHqN2HXVw7uyuNsxBVKgnnCaC68GhOsXegKOn8jV5VlxWfA1q5xFig== 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=1697404385; 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=Ywb66NBQ8qJAkDpa6YtYE2eczy38b4CdC98OyYkQ4eI=; b=N9I3repj4pZgVUqrI+DAJJXWi8ad3MwFh4c3YrJY4NxKaNS8qqnpjMDMFQxfEuk+xlkbFq irCZtxM/izk0NHGIKmn43jvVZ+9kkiVQ5jr3X7cYCbDm8xIIh1zB0oS16Kogng1E67tWFN dhJWEKdeJwUbj2cfPHY3yb0p76WO5vT4KijysUAQQcMQzhVYA6i3gK5u5k+4QVQwOKzngH UnSLNIv/VEwSR8lPheHYYWTiyOscrAku4FczEpgjmsU//rcybXBSLbY8ToGunKZ7F2twc2 10iIksFryHTtgwEy5EN/FcmzXTSfd7NsKRcU+xXWDMyTnHRwlwjli3ltfZ0bUw== 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 4S7tJ13pfYz1RxX; Sun, 15 Oct 2023 21:13:05 +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 39FLD554058807; Sun, 15 Oct 2023 21:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FLD5if058804; Sun, 15 Oct 2023 21:13:05 GMT (envelope-from git) Date: Sun, 15 Oct 2023 21:13:05 GMT Message-Id: <202310152113.39FLD5if058804@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: d2d578c63e18 - main - security/vault: Add missing Web UI 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2d578c63e18f76ed99f6636a67dee23a5e013a3 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2d578c63e18f76ed99f6636a67dee23a5e013a3 commit d2d578c63e18f76ed99f6636a67dee23a5e013a3 Author: Muhammad Moinur Rahman AuthorDate: 2023-10-15 21:09:31 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-10-15 21:12:59 +0000 security/vault: Add missing Web UI PR: 272617 Reported by: bd@dbconn.net --- security/vault/Makefile | 27 ++++++++++++++++++++++++--- security/vault/distinfo | 4 +++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/security/vault/Makefile b/security/vault/Makefile index ef3f68f07078..fd1932e6f8c2 100644 --- a/security/vault/Makefile +++ b/security/vault/Makefile @@ -1,15 +1,17 @@ PORTNAME= vault PORTVERSION= 1.14.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= security -MASTER_SITES= https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ +MASTER_SITES= https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ \ + LOCAL/bofh/security/${PORTNAME}/:web_ui DISTFILES= go.mod \ api/go.mod \ api/auth/approle/go.mod \ api/auth/kubernetes/go.mod \ api/auth/userpass/go.mod \ - sdk/go.mod + sdk/go.mod \ + ${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX}:web_ui MAINTAINER= bofh@FreeBSD.org COMMENT= Tool for securely accessing secrets @@ -18,6 +20,11 @@ WWW= https://vaultproject.io/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE +.if defined(MAINTAINER_MODE) +EXTRACT_DEPENDS=npm-node18>0:www/npm-node18 \ + yarn-node18>0:www/yarn-node18 +.endif + USES= cpe go:modules CPE_VENDOR= hashicorp USE_GITHUB= yes @@ -46,4 +53,18 @@ SOURCE_DATE_EPOCH_CMD= date -ur \ $$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \ '+%Y-%m-%dT%H:%M:%SZ' +post-patch: + ${CP} -Rf ${WRKDIR}/web_ui ${WRKSRC}/http/ + +.if defined(MAINTAINER_MODE) +_make-web_ui: extract + cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn + cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} npm rebuild node-sass + cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn run build + cd ${WRKDIR} && ${TAR} -czf \ + ${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/http web_ui + scp ${WRKDIR}/${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} \ + bofh@freefall.freebsd.org:public_distfiles/security/${PORTNAME}/ +.endif + .include diff --git a/security/vault/distinfo b/security/vault/distinfo index 803ae8802ca2..1701842d6bc0 100644 --- a/security/vault/distinfo +++ b/security/vault/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1688100641 +TIMESTAMP = 1697381170 SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/go.mod) = 95341cf91029519fbefe7ffd6deca16e4e8b66c5161dcb2702857d5e8bb86c62 SIZE (go/security_vault/hashicorp-vault-v1.14.0_GH0/go.mod) = 26115 SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/api/go.mod) = ed6f55c24bcb000178b01e54a80e175bc4d7266f3c6c4933a852f9f629c91e76 @@ -11,5 +11,7 @@ SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/api/auth/userpass/go.mod) SIZE (go/security_vault/hashicorp-vault-v1.14.0_GH0/api/auth/userpass/go.mod) = 108 SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/sdk/go.mod) = f712cb4478cf99ce40d2edb3c2c30ac05179373b7cf8e6b6a917c65506d9db27 SIZE (go/security_vault/hashicorp-vault-v1.14.0_GH0/sdk/go.mod) = 4153 +SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/vault-web_ui-1.14.0.tar.gz) = edfe47e08484831a685058570207d183eaf5aa6aa043fb414a1fddc6bf08e395 +SIZE (go/security_vault/hashicorp-vault-v1.14.0_GH0/vault-web_ui-1.14.0.tar.gz) = 2118920 SHA256 (go/security_vault/hashicorp-vault-v1.14.0_GH0/hashicorp-vault-v1.14.0_GH0.tar.gz) = 0fad3903be0573312447e7250adc192e920cead1fb5d4dc4cca6c79c385907eb SIZE (go/security_vault/hashicorp-vault-v1.14.0_GH0/hashicorp-vault-v1.14.0_GH0.tar.gz) = 30824651