From nobody Tue Mar 21 12:55:11 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 4Pgs5W3k1Tz40HW4; Tue, 21 Mar 2023 12:55: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 4Pgs5W30gHz4LWv; Tue, 21 Mar 2023 12:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679403311; 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=3lL0Dds1I7UupFsO8l7iufYi/eVcniedYR+vBSCcRRs=; b=hpH0GB9kAxPxC0ZwAu0YeDYBbE0AZ6SrkVM/RauoEO/SxGyufkSmudBbMNzYwlU3dw8PSW IU7gaTl82iOCAedomX5FkzdiE2qa68srvk8l3EtlYXpVcEf4/gGdEqBGLQdGlqx3q5IV6t cVS6NkNiIYIt8nCkAGP3wpaeY0P9Ubof013UqMUTbI5/DD9PEYFNTGPCe05U1Kp1TE9Ap/ PajV9dze+f/avCei3LaJ9B4ZzWdHBag0amk3T7eVxjk56guePSNYARp4is9GoNpJDghEpl 6YtSJNVr6DJLn5hiZdNx1mJV7forkfBaQBxaoQ9y9j7yPd0QXUsgOIWuhQWwzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679403311; 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=3lL0Dds1I7UupFsO8l7iufYi/eVcniedYR+vBSCcRRs=; b=L7VWzqEWJwTuHseDLbf+h72quobG7Ybpsy0M/uqaSuoTpaSQfa/wRlyGO8b15j+38bKY1b O80rhtjvNJdHjSLjw+CkKySocahsk9Dz5Fho5mE3kYl0g6kHGJ8vAy3KuDirCfJuU0a05M DHXHWnjb6rt0E1mQ3VkIEwAK8OCDbcanAAZCb0yPEXtsv3JBfAbFPOd+xo4ZnwBogKNSow 5thjBXonSPBbQsj+KXslfmbJk0qBGXGphp4SwVBRBUeue7aIAvbdWDrf7cQq5aalAddzEy KD9VhVg+nVsm7QtG30Aukc8Vd75OITotXKReXhf8WpQdpEmvBUGf68aI7sH/BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679403311; a=rsa-sha256; cv=none; b=gcJwdtTgD9AYwqSOsNc7gg/qdZqXm4m0AmNq2IXoDtXDtpvB3UbNlSWYetvkr2+OF2YFrn 1zx+MvekJD9OO3vDL/K9MtsgAYFVGaaGGTXO6JTI9yXFRDOzmOyyPWsT0nG6t+pcHu1Plv RwE9QmPGQ85YYbgEhyc6dmOBOhzFuvJaa171QsFKdpKx4INx0+im2NrW4m9RbqAZqBsMBY W4x5rQ/b+wyN2aDMXNG17qlmN3G9bODpI5df+5+novUB2vPqu6hBQlEsAyID72dYOuhj+M SOunI00XLOfbbWnvPOMSjFQgCUx+yemyyWTzizQmrPvE3cTjY1U2GXgOU0tDCw== 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 4Pgs5W1qXNz1By7; Tue, 21 Mar 2023 12:55:11 +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 32LCtBUM077692; Tue, 21 Mar 2023 12:55:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LCtBCR077691; Tue, 21 Mar 2023 12:55:11 GMT (envelope-from git) Date: Tue, 21 Mar 2023 12:55:11 GMT Message-Id: <202303211255.32LCtBCR077691@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: aa7d1992a8cf - main - security/nebula: 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: aa7d1992a8cf1071b4bd8425c10124a2ad48f9a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa7d1992a8cf1071b4bd8425c10124a2ad48f9a7 commit aa7d1992a8cf1071b4bd8425c10124a2ad48f9a7 Author: Robert Clausecker AuthorDate: 2023-03-18 15:42:51 +0000 Commit: Robert Clausecker CommitDate: 2023-03-21 12:53:51 +0000 security/nebula: fix build on riscv64 Bump golang.org/x/{net,term,sys} dependencies to a version recent enough to support a build on riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) Differential Revision: https://reviews.freebsd.org/D39162 --- security/nebula/Makefile | 13 ++++++++++++- security/nebula/distinfo | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/security/nebula/Makefile b/security/nebula/Makefile index 0c8f514e5eca..503ab13a05a8 100644 --- a/security/nebula/Makefile +++ b/security/nebula/Makefile @@ -1,7 +1,7 @@ PORTNAME= nebula DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MAINTAINER= ashish@FreeBSD.org @@ -12,6 +12,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:net:v0.8.0:net \ + golang:term:v0.6.0:term \ + golang:sys:v0.6.0:sys + CPE_VENDOR= slack GO_MODULE= github.com/slackhq/nebula GO_TARGET= ./cmd/nebula ./cmd/nebula-cert @@ -21,6 +26,12 @@ PLIST_FILES= bin/nebula \ bin/nebula-cert \ etc/${PORTNAME}/config.yml.example +pre-patch: +.for m in net term sys + ${RM} -r ${WRKSRC}/vendor/golang.org/x/$m + ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m +.endfor + post-patch: ${REINPLACE_CMD} -e s,/etc/nebula,${PREFIX}/etc/${PORTNAME}, \ -e /dev:/s/nebula1/tun1/ \ diff --git a/security/nebula/distinfo b/security/nebula/distinfo index 1e769a768e74..fb71d9c0f964 100644 --- a/security/nebula/distinfo +++ b/security/nebula/distinfo @@ -1,5 +1,11 @@ -TIMESTAMP = 1664250466 +TIMESTAMP = 1679153823 SHA256 (go/security_nebula/nebula-v1.6.1/v1.6.1.mod) = b555f4be50246ff2d5373474de23bffccbea76514879dc2400fc5031cde73c3c SIZE (go/security_nebula/nebula-v1.6.1/v1.6.1.mod) = 2042 SHA256 (go/security_nebula/nebula-v1.6.1/v1.6.1.zip) = d0e28bf9e41484276be9da78530b1ba97b87fdd6b624fe4fd31505c4c12d0afe SIZE (go/security_nebula/nebula-v1.6.1/v1.6.1.zip) = 1059841 +SHA256 (go/security_nebula/nebula-v1.6.1/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 +SIZE (go/security_nebula/nebula-v1.6.1/golang-net-v0.8.0_GH0.tar.gz) = 1244302 +SHA256 (go/security_nebula/nebula-v1.6.1/golang-term-v0.6.0_GH0.tar.gz) = 4fdff852a658e927e7886629ef7cd88874a11ddf0c8b3633a50961afc8902093 +SIZE (go/security_nebula/nebula-v1.6.1/golang-term-v0.6.0_GH0.tar.gz) = 14795 +SHA256 (go/security_nebula/nebula-v1.6.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/security_nebula/nebula-v1.6.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234