diff --git a/jq-1.6.tar.gz b/jq-1.6.tar.gz deleted file mode 100644 index dbd18fb91dca5da01c9f4b90aa1260313725a535..0000000000000000000000000000000000000000 Binary files a/jq-1.6.tar.gz and /dev/null differ diff --git a/jq-1.7.1.tar.gz b/jq-1.7.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..40718ba6f7ac1e08c8ed93862b4fb0926b446f9b Binary files /dev/null and b/jq-1.7.1.tar.gz differ diff --git a/jq.spec b/jq.spec index 6b1234548d1e42ca851652dde9f859c97f77d416..15169655e64e7b4138b3e7ab6de22eadae1d930d 100644 --- a/jq.spec +++ b/jq.spec @@ -1,17 +1,12 @@ Name: jq -Version: 1.6 -Release: 3 +Version: 1.7.1 +Release: 1 Summary: A lightweight and flexible command-line JSON processor License: MIT and ASL 2.0 and CC-BY-3.0 and GPLv3 URL: http://stedolan.github.io/jq/ -Source0: https://github.com/stedolan/jq/releases/download/jq-%{version}/jq-%{version}.tar.gz +Source0: https://github.com/jqlang/jq/releases/download/jq-%{version}/jq-%{version}.tar.gz BuildRequires: make flex bison valgrind gcc chrpath oniguruma-devel -Patch0001: jv_string_implode-avoid-producing-unprintable-string-fromreserved-code-points.patch -Patch0002: Binary-strings-preserve-UTF-8-and-UTF-16-errors.patch -Patch0003: Update-base64-utf8bytelength-and-fromjson-to-handlebinary-strings.patch -Patch0004: Correct-UTF-8-and-UTF-16-errors-during-concatenation.patch - %description jq is a lightweight and flexible command-line JSON processor. you can use it to slice and filter and map and transform structured data. @@ -36,7 +31,7 @@ Documentation for jq package. %autosetup -n jq-%{version} -p1 %build -%configure +%configure --disable-static %make_build %install @@ -67,14 +62,18 @@ make check %files devel %{_includedir}/*.h %{_libdir}/libjq.so +%{_libdir}/pkgconfig/libjq.pc %files help %{_datadir}/man/man1/jq.1.gz -%{_datadir}/doc/jq/README %{_datadir}/doc/jq/README.md +%{_datadir}/doc/jq/NEWS.md %changelog +* Wed Jul 24 2024 dillon chen - 1.7.1-1 +- Upgrade to 1.7.1 + * Mon May 30 2022 Chenyx - 1.6-3 - License compliance rectification diff --git a/jv_string_implode-avoid-producing-unprintable-string-fromreserved-code-points.patch b/jv_string_implode-avoid-producing-unprintable-string-fromreserved-code-points.patch deleted file mode 100644 index a90b87511934433fa74951c442c9907f5f7d8fa0..0000000000000000000000000000000000000000 --- a/jv_string_implode-avoid-producing-unprintable-string-fromreserved-code-points.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e165542664e9fe3c155eeb13e16320a07dfbd5fd Mon Sep 17 00:00:00 2001 -From: Max Zerzouri -Date: Sat, 15 May 2021 10:50:15 +0000 -Subject: [PATCH] jv_string_implode: avoid producing unprintable string from - reserved code points - ---- - src/jv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jv.c b/src/jv.c -index 979d188..1f1029e 100644 ---- a/src/jv.c -+++ b/src/jv.c -@@ -725,7 +725,7 @@ jv jv_string_implode(jv j) { - jv n = jv_array_get(jv_copy(j), i); - assert(jv_get_kind(n) == JV_KIND_NUMBER); - int nv = jv_number_value(n); -- if (nv > 0x10FFFF) -+ if (nv < 0 || (nv >= 0xD800 && nv <= 0xDFFF) || nv > 0x10FFFF) - nv = 0xFFFD; // U+FFFD REPLACEMENT CHARACTER - s = jv_string_append_codepoint(s, nv); - }