From nobody Mon Mar 27 11:27:25 2023 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 4PlVsT4nJDz4289l; Mon, 27 Mar 2023 11:27:25 +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 4PlVsT3072z3LMM; Mon, 27 Mar 2023 11:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916445; 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=0IZLRktAj0XAvPUPv6uy+6gKLCiGcHGO7C7YXs1zu3I=; b=BmWZcXrZx2iyHqZIjOAwNw6zSUMb5zWdKbxsl2zM3zsyrqcEyATq3n/sNHokn7KSZvoBLM otrvEYnGAaf6rxSPdiLl+BOCnoXzMZcIpzmny7u6VCt1a4bFkbqAzGyHXmTnugQuJ6dtYX fi5HcVj/a3I2hPqFzsVbtbA/Lgp/RT3bXFVG9RNVjUqzGpS5ULnJz1pgRpxJpP6A77oLCQ HGp3Z364tbQQq46kkJqu0PDUiaQa6nSZVCaBVoFxBSbNBgmYEGZDh6ncGLbTr6Ey6F5eiF nZqKTEoNbmolGSSFrnLhzlvxIeUqjgw0phOGV/k0UGp7DmUtrONjKwWCUP/eSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916445; 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=0IZLRktAj0XAvPUPv6uy+6gKLCiGcHGO7C7YXs1zu3I=; b=QMslFAhR7laEFqQ9WVoBcOgAI4tqH/aiddDq3sI9mXT3/l963gHvr+Ibl7IQqQjwO/7yEj 1y1aWMW7n7W1/kqDNA7JshcKILpqHufUNP+C3qH8Vm6fk/5lNiU4x5SwBIkCJZ/a0gSZFU VwlYwyWi4fAWkUc37e7wP6sgC+5T/aINt9w/D8h3cVnCn0/Q5geOEOJOuPklkiG2pztKkd DCqmteNpKlLaHCjb4E87Uwo+rXnp33ZdPM4mUFFgVLq2bprzrj+6CDxKBKlu/fcOb3d/xz pZ6i1GZpqSctsc+sGw68dGEp4oAOnxgJ/tQ/CBU3gO2mLn+AMrt2e8FWSC7ctg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679916445; a=rsa-sha256; cv=none; b=xKoD6PhophmlOBkS7byB4VUnMObiAZSz7Q0df0Go3oZ+NlXhSWO9f40M/x4gsvJ7cLJOEA 9EIORiXRaOgDvjeecwUonKOqls4EHhB+QEF/40FryVn81ghTruT6u9vsRe9ZANuSxqozAH iakJK7tjNTClGkyT9/v2pRS+9i46Kq6ZDfL+FOs2j8QZc4KW5vmhI/O62XP0Uha7zLZABv pLKrdbpVUmJ7RtYpWkNlJ0BJGcP+NqzjXUjJknCNUFNWztFCLO8U2NwVK9bYO5r2QAREAc wDJegnzN4BsKbdbVnxTHHDqtl4jPNK1V0o9nVXz9Y0acAZfbds7blDQFCvfCkA== 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 4PlVsT26FRzL01; Mon, 27 Mar 2023 11:27:25 +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 32RBRPVU058729; Mon, 27 Mar 2023 11:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBRPvE058728; Mon, 27 Mar 2023 11:27:25 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:27:25 GMT Message-Id: <202303271127.32RBRPvE058728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 2b661526f570 - main - net/frp: fix build on riscv64 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b661526f5709fcd7ebb3720273c7c1cb635c079 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b661526f5709fcd7ebb3720273c7c1cb635c079 commit 2b661526f5709fcd7ebb3720273c7c1cb635c079 Author: Robert Clausecker AuthorDate: 2023-03-25 11:13:14 +0000 Commit: Robert Clausecker CommitDate: 2023-03-27 11:24:58 +0000 net/frp: fix build on riscv64 Bump golang.org/x/{net,sys,text} dependencies to versions new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- net/frp/Makefile | 12 +++++++++++- net/frp/distinfo | 8 +++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/net/frp/Makefile b/net/frp/Makefile index 74fdadc89efc..1534f3bf1a73 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,7 +1,7 @@ PORTNAME= frp DISTVERSIONPREFIX= v DISTVERSION= 0.45.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -12,6 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:net:v0.8.0:net \ + golang:sys:v0.6.0:sys \ + golang:text:v0.8.0:text GO_MODULE= github.com/fatedier/frp GO_TARGET= ./cmd/frpc ./cmd/frps @@ -20,6 +24,12 @@ USER= nobody SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME}s +pre-patch: +.for m in net sys test + ${RM} -r ${WRKSRC}/vendor/golang.org/x/$m + ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m +.endfor + post-install: ${INSTALL_DATA} ${WRKSRC}/conf/frps.ini ${STAGEDIR}${PREFIX}/etc/frps.ini.sample diff --git a/net/frp/distinfo b/net/frp/distinfo index 886610711d32..e4ae5a0a614d 100644 --- a/net/frp/distinfo +++ b/net/frp/distinfo @@ -1,5 +1,11 @@ -TIMESTAMP = 1666974352 +TIMESTAMP = 1679742375 SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2e0af530bd1fd1479667cf35feae544d645f3eb475db42fa3c36cab8fe05d0c2 SIZE (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2933 SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 8c353832727a71bc5fd0f5ef4b9a2d92fe081ffc7e3f5ceac2ec2cf43761c6d0 SIZE (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 1411497 +SHA256 (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 +SIZE (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = 1244302 +SHA256 (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 +SHA256 (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64 +SIZE (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = 8359526