CVS commit: pkgsrc/devel/jq

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul  2 15:26:35 UTC 2026

Modified Files:
        pkgsrc/devel/jq: Makefile distinfo
Added Files:
        pkgsrc/devel/jq/patches: patch-src_builtin.c

Log Message:
jq: fix self tests.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/jq/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/jq/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/devel/jq/patches/patch-src_builtin.c

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

Modified files:

Index: pkgsrc/devel/jq/Makefile
diff -u pkgsrc/devel/jq/Makefile:1.26 pkgsrc/devel/jq/Makefile:1.27
--- pkgsrc/devel/jq/Makefile:1.26       Tue Jun 30 13:43:04 2026
+++ pkgsrc/devel/jq/Makefile    Thu Jul  2 15:26:34 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2026/06/30 13:43:04 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/07/02 15:26:34 wiz Exp $
 
 DISTNAME=      jq-1.8.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jqlang/}
 GITHUB_RELEASE=        ${DISTNAME}
@@ -21,9 +21,6 @@ PKGCONFIG_OVERRIDE=   libjq.pc.in
 
 TEST_TARGET=   check
 
-# 3 self tests failed as of 1.8.2
-# https://github.com/jqlang/jq/issues/3567
-
 .include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/jq/distinfo
diff -u pkgsrc/devel/jq/distinfo:1.25 pkgsrc/devel/jq/distinfo:1.26
--- pkgsrc/devel/jq/distinfo:1.25       Tue Jun 30 13:43:04 2026
+++ pkgsrc/devel/jq/distinfo    Thu Jul  2 15:26:34 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.25 2026/06/30 13:43:04 wiz Exp $
+$NetBSD: distinfo,v 1.26 2026/07/02 15:26:34 wiz Exp $
 
 BLAKE2s (jq-1.8.2.tar.gz) = 0fc6f98a3e806e61bcfa45cd65e635208b0d4023b108da7ff224762955b356ff
 SHA512 (jq-1.8.2.tar.gz) = d4058940cff1cd9946d7f2a9057316bf05915679385386685d140b7a82d870d43ae5b5b4d0a5560c864cf0ef2cc59d7b6ed3afb46b3aea0f4d35329678b2c328
 Size (jq-1.8.2.tar.gz) = 1959950 bytes
+SHA1 (patch-src_builtin.c) = 0ba59f78117dcd23b7f0a74ba319174005af836a
 SHA1 (patch-src_main.c) = 052b272a8d85f070e7d2e0d132b56dabdaa76846

Added files:

Index: pkgsrc/devel/jq/patches/patch-src_builtin.c
diff -u /dev/null pkgsrc/devel/jq/patches/patch-src_builtin.c:1.7
--- /dev/null   Thu Jul  2 15:26:35 2026
+++ pkgsrc/devel/jq/patches/patch-src_builtin.c Thu Jul  2 15:26:35 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_builtin.c,v 1.7 2026/07/02 15:26:35 wiz Exp $
+
+Workaround for timezone problem.
+https://github.com/jqlang/jq/issues/3568
+
+--- src/builtin.c.orig 2026-06-20 13:36:30.000000000 +0000
++++ src/builtin.c
+@@ -1847,7 +1847,13 @@ static jv f_strftime(jq_state *jq, jv a, jv b) {
+    * account ... */
+   tzset();
+ #endif
++#ifdef __NetBSD__
++  timezone_t tz_utc = tzalloc("UTC");
++  size_t n = strftime_z(tz_utc, buf, max_size, fmt, &tm);
++  tzfree(tz_utc);
++#else
+   size_t n = strftime(buf, max_size, fmt, &tm);
++#endif
+ #if defined(__APPLE__) || defined(__sun)
+   if (tz) {
+     setenv("TZ", tz, 1);