Package: yajl Version: 2.1.0-5 Severity: normal Tags: patch pending X-Debbugs-CC: [email protected], [email protected]
Dear maintainer, I've prepared an NMU for yajl (versioned as 2.1.0-5.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Cheers, Flo
diff -Nru yajl-2.1.0/debian/changelog yajl-2.1.0/debian/changelog --- yajl-2.1.0/debian/changelog 2023-07-11 00:08:58.000000000 +0200 +++ yajl-2.1.0/debian/changelog 2025-12-29 18:35:45.000000000 +0100 @@ -1,3 +1,16 @@ +yajl (2.1.0-5.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Helmut Grohne ] + * Fix FTCBFS: Stop using dpkg-cross' toolchain file. (Closes: #1116697) + + [ Florian Ernst ] + * add d/patches/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch to fix FTBFS + with CMake 4 (Closes: #1113652) + + -- Florian Ernst <[email protected]> Mon, 29 Dec 2025 18:35:45 +0100 + yajl (2.1.0-5) unstable; urgency=medium * The patch for CVE-2023-33460 turned out to be incomplete. Fix that. diff -Nru yajl-2.1.0/debian/patches/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch yajl-2.1.0/debian/patches/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch --- yajl-2.1.0/debian/patches/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch 1970-01-01 01:00:00.000000000 +0100 +++ yajl-2.1.0/debian/patches/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch 2025-12-29 18:33:17.000000000 +0100 @@ -0,0 +1,68 @@ +From: Rudi Heitbaum <[email protected]> +Date: Fri, 28 Mar 2025 09:31:40 +0000 +Origin: https://github.com/lloyd/yajl/pull/256/commits/6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9 +Bug: https://github.com/lloyd/yajl/issues/254 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1113652 +Description: [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 $<TARGET_FILE>, as appropriate. + . + Signed-off-by: Rudi Heitbaum <[email protected]> +--- + CMakeLists.txt | 2 +- + reformatter/CMakeLists.txt | 4 +--- + verify/CMakeLists.txt | 4 +--- + 3 files changed, 3 insertions(+), 7 deletions(-) + +Index: yajl-2.1.0/CMakeLists.txt +=================================================================== +--- yajl-2.1.0.orig/CMakeLists.txt ++++ yajl-2.1.0/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) + +Index: yajl-2.1.0/reformatter/CMakeLists.txt +=================================================================== +--- yajl-2.1.0.orig/reformatter/CMakeLists.txt ++++ yajl-2.1.0/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 $<TARGET_FILE:json_reformat> ${binDir}) + + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +Index: yajl-2.1.0/verify/CMakeLists.txt +=================================================================== +--- yajl-2.1.0.orig/verify/CMakeLists.txt ++++ yajl-2.1.0/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 $<TARGET_FILE:json_verify> ${binDir}) + + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff -Nru yajl-2.1.0/debian/patches/series yajl-2.1.0/debian/patches/series --- yajl-2.1.0/debian/patches/series 2023-07-09 03:14:28.000000000 +0200 +++ yajl-2.1.0/debian/patches/series 2025-12-29 18:25:35.000000000 +0100 @@ -3,3 +3,4 @@ CVE-2017-16516.patch CVE-2022-24795.patch CVE-2023-33460.patch +6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9.patch diff -Nru yajl-2.1.0/debian/rules yajl-2.1.0/debian/rules --- yajl-2.1.0/debian/rules 2023-07-09 01:50:23.000000000 +0200 +++ yajl-2.1.0/debian/rules 2025-12-29 18:23:59.000000000 +0100 @@ -13,10 +13,6 @@ # Needed if building with clang export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -CROSS_CONFIG := -DCMAKE_TOOLCHAIN_FILE="/etc/dpkg-cross/cmake/CMakeCross.txt" -endif - %: dh $@
signature.asc
Description: PGP signature
