From 12d4daa8b397df805c35f4d8a11f9cda50b71af9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 01/28] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- yajl.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 3f65f55..0bb7fd3 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,6 @@ Version: 2.1.0 Release: 11%{?dist} Summary: Yet Another JSON Library (YAJL) -Group: Development/Libraries License: ISC URL: http://lloyd.github.com/yajl/ From 9e7ae160b1aefd53718eda0fdd2a396c6be22456 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:55:41 +0000 Subject: [PATCH 02/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 0bb7fd3..bb958bd 100644 --- a/yajl.spec +++ b/yajl.spec @@ -1,6 +1,6 @@ Name: yajl Version: 2.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -95,6 +95,9 @@ cd test %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a81c5e13e31f2db3820dc2d22204b6f55f1e6c09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:45:33 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index bb958bd..15eab05 100644 --- a/yajl.spec +++ b/yajl.spec @@ -1,6 +1,6 @@ Name: yajl Version: 2.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -95,6 +95,9 @@ cd test %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c96b0b99c305cce3286c957432b17ec37f457db5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:03:12 +0000 Subject: [PATCH 04/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 15eab05..d7a0e63 100644 --- a/yajl.spec +++ b/yajl.spec @@ -1,6 +1,6 @@ Name: yajl Version: 2.1.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -95,6 +95,9 @@ cd test %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.1.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3d32f58e8187d247f28bb2ef8ac97dffe6dc3dee Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 20:05:47 +0200 Subject: [PATCH 05/28] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- yajl.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/yajl.spec b/yajl.spec index d7a0e63..22e69e6 100644 --- a/yajl.spec +++ b/yajl.spec @@ -1,3 +1,6 @@ +%undefine __cmake_in_source_build +%global _vpath_builddir build + Name: yajl Version: 2.1.0 Release: 14%{?dist} @@ -52,16 +55,12 @@ necessary for developing against the YAJL library # NB, we are not using upstream's 'configure'/'make' # wrapper, instead we use cmake directly to better # align with Fedora standards -mkdir build -cd build -%cmake .. -make VERBOSE=1 %{?_smp_mflags} +%cmake +%cmake_build %install -rm -rf $RPM_BUILD_ROOT -cd build -make install DESTDIR=$RPM_BUILD_ROOT +%cmake_install # No static libraries From 4ccbde7157e0178dd3f367b03a86954c14d01652 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:10:59 +0000 Subject: [PATCH 06/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 22e69e6..b61cb25 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.1.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cd680eb0ce01ff2a3d5df48cb018f46a647d5a7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:29:46 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index b61cb25..0921a7c 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1837eb7df568fb084460a3aca35cfaa4152978f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:04:53 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 0921a7c..c58b016 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2.1.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6185d78c316516930d63be2cb27c1a4b71a434b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:38:28 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index c58b016..4561d1b 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.1.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4caadd48a5b6006217fd4c092a6043b28295adfc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:41:02 +0000 Subject: [PATCH 10/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 4561d1b..d5abd62 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.1.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d32e5276d1df983393abf459457fbddb2805c510 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:01:01 +0000 Subject: [PATCH 11/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index d5abd62..c052e1a 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -94,6 +94,9 @@ cd test %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fc88a8c50aeefa7031970b63e199bd69b1a3cf34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 10:44:48 +0100 Subject: [PATCH 12/28] Remove obsolete patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- lloyd-yajl-2.0.4-pkgconfig-includedir.patch | 13 --------- lloyd-yajl-2.0.4-pkgconfig-location.patch | 29 --------------------- 2 files changed, 42 deletions(-) delete mode 100644 lloyd-yajl-2.0.4-pkgconfig-includedir.patch delete mode 100644 lloyd-yajl-2.0.4-pkgconfig-location.patch diff --git a/lloyd-yajl-2.0.4-pkgconfig-includedir.patch b/lloyd-yajl-2.0.4-pkgconfig-includedir.patch deleted file mode 100644 index 2593c61..0000000 --- a/lloyd-yajl-2.0.4-pkgconfig-includedir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Only in lloyd-yajl-fee1ebe.new/src: CMakeLists.txt~ -diff -rup lloyd-yajl-fee1ebe.orig/src/yajl.pc.cmake lloyd-yajl-fee1ebe.new/src/yajl.pc.cmake ---- lloyd-yajl-fee1ebe.orig/src/yajl.pc.cmake 2011-12-20 00:23:22.000000000 +0000 -+++ lloyd-yajl-fee1ebe.new/src/yajl.pc.cmake 2012-08-06 14:05:49.639854538 +0100 -@@ -1,6 +1,6 @@ - prefix=${CMAKE_INSTALL_PREFIX} - libdir=${dollar}{prefix}/lib${LIB_SUFFIX} --includedir=${dollar}{prefix}/include/yajl -+includedir=${dollar}{prefix}/include - - Name: Yet Another JSON Library - Description: A Portable JSON parsing and serialization library in ANSI C -Only in lloyd-yajl-fee1ebe.new/src: yajl.pc.cmake~ diff --git a/lloyd-yajl-2.0.4-pkgconfig-location.patch b/lloyd-yajl-2.0.4-pkgconfig-location.patch deleted file mode 100644 index 26da5ff..0000000 --- a/lloyd-yajl-2.0.4-pkgconfig-location.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -rup lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt lloyd-yajl-fee1ebe.new/src/CMakeLists.txt ---- lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt 2011-12-20 00:23:22.000000000 +0000 -+++ lloyd-yajl-fee1ebe.new/src/CMakeLists.txt 2012-08-06 13:59:02.222065755 +0100 -@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD) - # set up some paths - SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl) --SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig) -+SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig) - - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) -@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir}) - # generate build-time source - SET(dollar $) - CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h) --CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc) -+CONFIGURE_FILE(yajl.pc.cmake ${pkgconfigDir}/yajl.pc) - - # copy public headers to output directory - FOREACH (header ${PUB_HDRS}) -@@ -82,5 +82,5 @@ IF(NOT WIN32) - INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) -- INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig) -+ INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - ENDIF() -Only in lloyd-yajl-fee1ebe.new/src: CMakeLists.txt~ From aa1d9aace4594d71e6804142c4293fac5620b429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 12:56:47 +0100 Subject: [PATCH 13/28] Switch to using %autosetup for patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- yajl.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/yajl.spec b/yajl.spec index c052e1a..b6c92e9 100644 --- a/yajl.spec +++ b/yajl.spec @@ -19,10 +19,10 @@ URL: http://lloyd.github.com/yajl/ # https://github.com/lloyd/yajl/releases/tag/2.1.0 # Source0: %{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-pkgconfig-location.patch -Patch2: %{name}-%{version}-pkgconfig-includedir.patch -Patch3: %{name}-%{version}-test-location.patch -Patch4: %{name}-%{version}-dynlink-binaries.patch +Patch: %{name}-%{version}-pkgconfig-location.patch +Patch: %{name}-%{version}-pkgconfig-includedir.patch +Patch: %{name}-%{version}-test-location.patch +Patch: %{name}-%{version}-dynlink-binaries.patch BuildRequires: gcc BuildRequires: cmake @@ -45,11 +45,7 @@ This sub-package provides the libraries and includes necessary for developing against the YAJL library %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 %build # NB, we are not using upstream's 'configure'/'make' From 39b3d10267ef7a0f455bac4538217bcd819a25fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 14:08:37 +0100 Subject: [PATCH 14/28] Switch to using git for managing patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Primary source: https://github.com/berrange/yajl/tree/fedora-dist-git Signed-off-by: Daniel P. Berrangé --- ...should-be-in-lib-dir-not-shared-data.patch | 23 ++++++++-- ...de-dir-should-not-have-the-yajl-suff.patch | 30 +++++++++++++ ...-test-files-to-take-account-of-vpath.patch | 31 ++++++++++--- ...-_s-suffix-from-yajl-dynamic-library.patch | 43 +++++++++++++++++++ yajl-2.1.0-dynlink-binaries.patch | 28 ------------ yajl-2.1.0-pkgconfig-includedir.patch | 11 ----- yajl.spec | 20 ++++++--- 7 files changed, 131 insertions(+), 55 deletions(-) rename yajl-2.1.0-pkgconfig-location.patch => 0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch (64%) create mode 100644 0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch rename yajl-2.1.0-test-location.patch => 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch (53%) create mode 100644 0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch delete mode 100644 yajl-2.1.0-dynlink-binaries.patch delete mode 100644 yajl-2.1.0-pkgconfig-includedir.patch diff --git a/yajl-2.1.0-pkgconfig-location.patch b/0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch similarity index 64% rename from yajl-2.1.0-pkgconfig-location.patch rename to 0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch index 757a9cc..acc8a81 100644 --- a/yajl-2.1.0-pkgconfig-location.patch +++ b/0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch @@ -1,6 +1,20 @@ -diff -rup yajl-2.1.0.orig/src/CMakeLists.txt yajl-2.1.0.new/src/CMakeLists.txt ---- yajl-2.1.0.orig/src/CMakeLists.txt 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/src/CMakeLists.txt 2014-04-28 11:19:28.431492533 +0100 +From a319e9c853d787a9033e14436a5a80381e954a26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:42:30 +0100 +Subject: [PATCH 1/8] pkg-config file should be in lib dir, not shared data dir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Daniel P. Berrangé +--- + src/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 99cf9e9..789ddf9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD) # set up some paths SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) @@ -25,3 +39,6 @@ diff -rup yajl-2.1.0.orig/src/CMakeLists.txt yajl-2.1.0.new/src/CMakeLists.txt INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) -INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig) +INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +-- +2.41.0 + diff --git a/0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch b/0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch new file mode 100644 index 0000000..b6175b3 --- /dev/null +++ b/0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch @@ -0,0 +1,30 @@ +From 0eaa8db35c9e580f27ba0c90d11b173cb1d96687 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:43:25 +0100 +Subject: [PATCH 2/8] pkg-config include dir should not have the 'yajl' suffix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apps use '#include ' for includes historically. + +Signed-off-by: Daniel P. Berrangé +--- + src/yajl.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/yajl.pc.cmake b/src/yajl.pc.cmake +index 6eaca14..485ded9 100644 +--- a/src/yajl.pc.cmake ++++ b/src/yajl.pc.cmake +@@ -1,6 +1,6 @@ + prefix=${CMAKE_INSTALL_PREFIX} + libdir=${dollar}{prefix}/lib${LIB_SUFFIX} +-includedir=${dollar}{prefix}/include/yajl ++includedir=${dollar}{prefix}/include + + Name: Yet Another JSON Library + Description: A Portable JSON parsing and serialization library in ANSI C +-- +2.41.0 + diff --git a/yajl-2.1.0-test-location.patch b/0003-fix-patch-to-test-files-to-take-account-of-vpath.patch similarity index 53% rename from yajl-2.1.0-test-location.patch rename to 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch index 04f5aee..8f1d5ab 100644 --- a/yajl-2.1.0-test-location.patch +++ b/0003-fix-patch-to-test-files-to-take-account-of-vpath.patch @@ -1,6 +1,21 @@ -diff -rup yajl-2.1.0.orig/test/api/run_tests.sh yajl-2.1.0.new/test/api/run_tests.sh ---- yajl-2.1.0.orig/test/api/run_tests.sh 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/test/api/run_tests.sh 2014-04-28 11:27:26.006405320 +0100 +From 39b9c104275a5eac498f5d2a92b462d10381a9eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:44:26 +0100 +Subject: [PATCH 3/8] fix patch to test files to take account of vpath +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Daniel P. Berrangé +--- + test/api/run_tests.sh | 2 +- + test/parsing/run_tests.sh | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/api/run_tests.sh b/test/api/run_tests.sh +index 6655152..88e43fb 100755 +--- a/test/api/run_tests.sh ++++ b/test/api/run_tests.sh @@ -5,7 +5,7 @@ echo Running api tests: tests=0 passed=0 @@ -10,9 +25,10 @@ diff -rup yajl-2.1.0.orig/test/api/run_tests.sh yajl-2.1.0.new/test/api/run_test [ ! -x $file -o -d $file ] && continue tests=`expr 1 + $tests` printf " test(%s): " $file -diff -rup yajl-2.1.0.orig/test/parsing/run_tests.sh yajl-2.1.0.new/test/parsing/run_tests.sh ---- yajl-2.1.0.orig/test/parsing/run_tests.sh 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/test/parsing/run_tests.sh 2014-04-28 11:25:51.239025722 +0100 +diff --git a/test/parsing/run_tests.sh b/test/parsing/run_tests.sh +index b37e4dd..ceb2e7a 100755 +--- a/test/parsing/run_tests.sh ++++ b/test/parsing/run_tests.sh @@ -16,11 +16,11 @@ fi # find test binary on both platforms. allow the caller to force a # particular test binary (useful for non-cmake build systems). @@ -28,3 +44,6 @@ diff -rup yajl-2.1.0.orig/test/parsing/run_tests.sh yajl-2.1.0.new/test/parsing/ if [ ! -x $testBin ] ; then ${ECHO} "cannot execute test binary: '$testBin'" exit 1; +-- +2.41.0 + diff --git a/0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch b/0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch new file mode 100644 index 0000000..1c97cc8 --- /dev/null +++ b/0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch @@ -0,0 +1,43 @@ +From c98c00d6957601b95f3982f3d9460868469a299e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:45:36 +0100 +Subject: [PATCH 4/8] drop bogus '_s' suffix from yajl dynamic library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Daniel P. Berrangé +--- + reformatter/CMakeLists.txt | 2 +- + verify/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 52a9bee..4b7b3fa 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(json_reformat ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_reformat yajl_s) ++TARGET_LINK_LIBRARIES(json_reformat yajl) + + # In some environments, we must explicitly link libm (like qnx, + # thanks @shahbag) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 967fca1..2bceb26 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(json_verify ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_verify yajl_s) ++TARGET_LINK_LIBRARIES(json_verify yajl) + + # copy in the binary + GET_TARGET_PROPERTY(binPath json_verify LOCATION) +-- +2.41.0 + diff --git a/yajl-2.1.0-dynlink-binaries.patch b/yajl-2.1.0-dynlink-binaries.patch deleted file mode 100644 index fa53913..0000000 --- a/yajl-2.1.0-dynlink-binaries.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -rup yajl-2.1.0.orig/reformatter/CMakeLists.txt yajl-2.1.0.new/reformatter/CMakeLists.txt ---- yajl-2.1.0.orig/reformatter/CMakeLists.txt 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/reformatter/CMakeLists.txt 2014-04-28 11:36:11.909478329 +0100 -@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ - - ADD_EXECUTABLE(json_reformat ${SRCS}) - --TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+TARGET_LINK_LIBRARIES(json_reformat yajl) - - # In some environments, we must explicitly link libm (like qnx, - # thanks @shahbag) -Only in yajl-2.1.0.new/reformatter: CMakeLists.txt.orig -Only in yajl-2.1.0.new/src: CMakeLists.txt~ -Only in yajl-2.1.0.new/test/api: run_tests.sh~ -Only in yajl-2.1.0.new/test/parsing: run_tests.sh~ -diff -rup yajl-2.1.0.orig/verify/CMakeLists.txt yajl-2.1.0.new/verify/CMakeLists.txt ---- yajl-2.1.0.orig/verify/CMakeLists.txt 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/verify/CMakeLists.txt 2014-04-28 11:36:11.909478329 +0100 -@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ - - ADD_EXECUTABLE(json_verify ${SRCS}) - --TARGET_LINK_LIBRARIES(json_verify yajl_s) -+TARGET_LINK_LIBRARIES(json_verify yajl) - - # copy in the binary - GET_TARGET_PROPERTY(binPath json_verify LOCATION) diff --git a/yajl-2.1.0-pkgconfig-includedir.patch b/yajl-2.1.0-pkgconfig-includedir.patch deleted file mode 100644 index ba134f0..0000000 --- a/yajl-2.1.0-pkgconfig-includedir.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup yajl-2.1.0.orig/src/yajl.pc.cmake yajl-2.1.0.new/src/yajl.pc.cmake ---- yajl-2.1.0.orig/src/yajl.pc.cmake 2014-03-19 04:58:29.000000000 +0000 -+++ yajl-2.1.0.new/src/yajl.pc.cmake 2014-04-28 11:12:23.505791003 +0100 -@@ -1,6 +1,6 @@ - prefix=${CMAKE_INSTALL_PREFIX} - libdir=${dollar}{prefix}/lib${LIB_SUFFIX} --includedir=${dollar}{prefix}/include/yajl -+includedir=${dollar}{prefix}/include - - Name: Yet Another JSON Library - Description: A Portable JSON parsing and serialization library in ANSI C diff --git a/yajl.spec b/yajl.spec index b6c92e9..05f131f 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -19,13 +19,16 @@ URL: http://lloyd.github.com/yajl/ # https://github.com/lloyd/yajl/releases/tag/2.1.0 # Source0: %{name}-%{version}.tar.gz -Patch: %{name}-%{version}-pkgconfig-location.patch -Patch: %{name}-%{version}-pkgconfig-includedir.patch -Patch: %{name}-%{version}-test-location.patch -Patch: %{name}-%{version}-dynlink-binaries.patch -BuildRequires: gcc +# Patches managed at https://github.com/berrange/yajl/tree/fedora-dist-git +Patch: 0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch +Patch: 0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch +Patch: 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch +Patch: 0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch + +BuildRequires: gcc BuildRequires: cmake +BuildRequires: git %package devel Summary: Libraries, includes, etc to develop with YAJL @@ -45,7 +48,7 @@ This sub-package provides the libraries and includes necessary for developing against the YAJL library %prep -%autosetup -p1 +%autosetup -S git_am %build # NB, we are not using upstream's 'configure'/'make' @@ -90,6 +93,9 @@ cd test %changelog +* Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 +- Switch to using git for managing patches + * Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b9e95f336638c63e4f33825384a2829f7c864948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 14:16:22 +0100 Subject: [PATCH 15/28] Fix potential buffer overread (CVE-2017-16516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- 0005-Fix-for-CVE-2017-16516.patch | 43 +++++++++++++++++++++++++++++++ yajl.spec | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 0005-Fix-for-CVE-2017-16516.patch diff --git a/0005-Fix-for-CVE-2017-16516.patch b/0005-Fix-for-CVE-2017-16516.patch new file mode 100644 index 0000000..7d48816 --- /dev/null +++ b/0005-Fix-for-CVE-2017-16516.patch @@ -0,0 +1,43 @@ +From 0b5e73c4321de0ba1d495fdc0967054b2a77931c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:36:10 +0100 +Subject: [PATCH 5/8] Fix for CVE-2017-16516 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Description: Fix for CVE-2017-16516 + Potential buffer overread: A JSON file can cause denial of service. +Origin: https://github.com/brianmario/yajl-ruby/commit/a8ca8f476655adaa187eedc60bdc770fff3c51ce +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040036 +Bug: https://github.com/lloyd/yajl/issues/248 + +Patch taken from Debian package source + +NB, Fedora code can't trigger the reported aborts since it passes the +-DNDEBUG flag, but pulling the fix for robustness in case a future +change enables the assert()s. + +Signed-off-by: Daniel P. Berrangé +--- + src/yajl_encode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/yajl_encode.c b/src/yajl_encode.c +index fd08258..0d97cc5 100644 +--- a/src/yajl_encode.c ++++ b/src/yajl_encode.c +@@ -139,8 +139,8 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str, + end+=3; + /* check if this is a surrogate */ + if ((codepoint & 0xFC00) == 0xD800) { +- end++; +- if (str[end] == '\\' && str[end + 1] == 'u') { ++ if (end + 2 < len && str[end + 1] == '\\' && str[end + 2] == 'u') { ++ end++; + unsigned int surrogate = 0; + hexToDigit(&surrogate, str + end + 2); + codepoint = +-- +2.41.0 + diff --git a/yajl.spec b/yajl.spec index 05f131f..acb531f 100644 --- a/yajl.spec +++ b/yajl.spec @@ -25,6 +25,7 @@ Patch: 0001-pkg-config-file-should-be-in-lib-dir-not-shared-data.patch Patch: 0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch Patch: 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch Patch: 0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch +Patch: 0005-Fix-for-CVE-2017-16516.patch BuildRequires: gcc BuildRequires: cmake @@ -95,6 +96,7 @@ cd test %changelog * Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 - Switch to using git for managing patches +- Fix potential buffer overread (CVE-2017-16516) * Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9c33a12015768299d4ee1d00177293274f5338c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 14:17:15 +0100 Subject: [PATCH 16/28] Fix integer overflow leading to heap corruption (CVE-2022-24795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- 0006-Fix-CVE-2022-24795.patch | 60 +++++++++++++++++++++++++++++++++++ yajl.spec | 2 ++ 2 files changed, 62 insertions(+) create mode 100644 0006-Fix-CVE-2022-24795.patch diff --git a/0006-Fix-CVE-2022-24795.patch b/0006-Fix-CVE-2022-24795.patch new file mode 100644 index 0000000..704e884 --- /dev/null +++ b/0006-Fix-CVE-2022-24795.patch @@ -0,0 +1,60 @@ +From 17de4d15687aa30c49660dc4b792b1fb4d38b569 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 7 Apr 2022 17:29:54 +0200 +Subject: [PATCH 6/8] Fix CVE-2022-24795 + +There was an integer overflow in yajl_buf_ensure_available() leading +to allocating less memory than requested. Then data were written past +the allocated heap buffer in yajl_buf_append(), the only caller of +yajl_buf_ensure_available(). Another result of the overflow was an +infinite loop without a return from yajl_buf_ensure_available(). + +yajl-ruby project, which bundles yajl, fixed it + by checking for the +integer overflow, fortifying buffer allocations, and report the +failures to a caller. But then the caller yajl_buf_append() skips +a memory write if yajl_buf_ensure_available() failed leading to a data +corruption. + +A yajl fork mainter recommended calling memory allocation callbacks with +the large memory request and let them to handle it. But that has the +problem that it's not possible pass the overely large size to the +callbacks. + +This patch catches the integer overflow and terminates the process +with abort(). + +https://github.com/lloyd/yajl/issues/239 +https://github.com/brianmario/yajl-ruby/security/advisories/GHSA-jj47-x69x-mxrm +(cherry picked from commit 23cea2d7677e396efed78bbf1bf153961fab6bad + in https://github.com/ppisar/yajl) +--- + src/yajl_buf.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/yajl_buf.c b/src/yajl_buf.c +index 1aeafde..55c11ad 100644 +--- a/src/yajl_buf.c ++++ b/src/yajl_buf.c +@@ -45,7 +45,17 @@ void yajl_buf_ensure_available(yajl_buf buf, size_t want) + + need = buf->len; + +- while (want >= (need - buf->used)) need <<= 1; ++ if (((buf->used > want) ? buf->used : want) > (size_t)(buf->used + want)) { ++ /* We cannot allocate more memory than SIZE_MAX. */ ++ abort(); ++ } ++ while (want >= (need - buf->used)) { ++ if (need >= (size_t)((size_t)(-1)<<1)>>1) { ++ /* need would overflow. */ ++ abort(); ++ } ++ need <<= 1; ++ } + + if (need != buf->len) { + buf->data = (unsigned char *) YA_REALLOC(buf->alloc, buf->data, need); +-- +2.41.0 + diff --git a/yajl.spec b/yajl.spec index acb531f..72e4232 100644 --- a/yajl.spec +++ b/yajl.spec @@ -26,6 +26,7 @@ Patch: 0002-pkg-config-include-dir-should-not-have-the-yajl-suff.patch Patch: 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch Patch: 0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch Patch: 0005-Fix-for-CVE-2017-16516.patch +Patch: 0006-Fix-CVE-2022-24795.patch BuildRequires: gcc BuildRequires: cmake @@ -97,6 +98,7 @@ cd test * Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 - Switch to using git for managing patches - Fix potential buffer overread (CVE-2017-16516) +- Fix integer overflow leading to heap corruption (CVE-2022-24795) * Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1f9c12340fc977a52a3af71ec567b1c7f29849df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Jul 2023 14:18:30 +0100 Subject: [PATCH 17/28] Fix multiple memory leaks (CVE-2023-33460) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- 0007-yajl-fix-memory-leak-problem.patch | 41 +++++++++++++++++++++++++ 0008-fix-memory-leaks.patch | 30 ++++++++++++++++++ yajl.spec | 3 ++ 3 files changed, 74 insertions(+) create mode 100644 0007-yajl-fix-memory-leak-problem.patch create mode 100644 0008-fix-memory-leaks.patch diff --git a/0007-yajl-fix-memory-leak-problem.patch b/0007-yajl-fix-memory-leak-problem.patch new file mode 100644 index 0000000..0a6be95 --- /dev/null +++ b/0007-yajl-fix-memory-leak-problem.patch @@ -0,0 +1,41 @@ +From c4304a2c04a1b392eb1464a9da892a9e0dff7683 Mon Sep 17 00:00:00 2001 +From: wujing +Date: Thu, 14 Feb 2019 03:12:30 +0800 +Subject: [PATCH 7/8] yajl: fix memory leak problem + +reason: fix memory leak problem +(cherry picked from commit 3d65cb0c6db4d433e5e42ee7d91d8a04e21337cf + in https://github.com/openEuler-BaseService) + +Fixes: https://github.com/lloyd/yajl/issues/250 (CVE-2023-33460) +--- + src/yajl_tree.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/yajl_tree.c b/src/yajl_tree.c +index 3d357a3..4b3cf2b 100644 +--- a/src/yajl_tree.c ++++ b/src/yajl_tree.c +@@ -143,7 +143,7 @@ static yajl_val context_pop(context_t *ctx) + ctx->stack = stack->next; + + v = stack->value; +- ++ free (stack->key); + free (stack); + + return (v); +@@ -444,6 +444,10 @@ yajl_val yajl_tree_parse (const char *input, + snprintf(error_buffer, error_buffer_size, "%s", internal_err_str); + YA_FREE(&(handle->alloc), internal_err_str); + } ++ while(ctx.stack != NULL) { ++ yajl_val v = context_pop(&ctx); ++ yajl_tree_free(v); ++ } + yajl_free (handle); + return NULL; + } +-- +2.41.0 + diff --git a/0008-fix-memory-leaks.patch b/0008-fix-memory-leaks.patch new file mode 100644 index 0000000..cc8e5f7 --- /dev/null +++ b/0008-fix-memory-leaks.patch @@ -0,0 +1,30 @@ +From 9cb871049261eeda844b8943d15580763a0ac3d3 Mon Sep 17 00:00:00 2001 +From: "zhang.jiujiu" <282627424@qq.com> +Date: Tue, 7 Dec 2021 22:37:02 +0800 +Subject: [PATCH 8/8] fix memory leaks + +(cherry picked from commit 23a122eddaa28165a6c219000adcc31ff9a8a698 + in https://github.com/openEuler-BaseService) + +Fixes: https://github.com/lloyd/yajl/issues/250 (CVE-2023-33460) +--- + src/yajl_tree.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/yajl_tree.c b/src/yajl_tree.c +index 4b3cf2b..56c7012 100644 +--- a/src/yajl_tree.c ++++ b/src/yajl_tree.c +@@ -449,6 +449,9 @@ yajl_val yajl_tree_parse (const char *input, + yajl_tree_free(v); + } + yajl_free (handle); ++ //If the requested memory is not released in time, it will cause memory leakage ++ if(ctx.root) ++ yajl_tree_free(ctx.root); + return NULL; + } + +-- +2.41.0 + diff --git a/yajl.spec b/yajl.spec index 72e4232..11c3c19 100644 --- a/yajl.spec +++ b/yajl.spec @@ -27,6 +27,8 @@ Patch: 0003-fix-patch-to-test-files-to-take-account-of-vpath.patch Patch: 0004-drop-bogus-_s-suffix-from-yajl-dynamic-library.patch Patch: 0005-Fix-for-CVE-2017-16516.patch Patch: 0006-Fix-CVE-2022-24795.patch +Patch: 0007-yajl-fix-memory-leak-problem.patch +Patch: 0008-fix-memory-leaks.patch BuildRequires: gcc BuildRequires: cmake @@ -99,6 +101,7 @@ cd test - Switch to using git for managing patches - Fix potential buffer overread (CVE-2017-16516) - Fix integer overflow leading to heap corruption (CVE-2022-24795) +- Fix multiple memory leaks (CVE-2023-33460) * Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 03dabca61350a909d8060b4d599ec4de5e2460c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:26:39 +0000 Subject: [PATCH 18/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index 11c3c19..f688273 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -97,6 +97,9 @@ cd test %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 - Switch to using git for managing patches - Fix potential buffer overread (CVE-2017-16516) From dbbc6b439c206227182345affe799e35b91dc6a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:37:17 +0000 Subject: [PATCH 19/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index f688273..b0958c6 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -97,6 +97,9 @@ cd test %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.1.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7dff445abe91df3833c55693ca698076dbd981a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:37:35 +0000 Subject: [PATCH 20/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index b0958c6..ba96408 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -97,6 +97,9 @@ cd test %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.1.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 46cdd4064917eabe3cb428df1b47c6cf6b78f036 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:28:56 +0000 Subject: [PATCH 21/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yajl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index ba96408..5f0c9c3 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Yet Another JSON Library (YAJL) License: ISC @@ -97,6 +97,9 @@ cd test %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.1.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.1.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ac43ac7377fd2c2f947f8c6dc5ae454d10d745f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 17 Jul 2025 11:15:33 +0100 Subject: [PATCH 22/28] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++ yajl.spec | 114 +----------------------------------------------------- 2 files changed, 113 insertions(+), 112 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a99b726 --- /dev/null +++ b/changelog @@ -0,0 +1,111 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 2.1.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.1.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 +- Switch to using git for managing patches +- Fix potential buffer overread (CVE-2017-16516) +- Fix integer overflow leading to heap corruption (CVE-2022-24795) +- Fix multiple memory leaks (CVE-2023-33460) + +* Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.1.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 2.1.0-9 +- Switch to %%ldconfig_scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 2.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 28 2014 Daniel P. Berrange - 2.1.0-1 +- Update to 2.1.0 release (rhbz #1080935) + +* Sun Aug 04 2013 Fedora Release Engineering - 2.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Aug 6 2012 Daniel P. Berrange - 2.0.4-1 +- Update to 2.0.4 release (rhbz #845777) +- Fix License tag to reflect change in 2.0.0 series from BSD to ISC + +* Sun Jul 22 2012 Fedora Release Engineering - 2.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 10 2011 Daniel P. Berrange - 2.0.1-1 +- Update to 2.0.1 release + +* Tue May 3 2011 Daniel P. Berrange - 1.0.12-1 +- Update to 1.0.12 release + +* Fri Dec 17 2010 Daniel P. Berrange - 1.0.11-1 +- Update to 1.0.11 release + +* Mon Jan 11 2010 Daniel P. Berrange - 1.0.7-3 +- Fix ignoring of cflags (rhbz #547500) + +* Tue Dec 8 2009 Daniel P. Berrange - 1.0.7-2 +- Change use of 'define' to 'global' + +* Mon Dec 7 2009 Daniel P. Berrange - 1.0.7-1 +- Initial Fedora package diff --git a/yajl.spec b/yajl.spec index 5f0c9c3..f9580b2 100644 --- a/yajl.spec +++ b/yajl.spec @@ -3,7 +3,7 @@ Name: yajl Version: 2.1.0 -Release: 25%{?dist} +Release: %autorelease Summary: Yet Another JSON Library (YAJL) License: ISC @@ -97,114 +97,4 @@ cd test %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 2.1.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 2.1.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 10 2023 Daniel P. Berrangé - 2.1.0-21 -- Switch to using git for managing patches -- Fix potential buffer overread (CVE-2017-16516) -- Fix integer overflow leading to heap corruption (CVE-2022-24795) -- Fix multiple memory leaks (CVE-2023-33460) - -* Sat Jan 21 2023 Fedora Release Engineering - 2.1.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.1.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 2.1.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.1.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.1.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.1.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 2.1.0-9 -- Switch to %%ldconfig_scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 2.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 28 2014 Daniel P. Berrange - 2.1.0-1 -- Update to 2.1.0 release (rhbz #1080935) - -* Sun Aug 04 2013 Fedora Release Engineering - 2.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Aug 6 2012 Daniel P. Berrange - 2.0.4-1 -- Update to 2.0.4 release (rhbz #845777) -- Fix License tag to reflect change in 2.0.0 series from BSD to ISC - -* Sun Jul 22 2012 Fedora Release Engineering - 2.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Nov 10 2011 Daniel P. Berrange - 2.0.1-1 -- Update to 2.0.1 release - -* Tue May 3 2011 Daniel P. Berrange - 1.0.12-1 -- Update to 1.0.12 release - -* Fri Dec 17 2010 Daniel P. Berrange - 1.0.11-1 -- Update to 1.0.11 release - -* Mon Jan 11 2010 Daniel P. Berrange - 1.0.7-3 -- Fix ignoring of cflags (rhbz #547500) - -* Tue Dec 8 2009 Daniel P. Berrange - 1.0.7-2 -- Change use of 'define' to 'global' - -* Mon Dec 7 2009 Daniel P. Berrange - 1.0.7-1 -- Initial Fedora package +%autochangelog From fead44c7e74d80653bf005332a09166faea1e6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 17 Jul 2025 11:15:54 +0100 Subject: [PATCH 23/28] Adapt to changed cmake version Fixes FTBFS https://bugzilla.redhat.com/show_bug.cgi?id=2381648 --- yajl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yajl.spec b/yajl.spec index f9580b2..e74d88c 100644 --- a/yajl.spec +++ b/yajl.spec @@ -55,6 +55,7 @@ necessary for developing against the YAJL library %autosetup -S git_am %build +export CMAKE_POLICY_VERSION_MINIMUM=3.5 # NB, we are not using upstream's 'configure'/'make' # wrapper, instead we use cmake directly to better # align with Fedora standards From f9c04420401dbe64f843ba6d87964d0f8a33d0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 17 Jul 2025 11:46:39 +0100 Subject: [PATCH 24/28] Re-add cmake path variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes FTBFS in https://bugzilla.redhat.com/show_bug.cgi?id=2381684 Signed-off-by: Daniel P. Berrangé --- yajl.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yajl.spec b/yajl.spec index e74d88c..16c77ea 100644 --- a/yajl.spec +++ b/yajl.spec @@ -59,7 +59,14 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 # NB, we are not using upstream's 'configure'/'make' # wrapper, instead we use cmake directly to better # align with Fedora standards -%cmake +%cmake \ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} + %endif %cmake_build From f3961701ecb698317710b778ea6756ada9e0087b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:09:52 +0000 Subject: [PATCH 25/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d49b1916ea2333ea43303925340b512faf4f783b Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 11 Nov 2025 14:39:25 +0100 Subject: [PATCH 26/28] Allow to build with CMake 4.0 (rhbz#2381648) --- 0009-Allow-cmake-4.0.patch | 66 ++++++++++++++++++++++++++++++++++++++ yajl.spec | 8 ++--- 2 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 0009-Allow-cmake-4.0.patch diff --git a/0009-Allow-cmake-4.0.patch b/0009-Allow-cmake-4.0.patch new file mode 100644 index 0000000..e447252 --- /dev/null +++ b/0009-Allow-cmake-4.0.patch @@ -0,0 +1,66 @@ +From 6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 09:31:40 +0000 +Subject: [PATCH] Allow build with CMake 4.0.0 + +fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE +update cmake supported minimum versions to 2.8.0...3.10 + +ref: +- https://cmake.org/cmake/help/latest/policy/CMP0026.html + +CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY): + The LOCATION property may not be read from target "json_...". Use the + target name directly with add_custom_command, or use the generator + expression $, as appropriate. + +Signed-off-by: Rudi Heitbaum +--- + CMakeLists.txt | 2 +- + reformatter/CMakeLists.txt | 4 +--- + verify/CMakeLists.txt | 4 +--- + 3 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471eee13..deba3a40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10) + + PROJECT(YetAnotherJSONParser C) + +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 52a9bee8..267d02e2 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -35,9 +35,7 @@ IF (NOT WIN32) + ENDIF (NOT WIN32) + + # copy the binary into the output directory +-GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 967fca16..2f390082 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS}) + TARGET_LINK_LIBRARIES(json_verify yajl) + + # copy in the binary +-GET_TARGET_PROPERTY(binPath json_verify LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff --git a/yajl.spec b/yajl.spec index 16c77ea..b26d952 100644 --- a/yajl.spec +++ b/yajl.spec @@ -29,6 +29,8 @@ Patch: 0005-Fix-for-CVE-2017-16516.patch Patch: 0006-Fix-CVE-2022-24795.patch Patch: 0007-yajl-fix-memory-leak-problem.patch Patch: 0008-fix-memory-leaks.patch +# Cherry-picked from: https://github.com/lloyd/yajl/pull/256.patch +Patch: 0009-Allow-cmake-4.0.patch BuildRequires: gcc BuildRequires: cmake @@ -55,18 +57,14 @@ necessary for developing against the YAJL library %autosetup -S git_am %build -export CMAKE_POLICY_VERSION_MINIMUM=3.5 # NB, we are not using upstream's 'configure'/'make' # wrapper, instead we use cmake directly to better # align with Fedora standards %cmake \ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ %if "%{?_lib}" == "lib64" %{?_cmake_lib_suffix64} %endif + %cmake_build From 33f28e0c2979994bb2e6e8f23f3d1ca325fd3a01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:59:38 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ace9a63c34f56b5f7c6f9ebf3a32d3281880c695 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:32:07 +0000 Subject: [PATCH 28/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild