[arch-commits] Commit in gitlab-runner/trunk (PKGBUILD remove-syscall-test.patch)

[Sven-Hendrik Haase]

    Date: Saturday, December 11, 2021 @ 10:30:25
  Author: svenstaro
Revision: 1068203

upgpkg: gitlab-runner 14.5.2-1

Added:
  gitlab-runner/trunk/remove-syscall-test.patch
Modified:
  gitlab-runner/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   35 ++++++++++++++++++++++-------------
 remove-syscall-test.patch |   21 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-11 10:29:46 UTC (rev 1068202)
+++ PKGBUILD	2021-12-11 10:30:25 UTC (rev 1068203)
@@ -1,9 +1,9 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
 # Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com>
 
 pkgname=gitlab-runner
-pkgver=14.5.0
-_commit=f0a95a76
+pkgver=14.5.2
+_commit=e91107dd
 pkgrel=1
 pkgdesc="The official GitLab CI runner written in Go"
 arch=('x86_64')
@@ -38,21 +38,23 @@
         "gitlab-runner.service"
         "gitlab-runner.sysusers"
         "gitlab-runner.tmpfiles"
+        "remove-syscall-test.patch"
         "config.toml")
 sha512sums=('SKIP'
-            '392ab768f8cb3520ccce51260642bdd706dc04d419b83c5aca9c0af235194338a2d4e238db72b320a3c50ae8dcec14afe7ccfd644f8fa75827aa9f5316effe03'
-            '1e485e81673b8d2a4dd39e884adef3b32894953e94cb1759b0e58b760e3605cfa2e50c482dd5f49f1dba9c72f1c4fce7b5998722c78b68c67b4ff1f251b28403'
-            'f563c95562d972b84af47ed9904127cee78f4db3a4217b140b5fbf7541014e38c27562ed1c838df376382a51216e47e4f9351d5bc7881dc256013059aeff0949'
-            'df3efc638f55fdc8c4bf080686e501b3dbd19b981b831d95942bf14e676b7af97f06f53c1f6126c673338b359dbe9ce42eee00ea2a68bb5460791d84794206b8'
-            'f6c965344d23df5dfc5b8a9b329e93a3c6948bf1f952104e814d2bb47079bf5323972733253da3d160a1a2db9c09242aa41442cb07c34b482d4b758c1fb186a3'
-            'f02883a80be301f542a43667439ecb647ba6e798a8b0490549239b11b6924a43a18877aa6ad9de1d172c93cdcff5f45664c5d9d774dcbba3d0300810b1323895'
-            '2caa0f2fae05a53c2b598e78023077e0c0edb6a61e780a5a0f85f9dc0610db27f740077186972caf0f7707eeb6709c3dd58b489f76c8ae6de2fe68b833d96100'
-            '7525578c56ace417d252ebef9570032e9c42646e28e14bb5ffee3b0240174590436c5fd143fcfc96f022327ac5b08ad63d770a57c3b29f5ac43c2ea355def2ea'
-            'a5699ffb31d1589dc7a703131613bcff1127db193ba54afbfa4f5192c7c821d9f0348e1dfbc1bf6c627e22db108e6a966cdf287d4df47ec5b121d75a6ec3892c'
-            '4e00c0af07b3666082186fbd0729c701eb877bf16c554de9d82622384e65ab205ddc035c6b6bf755cd8d7d893da605f72710c58e087a7d075e54f87c8ab00ca9'
+            'd0db92ca78ff45a58e06b8c3d3b43dd1897b0358b7b77ec9f0e5e9d7884cb8205a90ee9336af5a4ff1ba227379d1dee00d803aa6118e6e6b73a0d9accd37f57b'
+            'ff8708b5d90021431695e32b0e425d240ca2235f19d4ea87fd0cd3073b31b8aa0ef0ff89765e9d99caef3da12a4faf87d95d08413bc606bba6681dc4f570c10b'
+            '7a2f65490abca21e63f3db5020526b0b4f414dd4707953ec6d9d8afc6aed70c1ff180821fe6dc7a3b8b00165cfa578cd11f12db2828ecc03eb97a0ec18e50625'
+            'c5ebceec56a273bcceb50cf433e2b6eaef4c6f1900812b05c4757b642b7aff92b41fb4ba87cd3d824c01bdc242c95d24cedb2cbf25565381633a64b8516a3360'
+            '145d41163adedf861a899c250d42cc7ded182f8659fe8a6164a979c307381007e3663f005f2d720a55de5f39b9138b35805405c478bb88b47beb6928cb6c2f15'
+            '44d27d00b0106997a797af1a8eed9de95219bb1f5698e25cb1f55c4bfff63f5aea92eae65a4dfae547dca336ced49cd1ed63b579a78ba247c6aeaf6478f723bc'
+            '1ecbd880d4fb116f9d4cebceacbdc5547fe83983574fabf9a738f87a67dfacc52e365c7b46d0f5455f53806b16a698cb8c3a0daf5d28e6a8284bc4164603213a'
+            'bfdc216a293e2cc5799c071ecf09b4d168574f913df81f6d3ffd619301f83ca199ff1a5d929b9d10705f8ecf5c92cd0da2f906a11d41f7e73359170991d367af'
+            '9c6b8aa436a2306e6c5f0a25fabf719fbdead7e9c102458033ee03ef1457686a7fd1e9af86d3a11299abeb75a252ba2926b81fc59af7fb0b33249bd3333c7ba2'
+            'a26c4e45bb2911272629cf4eca4bb0f82767eba4b076de4bffa7225094962c015ed7ec28c66dba14892dae4b4be3df01c22e2f9546a1db3e0495cc2e378c545b'
             'c0af374b9986895aedcfaee6c67cfad68f0f7289f87e4611358adaff59a2f349f55764fe28b2b1f61f8bfeb61126d4f90d433c626fdf9b826a2de6217f86574f'
             '8aa7f08702e99053c696fcc2aaba83beb9e9cd6f31973d82862db9350ac46df3a095377625d31fe909677525290d2de922d7a97930ed235774cb8f0da8944d40'
             '6751d9fa0b27172d1b419c4138f5ac15cbc7c9147653a7258cf1470216142c637210bb60608c7ed0974e0e4057e5ddeae32225df1bb36e7dd1f20fec71e33cc3'
+            'dc66f8c841c6b73ab031a5e4b891d6eb25a237647d179d792c73b645de99d7a2619788677e80d487b710eeef039242118b64abec9e32c7ce096f130732bcae43'
             '9718b94bd0ddb09095ffb8c1e60ca1e9649dabb1747e7fc95e58e404b2f9effdeb4cfd759f5b904443dc53a4e18c02003c38f85584713deb49f6a6d1007503de')
 
 prepare() {
@@ -62,6 +64,13 @@
   local revision=$(make version | grep "Current revision:" | sed -n "s/.*: \(.*\)/\1/p")
   local branch=$(make version | grep "Current branch:" | sed -n "s/.*: \(.*\)/\1/p")
 
+  # Upstream patches their own go here apparently and then they check for
+  # whether it was patched. It's kinda weird and the whole thing isn't really
+  # necessary at all if you let go upstream handle it:
+  # https://github.com/golang/go/commit/a76511f3a40ea69ee4f5cd86e735e1c8a84f0aa2
+  # Thankfully in Arch, we have a recent go (at least 1.17.5).
+  patch -Np1 -i "$srcdir"/remove-syscall-test.patch
+
   sed -i "s/var VERSION.*/var VERSION = \"$version\"/" common/version.go
   sed -i "s/var REVISION.*/var REVISION = \"$revision\"/" common/version.go
   sed -i "s/var BRANCH.*/var BRANCH = \"$branch\"/" common/version.go

Added: remove-syscall-test.patch
===================================================================
--- remove-syscall-test.patch	                        (rev 0)
+++ remove-syscall-test.patch	2021-12-11 10:30:25 UTC (rev 1068203)
@@ -0,0 +1,21 @@
+diff --git a/main.go b/main.go
+index 9f2b76ffd..03ff858f3 100644
+--- a/main.go
++++ b/main.go
+@@ -9,7 +9,6 @@ import (
+ 
+ 	"gitlab.com/gitlab-org/gitlab-runner/common"
+ 	cli_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+-	issue_28732_patch "gitlab.com/gitlab-org/gitlab-runner/helpers/patches/issue_28732"
+ 	"gitlab.com/gitlab-org/gitlab-runner/log"
+ 
+ 	_ "gitlab.com/gitlab-org/gitlab-runner/cache/azure"
+@@ -40,8 +39,6 @@ func main() {
+ 		}
+ 	}()
+ 
+-	issue_28732_patch.AssertFixPresent()
+-
+ 	app := cli.NewApp()
+ 	app.Name = filepath.Base(os.Args[0])
+ 	app.Usage = "a GitLab Runner"