pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

resterm: fix NetBSD build by using older version of modernc.org/sqlite



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Apr 19 20:42:17 2026 +0200
Changeset:	a1dca231786bb6b11f437c1516486a0ea208eefb

Modified Files:
	resterm/distinfo
	resterm/go-modules.mk
Added Files:
	resterm/patches/patch-go.mod
	resterm/patches/patch-go.sum
Removed Files:
	resterm/TODO

Log Message:
resterm: fix NetBSD build by using older version of modernc.org/sqlite

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1dca231786bb6b11f437c1516486a0ea208eefb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 resterm/TODO                 |  7 -------
 resterm/distinfo             | 14 ++++++++------
 resterm/go-modules.mk        |  4 ++--
 resterm/patches/patch-go.mod | 18 ++++++++++++++++++
 resterm/patches/patch-go.sum | 20 ++++++++++++++++++++
 5 files changed, 48 insertions(+), 15 deletions(-)

diffs:
diff --git a/resterm/TODO b/resterm/TODO
deleted file mode 100644
index 95f7a6481d..0000000000
--- a/resterm/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-Fix build:
-
-odernc.org/sqlite/lib
-# modernc.org/sqlite/lib
-../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112447:5: mu.enter undefined (type mutex has no field or method enter)
-../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112448:11: mu.leave undefined (type mutex has no field or method leave)
-*** Error code 1
diff --git a/resterm/distinfo b/resterm/distinfo
index 9fc4ceb9c2..41a9a5afe5 100644
--- a/resterm/distinfo
+++ b/resterm/distinfo
@@ -750,12 +750,12 @@ Size (modernc.org_memory_@v_v1.11.0.mod) = 223 bytes
 BLAKE2s (modernc.org_memory_@v_v1.11.0.zip) = eeefcb244e7c9f2d58922784ee00eec84978c05c0aefe854cb928a55d766c720
 SHA512 (modernc.org_memory_@v_v1.11.0.zip) = 74e9f8b790047b9dcfd11efd38fb50d2bc6482773d9ac2a964e3fd6114cb12a1a18ccd6cbd08ae294b3f2ff308dca0f4301bcb301444d9ebc2e200d3e01214a0
 Size (modernc.org_memory_@v_v1.11.0.zip) = 29241 bytes
-BLAKE2s (modernc.org_sqlite_@v_v1.39.0.mod) = 30f7aec6e77953de07bfb10eb483deff73f2eac995279c58d5d43c39178ccbfa
-SHA512 (modernc.org_sqlite_@v_v1.39.0.mod) = 352f9ed2742df25e38930c9a8d6d1d1d407be7a72ba8fb96d994bad846ce9a828231765561e19e9cc37f6d041f4d20a75ff61fcb0a26ac6b22ad035fe7a3929b
-Size (modernc.org_sqlite_@v_v1.39.0.mod) = 1059 bytes
-BLAKE2s (modernc.org_sqlite_@v_v1.39.0.zip) = b78adbc754c9856e448ac656723020f28245cc66f1de3bf36123b5c16c8880fb
-SHA512 (modernc.org_sqlite_@v_v1.39.0.zip) = 51fbaadeb9407ad438597907f8adffca72a6f9ea2b3526c98c495b5d76d831419d358579bc6f2600a7228c06791c1497d062eec130a95fa4ed62454642a2c0b5
-Size (modernc.org_sqlite_@v_v1.39.0.zip) = 41153315 bytes
+BLAKE2s (modernc.org_sqlite_@v_v1.33.0.mod) = 71aa5b2f5ef69ab5d90a89d29b8d8e990120f83333c4e98ee1b755e79e77aa4a
+SHA512 (modernc.org_sqlite_@v_v1.33.0.mod) = 3af8caab263f61ff51916892551499f9720fb39f87ebac30b2d0b02207b30d5f2bcbd4225044f5890e8d8d53a56c64846d9ab52e28afc543fa5183252909fc73
+Size (modernc.org_sqlite_@v_v1.33.0.mod) = 937 bytes
+BLAKE2s (modernc.org_sqlite_@v_v1.33.0.zip) = 0ef604c786b661cf6d9554703079c102d140fdc4a3400c8503c42b0fd3107299
+SHA512 (modernc.org_sqlite_@v_v1.33.0.zip) = eb1e8843b0e2589b035dc77442231c7b35ccba7dc7448f760ee2dfefe3ad497d6b05f75fdcd03844ea8bd99142c090946345a917859e384f0761ef9ade256d29
+Size (modernc.org_sqlite_@v_v1.33.0.zip) = 34724831 bytes
 BLAKE2s (nhooyr.io_websocket_@v_v1.8.7.mod) = a542233da6ffcb27062c25a58afee7229ed5fdedffa63baee93edb8fc3273449
 SHA512 (nhooyr.io_websocket_@v_v1.8.7.mod) = 4edd5e8cf0c8cbacc5adef9b6e3880b554f969cb0436eae1d0e9c70972182f13d20199ec50930c10748656637245676efddda8f039f8b0ced96ca8a85570eb4f
 Size (nhooyr.io_websocket_@v_v1.8.7.mod) = 427 bytes
