From 420efb6f0864b58f5d2d73f6ebe3f91000d54cd8 Mon Sep 17 00:00:00 2001 From: jikai11 Date: Tue, 12 Sep 2023 12:11:13 +0000 Subject: [PATCH] Update from upstream Signed-off-by: jikai --- ...-reference-in-loop-in-listpodsandbox.patch | 10 +-- ... 0002-2156-Fix-sandbox-error-logging.patch | 2 +- 0002-fix-execlp-not-enough-args.patch | 54 -------------- ... 0003-2158-Use-crictl-v1.22.0-for-ci.patch | 2 +- ...2162-Fix-rename-issue-for-id-manager.patch | 2 +- ...> 0005-2163-add-bind-mount-file-lock.patch | 2 +- ...-bug.patch => 0006-2168-fix-code-bug.patch | 2 +- ...2171-Fix-nullptr-in-src-daemon-entry.patch | 2 +- ...h => 0008-Add-vsock-support-for-exec.patch | 2 +- ...=> 0009-remove-unneccessary-strerror.patch | 2 +- ...o-not-report-low-level-error-to-user.patch | 2 +- ...-of-strerror-with-user-defined-errno.patch | 2 +- ... 0012-use-gmtime_r-to-replace-gmtime.patch | 2 +- ...prove-report-error-message-of-client.patch | 2 +- ...adapt-new-error-message-for-isula-cp.patch | 2 +- ...-mutex-for-container-list-in-sandbox.patch | 2 +- ...0016-2180-fix-execlp-not-enough-args.patch | 2 +- ...-2135-modify-incorrect-variable-type.patch | 2 +- ...put-parameter-is-not-empty-and-optim.patch | 2 +- ...in-url-module-and-clean-sensitive-in.patch | 2 +- ...eck.patch => 0020-2153-fix-codecheck.patch | 2 +- ...patch => 0021-2157-bugfix-for-memset.patch | 2 +- ...to-isolate-the-password-option-of-lo.patch | 2 +- ...> 0023-2161-bugfix-for-api-cmakelist.patch | 2 +- ...the-use-of-insecure-isulad-tmpdir-di.patch | 2 +- ..._isulad_tmpdir_security-function-to-.patch | 2 +- ...s-to-isolate-isulad-s-enable_plugin-.patch | 2 +- ...n-path-for-fpath-and-verify-chain-id.patch | 2 +- ...permissions-of-tmpdir-and-file-lock-.patch | 2 +- ...-of-loaded-and-pulled-image-is-valid.patch | 2 +- ...atch => 0030-mask-proxy-informations.patch | 2 +- ... => 0031-add-testcase-for-isula-info.patch | 2 +- ...=> 0032-fix-oci-import-compile-error.patch | 2 +- iSulad.spec | 73 ++++++++++--------- 34 files changed, 75 insertions(+), 124 deletions(-) rename 0001-Use-reference-in-loop-in-listpodsandbox.patch => 0001-2155-Use-reference-in-loop-in-listpodsandbox.patch (80%) rename 0003-2156-Fix-sandbox-error-logging.patch => 0002-2156-Fix-sandbox-error-logging.patch (93%) delete mode 100644 0002-fix-execlp-not-enough-args.patch rename 0004-2158-Use-crictl-v1.22.0-for-ci.patch => 0003-2158-Use-crictl-v1.22.0-for-ci.patch (92%) rename 0005-2162-Fix-rename-issue-for-id-manager.patch => 0004-2162-Fix-rename-issue-for-id-manager.patch (98%) rename 0006-2163-add-bind-mount-file-lock.patch => 0005-2163-add-bind-mount-file-lock.patch (99%) rename 0007-2168-fix-code-bug.patch => 0006-2168-fix-code-bug.patch (99%) rename 0008-2171-Fix-nullptr-in-src-daemon-entry.patch => 0007-2171-Fix-nullptr-in-src-daemon-entry.patch (99%) rename 0009-Add-vsock-support-for-exec.patch => 0008-Add-vsock-support-for-exec.patch (99%) rename 0010-remove-unneccessary-strerror.patch => 0009-remove-unneccessary-strerror.patch (99%) rename 0011-do-not-report-low-level-error-to-user.patch => 0010-do-not-report-low-level-error-to-user.patch (99%) rename 0012-remove-usage-of-strerror-with-user-defined-errno.patch => 0011-remove-usage-of-strerror-with-user-defined-errno.patch (99%) rename 0013-use-gmtime_r-to-replace-gmtime.patch => 0012-use-gmtime_r-to-replace-gmtime.patch (97%) rename 0014-improve-report-error-message-of-client.patch => 0013-improve-report-error-message-of-client.patch (98%) rename 0015-adapt-new-error-message-for-isula-cp.patch => 0014-adapt-new-error-message-for-isula-cp.patch (97%) rename 0016-2182-Add-mutex-for-container-list-in-sandbox.patch => 0015-2182-Add-mutex-for-container-list-in-sandbox.patch (96%) rename 0017-2180-fix-execlp-not-enough-args.patch => 0016-2180-fix-execlp-not-enough-args.patch (97%) rename 0018-2135-modify-incorrect-variable-type.patch => 0017-2135-modify-incorrect-variable-type.patch (99%) rename 0019-make-sure-the-input-parameter-is-not-empty-and-optim.patch => 0018-make-sure-the-input-parameter-is-not-empty-and-optim.patch (99%) rename 0020-remove-password-in-url-module-and-clean-sensitive-in.patch => 0019-remove-password-in-url-module-and-clean-sensitive-in.patch (99%) rename 0021-2153-fix-codecheck.patch => 0020-2153-fix-codecheck.patch (99%) rename 0022-2157-bugfix-for-memset.patch => 0021-2157-bugfix-for-memset.patch (92%) rename 0023-2159-use-macros-to-isolate-the-password-option-of-lo.patch => 0022-2159-use-macros-to-isolate-the-password-option-of-lo.patch (99%) rename 0024-2161-bugfix-for-api-cmakelist.patch => 0023-2161-bugfix-for-api-cmakelist.patch (91%) rename 0025-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch => 0024-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch (98%) rename 0026-2166-move-ensure_isulad_tmpdir_security-function-to-.patch => 0025-2166-move-ensure_isulad_tmpdir_security-function-to-.patch (98%) rename 0027-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch => 0026-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch (98%) rename 0028-2178-clean-path-for-fpath-and-verify-chain-id.patch => 0027-2178-clean-path-for-fpath-and-verify-chain-id.patch (97%) rename 0029-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch => 0028-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch (93%) rename 0030-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch => 0029-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch (99%) rename 0031-mask-proxy-informations.patch => 0030-mask-proxy-informations.patch (98%) rename 0032-add-testcase-for-isula-info.patch => 0031-add-testcase-for-isula-info.patch (98%) rename 0033-fix-oci-import-compile-error.patch => 0032-fix-oci-import-compile-error.patch (93%) diff --git a/0001-Use-reference-in-loop-in-listpodsandbox.patch b/0001-2155-Use-reference-in-loop-in-listpodsandbox.patch similarity index 80% rename from 0001-Use-reference-in-loop-in-listpodsandbox.patch rename to 0001-2155-Use-reference-in-loop-in-listpodsandbox.patch index 25b0754..f78f5df 100644 --- a/0001-Use-reference-in-loop-in-listpodsandbox.patch +++ b/0001-2155-Use-reference-in-loop-in-listpodsandbox.patch @@ -1,9 +1,9 @@ -From 3f949cbfe601de10d813fd08a5ca58cdc5a7258e Mon Sep 17 00:00:00 2001 +From 8dacc4a2740ed3ba99fab88324c50fa37274297d Mon Sep 17 00:00:00 2001 From: xuxuepeng -Date: Tue, 29 Aug 2023 19:21:27 +0800 -Subject: [PATCH] Use reference in loop in listpodsandbox +Date: Tue, 29 Aug 2023 11:50:52 +0000 +Subject: [PATCH 01/32] !2155 Use reference in loop in listpodsandbox * Use + reference in loop in listpodsandbox -Signed-off-by: xuxuepeng --- src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -22,5 +22,5 @@ index 33b700f3..687f4e6d 100644 pod->set_id(sandbox->GetId()); -- -2.40.1 +2.33.0 diff --git a/0003-2156-Fix-sandbox-error-logging.patch b/0002-2156-Fix-sandbox-error-logging.patch similarity index 93% rename from 0003-2156-Fix-sandbox-error-logging.patch rename to 0002-2156-Fix-sandbox-error-logging.patch index 68430f2..90d201d 100644 --- a/0003-2156-Fix-sandbox-error-logging.patch +++ b/0002-2156-Fix-sandbox-error-logging.patch @@ -1,7 +1,7 @@ From cc6302549b722a5c309c90794afe27b2e7e7b29e Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Tue, 29 Aug 2023 13:18:13 +0000 -Subject: [PATCH 03/33] !2156 Fix sandbox error logging * Fix sandbox error +Subject: [PATCH 02/32] !2156 Fix sandbox error logging * Fix sandbox error logging --- diff --git a/0002-fix-execlp-not-enough-args.patch b/0002-fix-execlp-not-enough-args.patch deleted file mode 100644 index 1205b1f..0000000 --- a/0002-fix-execlp-not-enough-args.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cf814ba338f3fd52c9c1e5d187f34e971fab4deb Mon Sep 17 00:00:00 2001 -From: zhangxiaoyu -Date: Tue, 1 Aug 2023 15:05:55 +0800 -Subject: [PATCH] fix execlp not enough args - -Signed-off-by: zhangxiaoyu ---- - cmake/set_build_flags.cmake | 2 +- - test/fuzz/CMakeLists.txt | 2 +- - test/image/oci/oci_ut_common.cc | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmake/set_build_flags.cmake b/cmake/set_build_flags.cmake -index ba250cdc..09c85c65 100644 ---- a/cmake/set_build_flags.cmake -+++ b/cmake/set_build_flags.cmake -@@ -3,7 +3,7 @@ set(CMAKE_C_FLAGS "-fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wall -fP - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") - - if (GRPC_CONNECTOR) -- set(CMAKE_CXX_FLAGS "-fPIC -std=c++11 -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wall -Wno-error=deprecated-declarations") -+ set(CMAKE_CXX_FLAGS "-fPIC -std=c++17 -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wall -Wno-error=deprecated-declarations") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") - endif() - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-E -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -shared -pthread") -diff --git a/test/fuzz/CMakeLists.txt b/test/fuzz/CMakeLists.txt -index 478a4012..617a168f 100644 ---- a/test/fuzz/CMakeLists.txt -+++ b/test/fuzz/CMakeLists.txt -@@ -34,7 +34,7 @@ MESSAGE(STATUS "GCLANG_PP_BINARY is set to ${GCLANG_PP_BINARY}") - SET(CMAKE_C_COMPILER "${GCLANG_BINARY}") - SET(CMAKE_CXX_COMPILER "${GCLANG_PP_BINARY}") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fsanitize=fuzzer,address -fsanitize-coverage=indirect-calls,trace-cmp,trace-div,trace-gep") --SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 --coverage -std=c++11 -fsanitize=fuzzer,address -fsanitize-coverage=indirect-calls,trace-cmp,trace-div,trace-gep") -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 --coverage -std=c++17 -fsanitize=fuzzer,address -fsanitize-coverage=indirect-calls,trace-cmp,trace-div,trace-gep") - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - - SET(EXE0 test_volume_mount_spec_fuzz) -diff --git a/test/image/oci/oci_ut_common.cc b/test/image/oci/oci_ut_common.cc -index 1158ae85..9fa25d1c 100644 ---- a/test/image/oci/oci_ut_common.cc -+++ b/test/image/oci/oci_ut_common.cc -@@ -22,7 +22,7 @@ - - int execvp_success(const char *file, char * const argv[]) - { -- execlp("echo", "echo"); -+ execlp("echo", "echo", NULL); - return -1; - } - --- -2.25.1 - diff --git a/0004-2158-Use-crictl-v1.22.0-for-ci.patch b/0003-2158-Use-crictl-v1.22.0-for-ci.patch similarity index 92% rename from 0004-2158-Use-crictl-v1.22.0-for-ci.patch rename to 0003-2158-Use-crictl-v1.22.0-for-ci.patch index 48760a5..0dec410 100644 --- a/0004-2158-Use-crictl-v1.22.0-for-ci.patch +++ b/0003-2158-Use-crictl-v1.22.0-for-ci.patch @@ -1,7 +1,7 @@ From 384940dee7ed5bcc01014520b94917f5782f996e Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Wed, 30 Aug 2023 03:36:45 +0000 -Subject: [PATCH 04/33] !2158 Use crictl v1.22.0 for ci * Use crictl v1.22.0 +Subject: [PATCH 03/32] !2158 Use crictl v1.22.0 for ci * Use crictl v1.22.0 for ci --- diff --git a/0005-2162-Fix-rename-issue-for-id-manager.patch b/0004-2162-Fix-rename-issue-for-id-manager.patch similarity index 98% rename from 0005-2162-Fix-rename-issue-for-id-manager.patch rename to 0004-2162-Fix-rename-issue-for-id-manager.patch index 739bf13..28ec82c 100644 --- a/0005-2162-Fix-rename-issue-for-id-manager.patch +++ b/0004-2162-Fix-rename-issue-for-id-manager.patch @@ -1,7 +1,7 @@ From 0dbf21e22d51721e43fa2c1abecf30da271501c5 Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Thu, 31 Aug 2023 04:11:22 +0000 -Subject: [PATCH 05/33] !2162 Fix rename issue for id manager Merge pull +Subject: [PATCH 04/32] !2162 Fix rename issue for id manager Merge pull request !2162 from xuxuepeng/master --- diff --git a/0006-2163-add-bind-mount-file-lock.patch b/0005-2163-add-bind-mount-file-lock.patch similarity index 99% rename from 0006-2163-add-bind-mount-file-lock.patch rename to 0005-2163-add-bind-mount-file-lock.patch index a0a22bb..5082a5d 100644 --- a/0006-2163-add-bind-mount-file-lock.patch +++ b/0005-2163-add-bind-mount-file-lock.patch @@ -1,7 +1,7 @@ From c1c5159675073450fe13906771cec6f666053380 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Thu, 31 Aug 2023 13:14:02 +0000 -Subject: [PATCH 06/33] !2163 add bind mount file lock * add bind mount file +Subject: [PATCH 05/32] !2163 add bind mount file lock * add bind mount file lock --- diff --git a/0007-2168-fix-code-bug.patch b/0006-2168-fix-code-bug.patch similarity index 99% rename from 0007-2168-fix-code-bug.patch rename to 0006-2168-fix-code-bug.patch index 41c8670..53617e1 100644 --- a/0007-2168-fix-code-bug.patch +++ b/0006-2168-fix-code-bug.patch @@ -1,7 +1,7 @@ From f6c1ec5c8603124511c7a726a487757609a1d7a5 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Tue, 5 Sep 2023 02:15:57 +0000 -Subject: [PATCH 07/33] !2168 fix code bug * fix code bug +Subject: [PATCH 06/32] !2168 fix code bug * fix code bug --- src/daemon/common/events_format.c | 6 +- diff --git a/0008-2171-Fix-nullptr-in-src-daemon-entry.patch b/0007-2171-Fix-nullptr-in-src-daemon-entry.patch similarity index 99% rename from 0008-2171-Fix-nullptr-in-src-daemon-entry.patch rename to 0007-2171-Fix-nullptr-in-src-daemon-entry.patch index e957ae7..b394f99 100644 --- a/0008-2171-Fix-nullptr-in-src-daemon-entry.patch +++ b/0007-2171-Fix-nullptr-in-src-daemon-entry.patch @@ -1,7 +1,7 @@ From 290758ba7ee8ce9b1696628ee207bceed847d2d3 Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Tue, 5 Sep 2023 11:10:11 +0000 -Subject: [PATCH 08/33] !2171 Fix nullptr in src/daemon/entry * !2160 Fix +Subject: [PATCH 07/32] !2171 Fix nullptr in src/daemon/entry * !2160 Fix nullptr in src/daemon/entry --- diff --git a/0009-Add-vsock-support-for-exec.patch b/0008-Add-vsock-support-for-exec.patch similarity index 99% rename from 0009-Add-vsock-support-for-exec.patch rename to 0008-Add-vsock-support-for-exec.patch index a534dd1..ec130a9 100644 --- a/0009-Add-vsock-support-for-exec.patch +++ b/0008-Add-vsock-support-for-exec.patch @@ -1,7 +1,7 @@ From ee941bd9f7520eb1160d6fb8a80cca2552f5d990 Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Thu, 7 Sep 2023 20:11:55 +0800 -Subject: [PATCH 09/33] Add vsock support for exec +Subject: [PATCH 08/32] Add vsock support for exec Signed-off-by: xuxuepeng --- diff --git a/0010-remove-unneccessary-strerror.patch b/0009-remove-unneccessary-strerror.patch similarity index 99% rename from 0010-remove-unneccessary-strerror.patch rename to 0009-remove-unneccessary-strerror.patch index 5df93ab..d8da804 100644 --- a/0010-remove-unneccessary-strerror.patch +++ b/0009-remove-unneccessary-strerror.patch @@ -1,7 +1,7 @@ From 3536723347722180d8964edf7687bef6343edc77 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 4 Sep 2023 10:44:35 +0800 -Subject: [PATCH 10/33] remove unneccessary strerror +Subject: [PATCH 09/32] remove unneccessary strerror 1. use SYS-log to replace log; 2. remove unuseful strerror; diff --git a/0011-do-not-report-low-level-error-to-user.patch b/0010-do-not-report-low-level-error-to-user.patch similarity index 99% rename from 0011-do-not-report-low-level-error-to-user.patch rename to 0010-do-not-report-low-level-error-to-user.patch index 7681187..9eabe2f 100644 --- a/0011-do-not-report-low-level-error-to-user.patch +++ b/0010-do-not-report-low-level-error-to-user.patch @@ -1,7 +1,7 @@ From ab03fdd4261ebc11f18e3b783dfc38558e5247b5 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Wed, 6 Sep 2023 10:45:37 +0800 -Subject: [PATCH 11/33] do not report low level error to user +Subject: [PATCH 10/32] do not report low level error to user Signed-off-by: haozi007 --- diff --git a/0012-remove-usage-of-strerror-with-user-defined-errno.patch b/0011-remove-usage-of-strerror-with-user-defined-errno.patch similarity index 99% rename from 0012-remove-usage-of-strerror-with-user-defined-errno.patch rename to 0011-remove-usage-of-strerror-with-user-defined-errno.patch index b7ebdb6..a7635e1 100644 --- a/0012-remove-usage-of-strerror-with-user-defined-errno.patch +++ b/0011-remove-usage-of-strerror-with-user-defined-errno.patch @@ -1,7 +1,7 @@ From 16a4b6f334e4e81615a71cf7930158fb1bee5a12 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Wed, 6 Sep 2023 15:05:29 +0800 -Subject: [PATCH 12/33] remove usage of strerror with user defined errno +Subject: [PATCH 11/32] remove usage of strerror with user defined errno Signed-off-by: haozi007 --- diff --git a/0013-use-gmtime_r-to-replace-gmtime.patch b/0012-use-gmtime_r-to-replace-gmtime.patch similarity index 97% rename from 0013-use-gmtime_r-to-replace-gmtime.patch rename to 0012-use-gmtime_r-to-replace-gmtime.patch index ea63906..8ffd059 100644 --- a/0013-use-gmtime_r-to-replace-gmtime.patch +++ b/0012-use-gmtime_r-to-replace-gmtime.patch @@ -1,7 +1,7 @@ From ec04faff6fba052b5bb4ed0b090ae441f888ce5c Mon Sep 17 00:00:00 2001 From: haozi007 Date: Wed, 6 Sep 2023 16:31:19 +0800 -Subject: [PATCH 13/33] use gmtime_r to replace gmtime +Subject: [PATCH 12/32] use gmtime_r to replace gmtime Signed-off-by: haozi007 --- diff --git a/0014-improve-report-error-message-of-client.patch b/0013-improve-report-error-message-of-client.patch similarity index 98% rename from 0014-improve-report-error-message-of-client.patch rename to 0013-improve-report-error-message-of-client.patch index 2c6aee3..8dd1f1b 100644 --- a/0014-improve-report-error-message-of-client.patch +++ b/0013-improve-report-error-message-of-client.patch @@ -1,7 +1,7 @@ From a446152d676cf5616784e3f8f80dea8fd2ac221a Mon Sep 17 00:00:00 2001 From: haozi007 Date: Thu, 7 Sep 2023 14:34:01 +0800 -Subject: [PATCH 14/33] improve report error message of client +Subject: [PATCH 13/32] improve report error message of client Signed-off-by: haozi007 --- diff --git a/0015-adapt-new-error-message-for-isula-cp.patch b/0014-adapt-new-error-message-for-isula-cp.patch similarity index 97% rename from 0015-adapt-new-error-message-for-isula-cp.patch rename to 0014-adapt-new-error-message-for-isula-cp.patch index 260ab20..a8b0548 100644 --- a/0015-adapt-new-error-message-for-isula-cp.patch +++ b/0014-adapt-new-error-message-for-isula-cp.patch @@ -1,7 +1,7 @@ From aba6d26fe34b3bea5964bca25f081a240312f08b Mon Sep 17 00:00:00 2001 From: haozi007 Date: Thu, 7 Sep 2023 14:41:48 +0800 -Subject: [PATCH 15/33] adapt new error message for isula cp +Subject: [PATCH 14/32] adapt new error message for isula cp Signed-off-by: haozi007 --- diff --git a/0016-2182-Add-mutex-for-container-list-in-sandbox.patch b/0015-2182-Add-mutex-for-container-list-in-sandbox.patch similarity index 96% rename from 0016-2182-Add-mutex-for-container-list-in-sandbox.patch rename to 0015-2182-Add-mutex-for-container-list-in-sandbox.patch index 414d499..babf222 100644 --- a/0016-2182-Add-mutex-for-container-list-in-sandbox.patch +++ b/0015-2182-Add-mutex-for-container-list-in-sandbox.patch @@ -1,7 +1,7 @@ From dcceff17d6c2e1c97cb18c65260edfd2d6a3a60a Mon Sep 17 00:00:00 2001 From: xuxuepeng Date: Tue, 12 Sep 2023 03:20:33 +0000 -Subject: [PATCH 16/33] !2182 Add mutex for container list in sandbox * Add +Subject: [PATCH 15/32] !2182 Add mutex for container list in sandbox * Add mutex for container list in sandbox --- diff --git a/0017-2180-fix-execlp-not-enough-args.patch b/0016-2180-fix-execlp-not-enough-args.patch similarity index 97% rename from 0017-2180-fix-execlp-not-enough-args.patch rename to 0016-2180-fix-execlp-not-enough-args.patch index b7546a0..7361888 100644 --- a/0017-2180-fix-execlp-not-enough-args.patch +++ b/0016-2180-fix-execlp-not-enough-args.patch @@ -1,7 +1,7 @@ From e9c0fb3c72bd102f24afe247bb545df210fa9aee Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Tue, 12 Sep 2023 03:55:17 +0000 -Subject: [PATCH 17/33] !2180 fix execlp not enough args * fix execlp not +Subject: [PATCH 16/32] !2180 fix execlp not enough args * fix execlp not enough args --- diff --git a/0018-2135-modify-incorrect-variable-type.patch b/0017-2135-modify-incorrect-variable-type.patch similarity index 99% rename from 0018-2135-modify-incorrect-variable-type.patch rename to 0017-2135-modify-incorrect-variable-type.patch index d349f85..e7fcb13 100644 --- a/0018-2135-modify-incorrect-variable-type.patch +++ b/0017-2135-modify-incorrect-variable-type.patch @@ -1,7 +1,7 @@ From e7f21e04b8710ec60045ba26ebdda5ce8a0c0f09 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Mon, 28 Aug 2023 06:46:10 +0000 -Subject: [PATCH 18/33] !2135 modify incorrect variable type * modify incorrect +Subject: [PATCH 17/32] !2135 modify incorrect variable type * modify incorrect variable type --- diff --git a/0019-make-sure-the-input-parameter-is-not-empty-and-optim.patch b/0018-make-sure-the-input-parameter-is-not-empty-and-optim.patch similarity index 99% rename from 0019-make-sure-the-input-parameter-is-not-empty-and-optim.patch rename to 0018-make-sure-the-input-parameter-is-not-empty-and-optim.patch index f5b130e..709c6da 100644 --- a/0019-make-sure-the-input-parameter-is-not-empty-and-optim.patch +++ b/0018-make-sure-the-input-parameter-is-not-empty-and-optim.patch @@ -1,7 +1,7 @@ From c6442b5805d39d8749a1016e2932543a130f16dc Mon Sep 17 00:00:00 2001 From: zhongtao Date: Fri, 25 Aug 2023 17:34:12 +0800 -Subject: [PATCH 19/33] make sure the input parameter is not empty and optimize +Subject: [PATCH 18/32] make sure the input parameter is not empty and optimize the code Signed-off-by: zhongtao diff --git a/0020-remove-password-in-url-module-and-clean-sensitive-in.patch b/0019-remove-password-in-url-module-and-clean-sensitive-in.patch similarity index 99% rename from 0020-remove-password-in-url-module-and-clean-sensitive-in.patch rename to 0019-remove-password-in-url-module-and-clean-sensitive-in.patch index 250b467..e8c1a8a 100644 --- a/0020-remove-password-in-url-module-and-clean-sensitive-in.patch +++ b/0019-remove-password-in-url-module-and-clean-sensitive-in.patch @@ -1,7 +1,7 @@ From 4adc923cfaf25142aa4cbb909d65c0f3a999cc02 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Tue, 29 Aug 2023 11:41:26 +0800 -Subject: [PATCH 20/33] remove password in url module and clean sensitive info +Subject: [PATCH 19/32] remove password in url module and clean sensitive info in struct passwd Signed-off-by: zhongtao diff --git a/0021-2153-fix-codecheck.patch b/0020-2153-fix-codecheck.patch similarity index 99% rename from 0021-2153-fix-codecheck.patch rename to 0020-2153-fix-codecheck.patch index ad8357d..554e3a6 100644 --- a/0021-2153-fix-codecheck.patch +++ b/0020-2153-fix-codecheck.patch @@ -1,7 +1,7 @@ From d9c60a7309f3616c1d9d0051ba338a8def37a538 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Tue, 29 Aug 2023 09:38:53 +0000 -Subject: [PATCH 21/33] !2153 fix codecheck * fix codecheck +Subject: [PATCH 20/32] !2153 fix codecheck * fix codecheck --- src/daemon/modules/image/embedded/load.c | 2 +- diff --git a/0022-2157-bugfix-for-memset.patch b/0021-2157-bugfix-for-memset.patch similarity index 92% rename from 0022-2157-bugfix-for-memset.patch rename to 0021-2157-bugfix-for-memset.patch index a5a1e1e..24dfc78 100644 --- a/0022-2157-bugfix-for-memset.patch +++ b/0021-2157-bugfix-for-memset.patch @@ -1,7 +1,7 @@ From 14bc12be8e4219a78b877e60affd4f584ccab220 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Tue, 29 Aug 2023 13:18:34 +0000 -Subject: [PATCH 22/33] !2157 bugfix for memset * bugfix for memset +Subject: [PATCH 21/32] !2157 bugfix for memset * bugfix for memset --- src/daemon/modules/image/image_rootfs_handler.c | 2 +- diff --git a/0023-2159-use-macros-to-isolate-the-password-option-of-lo.patch b/0022-2159-use-macros-to-isolate-the-password-option-of-lo.patch similarity index 99% rename from 0023-2159-use-macros-to-isolate-the-password-option-of-lo.patch rename to 0022-2159-use-macros-to-isolate-the-password-option-of-lo.patch index a6b51b7..0a89609 100644 --- a/0023-2159-use-macros-to-isolate-the-password-option-of-lo.patch +++ b/0022-2159-use-macros-to-isolate-the-password-option-of-lo.patch @@ -1,7 +1,7 @@ From 0c0bc7a873cb5377aa0d5587c28d711a09f00811 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Wed, 30 Aug 2023 09:56:29 +0000 -Subject: [PATCH 23/33] !2159 use macros to isolate the password option of +Subject: [PATCH 22/32] !2159 use macros to isolate the password option of login and the plugin module * use macros to isolate the password option of login and the plugin module diff --git a/0024-2161-bugfix-for-api-cmakelist.patch b/0023-2161-bugfix-for-api-cmakelist.patch similarity index 91% rename from 0024-2161-bugfix-for-api-cmakelist.patch rename to 0023-2161-bugfix-for-api-cmakelist.patch index 124aa4f..02327cf 100644 --- a/0024-2161-bugfix-for-api-cmakelist.patch +++ b/0023-2161-bugfix-for-api-cmakelist.patch @@ -1,7 +1,7 @@ From 6b02ac8055379fa0b907f5ed10c5bd974cade90f Mon Sep 17 00:00:00 2001 From: zhongtao Date: Thu, 31 Aug 2023 01:55:41 +0000 -Subject: [PATCH 24/33] !2161 bugfix for api cmakelist * bugfix for api +Subject: [PATCH 23/32] !2161 bugfix for api cmakelist * bugfix for api cmakelist --- diff --git a/0025-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch b/0024-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch similarity index 98% rename from 0025-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch rename to 0024-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch index e9b519b..bd2b49d 100644 --- a/0025-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch +++ b/0024-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch @@ -1,7 +1,7 @@ From 64f94112728f35ee76d56fa4cf6dc41bd5cd5d33 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 2 Sep 2023 08:56:38 +0000 -Subject: [PATCH 25/33] !2165 preventing the use of insecure isulad tmpdir +Subject: [PATCH 24/32] !2165 preventing the use of insecure isulad tmpdir directory * preventing the use of insecure isulad tmpdir directory --- diff --git a/0026-2166-move-ensure_isulad_tmpdir_security-function-to-.patch b/0025-2166-move-ensure_isulad_tmpdir_security-function-to-.patch similarity index 98% rename from 0026-2166-move-ensure_isulad_tmpdir_security-function-to-.patch rename to 0025-2166-move-ensure_isulad_tmpdir_security-function-to-.patch index 60f39a6..6330331 100644 --- a/0026-2166-move-ensure_isulad_tmpdir_security-function-to-.patch +++ b/0025-2166-move-ensure_isulad_tmpdir_security-function-to-.patch @@ -1,7 +1,7 @@ From c2af7f7d7f6b0f1aaa884204a037e8275092121a Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 2 Sep 2023 10:38:29 +0000 -Subject: [PATCH 26/33] !2166 move ensure_isulad_tmpdir_security function to +Subject: [PATCH 25/32] !2166 move ensure_isulad_tmpdir_security function to main.c * move ensure_isulad_tmpdir_security function to main.c --- diff --git a/0027-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch b/0026-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch similarity index 98% rename from 0027-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch rename to 0026-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch index a5436e6..4e3a7bd 100644 --- a/0027-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch +++ b/0026-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch @@ -1,7 +1,7 @@ From 4e6473570e3a5cd59585818216218a7a512790a5 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Mon, 4 Sep 2023 08:45:55 +0000 -Subject: [PATCH 27/33] !2169 using macros to isolate isulad's enable_plugin +Subject: [PATCH 26/32] !2169 using macros to isolate isulad's enable_plugin configuration option * using macros to isolate isulad's enable_plugin configuration option diff --git a/0028-2178-clean-path-for-fpath-and-verify-chain-id.patch b/0027-2178-clean-path-for-fpath-and-verify-chain-id.patch similarity index 97% rename from 0028-2178-clean-path-for-fpath-and-verify-chain-id.patch rename to 0027-2178-clean-path-for-fpath-and-verify-chain-id.patch index f2f28f0..cdeb80e 100644 --- a/0028-2178-clean-path-for-fpath-and-verify-chain-id.patch +++ b/0027-2178-clean-path-for-fpath-and-verify-chain-id.patch @@ -1,7 +1,7 @@ From 6dcde807f5bba8ff1aa7d049856f3eddd4b0586f Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 9 Sep 2023 06:48:39 +0000 -Subject: [PATCH 28/33] !2178 clean path for fpath and verify chain id Merge +Subject: [PATCH 27/32] !2178 clean path for fpath and verify chain id Merge pull request !2178 from zhongtao/image --- diff --git a/0029-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch b/0028-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch similarity index 93% rename from 0029-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch rename to 0028-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch index da1fd14..4a0a483 100644 --- a/0029-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch +++ b/0028-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch @@ -1,7 +1,7 @@ From a291302fe12e21207c30ebffebf852cb37aface4 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 9 Sep 2023 08:11:06 +0000 -Subject: [PATCH 29/33] !2179 modify the permissions of tmpdir and file lock to +Subject: [PATCH 28/32] !2179 modify the permissions of tmpdir and file lock to 600 Merge pull request !2179 from zhongtao/mode --- diff --git a/0030-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch b/0029-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch similarity index 99% rename from 0030-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch rename to 0029-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch index 3440fe5..2795270 100644 --- a/0030-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch +++ b/0029-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch @@ -1,7 +1,7 @@ From 460c943125d9eca7cb4259d42c6c008a709e9dbe Mon Sep 17 00:00:00 2001 From: haozi007 Date: Wed, 23 Aug 2023 15:42:42 +0800 -Subject: [PATCH 30/33] [image] ensure id of loaded and pulled image is valid +Subject: [PATCH 29/32] [image] ensure id of loaded and pulled image is valid Signed-off-by: haozi007 --- diff --git a/0031-mask-proxy-informations.patch b/0030-mask-proxy-informations.patch similarity index 98% rename from 0031-mask-proxy-informations.patch rename to 0030-mask-proxy-informations.patch index 025099e..ca3ca01 100644 --- a/0031-mask-proxy-informations.patch +++ b/0030-mask-proxy-informations.patch @@ -1,7 +1,7 @@ From ff67cabc3e3839ef4b539805ed54b5c826b6f446 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 4 Sep 2023 15:19:36 +0800 -Subject: [PATCH 31/33] mask proxy informations +Subject: [PATCH 30/32] mask proxy informations Signed-off-by: haozi007 --- diff --git a/0032-add-testcase-for-isula-info.patch b/0031-add-testcase-for-isula-info.patch similarity index 98% rename from 0032-add-testcase-for-isula-info.patch rename to 0031-add-testcase-for-isula-info.patch index 4b4a41f..be45f2d 100644 --- a/0032-add-testcase-for-isula-info.patch +++ b/0031-add-testcase-for-isula-info.patch @@ -1,7 +1,7 @@ From e40f451f5b919ba4154cc6005439f6b4370a7ac3 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 4 Sep 2023 17:13:13 +0800 -Subject: [PATCH 32/33] add testcase for isula info +Subject: [PATCH 31/32] add testcase for isula info Signed-off-by: haozi007 --- diff --git a/0033-fix-oci-import-compile-error.patch b/0032-fix-oci-import-compile-error.patch similarity index 93% rename from 0033-fix-oci-import-compile-error.patch rename to 0032-fix-oci-import-compile-error.patch index d95b79c..e2d5484 100644 --- a/0033-fix-oci-import-compile-error.patch +++ b/0032-fix-oci-import-compile-error.patch @@ -1,7 +1,7 @@ From ff0bf5155c163c5230b3ac6d71e2dfc1ed6cfa01 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Tue, 12 Sep 2023 17:24:24 +0800 -Subject: [PATCH 33/33] fix oci import compile error +Subject: [PATCH 32/32] fix oci import compile error Signed-off-by: haozi007 --- diff --git a/iSulad.spec b/iSulad.spec index 8332de6..4020c62 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.1.3 -%global _release 4 +%global _release 5 %global is_systemd 1 %global enable_criv1 1 %global enable_shimv2 1 @@ -15,39 +15,38 @@ URL: https://gitee.com/openeuler/iSulad Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar.gz BuildRoot: {_tmppath}/iSulad-%{version} -Patch0001: 0001-Use-reference-in-loop-in-listpodsandbox.patch -Patch0002: 0002-fix-execlp-not-enough-args.patch -Patch0003: 0003-2156-Fix-sandbox-error-logging.patch -Patch0004: 0004-2158-Use-crictl-v1.22.0-for-ci.patch -Patch0005: 0005-2162-Fix-rename-issue-for-id-manager.patch -Patch0006: 0006-2163-add-bind-mount-file-lock.patch -Patch0007: 0007-2168-fix-code-bug.patch -Patch0008: 0008-2171-Fix-nullptr-in-src-daemon-entry.patch -Patch0009: 0009-Add-vsock-support-for-exec.patch -Patch0010: 0010-remove-unneccessary-strerror.patch -Patch0011: 0011-do-not-report-low-level-error-to-user.patch -Patch0012: 0012-remove-usage-of-strerror-with-user-defined-errno.patch -Patch0013: 0013-use-gmtime_r-to-replace-gmtime.patch -Patch0014: 0014-improve-report-error-message-of-client.patch -Patch0015: 0015-adapt-new-error-message-for-isula-cp.patch -Patch0016: 0016-2182-Add-mutex-for-container-list-in-sandbox.patch -Patch0017: 0017-2180-fix-execlp-not-enough-args.patch -Patch0018: 0018-2135-modify-incorrect-variable-type.patch -Patch0019: 0019-make-sure-the-input-parameter-is-not-empty-and-optim.patch -Patch0020: 0020-remove-password-in-url-module-and-clean-sensitive-in.patch -Patch0021: 0021-2153-fix-codecheck.patch -Patch0022: 0022-2157-bugfix-for-memset.patch -Patch0023: 0023-2159-use-macros-to-isolate-the-password-option-of-lo.patch -Patch0024: 0024-2161-bugfix-for-api-cmakelist.patch -Patch0025: 0025-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch -Patch0026: 0026-2166-move-ensure_isulad_tmpdir_security-function-to-.patch -Patch0027: 0027-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch -Patch0028: 0028-2178-clean-path-for-fpath-and-verify-chain-id.patch -Patch0029: 0029-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch -Patch0030: 0030-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch -Patch0031: 0031-mask-proxy-informations.patch -Patch0032: 0032-add-testcase-for-isula-info.patch -Patch0033: 0033-fix-oci-import-compile-error.patch +Patch0001: 0001-2155-Use-reference-in-loop-in-listpodsandbox.patch +Patch0002: 0002-2156-Fix-sandbox-error-logging.patch +Patch0003: 0003-2158-Use-crictl-v1.22.0-for-ci.patch +Patch0004: 0004-2162-Fix-rename-issue-for-id-manager.patch +Patch0005: 0005-2163-add-bind-mount-file-lock.patch +Patch0006: 0006-2168-fix-code-bug.patch +Patch0007: 0007-2171-Fix-nullptr-in-src-daemon-entry.patch +Patch0008: 0008-Add-vsock-support-for-exec.patch +Patch0009: 0009-remove-unneccessary-strerror.patch +Patch0010: 0010-do-not-report-low-level-error-to-user.patch +Patch0011: 0011-remove-usage-of-strerror-with-user-defined-errno.patch +Patch0012: 0012-use-gmtime_r-to-replace-gmtime.patch +Patch0013: 0013-improve-report-error-message-of-client.patch +Patch0014: 0014-adapt-new-error-message-for-isula-cp.patch +Patch0015: 0015-2182-Add-mutex-for-container-list-in-sandbox.patch +Patch0016: 0016-2180-fix-execlp-not-enough-args.patch +Patch0017: 0017-2135-modify-incorrect-variable-type.patch +Patch0018: 0018-make-sure-the-input-parameter-is-not-empty-and-optim.patch +Patch0019: 0019-remove-password-in-url-module-and-clean-sensitive-in.patch +Patch0020: 0020-2153-fix-codecheck.patch +Patch0021: 0021-2157-bugfix-for-memset.patch +Patch0022: 0022-2159-use-macros-to-isolate-the-password-option-of-lo.patch +Patch0023: 0023-2161-bugfix-for-api-cmakelist.patch +Patch0024: 0024-2165-preventing-the-use-of-insecure-isulad-tmpdir-di.patch +Patch0025: 0025-2166-move-ensure_isulad_tmpdir_security-function-to-.patch +Patch0026: 0026-2169-using-macros-to-isolate-isulad-s-enable_plugin-.patch +Patch0027: 0027-2178-clean-path-for-fpath-and-verify-chain-id.patch +Patch0028: 0028-2179-modify-the-permissions-of-tmpdir-and-file-lock-.patch +Patch0029: 0029-image-ensure-id-of-loaded-and-pulled-image-is-valid.patch +Patch0030: 0030-mask-proxy-informations.patch +Patch0031: 0031-add-testcase-for-isula-info.patch +Patch0032: 0032-fix-oci-import-compile-error.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -303,6 +302,12 @@ fi %endif %changelog +* Tue Sep 12 2023 jikai - 2.1.3-5 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: update from upstream + * Tue Sep 12 2023 jikai - 2.1.3-4 - Type: bugfix - ID: NA -- Gitee