From nobody Sun May 08 15:08: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 4C6521ACDB32; Sun, 8 May 2022 15:08:58 +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 4Kx74B1dghz3Khn; Sun, 8 May 2022 15:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652022538; 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=5y4EgCKtr8L0NskNbeasdENkUjpBHgyJI6xkDXL/5VM=; b=jGHOsiuRxqQL8EzW4vYyVXPlz/mwVDPPeD27nsnw6Pwq4BfEpAgFvYErEYzIra5l7xsYuy tDuUaR0CGuXTI1G1E34ZEE1T1n47s/NOXakysskaShULW3EMFhAOnwTQn0bfIj3Db4msED 3H+XgyteVAPbh5bM8Y4uzC7E6COTd3+CTeiBAGWZfD00rlrJLLhcKKzb1pqLP667hEVHtR 62IXFAJJaZwKluKC6PK8MnN1QCR4RUs94vcePDc7GCOVBIuL8L9xF1ejXNlEFDSXryl9U7 nF/mAzHS/PMBKxi5ixkXVJoZNX1M3dmCudtiKaqNLTuW/zMYhF+QsV/o8NRDQA== 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 1915F26EA2; Sun, 8 May 2022 15:08:58 +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 248F8wvN092715; Sun, 8 May 2022 15:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248F8vH9092714; Sun, 8 May 2022 15:08:57 GMT (envelope-from git) Date: Sun, 8 May 2022 15:08:57 GMT Message-Id: <202205081508.248F8vH9092714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 2ff27291417d - main - net/syncthing: Fix broken build and upgrade to 1.20.1 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ff27291417d9a79b9c43d6d128817e5ec465a17 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652022538; 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=5y4EgCKtr8L0NskNbeasdENkUjpBHgyJI6xkDXL/5VM=; b=qM2Was91C0cHRRBA8ftPXTfEXUTw3j1m+5IxzjEzkFVZCuhEZiL5BZ6A7DDmeV3tUC5QJn lCAMPXBP9+FTOeBEvoGlYB52Ly2T114Tfgq1Lw2/uqDEBqEU0iL6RlbsFUNXC1JYF+1QEQ cIeeBUgsYAd//JdOOc6M8CHLexRB6R9BgLkhU7zorxPV3gs8dAXDw219tkaAlgzSFK+yKl GZs+wC8hylCeOo+8pBtWeblX/RkKHJ7bdyNWQ2aiD31VYjmgKHYveOvQo8wKfu53ztcRyS ZuJNXq8Fo/zxe3weC19HEndwWXnZGjonKEmRlI/2SiUNyqdAcabGe/o4y/LKig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652022538; a=rsa-sha256; cv=none; b=mtzQelSuN85hLSBEHOK+JboU2AruiO9KTX8WTD+Dp4oqXvY98NQ+7lNzaRVK9ByqDqk+Zh TSitsZj77YKmq3sIE5Kzf4sMKSXKUfdOiZ+t2ksg23sRmYGwkoMPQAnn6OAW07gXTBIh/N 8tgjxm4BW8lsWQ/omBgbMN9Sw4lTZlIXKH5WEZJhvfVItblb78DNZ9mre02Kb9AkKQUeOf iAR/6a/u+nss5FD4Ji+D4FiLJrKvL94BNcuxMptVs1juXcKxFVmcLgvuF8RdxU+8L40yf2 g03dWrFTYdOsz2/rBxLuM2QxB9C3QQyuDyF6yY7iSo1b2bNKtT8GNd2e3TBOQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=2ff27291417d9a79b9c43d6d128817e5ec465a17 commit 2ff27291417d9a79b9c43d6d128817e5ec465a17 Author: Dimitry Andric AuthorDate: 2022-05-08 15:05:07 +0000 Commit: Dimitry Andric CommitDate: 2022-05-08 15:05:07 +0000 net/syncthing: Fix broken build and upgrade to 1.20.1 After lang/go was updated to 1.18, net/syncthing failed to build under poudriere, with errors similar to: vendor/github.com/marten-seemann/qtls-go1-18/cipher_suites.go:143:43: undeclared name: any (requires version go1.18 or later) This is because the packaged vendor libraries in the upstream tarball don't work with go 1.18. Fix this by using USES=go:modules and changing the build commands. Also, upgrade to 1.20.1. PR: 262808 Reported by: Oscar Carlsson Approved by: maintainer timeout (2 weeks) Submitted by: dmgk MFH: 2022Q2 --- net/syncthing/Makefile | 13 ++++++------- net/syncthing/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index 2a8025f96c71..1d8d51b424d6 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,7 +1,6 @@ PORTNAME= syncthing -PORTVERSION= 1.19.1 +PORTVERSION= 1.20.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION} @@ -13,7 +12,7 @@ COMMENT= Encrypted file sync tool LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/${PORTNAME}/LICENSE -USES= cpe go +USES= cpe go:modules USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv @@ -37,10 +36,10 @@ NO_WRKSUBDIR= yes do-build: @( cd ${WRKSRC}/${PORTNAME} ; \ - ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build ; \ - ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \ - ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \ - ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${PORTVERSION} -no-upgrade build ; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv; \ ) do-install: diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo index ac9d17da9b5a..34261f80f008 100644 --- a/net/syncthing/distinfo +++ b/net/syncthing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647122497 -SHA256 (syncthing-source-v1.19.1.tar.gz) = ffc5ec2f232314122a216884f63a48eea7c8739f9779e249be1f4776d7a55127 -SIZE (syncthing-source-v1.19.1.tar.gz) = 13216635 +TIMESTAMP = 1651934802 +SHA256 (syncthing-source-v1.20.1.tar.gz) = a88fabaea11a8df5cc134075c37dc87f1fb33b48d3d8afb1dc8ea11b3c0925bc +SIZE (syncthing-source-v1.20.1.tar.gz) = 13184830