From owner-svn-ports-all@freebsd.org Mon Mar 30 15:07:00 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69C7A2A58AC; Mon, 30 Mar 2020 15:07:00 +0000 (UTC) (envelope-from mikael@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 48rbQp3Kd5z3H3s; Mon, 30 Mar 2020 15:06:58 +0000 (UTC) (envelope-from mikael@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 0F7DA1E134; Mon, 30 Mar 2020 15:06:50 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02UF6n8j085086; Mon, 30 Mar 2020 15:06:49 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02UF6nr2085084; Mon, 30 Mar 2020 15:06:49 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202003301506.02UF6nr2085084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Mon, 30 Mar 2020 15:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529892 - head/devel/gitlab-runner/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/devel/gitlab-runner/files X-SVN-Commit-Revision: 529892 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.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, 30 Mar 2020 15:07:00 -0000 Author: mikael Date: Mon Mar 30 15:06:49 2020 New Revision: 529892 URL: https://svnweb.freebsd.org/changeset/ports/529892 Log: devel/gitlab-runner: fix patch files The patch were applied twice. Reported by: mfechner Approved by: manu (mentor, implicit) Modified: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Modified: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go ============================================================================== --- head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go Mon Mar 30 14:56:20 2020 (r529891) +++ head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go Mon Mar 30 15:06:49 2020 (r529892) @@ -14,19 +14,3 @@ + Len int32 + Buf *byte +} ---- vendor/github.com/kr/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC -+++ vendor/github.com/kr/pty/ztypes_freebsd_arm64.go -@@ -0,0 +1,13 @@ -+// Created by cgo -godefs - DO NOT EDIT -+// cgo -godefs types_freebsd.go -+ -+package pty -+ -+const ( -+ _C_SPECNAMELEN = 0x3f -+) -+ -+type fiodgnameArg struct { -+ Len int32 -+ Buf *byte -+} Modified: head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go ============================================================================== --- head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Mon Mar 30 14:56:20 2020 (r529891) +++ head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Mon Mar 30 15:06:49 2020 (r529892) @@ -22,27 +22,3 @@ Reviewed-by: Brad Fitzpatrick Fp_sr uint32 Fp_cr uint32 } -From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Fri, 25 Oct 2019 21:13:51 +0200 -Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 - -CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a -type uint128. This type doesn't exist in Go. - -Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b -Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 -Run-TryBot: Tobias Klauser -TryBot-Result: Gobot Gobot -Reviewed-by: Brad Fitzpatrick ---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC -+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go -@@ -397,7 +397,7 @@ type Reg struct { - } - - type FpReg struct { -- Fp_q [32]uint128 -+ Fp_q [512]uint8 - Fp_sr uint32 - Fp_cr uint32 - }