commit: 8dc6169bcae4255a996f29ab59c839c559fcdc24 parent ac74cc008e1a9bdcf438caed66acf80dbd90e01c Author: Michael Forney <mforney@mforney.org> Date: Mon, 29 Nov 2021 13:43:35 -0800 catgirl: Fix strptime decode on muslDiffstat:
3 files changed, 35 insertions(+), 1 deletion(-)diff --git a/pkg/catgirl/patch/0004-Fix-strptime-decode-for-musl-libc.patch b/pkg/catgirl/patch/0004-Fix-strptime-decode-for-musl-libc.patch@@ -0,0 +1,34 @@ +From c6813f480f7c60541f4e3cb7601c89dfafc59ddc Mon Sep 17 00:00:00 2001 +From: psykose <alice@ayaya.dev> +Date: Tue, 26 Oct 2021 10:14:17 +0200 +Subject: [PATCH] Fix strptime decode for musl libc + +POSIX does not define a %F for strptime[1], but does define %F for +strftime[2]. Afaik most libc's implement %F for both, but musl is very +standards-compliant and does not have %F on strptime, leading to +unparsed message tag times, which causes all backlog sent from bouncer +on startup to have a timestamp of the current time, instead of the +actual timestamp sent. + +[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/strptime.html +[2] https://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html +--- + handle.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/handle.c b/handle.c +index 1ace1b3..7f99a7c 100644 +--- a/handle.c ++++ b/handle.c +@@ -91,7 +91,7 @@ static const time_t *tagTime(const struct Message *msg) { + static time_t time; + struct tm tm; + if (!msg->tags[TagTime]) return NULL; +- if (!strptime(msg->tags[TagTime], "%FT%T", &tm)) return NULL; ++ if (!strptime(msg->tags[TagTime], "%Y-%m-%dT%T", &tm)) return NULL; + time = timegm(&tm); + return &time; + } +-- +2.34.0 +diff --git a/pkg/catgirl/patch/0004-HACK-Disable-colorized-output-in-M-l-window-list.patch b/pkg/catgirl/patch/0005-HACK-Disable-colorized-output-in-M-l-window-list.patchdiff --git a/pkg/catgirl/ver b/pkg/catgirl/ver@@ -1 +1 @@ -1.9a r0 +1.9a r1