diff --git a/0015-fix-undefined-reference-to-service_arguments_free-in.patch b/0015-fix-undefined-reference-to-service_arguments_free-in.patch new file mode 100644 index 0000000..681db0a --- /dev/null +++ b/0015-fix-undefined-reference-to-service_arguments_free-in.patch @@ -0,0 +1,26 @@ +From 08a39a58fe36af1705df60373789d23d258d8327 Mon Sep 17 00:00:00 2001 +From: WangFengTu +Date: Fri, 3 Dec 2021 09:32:39 +0800 +Subject: [PATCH] fix undefined reference to `service_arguments_free' in + libisulad_img.so + +Signed-off-by: WangFengTu +--- + src/daemon/modules/image/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt +index 0a004835..14ce571d 100644 +--- a/src/daemon/modules/image/CMakeLists.txt ++++ b/src/daemon/modules/image/CMakeLists.txt +@@ -72,6 +72,7 @@ add_library(${LIB_ISULAD_IMG} ${LIBTYPE} + ${CMAKE_SOURCE_DIR}/src/utils/tar/util_archive.c + ${CMAKE_SOURCE_DIR}/src/utils/tar/util_gzip.c + ${CMAKE_SOURCE_DIR}/src/daemon/config/isulad_config.c ++ ${CMAKE_SOURCE_DIR}/src/daemon/config/daemon_arguments.c + ) + + target_include_directories(${LIB_ISULAD_IMG} PUBLIC +-- +2.25.1 + diff --git a/iSulad.spec b/iSulad.spec index 9a2c139..4953008 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.10 -%global _release 7 +%global _release 9 %global is_systemd 1 %global enable_shimv2 1 @@ -26,6 +26,7 @@ Patch0011: 0011-add-fuzz-build-in-CI.patch Patch0012: 0012-print-valgrind-log.patch Patch0013: 0013-fix-cri-version-memory-leak.patch Patch0014: 0014-fix-undefined-reference-in-libisulad_img.so.patch +Patch0015: 0015-fix-undefined-reference-to-service_arguments_free-in.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -44,7 +45,12 @@ Requires(preun): chkconfig Requires(preun): initscripts %endif -BuildRequires: cmake gcc-c++ lxc lxc-devel lcr-devel yajl-devel clibcni-devel +%define lcrver 2.0.6 +%define clibcniver 2.0.6 + + +BuildRequires: lcr-devel >= %{lcrver} clibcni-devel >= %{clibcniver} +BuildRequires: cmake gcc-c++ yajl-devel lxc lxc-devel BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel BuildRequires: libcurl libcurl-devel sqlite-devel libarchive-devel device-mapper-devel BuildRequires: http-parser-devel @@ -54,8 +60,9 @@ BuildRequires: systemd-devel git chrpath BuildRequires: lib-shim-v2 lib-shim-v2-devel %endif -Requires: lcr lxc clibcni -Requires: grpc protobuf + +Requires: clibcni >= %{clibcniver} lcr >= %{lcrver} +Requires: grpc protobuf lxc Requires: libcurl Requires: sqlite http-parser libseccomp Requires: libcap libselinux libwebsockets libarchive device-mapper @@ -239,6 +246,18 @@ fi %endif %changelog +* Mon Dec 06 2021 gaohuatao - 2.0.10-9 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: specify version + +* Thu Dec 03 2021 wangfengtu - 2.0.10-8 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: fix undefined reference to `service_arguments_free' in libisulad_img.so + * Thu Dec 02 2021 wangfengtu - 2.0.10-7 - Type: bugfix - ID: NA