From nobody Tue May 31 19:24:57 2022 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 B768D1B63BC8; Tue, 31 May 2022 19:24:57 +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 4LCMfx4mQGz3Kby; Tue, 31 May 2022 19:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654025097; 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=2+MOHLWRm0FXKdtD+jobfBToc7r8KM0KKs35AAgUv0w=; b=TeXtirx1bEH8GgaJrUayF0huZdCdKIyGNCpKvGYCoxTzSPGBYhKrY+/gw0cqomG4Lrmkyj 4esC6l+imTpkLsSm4xPl52FN3TmcOLUmeb7wqC9pmCIZcozxF1SnO16myJ+YrvHDNBVqBv hbUEhkX34BNNd742n5xrSMbzTJn5Od6RsoSVJe5p8ZatzM+vxqiIigljn7QYBDYVIyX6Wj Z18aeEwKZdEBMrR40TzsCyu+C0+I8biHrHGRjcWgHZDGdDYBZAdN0lNX4+lpsvEargzv2b DFi4Ldyc0j304LudvyMxp1xdX48ySpNPx141fWtv5gQgf3yGhjV/f39gQ5OH3g== 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 83A1111DDE; Tue, 31 May 2022 19:24:57 +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 24VJOv9u099134; Tue, 31 May 2022 19:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24VJOvXX099132; Tue, 31 May 2022 19:24:57 GMT (envelope-from git) Date: Tue, 31 May 2022 19:24:57 GMT Message-Id: <202205311924.24VJOvXX099132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 7cc08e77479c - main - net-mgmt/prometheus2: Update to 2.36.0 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cc08e77479cf5886a12ca7ecd7fce601b160773 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654025097; 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=2+MOHLWRm0FXKdtD+jobfBToc7r8KM0KKs35AAgUv0w=; b=pns50AtTzDK5lQ70+2BkSmbFe4hyG/hkRYrAIRr+wFzH1QVU+tTDWHXwcgPwSZmeTFWSh+ oMl2dfyDlbaxmngE+hhxuSKBDU/m96CukwiBDmYUV5Z6+b8poznYkX89mSpYJPBqgNEKK4 SGBxK1zB2HGubh9p+0IIvCAljRKB76Wy6hJSmdBsh0dNWCO498P+H8XrP6Vy7jk+MZN/dR liudUUHO772cdDqc4i1gJxW0bOACoAdcKzYNtIBZiXXFDvcD8fnGedYK1OF8FIurnkuhN3 gh0XYPJz7M3xohAH2DRvV7AITHnd1wC5nKUdAxqfNr7sWCVu4KLsAIpiR/127g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654025097; a=rsa-sha256; cv=none; b=DWp1gHcLSDIt/GmtUCzGsRo0IlgifFzMx0nLMNOIswzAN4Q86g5Rl/0ZKLroLBAH/UHjbS mYPVC3TuMM4hyH/NIgVOF9hYTt+fJ9nHjSZSsSd1pbKU1hmiAXQRGrbXY6nGXjUYcAHTNU HzrSeQF/IqUsQ6YyR2Lorh+4HnXOR8V4/ekq+XkX858ur8+D9j5D0BtTTyP05WIwVbI8sj 4BqY5foa7zN9qYIblZylEOriB9KMneI+7IZ8J1SWURP/Tq3faCV7ANGP1FUipCGuqK+DvW ac+a43ygsa3UlugdN2IPO9h/7iG517dXqLDMA7D78Yt5hEWQHv9+L6HJsAFbeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cc08e77479cf5886a12ca7ecd7fce601b160773 commit 7cc08e77479cf5886a12ca7ecd7fce601b160773 Author: David O'Rourke AuthorDate: 2022-05-31 19:02:20 +0000 Commit: Dmitri Goutnik CommitDate: 2022-05-31 19:06:46 +0000 net-mgmt/prometheus2: Update to 2.36.0 Changes: https://github.com/prometheus/prometheus/releases PR: 264370 There are a lot of changes since 2.33.5 which can be viewed at https://github.com/prometheus/prometheus/releases, but the main change is that TLS 1.0 and 1.1 are now disabled by default. They can be re-enabled via the tls_config section of the Prometheus configuration as documented at https://prometheus.io/docs/prometheus/latest/configuration/configuration/#tls_config. Certificates using SHA-1 hash functions are also rejected, this support can be re-enabled (for now) via some Go debug environment variables: https://go.dev/doc/go1.18#sha1 --- net-mgmt/prometheus2/Makefile | 20 ++++++++++++-------- net-mgmt/prometheus2/distinfo | 14 +++++++------- net-mgmt/prometheus2/pkg-message | 9 +++++++++ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile index a0eb2812bbe0..ad44a5a9f18c 100644 --- a/net-mgmt/prometheus2/Makefile +++ b/net-mgmt/prometheus2/Makefile @@ -1,9 +1,10 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 2.33.5 +DISTVERSION= 2.36.0 CATEGORIES= net-mgmt -MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod -DISTFILES= go.mod:gomod +MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \ + https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui +DISTFILES= go.mod:gomod ${PORTNAME}-web-ui-${DISTVERSION}.tar.gz:ui MAINTAINER= dor.bsd@xm0.uk COMMENT= Systems monitoring and alerting toolkit @@ -11,10 +12,11 @@ COMMENT= Systems monitoring and alerting toolkit LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +PATCH_DEPENDS= bash:shells/bash + USES= cpe gmake go:modules USE_GITHUB= yes -GH_TUPLE= ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets USE_RC_SUBR= prometheus GO_MODULE= github.com/prometheus/prometheus @@ -58,8 +60,10 @@ SOURCE_DATE_EPOCH_CMD= date -ur $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} - '+%Y%m%d-%T' post-patch: - @${LN} -s ${WRKSRC_assets}/web/ui/assets_vfsdata.go \ - ${WRKSRC}/web/ui/assets_vfadata.go + @${RM} -rf ${WRKSRC}/web/ui/static + # A symlink isn't good enough here, copy the entire static directory over + @${CP} -a ${WRKDIR}/static ${WRKSRC}/web/ui/static + @( cd ${WRKSRC} && ${WRKSRC}/scripts/compress_assets.sh ) post-install: ${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_CONSOLES_DIR} @@ -73,8 +77,8 @@ post-install: && ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} ) post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ( cd ${WRKSRC}/docs \ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @( cd ${WRKSRC}/docs \ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ) .include diff --git a/net-mgmt/prometheus2/distinfo b/net-mgmt/prometheus2/distinfo index 642d88bd0068..1053cddcda8d 100644 --- a/net-mgmt/prometheus2/distinfo +++ b/net-mgmt/prometheus2/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1653749506 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/go.mod) = 5ea7655ecbe5065b78619bac7277d2598e3301387a65cbf210a686b7955e0298 -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/go.mod) = 4541 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/prometheus-prometheus-v2.33.5_GH0.tar.gz) = a385dab190fd4bf973a9950d6c53fa9d2b92c55ea2225a53305fe546749ddc0d -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/prometheus-prometheus-v2.33.5_GH0.tar.gz) = 5858953 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/ports-assets-net-mgmt_prometheus2-v2.33.5_GH0.tar.gz) = af7d729e4b69d7e90d70d9e64c31ee850616417318fc1168999ef0320988a550 -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/ports-assets-net-mgmt_prometheus2-v2.33.5_GH0.tar.gz) = 6047050 +TIMESTAMP = 1653992116 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/go.mod) = 74e49f0f2cf67d6c9dbcb3626cb9fa12ee4b95a977f7c5763851ba5fb3f709bb +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/go.mod) = 9168 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-web-ui-2.36.0.tar.gz) = 0be369da6a80610d5152a626aa5d1eb9d3c3fd2a569b174c40b7bce527a7200e +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-web-ui-2.36.0.tar.gz) = 4387594 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-prometheus-v2.36.0_GH0.tar.gz) = c7b3b17edc22f93c4573b42c7c892123036b518f6058a0a97637b4190f74bc3f +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-prometheus-v2.36.0_GH0.tar.gz) = 6019777 diff --git a/net-mgmt/prometheus2/pkg-message b/net-mgmt/prometheus2/pkg-message index 10ae0129b88d..4fed5e509efa 100644 --- a/net-mgmt/prometheus2/pkg-message +++ b/net-mgmt/prometheus2/pkg-message @@ -1,4 +1,13 @@ [ +{ + message: <