diff --git a/0019-fix-invalid-usage-of-arrtibute-visibility.patch b/0019-fix-invalid-usage-of-arrtibute-visibility.patch new file mode 100644 index 0000000000000000000000000000000000000000..a1c37c782e90abaea91eef5bea9b00b6c0b619c6 --- /dev/null +++ b/0019-fix-invalid-usage-of-arrtibute-visibility.patch @@ -0,0 +1,76 @@ +From 57d2fe1b26429490b61d09dc8402024dc51b4386 Mon Sep 17 00:00:00 2001 +From: yuncang123 <1050706328@qq.com> +Date: Tue, 27 Aug 2024 14:39:33 +0800 +Subject: [PATCH 19/20] fix invalid usage of arrtibute'visibility' + +--- + src/runtime/lcrcontainer.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/runtime/lcrcontainer.h b/src/runtime/lcrcontainer.h +index d4cef39..4eedec9 100644 +--- a/src/runtime/lcrcontainer.h ++++ b/src/runtime/lcrcontainer.h +@@ -40,13 +40,13 @@ extern "C" { + + /* define console log config */ + +-__EXPORT__ struct lcr_console_config { ++struct lcr_console_config { + char *log_path; + unsigned int log_rotate; + char *log_file_size; + }; + +-__EXPORT__ struct blkio_stats { ++struct blkio_stats { + uint64_t read; + uint64_t write; + uint64_t total; +@@ -55,7 +55,7 @@ __EXPORT__ struct blkio_stats { + /* + * Store lcr container state + */ +-__EXPORT__ struct lcr_container_state { ++struct lcr_container_state { + /* Name of container */ + char *name; + /* State of container */ +@@ -92,14 +92,14 @@ typedef enum { + lcr_msg_exit_code, + } lcr_msg_type_t; + +-__EXPORT__ struct lcr_msg { ++struct lcr_msg { + lcr_msg_type_t type; + char name[NAME_MAX + 1]; + int value; + int pid; + }; + +-__EXPORT__ struct lcr_cgroup_resources { ++struct lcr_cgroup_resources { + uint64_t blkio_weight; + uint64_t cpu_shares; + uint64_t cpu_period; +@@ -150,7 +150,7 @@ __EXPORT__ bool lcr_create(const char *name, const char *lcrpath, void *oci_conf + * gid : user in which group + * additional_gids : Add additional groups to join + */ +-__EXPORT__ struct lcr_start_request { ++struct lcr_start_request { + const char *name; + const char *lcrpath; + +@@ -237,7 +237,7 @@ __EXPORT__ void lcr_free_console_config(struct lcr_console_config *config); + __EXPORT__ int lcr_log_init(const char *name, const char *file, const char *priority, + const char *prefix, int quiet, const char *lcrpath); + +-__EXPORT__ struct lcr_exec_request { ++struct lcr_exec_request { + const char *name; + const char *lcrpath; + +-- +2.33.0 + diff --git a/0020-unify-nri-variable-format.patch b/0020-unify-nri-variable-format.patch new file mode 100644 index 0000000000000000000000000000000000000000..bfd88a2e16a5f5f003b7b0de99d72451ecca6653 --- /dev/null +++ b/0020-unify-nri-variable-format.patch @@ -0,0 +1,42 @@ +From 6fd7cdec3c383461695f45e96d59353c68ecf286 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Wed, 4 Sep 2024 10:38:08 +0800 +Subject: [PATCH 20/20] unify nri variable format + +Signed-off-by: zhongtao +--- + src/json/schema/isulad-daemon-configs.json | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json +index 7b148bd..e21c3cf 100644 +--- a/src/json/schema/isulad-daemon-configs.json ++++ b/src/json/schema/isulad-daemon-configs.json +@@ -106,19 +106,19 @@ + "disable-connections" : { + "type": "boolean" + }, +- "plugin_config_path": { ++ "plugin-config-path": { + "type": "string" + }, +- "plugin_path": { ++ "plugin-path": { + "type": "string" + }, +- "nri_socket_path": { ++ "nri-socket-path": { + "type": "string" + }, +- "plugin_registration_timeout": { ++ "plugin-registration-timeout": { + "type": "uint64" + }, +- "plugin_requst_timeout": { ++ "plugin-requst-timeout": { + "type": "uint64" + }, + "image-layer-check": { +-- +2.33.0 + diff --git a/lcr.spec b/lcr.spec index 4b25300a635a3eabcdcdd770040802c68a370ec1..8204f49ff6160b61d8755eec89899e3c394b4a81 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.1.4 -%global _release 10 +%global _release 11 %global _inner_name isula_libutils %global enable_lxc 1 @@ -31,6 +31,8 @@ Patch0015: 0015-fix-invalid-args-len-set-in-execute_lxc_attach.patch Patch0016: 0016-add-nri-definitions.patch Patch0017: 0017-add-struct-for-nri.patch Patch0018: 0018-add-nri-def-in-host-config.patch +Patch0019: 0019-fix-invalid-usage-of-arrtibute-visibility.patch +Patch0020: 0020-unify-nri-variable-format.patch %define lxcver_lower 4.0.3-2022102400 %define lxcver_upper 5.0.3 @@ -151,6 +153,12 @@ rm -rf %{buildroot} %{_includedir}/lcr/utils_compile.h %changelog +* Thu Oct 17 2024 wujichao - 2.1.4-11 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix-invalid-usage-of-arrtibute-visibility and Unify-nri-variable-format + * Mon Aug 19 2024 zhongtao - 2.1.4-10 - Type:enhancement - CVE:NA