From bb3d288a2d004dc0283ea12ad5f1070cb43826ce Mon Sep 17 00:00:00 2001 From: jikai Date: Wed, 15 Nov 2023 11:44:19 +0800 Subject: [PATCH] sync from upstream Signed-off-by: jikai --- ...-51-version-support-cni_version_info.patch | 52 +++++++++++++++++++ ...Remove-duplicate-free-err-code-lines.patch | 40 ++++++++++++++ clibcni.spec | 10 +++- 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 0002-51-version-support-cni_version_info.patch create mode 100644 0003-50-Remove-duplicate-free-err-code-lines.patch diff --git a/0002-51-version-support-cni_version_info.patch b/0002-51-version-support-cni_version_info.patch new file mode 100644 index 0000000..c403efa --- /dev/null +++ b/0002-51-version-support-cni_version_info.patch @@ -0,0 +1,52 @@ +From 26f8126da02bd2d6bd099ab53988a8d1d6fa69e0 Mon Sep 17 00:00:00 2001 +From: liuxu +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 + diff --git a/0003-50-Remove-duplicate-free-err-code-lines.patch b/0003-50-Remove-duplicate-free-err-code-lines.patch new file mode 100644 index 0000000..53a1fc7 --- /dev/null +++ b/0003-50-Remove-duplicate-free-err-code-lines.patch @@ -0,0 +1,40 @@ +From 97c54727a85a7046fb93b9c0de5946b7c7c9fad7 Mon Sep 17 00:00:00 2001 +From: ziven +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 + diff --git a/clibcni.spec b/clibcni.spec index 1757966..6e89b99 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.0.7 -%global _release 8 +%global _release 9 Name: clibcni Version: %{_version} Release: %{_release} @@ -11,6 +11,8 @@ Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.ta 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 @@ -89,6 +91,12 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Nov 15 2023 jikai - 2.0.7-9 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: sync from upstream + * Fri May 19 2023 zhangxiaoyu - 2.0.7-8 - Type: bugfix - ID: NA -- Gitee