From nobody Sun Aug 07 15:12:43 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 4M12rW28Pvz4Y9lp; Sun, 7 Aug 2022 15:12:43 +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 4M12rW1j8nz3djh; Sun, 7 Aug 2022 15:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659885163; 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=mQi9Q9uAmnJVaA2OU8Rf7n8/PoA80mBbjtX+mwj5aoQ=; b=IIJ5NTY6FjxFIveSUc04X1h5qWlSwqdThYb4ydMCs20+NWxSTTg2gTcFALXnWhcfC/Qje1 1JK7pGUKYOGyXw5ISBKA9LU+rGoqTToEJ24KUraWRT9EcjnIIIpKb9+gby2TWrjUwONtjy bGz1QNt1gU+reNjVhB/SPgIWi+jBQ1pNW3x4CI1nJR+hfZkk63xIFO2fZhQ9+5KNRvul2M 9EPZqP5kTIcYkprClYqiU5QwVEwONdqr56f3BcQP4kGEXGJso/nx9+XV6663cUJyoANYSP z+cG5SiZDEmRTuxHwhZLmAQeBTJNp8l9DcUsMhcJW/LMSeoffiiyIYCQ3g8rCQ== 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 4M12rW0ll5zH8v; Sun, 7 Aug 2022 15:12:43 +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 277FChAN028708; Sun, 7 Aug 2022 15:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 277FChSc028707; Sun, 7 Aug 2022 15:12:43 GMT (envelope-from git) Date: Sun, 7 Aug 2022 15:12:43 GMT Message-Id: <202208071512.277FChSc028707@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Vin=C3=ADcius=20Zavam?= Subject: git: 9273a07f860a - main - security/meek: update 0.35.0 to 0.37.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: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9273a07f860ab1959d23216a84a836b6a2a9ee2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659885163; 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=mQi9Q9uAmnJVaA2OU8Rf7n8/PoA80mBbjtX+mwj5aoQ=; b=dvyFrROpJFRsxhrRtUfo96HauzW890zZ0Tz8kcuYhpTf+7s0PgK/zCHr97nw3gA4mJRUBQ Or0ZTOPxqsL+nYiXEZmpZ5/pBfFVIGFs5hfIaplyuagNpaGpczuV4fn0NHJ1GyS6RTog6h +6sxqnMrInPFb2WtwC+xhAaFh1+E1XbdazQ/WwQJCIMsyqTwzMp5WFty4SGy8Vw1N1Ert6 g9Iykob6DSlvFUMjZoQ50YXhLma/y+7fNjj+54F5sMHggzaqyu/HPY07nFow8mXcvaFW3N TXqtL6J2YojGzRcH/VXlKPd8DGoVivA4JCTuWWDk+8ufb3lii2ZYNtEls/WVDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659885163; a=rsa-sha256; cv=none; b=a0Zx5a3QtfgSLRs7qu1HGTlXNwLYcWwV9FD5uXC7+Y6jPDCFprOpcChTGU/2ZRR6WxNNUA R6Jcy7+MFLetM+Fuz2/9kXeoKGX4JoL1ISiPuJ9k8x/y4xPZoRQjwzkwEcDR6HiiwoeK7r flfoN0VQ8YjkndRTOa+zlzwwrSB6rwIGGD2VB23G8cGmOV8TVZWgiNkcLCj3u0s32SoFM/ 6DS3o8Fp/AZ9VGw5BE9K4OKM4Lw9BCOISoPkYFDIwe0ddNKj5kQU0qcxr6wi9Tw5d/Rm7Y r+aOz1xeOML4uwtOi0/MHRM111N6mftTr/TEFLAW7B41nt0wDxUzoByYlZMvFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=9273a07f860ab1959d23216a84a836b6a2a9ee2e commit 9273a07f860ab1959d23216a84a836b6a2a9ee2e Author: Vinícius Zavam AuthorDate: 2022-08-07 15:06:57 +0000 Commit: Vinícius Zavam CommitDate: 2022-08-07 15:06:57 +0000 security/meek: update 0.35.0 to 0.37.0 bulk/testpost OK: 12, 13, main (CURRENT/HEAD) while here, - USE_GITHUB=yes (follows upstream); - update base Golan dependencies; - apply backport fix for CVE-2021-34558 on 'utls'; - goptlib goes from 0.7 to 1.2.0; - fix `test` target run; - maintainer reset, after long time hiatus in Bugzilla (6months+). PR: 262327 Reported by: egypcio@ Security: CVE-2021-34558 Approved by: philip@ --- security/meek/Makefile | 47 ++++++++++++++++++++++------------------------- security/meek/distinfo | 30 +++++++++++++++--------------- 2 files changed, 37 insertions(+), 40 deletions(-) diff --git a/security/meek/Makefile b/security/meek/Makefile index b3d0ddc6e491..f0190a6e4bfb 100644 --- a/security/meek/Makefile +++ b/security/meek/Makefile @@ -1,30 +1,31 @@ PORTNAME= meek -DISTVERSION= 0.35.0 -PORTREVISION= 4 -CATEGORIES= security -MASTER_SITES= https://gitweb.torproject.org/pluggable-transports/meek.git/snapshot/ \ - https://gitweb.torproject.org/pluggable-transports/goptlib.git/snapshot/:goptlib -DISTFILES= ${PORTNAME}-${DISTVERSION}.tar.gz \ - goptlib-${GOPTLIBVERSION}.tar.gz:goptlib - -MAINTAINER= cs@FreeBSD.org +DISTVERSIONPREFIX=v +DISTVERSION= 0.37.0 +CATEGORIES= security net + +MAINTAINER= egypcio@FreeBSD.org COMMENT= Pluggable transport proxy that relays through third-party server LICENSE= CC0-1.0 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/${GO_PKGNAME}/COPYING + +USES= cpe go:modules +USE_GITHUB= yes -USES= go:modules -USE_GITHUB= nodefault +CPE_VENDOR= torproject -GOPTLIBVERSION= 0.7 -GO_TARGET= ./meek-client \ - ./meek-server -GH_TUPLE= \ - golang:crypto:4b2356b1ed79:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:ff2c4b7c35a0:golang_net/vendor/golang.org/x/net \ - golang:sys:593003d681fa:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ - refraction-networking:utls:43c36d3c1f57:refraction_networking_utls/vendor/github.com/refraction-networking/utls +GO_BUILDFLAGS+= -ldflags '-s -w' +GO_PKGNAME= git.torproject.org/pluggable-transports/meek.git +GO_TARGET= ./meek-client ./meek-server + +GH_ACCOUNT= torbsd +GH_SUBDIR= ${GO_PKGNAME} +GH_TUPLE= torbsd:goptlib:v1.2.0:torbsd_goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \ + golang:crypto:86341886e292:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:27dd8689420f:golang_net/vendor/golang.org/x/net \ + golang:sys:4e6760a101f9:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \ + refraction-networking:utls:v1.0.0:refraction_networking_utls/vendor/github.com/refraction-networking/utls PLIST_FILES= bin/meek-client \ bin/meek-server \ @@ -33,10 +34,6 @@ PLIST_FILES= bin/meek-client \ SUB_FILES= pkg-message -post-patch: - @${MKDIR} ${WRKSRC}/vendor/git.torproject.org/pluggable-transports - @${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKSRC}/vendor/git.torproject.org/pluggable-transports/goptlib.git - do-test: .for t in ${GO_TARGET} cd ${GO_WRKSRC}; \ diff --git a/security/meek/distinfo b/security/meek/distinfo index a858ce011cb3..db8d230361b8 100644 --- a/security/meek/distinfo +++ b/security/meek/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1611397336 -SHA256 (meek-0.35.0.tar.gz) = 9e3493da0a092d4d49ae9c4589d78462e230f9e19b4d5d0fec88542f7b1a5e72 -SIZE (meek-0.35.0.tar.gz) = 61736 -SHA256 (goptlib-0.7.tar.gz) = 71f29f7bb7a989e23533bab6544879c7ca9370b695aba891c1e9c91a10ae5c02 -SIZE (goptlib-0.7.tar.gz) = 25835 -SHA256 (golang-crypto-4b2356b1ed79_GH0.tar.gz) = c881b4149829d6e249674bed9ff03d61811aeaf7c66708b36599f595a5a31d08 -SIZE (golang-crypto-4b2356b1ed79_GH0.tar.gz) = 1728742 -SHA256 (golang-net-ff2c4b7c35a0_GH0.tar.gz) = 0fb9448f6194b35e765516f8a7867f2b61abfa6c90e616f20eeac697765ed83f -SIZE (golang-net-ff2c4b7c35a0_GH0.tar.gz) = 1174436 -SHA256 (golang-sys-593003d681fa_GH0.tar.gz) = 10a694507471f41b86b417d38c717306786783ab59f65abfecd56759423b5472 -SIZE (golang-sys-593003d681fa_GH0.tar.gz) = 1051033 -SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb -SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 -SHA256 (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = ad3d597fc9d3d57637de5085a59b07dda87faca0ff2ef70d50df6b4065d801b3 -SIZE (refraction-networking-utls-43c36d3c1f57_GH0.tar.gz) = 526322 +TIMESTAMP = 1646338121 +SHA256 (torbsd-meek-v0.37.0_GH0.tar.gz) = f5650e26638f94954d0b89892ac0f4241cfeb55c17f555ee890609544ea85474 +SIZE (torbsd-meek-v0.37.0_GH0.tar.gz) = 61508 +SHA256 (torbsd-goptlib-v1.2.0_GH0.tar.gz) = ddb7add33157fdd60e3358c9a53f0e0db446fc320b4e4ecbbf36af0d96b2deeb +SIZE (torbsd-goptlib-v1.2.0_GH0.tar.gz) = 29678 +SHA256 (golang-crypto-86341886e292_GH0.tar.gz) = 92b4ef34c44645bf9e6fccc20ca0a4307ef1e4e526f583141c05832182124b6b +SIZE (golang-crypto-86341886e292_GH0.tar.gz) = 1628070 +SHA256 (golang-net-27dd8689420f_GH0.tar.gz) = e72ae02627807460cd899f85e9043f3b5047f2842b82457f5c7b18466f791eaf +SIZE (golang-net-27dd8689420f_GH0.tar.gz) = 1229548 +SHA256 (golang-sys-4e6760a101f9_GH0.tar.gz) = 03a0fe05c767ee371318e94f05d0fb59ce1d00d0716e522cd4e31e6424a394a1 +SIZE (golang-sys-4e6760a101f9_GH0.tar.gz) = 1259262 +SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26 +SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718 +SHA256 (refraction-networking-utls-v1.0.0_GH0.tar.gz) = 88c18e1913b291dc58b5088e7b1115508a6e0b1460f6bdb8b68ff761e56111ce +SIZE (refraction-networking-utls-v1.0.0_GH0.tar.gz) = 546244