From owner-svn-ports-all@freebsd.org Mon Mar 4 21:57:16 2019 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 A457F152484C; Mon, 4 Mar 2019 21:57:16 +0000 (UTC) (envelope-from swills@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 182608A6DB; Mon, 4 Mar 2019 21:57:16 +0000 (UTC) (envelope-from swills@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 B42B2A25E; Mon, 4 Mar 2019 21:57:15 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x24LvFch094978; Mon, 4 Mar 2019 21:57:15 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x24LvFQl094976; Mon, 4 Mar 2019 21:57:15 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201903042157.x24LvFQl094976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 4 Mar 2019 21:57:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494656 - in head/devel/gitlab-runner: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/devel/gitlab-runner: . files X-SVN-Commit-Revision: 494656 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 182608A6DB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 04 Mar 2019 21:57:16 -0000 Author: swills Date: Mon Mar 4 21:57:14 2019 New Revision: 494656 URL: https://svnweb.freebsd.org/changeset/ports/494656 Log: devel/gitlab-runner: fix build after go 1.12 update PR: 236131 Submitted by: mfechner Added: head/devel/gitlab-runner/files/patch-mknod.go (contents, props changed) Modified: head/devel/gitlab-runner/Makefile (contents, props changed) Modified: head/devel/gitlab-runner/Makefile ============================================================================== --- head/devel/gitlab-runner/Makefile Mon Mar 4 21:52:41 2019 (r494655) +++ head/devel/gitlab-runner/Makefile Mon Mar 4 21:57:14 2019 (r494656) @@ -2,6 +2,7 @@ PORTNAME= gitlab-runner PORTVERSION= 11.7.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ @@ -25,6 +26,7 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ git:devel/git USE_GITLAB= yes + GL_ACCOUNT= gitlab-org GL_COMMIT= 8bb608ff3a677132022502b07dae8a3ea679f3d1 GITBRANCH= 11-7-stable @@ -47,6 +49,7 @@ post-extract: @${MKDIR} ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/ + @${MV} ${WRKSRC}/vendor ${WRKSRC}/src do-build: @cd ${WRKSRC} && go-bindata \ @@ -59,7 +62,6 @@ do-build: out/docker/prebuilt-x86_64.tar.xz \ out/docker/prebuilt-arm.tar.xz @cd ${WRKSRC} && go fmt executors/docker/bindata.go - @${MV} ${WRKSRC}/vendor ${WRKSRC}/src @${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org @${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner @cd ${WRKSRC} && \ Added: head/devel/gitlab-runner/files/patch-mknod.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitlab-runner/files/patch-mknod.go Mon Mar 4 21:57:14 2019 (r494656) @@ -0,0 +1,11 @@ +--- src/github.com/docker/docker/pkg/system/mknod.go.orig 2019-03-01 15:22:53 UTC ++++ src/github.com/docker/docker/pkg/system/mknod.go +@@ -9,7 +9,7 @@ import ( + // Mknod creates a filesystem node (file, device special file or named pipe) named path + // with attributes specified by mode and dev. + func Mknod(path string, mode uint32, dev int) error { +- return syscall.Mknod(path, mode, dev) ++ return syscall.Mknod(path, mode, uint64(dev)) + } + + // Mkdev is used to build the value of linux devices (in /dev/) which specifies major