diff --git a/fix-tests-failed.patch b/fix-tests-failed.patch new file mode 100644 index 0000000000000000000000000000000000000000..5b0967282e01f99c33d27a2c4d5fcf09b19ab57a --- /dev/null +++ b/fix-tests-failed.patch @@ -0,0 +1,37 @@ +From 2bded7f13b18039acfc5995a3da0a0882c3dae4b Mon Sep 17 00:00:00 2001 +From: licihua +Date: Thu, 11 Apr 2024 09:45:20 +0800 +Subject: [PATCH] fix tests failed + +--- + tests/Makefile.in | 2 +- + tests/{cve-2023-50967 => vectors}/cve-2023-50967.jwe | 0 + tests/{cve-2023-50967 => vectors}/cve-2023-50967.jwk | 0 + 3 files changed, 1 insertion(+), 1 deletion(-) + rename tests/{cve-2023-50967 => vectors}/cve-2023-50967.jwe (100%) + rename tests/{cve-2023-50967 => vectors}/cve-2023-50967.jwk (100%) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index b7cb180..692a521 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -530,7 +530,7 @@ zlib_CFLAGS = @zlib_CFLAGS@ + zlib_LIBS = @zlib_LIBS@ + AM_CFLAGS = @JOSE_CFLAGS@ @OPENMP_CFLAGS@ @jansson_CFLAGS@ -I$(top_srcdir) -I$(top_builddir) + EXTRA_DIST = vectors +-AM_TESTS_ENVIRONMENT = PATH=$(top_builddir)/cmd:$(PATH) VECTORS=$(top_srcdir)/tests/vectors:$(top_srcdir)/tests/CVE_2023_50967 ++AM_TESTS_ENVIRONMENT = PATH=$(top_builddir)/cmd:$(PATH) VECTORS=$(top_srcdir)/tests/vectors + TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS) + dist_check_SCRIPTS = \ + jose-alg \ +diff --git a/tests/cve-2023-50967/cve-2023-50967.jwe b/tests/vectors/cve-2023-50967.jwe +similarity index 100% +rename from tests/cve-2023-50967/cve-2023-50967.jwe +rename to tests/vectors/cve-2023-50967.jwe +diff --git a/tests/cve-2023-50967/cve-2023-50967.jwk b/tests/vectors/cve-2023-50967.jwk +similarity index 100% +rename from tests/cve-2023-50967/cve-2023-50967.jwk +rename to tests/vectors/cve-2023-50967.jwk +-- +2.27.0 + diff --git a/jose.spec b/jose.spec index ec6c664021cd8828076b6f5a782d6797e883f87d..e66c0e3e75ac3365e283391ec2e4b15ef5c4e0ef 100644 --- a/jose.spec +++ b/jose.spec @@ -1,11 +1,12 @@ Name: jose Version: 10 -Release: 6 +Release: 7 Summary: José is a command line utility for performing various tasks on JSON objects License: ASL 2.0 URL: https://github.com/latchset/%{name} Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 Patch001: backport-CVE_2023_50967.patch +Patch002: fix-tests-failed.patch BuildRequires: pkgconfig, gcc, openssl-devel, zlib-devel BuildRequires: jansson-devel >= 2.10 Provides: lib%{name} @@ -82,6 +83,13 @@ make %{?_smp_mflags} check %changelog +* Thu Apr 11 2024 licihua - 10-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix tests failed + + * Sun Apr 7 2024 licihua - 10-6 - Type:bugfix - ID:NA