@@ -789,3 +789,5 @@ Size (sigs.k8s.io_yaml_@v_v1.6.0.mod) = 162 bytes
 BLAKE2s (sigs.k8s.io_yaml_@v_v1.6.0.zip) = 8b92c92dfe4db5eaba71c57ef400ecffa2e0c42a6bfa3847c8a7c074670a1504
 SHA512 (sigs.k8s.io_yaml_@v_v1.6.0.zip) = 73e59bbf4443467f89ca6d891c9cd3eaa9bbbd920721bd9a032a34db7969b179bc1d5c98b8457ba3ce1633cd16dc8e0361cc41955e0c51cf50d1165551e9819a
 Size (sigs.k8s.io_yaml_@v_v1.6.0.zip) = 60719 bytes
+SHA1 (patch-go.mod) = 94dcb3000389f970beafcfe675aebea42154ab06
+SHA1 (patch-go.sum) = 2e3e95c2a751d0c9dca0508fa8fb9d1c28e7dc7d
diff --git a/resterm/go-modules.mk b/resterm/go-modules.mk
index babc4395ea..33849c85b2 100644
--- a/resterm/go-modules.mk
+++ b/resterm/go-modules.mk
@@ -250,8 +250,8 @@ GO_MODULE_FILES+=	modernc.org/mathutil/@v/v1.7.1.mod
 GO_MODULE_FILES+=	modernc.org/mathutil/@v/v1.7.1.zip
 GO_MODULE_FILES+=	modernc.org/memory/@v/v1.11.0.mod
 GO_MODULE_FILES+=	modernc.org/memory/@v/v1.11.0.zip
-GO_MODULE_FILES+=	modernc.org/sqlite/@v/v1.39.0.mod
-GO_MODULE_FILES+=	modernc.org/sqlite/@v/v1.39.0.zip
+GO_MODULE_FILES+=	modernc.org/sqlite/@v/v1.33.0.mod
+GO_MODULE_FILES+=	modernc.org/sqlite/@v/v1.33.0.zip
 GO_MODULE_FILES+=	nhooyr.io/websocket/@v/v1.8.7.mod
 GO_MODULE_FILES+=	nhooyr.io/websocket/@v/v1.8.7.zip
 GO_MODULE_FILES+=	sigs.k8s.io/json/@v/v0.0.0-20250730193827-2d320260d730.mod
diff --git a/resterm/patches/patch-go.mod b/resterm/patches/patch-go.mod
new file mode 100644
index 0000000000..8ba6412789
--- /dev/null
+++ b/resterm/patches/patch-go.mod
@@ -0,0 +1,18 @@
+$NetBSD$
+
+1.34+ fail on NetBSD with
+# modernc.org/sqlite/lib
+../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112447:5: mu.enter undefined (type mutex has no field or method enter)
+../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112448:11: mu.leave undefined (type mutex has no field or method leave)
+
+--- go.mod.orig	2026-04-19 18:39:26.036701306 +0000
++++ go.mod
+@@ -32,7 +32,7 @@ require (
+ 	k8s.io/api v0.35.1
+ 	k8s.io/apimachinery v0.35.1
+ 	k8s.io/client-go v0.35.1
+-	modernc.org/sqlite v1.39.0
++	modernc.org/sqlite v1.33.0
+ 	nhooyr.io/websocket v1.8.7
+ )
+ 
diff --git a/resterm/patches/patch-go.sum b/resterm/patches/patch-go.sum
new file mode 100644
index 0000000000..4f922c01af
--- /dev/null
+++ b/resterm/patches/patch-go.sum
@@ -0,0 +1,20 @@
+$NetBSD$
+
+1.34+ fail on NetBSD with
+# modernc.org/sqlite/lib
+../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112447:5: mu.enter undefined (type mutex has no field or method enter)
+../.gopath/pkg/mod/modernc.org/sqlite@v1.39.0/lib/sqlite_netbsd_amd64.go:112448:11: mu.leave undefined (type mutex has no field or method leave)
+
+--- go.sum.orig	2026-04-19 18:39:44.010700615 +0000
++++ go.sum
+@@ -312,8 +312,8 @@ modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCL
+ modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+ modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
+ modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
+-modernc.org/sqlite v1.39.0 h1:6bwu9Ooim0yVYA7IZn9demiQk/Ejp0BtTjBWFLymSeY=
+-modernc.org/sqlite v1.39.0/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E=
++modernc.org/sqlite v1.33.0 h1:WWkA/T2G17okiLGgKAj4/RMIvgyMT19yQ038160IeYk=
++modernc.org/sqlite v1.33.0/go.mod h1:9uQ9hF/pCZoYZK73D/ud5Z7cIRIILSZI8NdIemVMTX8=
+ modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
+ modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
+ modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=


Home | Main Index | Thread Index | Old Index