Merge pull request #7 from carapace-sh/fix-patches

fix patches

1-plugin-patch/patch.diff

@@ -1,23 +1,6 @@
-diff --git a/go-src/src/runtime/plugin.go b/go-src/src/runtime/plugin.go
-index 40dfefde17..eb933a8313 100644
---- a/go-src/src/runtime/plugin.go
-+++ b/go-src/src/runtime/plugin.go
-@@ -48,12 +48,12 @@ func plugin_lastmoduleinit() (path string, syms map[string]any, initTasks []*ini
- 			throw("plugin: new module data overlaps with previous moduledata")
- 		}
- 	}
--	for _, pkghash := range md.pkghashes {
--		if pkghash.linktimehash != *pkghash.runtimehash {
--			md.bad = true
--			return "", nil, nil, "plugin was built with a different version of package " + pkghash.modulename
--		}
--	}
-+	// for _, pkghash := range md.pkghashes {
-+	// 	if pkghash.linktimehash != *pkghash.runtimehash {
-+	// 		md.bad = true
-+	// 		return "", nil, nil, "plugin was built with a different version of package " + pkghash.modulename
-+	// 	}
-+	// }
-
- 	// Initialize the freshly loaded module.
- 	modulesinit()
+diff --git a/go-src b/go-src
+--- a/go-src
++++ b/go-src
+@@ -1 +1 @@
+-Subproject commit 619b419a4b1506bde1aa7e833898f2f67fd0e83e
++Subproject commit 619b419a4b1506bde1aa7e833898f2f67fd0e83e-dirty

Makefile

@@ -8,8 +8,8 @@ default:
 
 clean: patch
 	@echo "Resetting Go to clean state..."
-	@git restore go-src
-	@git clean -f go-src
+	@git -C go-src restore .
+	@git -C go-src clean -f .
 
 build: clean
 	$(call apply,1-plugin-patch)

termux/2-fix-GOPROXY-and-GOSUMDB-default-is-empty/patch.diff

@@ -1,15 +1,6 @@
-diff --git a/go-src/src/cmd/go/internal/cfg/cfg.go b/go-src/src/cmd/go/internal/cfg/cfg.go
-index a8daa2d..e532d5c 100644
---- a/go-src/src/cmd/go/internal/cfg/cfg.go
-+++ b/go-src/src/cmd/go/internal/cfg/cfg.go
-@@ -416,8 +416,8 @@ var (
- 	GOPPC64  = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", buildcfg.GOPPC64))
- 	GOWASM   = envOr("GOWASM", fmt.Sprint(buildcfg.GOWASM))
-
--	GOPROXY    = envOr("GOPROXY", "")
--	GOSUMDB    = envOr("GOSUMDB", "")
-+	GOPROXY    = envOr("GOPROXY", "https://proxy.golang.org,direct")
-+	GOSUMDB    = envOr("GOSUMDB", "sum.golang.org")
- 	GOPRIVATE  = Getenv("GOPRIVATE")
- 	GONOPROXY  = envOr("GONOPROXY", GOPRIVATE)
- 	GONOSUMDB  = envOr("GONOSUMDB", GOPRIVATE)
+diff --git a/go-src b/go-src
+--- a/go-src
++++ b/go-src
+@@ -1 +1 @@
+-Subproject commit 619b419a4b1506bde1aa7e833898f2f67fd0e83e
++Subproject commit 619b419a4b1506bde1aa7e833898f2f67fd0e83e-dirty