diff --git a/0001-parse-userns-remap-in-daemmon.json.patch b/0001-parse-userns-remap-in-daemmon.json.patch deleted file mode 100644 index 217c7b4..0000000 --- a/0001-parse-userns-remap-in-daemmon.json.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b81f5bb96474bbe6b3afb36dcdbe9ddc27597a53 Mon Sep 17 00:00:00 2001 -From: HumbleHunger <2495970924@qq.com> -Date: Thu, 5 Aug 2021 17:40:12 +0800 -Subject: [PATCH 1/4] parse userns-remap in daemmon.json - -Signed-off-by: HumbleHunger <2495970924@qq.com> ---- - src/json/schema/isulad-daemon-configs.json | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json -index 1134d37..54946c8 100644 ---- a/src/json/schema/isulad-daemon-configs.json -+++ b/src/json/schema/isulad-daemon-configs.json -@@ -61,6 +61,9 @@ - "enable-plugins": { - "type": "string" - }, -+ "userns-remap": { -+ "type": "string" -+ }, - "cpu-rt-period": { - "type": "int64" - }, --- -2.20.1 - diff --git a/0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch b/0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch deleted file mode 100644 index 3cd2841..0000000 --- a/0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 91c988d01b96ba31ac495228a17644aa4aab47c9 Mon Sep 17 00:00:00 2001 -From: haozi007 -Date: Tue, 22 Mar 2022 07:24:11 +0000 -Subject: [PATCH 2/4] add rename json schema for rename subcommand in restful - mode - -Signed-off-by: haozi007 ---- - src/json/schema/container/rename-request.json | 12 ++++++++++++ - src/json/schema/container/rename-response.json | 15 +++++++++++++++ - 2 files changed, 27 insertions(+) - create mode 100644 src/json/schema/container/rename-request.json - create mode 100644 src/json/schema/container/rename-response.json - -diff --git a/src/json/schema/container/rename-request.json b/src/json/schema/container/rename-request.json -new file mode 100644 -index 0000000..35a6bd3 ---- /dev/null -+++ b/src/json/schema/container/rename-request.json -@@ -0,0 +1,12 @@ -+{ -+ "$schema": "http://json-schema.org/draft-04/schema#", -+ "type": "object", -+ "properties": { -+ "old-name": { -+ "type": "string" -+ }, -+ "new-name": { -+ "type": "string" -+ } -+ } -+} -diff --git a/src/json/schema/container/rename-response.json b/src/json/schema/container/rename-response.json -new file mode 100644 -index 0000000..048f43d ---- /dev/null -+++ b/src/json/schema/container/rename-response.json -@@ -0,0 +1,15 @@ -+{ -+ "$schema": "http://json-schema.org/draft-04/schema#", -+ "type": "object", -+ "properties": { -+ "id": { -+ "type": "string" -+ }, -+ "cc": { -+ "type": "uint32" -+ }, -+ "errmsg": { -+ "type": "string" -+ } -+ } -+} --- -2.20.1 - diff --git a/0003-Add-restful-interface-isula-pull.patch b/0003-Add-restful-interface-isula-pull.patch deleted file mode 100644 index 79d9cde..0000000 --- a/0003-Add-restful-interface-isula-pull.patch +++ /dev/null @@ -1,54 +0,0 @@ -From be04a305d16c91bb05011a9b8e88ec41f1a5f90e Mon Sep 17 00:00:00 2001 -From: "yanshui.li" -Date: Fri, 25 Mar 2022 03:04:59 +0000 -Subject: [PATCH 3/4] Add restful interface isula pull - ---- - src/json/schema/image/pull-image-request.json | 9 +++++++++ - src/json/schema/image/pull-image-response.json | 18 ++++++++++++++++++ - 2 files changed, 27 insertions(+) - create mode 100644 src/json/schema/image/pull-image-request.json - create mode 100644 src/json/schema/image/pull-image-response.json - -diff --git a/src/json/schema/image/pull-image-request.json b/src/json/schema/image/pull-image-request.json -new file mode 100644 -index 0000000..a1d81a7 ---- /dev/null -+++ b/src/json/schema/image/pull-image-request.json -@@ -0,0 +1,9 @@ -+{ -+ "$schema": "http://json-schema.org/draft-04/schema#", -+ "type": "object", -+ "properties": { -+ "image_name": { -+ "type": "string" -+ } -+ } -+} -diff --git a/src/json/schema/image/pull-image-response.json b/src/json/schema/image/pull-image-response.json -new file mode 100644 -index 0000000..86c429a ---- /dev/null -+++ b/src/json/schema/image/pull-image-response.json -@@ -0,0 +1,18 @@ -+{ -+ "$schema": "http://json-schema.org/draft-04/schema#", -+ "type": "object", -+ "properties": { -+ "image_ref": { -+ "type": "string" -+ }, -+ "cc": { -+ "type": "uint32" -+ }, -+ "server_errono": { -+ "type": "uint32" -+ }, -+ "errmsg": { -+ "type": "string" -+ } -+ } -+} --- -2.20.1 - diff --git a/0004-use-vsnprintf-to-replace-vsprintf.patch b/0004-use-vsnprintf-to-replace-vsprintf.patch deleted file mode 100644 index cc97941..0000000 --- a/0004-use-vsnprintf-to-replace-vsprintf.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 00abacb3321b85dfb75039b2af7a447500f62c8b Mon Sep 17 00:00:00 2001 -From: haozi007 -Date: Thu, 16 Jun 2022 07:38:43 +0100 -Subject: [PATCH 4/4] use vsnprintf to replace vsprintf - -Signed-off-by: haozi007 ---- - src/buffer.c | 2 +- - src/error.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/buffer.c b/src/buffer.c -index f9955d6..39e0360 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -194,7 +194,7 @@ int buffer_nappendf(Buffer *buf, size_t length, const char *format, ...) - } - - va_start(argp, format); -- status = vsprintf(tmp, format, argp); -+ status = vsnprintf(tmp, length, format, argp); - va_end(argp); - if (status < 0) { - goto error; -diff --git a/src/error.c b/src/error.c -index bed77d7..71c4856 100644 ---- a/src/error.c -+++ b/src/error.c -@@ -68,7 +68,7 @@ void lcr_set_error_message(lcr_errno_t errcode, const char *format, ...) - va_list argp; - va_start(argp, format); - -- ret = vsprintf(errbuf, format, argp); -+ ret = vsnprintf(errbuf, BUFSIZ, format, argp); - va_end(argp); - clear_error_message(&g_lcr_error); - if (ret < 0) { -@@ -89,7 +89,7 @@ void lcr_try_set_error_message(lcr_errno_t errcode, const char *format, ...) - return; - } - va_start(argp, format); -- ret = vsprintf(errbuf, format, argp); -+ ret = vsnprintf(errbuf, BUFSIZ, format, argp); - va_end(argp); - clear_error_message(&g_lcr_error); - if (ret < 0) { -@@ -109,7 +109,7 @@ void lcr_append_error_message(lcr_errno_t errcode, const char *format, ...) - va_list argp; - va_start(argp, format); - -- ret = vsprintf(errbuf, format, argp); -+ ret = vsnprintf(errbuf, BUFSIZ, format, argp); - va_end(argp); - if (ret < 0) { - g_lcr_error.errcode = LCR_ERR_FORMAT; --- -2.20.1 - diff --git a/lcr.spec b/lcr.spec index 9e3b3ce..7b58b90 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ -%global _version 2.0.7 -%global _release 4 +%global _version 2.0.8 +%global _release 1 %global _inner_name isula_libutils Name: lcr @@ -12,11 +12,6 @@ Group: Applications/System License: LGPLv2.1+ BuildRoot: %{_tmppath}/lcr-%{version} -Patch0001: 0001-parse-userns-remap-in-daemmon.json.patch -Patch0002: 0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch -Patch0003: 0003-Add-restful-interface-isula-pull.patch -Patch0004: 0004-use-vsnprintf-to-replace-vsprintf.patch - %define lxcver 4.0.3-2021112501 BuildRequires: cmake gcc gcc-c++ git @@ -104,6 +99,12 @@ rm -rf %{buildroot} %{_includedir}/%{_inner_name}/*.h %changelog +* Mon Jul 04 2022 czrz - 2.0.8-1 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: upgrade version to v2.0.8 + * Thu Jun 16 2022 haozi007 - 2.0.7-4 - Type:enhancement - ID:NA diff --git a/v2.0.7.tar.gz b/v2.0.7.tar.gz deleted file mode 100644 index f684d66..0000000 Binary files a/v2.0.7.tar.gz and /dev/null differ diff --git a/v2.0.8.tar.gz b/v2.0.8.tar.gz new file mode 100644 index 0000000..c357bf4 Binary files /dev/null and b/v2.0.8.tar.gz differ