!169 Update to 2.1.0

From: @jikai11 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian

0001-modify-liblcr-to-libisula.patch

@@ -1,57 +0,0 @@
-From 92ded2cf442878a3d387f6d3f79e74595c785790 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Tue, 7 Feb 2023 14:57:40 +0800
-Subject: [PATCH] modify liblcr to libisula
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- CMakeLists.txt      | 2 +-
- clibcni.spec        | 4 ++--
- cmake/checker.cmake | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f87de1d..c2c5b13 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ else()
-   set(LIB_INSTALL_DIR_DEFAULT "lib")
- endif()
- 
--# set liblcr compile flags
-+# set libisula compile flags
- if (CLIBCNI_GCOV)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_OPTION} -fprofile-arcs -ftest-coverage -fkeep-static-functions -fkeep-inline-functions")
-     message("------compile with gcov-------------")
-diff --git a/clibcni.spec b/clibcni.spec
-index 7ec45d1..3e9de91 100644
---- a/clibcni.spec
-+++ b/clibcni.spec
-@@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
- 
- BuildRequires: gcc
- BuildRequires: cmake
--BuildRequires: lcr-devel yajl-devel gtest-devel
-+BuildRequires: libisula-devel yajl-devel gtest-devel
- 
--Requires:      lcr
-+Requires:      libisula
- 
- %ifarch x86_64 aarch64
- Provides:       lib%{name}.so()(64bit)
-diff --git a/cmake/checker.cmake b/cmake/checker.cmake
-index 4198c94..85d2b9a 100644
---- a/cmake/checker.cmake
-+++ b/cmake/checker.cmake
-@@ -12,7 +12,7 @@ endmacro()
- 
- 
- # check iSula libutils
--pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "lcr")
-+pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "libisula")
- find_path(ISULA_LIBUTILS_INCLUDE_DIR isula_libutils/log.h
- 	HINTS ${PC_ISULA_LIBUTILS_INCLUDEDIR} ${PC_ISULA_LIBUTILS_INCLUDE_DIRS})
- _CHECK(ISULA_LIBUTILS_INCLUDE_DIR "ISULA_LIBUTILS_INCLUDE_DIR-NOTFOUND" "isula_libutils/log.h")
--- 
-2.25.1
-

0002-51-version-support-cni_version_info.patch

@@ -1,52 +0,0 @@
-From 26f8126da02bd2d6bd099ab53988a8d1d6fa69e0 Mon Sep 17 00:00:00 2001
-From: liuxu <liuxu156@huawei.com>
-Date: Wed, 15 Nov 2023 03:30:07 +0000
-Subject: [PATCH 10/11] !51 version:support cni_version_info * version:support
- cni_version_info
-
----
- src/version/version.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/version/version.c b/src/version/version.c
-index 058e30f..891f00f 100644
---- a/src/version/version.c
-+++ b/src/version/version.c
-@@ -20,7 +20,7 @@
- 
- #include "version.h"
- #include "utils.h"
--#include "isula_libutils/cni_version.h"
-+#include "isula_libutils/cni_version_info.h"
- #include "isula_libutils/cni_inner_plugin_info.h"
- #include "types.h"
- #include "current.h"
-@@ -161,14 +161,14 @@ out:
- char *cniversion_decode(const char *jsonstr, char **errmsg)
- {
-     parser_error err = NULL;
--    cni_version *conf = NULL;
-+    cni_version_info *conf = NULL;
-     char *result = NULL;
-     int nret = 0;
- 
-     if (errmsg == NULL) {
-         return NULL;
-     }
--    conf = cni_version_parse_data(jsonstr, NULL, &err);
-+    conf = cni_version_info_parse_data(jsonstr, NULL, &err);
-     if (conf == NULL) {
-         nret = asprintf(errmsg, "decoding config \"%s\", failed: %s", jsonstr, err);
-         if (nret < 0) {
-@@ -185,7 +185,7 @@ char *cniversion_decode(const char *jsonstr, char **errmsg)
-     result = clibcni_util_strdup_s(conf->cni_version);
- out:
-     free(err);
--    free_cni_version(conf);
-+    free_cni_version_info(conf);
-     return result;
- }
- 
--- 
-2.33.0
-

0003-50-Remove-duplicate-free-err-code-lines.patch

@@ -1,40 +0,0 @@
-From 97c54727a85a7046fb93b9c0de5946b7c7c9fad7 Mon Sep 17 00:00:00 2001
-From: ziven <qinzhiben@uniontech.com>
-Date: Wed, 15 Nov 2023 03:31:44 +0000
-Subject: [PATCH 11/11] !50 Remove duplicate free err code lines * Remove
- duplicate free err code lines
-
----
- tests/api_llt.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/tests/api_llt.cpp b/tests/api_llt.cpp
-index 5ea7c09..82d5e9f 100644
---- a/tests/api_llt.cpp
-+++ b/tests/api_llt.cpp
-@@ -74,7 +74,6 @@ TEST(api_testcases, cni_conflist_from_bytes)
-     if (ret != 0) {
-         std::cout << "conflist parse failed:" << err << std::endl;
-     }
--    free(err);
-     std::cout << new_list->bytes << std::endl;
- 
-     api_check_network_config_list(new_list, "default", true);
-@@ -140,7 +139,6 @@ TEST(api_testcases, cni_conflist_from_conf)
-     if (ret != 0) {
-         std::cout << "conflist parse failed:" << err << std::endl;
-     }
--    free(err);
-     std::cout << new_list->bytes << std::endl;
- 
-     api_check_network_config_list_from_conf(new_list, "default", true);
-@@ -557,4 +555,4 @@ TEST(api_testcases, free_runtime_conf)
-     rc->p_mapping[1] = (struct cni_port_mapping *)calloc(sizeof(struct cni_port_mapping), 1);
- 
-     free_runtime_conf(rc);
--}
-\ No newline at end of file
-+}
--- 
-2.33.0
-

clibcni.spec

@@ -1,5 +1,5 @@
-%global _version 2.0.7
-%global _release 9
+%global _version 2.1.0
+%global _release 1
 Name:      clibcni
 Version:   %{_version}
 Release:   %{_release}
@@ -10,10 +10,6 @@ URL:       https://gitee.com/openeuler/clibcni
 Source0:   https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
-Patch0001:	0001-modify-liblcr-to-libisula.patch
-Patch0002:	0002-51-version-support-cni_version_info.patch
-Patch0003:	0003-50-Remove-duplicate-free-err-code-lines.patch
-
 %define libisulaver_lower 2.1.1-0
 
 BuildRequires: gcc git gcc-c++
@@ -91,6 +87,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Nov 16 2023 jikai <jikai11@huawei.com> - 2.1.0-1
+- Type: enhancement
+- ID: NA
+- SUG: NA
+- DESC: Update to 2.1.0
+
 * Wed Nov 15 2023 jikai <jikai11@huawei.com> - 2.0.7-9
 - Type: enhancement
 - ID: NA