From owner-svn-ports-all@freebsd.org Fri May 11 20:35:41 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 605E7FCBA79; Fri, 11 May 2018 20:35:41 +0000 (UTC) (envelope-from seanc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F26AF6A51D; Fri, 11 May 2018 20:35:40 +0000 (UTC) (envelope-from seanc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF128148C1; Fri, 11 May 2018 20:35:40 +0000 (UTC) (envelope-from seanc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4BKZeeT052714; Fri, 11 May 2018 20:35:40 GMT (envelope-from seanc@FreeBSD.org) Received: (from seanc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4BKZeQA052712; Fri, 11 May 2018 20:35:40 GMT (envelope-from seanc@FreeBSD.org) Message-Id: <201805112035.w4BKZeQA052712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: seanc set sender to seanc@FreeBSD.org using -f From: Sean Chittenden Date: Fri, 11 May 2018 20:35:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469693 - in head/security/teleport: . files X-SVN-Group: ports-head X-SVN-Commit-Author: seanc X-SVN-Commit-Paths: in head/security/teleport: . files X-SVN-Commit-Revision: 469693 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 May 2018 20:35:41 -0000 Author: seanc Date: Fri May 11 20:35:39 2018 New Revision: 469693 URL: https://svnweb.freebsd.org/changeset/ports/469693 Log: Upgrade gravitational teleport to 2.5.7. Explicitly specify the git sha when building teleport. Restrict builds to amd64. Reviewed by: swills, mat Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D15311 Added: head/security/teleport/files/patch-version.mk (contents, props changed) Modified: head/security/teleport/Makefile head/security/teleport/distinfo Modified: head/security/teleport/Makefile ============================================================================== --- head/security/teleport/Makefile Fri May 11 20:34:00 2018 (r469692) +++ head/security/teleport/Makefile Fri May 11 20:35:39 2018 (r469693) @@ -2,7 +2,7 @@ PORTNAME= teleport DISTVERSIONPREFIX= v -DISTVERSION= 2.5.6 +DISTVERSION= 2.5.7 CATEGORIES= security MAINTAINER= seanc@FreeBSD.org @@ -10,6 +10,8 @@ COMMENT= Gravitational Telport SSH LICENSE= APACHE20 +ONLY_FOR_ARCHS= amd64 + BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go \ ${LOCALBASE}/bin/zip:archivers/zip @@ -18,6 +20,7 @@ USES= compiler gmake USE_GITHUB= yes GH_ACCOUNT= gravitational GH_TAGNAME= v${DISTVERSION}${DISTVERSIONSUFFIX} +GH_TAG_COMMIT= b3f4ecb USE_RC_SUBR= teleport @@ -38,11 +41,15 @@ post-extract: @${CP} -rp ${WRKDIR}/${PRE_GOPATH_DIR}/vendor/* ${WRKDIR}/src/ @${CP} -rp ${WRKDIR}/${PRE_GOPATH_DIR}/* ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/ +post-patch: + @${REINPLACE_CMD} -e "s|%%GH_TAG_COMMIT%%|${GH_TAG_COMMIT}|g" \ + ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/version.mk + do-build: @cd ${WRKDIR}/${GO_TELEPORT_SRC_DIR} && \ ${SETENV} ${MAKE_ENV} ${BUILD_ENV} \ CGO_ENABLED=1 GOPATH=${WRKDIR} \ - ${GMAKE} full + ${GMAKE} -s full do-install: ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/teleport configure > ${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample Modified: head/security/teleport/distinfo ============================================================================== --- head/security/teleport/distinfo Fri May 11 20:34:00 2018 (r469692) +++ head/security/teleport/distinfo Fri May 11 20:35:39 2018 (r469693) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524207284 -SHA256 (gravitational-teleport-v2.5.6_GH0.tar.gz) = 7a7168df106b1d4ea3b81b5078eaf6ea8f6063b11c7171202d2e2b9bfbdcfe2c -SIZE (gravitational-teleport-v2.5.6_GH0.tar.gz) = 16216649 +TIMESTAMP = 1525898627 +SHA256 (gravitational-teleport-v2.5.7_GH0.tar.gz) = 26a62a4ae91482d51191f53edde01a93b13e23a257b5336de06e336ed39c8e7e +SIZE (gravitational-teleport-v2.5.7_GH0.tar.gz) = 16216353 Added: head/security/teleport/files/patch-version.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/teleport/files/patch-version.mk Fri May 11 20:35:39 2018 (r469693) @@ -0,0 +1,8 @@ +--- ../src/github.com/gravitational/teleport/version.mk.orig 2018-05-05 22:53:11 UTC ++++ ../src/github.com/gravitational/teleport/version.mk +@@ -1,4 +1,4 @@ +-GITREF=`git describe --dirty --long --tags` ++GITREF="%%GH_TAG_COMMIT%%" + + # $(VERSION_GO) will be written to version.go + VERSION_GO="/* DO NOT EDIT THIS FILE. IT IS GENERATED BY 'make setver'*/\n\n\