From c1ad95e171317a5619d0c91e24387d352722666c Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Wed, 23 Mar 2022 13:59:24 +0100
Subject: go: bump to 1.18

---
 extra/go/checksums             |  4 ++--
 extra/go/patches/no-bash.patch | 20 ++++++--------------
 extra/go/sources               |  2 +-
 extra/go/version               |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'extra/go')

diff --git a/extra/go/checksums b/extra/go/checksums
index ee133d5e..92f04ec5 100644
--- a/extra/go/checksums
+++ b/extra/go/checksums
@@ -1,4 +1,4 @@
 %BLAKE3
-8cff53ae76cfa44bc433f3371e93346e3c6910bd0d0409abd397263e997f40ad  go1.17.8.src.tar.gz
+d5c1c7b36644b2123077e9f1ecb7678458f8f929e0bc7eba5199455608199e54  go1.18.src.tar.gz
 e38b036986f4969980664342af2e0b14c503bf4222b980f2bfdcb32fd62fde14  go1.4-bootstrap-20171003.tar.gz
-dcd2b17ef49c90c0e215209f188a9287684cca9731d48319af1bc4da9e6feb3f  no-bash.patch
+66e10eadbc4e5ccc4db017cc58fb359eaa182ae74f2b5773463935b25343e537  no-bash.patch
diff --git a/extra/go/patches/no-bash.patch b/extra/go/patches/no-bash.patch
index 56177f16..a40844e7 100644
--- a/extra/go/patches/no-bash.patch
+++ b/extra/go/patches/no-bash.patch
@@ -1,6 +1,6 @@
 diff -ur a/go-current/src/make.bash b/go-current/src/make.bash
---- a/go-current/src/make.bash	2021-02-16 21:12:04.000000000 +0300
-+++ b/go-current/src/make.bash	2021-02-17 00:42:09.963840381 +0300
+--- a/go-current/src/make.bash	Tue Mar 15 15:08:16 2022
++++ b/go-current/src/make.bash	Wed Mar 23 13:56:11 2022
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -16,26 +16,18 @@ diff -ur a/go-current/src/make.bash b/go-current/src/make.bash
  		if ! cat $se_mount/booleans/allow_execstack | grep -c '^1 1$' >> /dev/null ; then
  			echo "WARNING: the default SELinux policy on, at least, Fedora 12 breaks "
  			echo "Go. You can enable the features that Go needs via the following "
-@@ -154,14 +154,14 @@
+@@ -164,7 +164,7 @@
+ export GOROOT_BOOTSTRAP
  
- export GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
  export GOROOT="$(cd .. && pwd)"
 -IFS=$'\n'; for go_exe in $(type -ap go); do
 +for go_exe in $(command -v go); do
  	if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
  		goroot=$(GOROOT='' GOOS='' GOARCH='' "$go_exe" env GOROOT)
  		if [ "$goroot" != "$GOROOT" ]; then
- 			GOROOT_BOOTSTRAP=$goroot
- 		fi
- 	fi
--done; unset IFS
-+done
- if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
- 	echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2
- 	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2
 diff -ur a/go1.4-bootstrap/src/make.bash b/go1.4-bootstrap/src/make.bash
---- a/go1.4-bootstrap/src/make.bash	2017-11-22 04:33:58.000000000 +0300
-+++ b/go1.4-bootstrap/src/make.bash	2021-02-17 00:40:52.245631282 +0300
+--- a/go1.4-bootstrap/src/make.bash	Wed Nov 22 02:33:58 2017
++++ b/go1.4-bootstrap/src/make.bash	Wed Mar 23 13:53:56 2022
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
diff --git a/extra/go/sources b/extra/go/sources
index 8719346d..86f04d9d 100644
--- a/extra/go/sources
+++ b/extra/go/sources
@@ -1,3 +1,3 @@
-https://golang.org/dl/go1.17.8.src.tar.gz go-current
+https://golang.org/dl/go1.18.src.tar.gz go-current
 https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz go1.4-bootstrap
 patches/no-bash.patch
diff --git a/extra/go/version b/extra/go/version
index f7df5fd2..4fd73f1f 100644
--- a/extra/go/version
+++ b/extra/go/version
@@ -1 +1 @@
-1.17.8 1
+1.18 1
-- 
cgit v1.2.3