From 7076df95c2fb5a7f04a853c4ed7ca3b7a2ad964d Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 19 Dec 2020 10:58:54 +0800 Subject: [PATCH 1/2] [patch tracking] 20201219105849769810 - https://github.com/json-c/json-c/commit/1fcb9e476b3542e91988832f30a0527eea8c77a3 --- 1fcb9e476b3542e91988832f30a0527eea8c77a3.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 1fcb9e476b3542e91988832f30a0527eea8c77a3.patch diff --git a/1fcb9e476b3542e91988832f30a0527eea8c77a3.patch b/1fcb9e476b3542e91988832f30a0527eea8c77a3.patch new file mode 100644 index 0000000..3d9e41c --- /dev/null +++ b/1fcb9e476b3542e91988832f30a0527eea8c77a3.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2333d08f6a..892aebb8e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -269,7 +269,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h") + configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in ${PROJECT_BINARY_DIR}/json_config.h) + message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h") + +-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") ++if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") + if ("${DISABLE_WERROR}" STREQUAL "OFF") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -- Gitee From 63191a12e8efe39480b7317b29a0dabfab1c3695 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 19 Dec 2020 10:58:55 +0800 Subject: [PATCH 2/2] [patch tracking] 20201219105849769810 - update spec file --- json-c.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/json-c.spec b/json-c.spec index 5fca26b..886b2e7 100644 --- a/json-c.spec +++ b/json-c.spec @@ -6,7 +6,7 @@ Name: json-c Version: 0.13.1 -Release: 8 +Release: 9 Summary: JSON implementation in C License: MIT @@ -27,6 +27,7 @@ Patch6004: 0002-Issue-486-append-a-missing-.0-to-negative-double-val.patch Patch9000: bugfix-json-c-support_aarch64.patch Patch6005: json-c-bugfix-against-INT64_MAX.patch Patch6006: CVE-2020-12762.patch +Patch9001: 1fcb9e476b3542e91988832f30a0527eea8c77a3.patch BuildRequires: libtool %description @@ -110,6 +111,9 @@ end %doc %{_pkgdocdir} %changelog +* 20201219105849769810 patch-tracking 0.13.1-9 +- append patch file of upstream repository from <1fcb9e476b3542e91988832f30a0527eea8c77a3> to <1fcb9e476b3542e91988832f30a0527eea8c77a3> + * Mon Jul 21 2020 wangye - 0.13.1-8 - fix hardlink path @@ -123,4 +127,4 @@ end - bugfix in oss-fuzz * Thu Sep 19 2019 openEuler Buildteam - 0.13.1-4 -- Package init +- Package init \ No newline at end of file -- Gitee