From 38c8222344e308b63ff7bd43224ad050eca338eb Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Tue, 3 Mar 2026 16:20:45 -0800 Subject: [PATCH 1/2] update strtime and drop patch --- go.mod | 2 +- go.sum | 2 ++ patches/strtime.patch | 12 ------------ 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 patches/strtime.patch diff --git a/go.mod b/go.mod index 1666f965706..d3738924c32 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/kisielk/errcheck v1.9.0 github.com/kisielk/gotool v1.0.0 github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9 - github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 + github.com/knz/strtime v1.0.0 github.com/kr/pretty v0.3.0 github.com/kr/text v0.2.0 github.com/kylelemons/godebug v1.1.0 diff --git a/go.sum b/go.sum index 4245736473d..914509d7728 100644 --- a/go.sum +++ b/go.sum @@ -1380,6 +1380,8 @@ github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9 h1:LkGI7do6fSw3K github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9/go.mod h1:dmDChGdWopkB61HsdDN0/fxKAMIYljKTu+AG9uc4qVY= github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 h1:GQE1iatYDRrIidq4Zf/9ZzKWyrTk2sXOYc1JADbkAjQ= github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= +github.com/knz/strtime v1.0.0 h1:mEAoLxUfThU6lgaMbNhH6gBPWg6dvC46J3UK0myue00= +github.com/knz/strtime v1.0.0/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/patches/strtime.patch b/patches/strtime.patch deleted file mode 100644 index 75ed0d3430d..00000000000 --- a/patches/strtime.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/vendor/github.com/knz/strtime/strptime.c Fri Aug 19 09:57:34 2022 -+++ b/vendor/github.com/knz/strtime/strptime.c Fri Aug 19 09:57:34 2022 -@@ -59,6 +59,9 @@ - // #include "libc_private.h" - #include "timelocal.h" - // #include "tzfile.h" -+#ifdef __sun -+#include -+#endif - - static char * _strptime(const char *, const char *, struct mytm *, int *, locale_t); - From 3517b2bb78d9c630ce21ab057a4c7809dc5a9415 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 6 Mar 2026 23:16:56 -0800 Subject: [PATCH 2/2] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 914509d7728..8c728b7b4be 100644 --- a/go.sum +++ b/go.sum @@ -1378,8 +1378,6 @@ github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH6 github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9 h1:LkGI7do6fSw3Kmp3kKLk+hH7/Xor8uk9IcVBS/y4DpQ= github.com/knz/go-libedit v1.10.2-0.20230308122845-657a11e944a9/go.mod h1:dmDChGdWopkB61HsdDN0/fxKAMIYljKTu+AG9uc4qVY= -github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 h1:GQE1iatYDRrIidq4Zf/9ZzKWyrTk2sXOYc1JADbkAjQ= -github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= github.com/knz/strtime v1.0.0 h1:mEAoLxUfThU6lgaMbNhH6gBPWg6dvC46J3UK0myue00= github.com/knz/strtime v1.0.0/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=