diff --git a/0105-suppress-proxy-connect-headers-message.patch b/0105-suppress-proxy-connect-headers-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa4ad76e4dcddcb3421667a448bf23c3c9e90201 --- /dev/null +++ b/0105-suppress-proxy-connect-headers-message.patch @@ -0,0 +1,28 @@ +From a4afe26b46c62d2750415908c4f99eb0f919fc6b Mon Sep 17 00:00:00 2001 +From: WangFengTu +Date: Fri, 4 Jun 2021 17:04:53 +0800 +Subject: [PATCH] suppress proxy connect headers message + +we need the real server message but not proxy's, so +ignore proxy's message + +Signed-off-by: WangFengTu +--- + src/utils/http/http.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils/http/http.c b/src/utils/http/http.c +index e502bb83..0937a77e 100644 +--- a/src/utils/http/http.c ++++ b/src/utils/http/http.c +@@ -429,6 +429,7 @@ int http_request(const char *url, struct http_get_options *options, long *respon + /* provide a buffer to store errors in */ + curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, errbuf); + curl_easy_setopt(curl_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); ++ curl_easy_setopt(curl_handle, CURLOPT_SUPPRESS_CONNECT_HEADERS, 1L); + + ret = http_custom_options(curl_handle, options); + if (ret) { +-- +2.25.1 + diff --git a/0105-fix-loading-of-nsswitch-based-config-inside-chr.patch b/0106-fix-loading-of-nsswitch-based-config-inside-chroot-u.patch similarity index 70% rename from 0105-fix-loading-of-nsswitch-based-config-inside-chr.patch rename to 0106-fix-loading-of-nsswitch-based-config-inside-chroot-u.patch index 9a8ba5ad1d2c69e67658f578a3680178ecf50eac..cc2e07d31e02ba99c3ae598362fdd3b37be17429 100644 --- a/0105-fix-loading-of-nsswitch-based-config-inside-chr.patch +++ b/0106-fix-loading-of-nsswitch-based-config-inside-chroot-u.patch @@ -1,27 +1,26 @@ -From e44b2fc5ee8c8b9ca577265e88ae3518828cf8a0 Mon Sep 17 00:00:00 2001 +From bbd571694b8657d7e580038399345bbf1cd8a2a2 Mon Sep 17 00:00:00 2001 From: zhongtao -Date: Tue, 8 Aug 2023 06:50:07 +0000 -Subject: [PATCH 07/11] !2095 fix loading of nsswitch based config inside - chroot under glibc * fix loading of nsswitch based config inside chroot under +Date: Thu, 17 Aug 2023 09:19:22 +0800 +Subject: [PATCH] fix loading of nsswitch based config inside chroot under glibc +Signed-off-by: zhongtao --- - cmake/checker.cmake | 6 + - src/CMakeLists.txt | 2 +- - src/cmd/isulad/main.c | 3 + - src/daemon/modules/api/leftover_cleanup_api.h | 2 + - .../container/leftover_cleanup/cleanup.c | 80 +++++++ - .../container/leftover_cleanup/cleanup.h | 1 + - .../leftover_cleanup/leftover_cleanup_api.c | 4 + - src/utils/tar/util_archive.c | 217 ++++++++++++++++-- - 8 files changed, 299 insertions(+), 16 deletions(-) + cmake/checker.cmake | 6 + + src/CMakeLists.txt | 4 +- + src/cmd/isulad/main.c | 87 ++++++++ + src/daemon/modules/image/CMakeLists.txt | 2 +- + src/utils/cutils/utils.h | 1 - + src/utils/tar/util_archive.c | 217 +++++++++++++++++-- + test/image/oci/storage/layers/CMakeLists.txt | 4 +- + 7 files changed, 300 insertions(+), 21 deletions(-) diff --git a/cmake/checker.cmake b/cmake/checker.cmake -index fea4f925..000c5e0c 100644 +index d4337a1..b46cf31 100644 --- a/cmake/checker.cmake +++ b/cmake/checker.cmake -@@ -30,6 +30,12 @@ else() - message("-- found linux capability.h --- no") +@@ -38,6 +38,12 @@ if (SYSTEMD_NOTIFY) + _CHECK(SYSTEMD_LIBRARY "SYSTEMD_LIBRARY-NOTFOUND" "libsystemd.so") endif() +# check libcapability @@ -34,66 +33,44 @@ index fea4f925..000c5e0c 100644 pkg_check_modules(PC_ZLIB "zlib>=1.2.8") find_path(ZLIB_INCLUDE_DIR zlib.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 02d7b13f..7201a030 100644 +index 4127e5a..086bb41 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -48,7 +48,7 @@ target_include_directories(libisulad_tools - PUBLIC ${ISULA_LIBUTILS_INCLUDE_DIR} - ) - set_target_properties(libisulad_tools PROPERTIES PREFIX "") --target_link_libraries(libisulad_tools ${ZLIB_LIBRARY} ${ISULA_LIBUTILS_LIBRARY} ${CRYPTO_LIBRARY}) -+target_link_libraries(libisulad_tools ${ZLIB_LIBRARY} ${ISULA_LIBUTILS_LIBRARY} ${CRYPTO_LIBRARY} ${CAP_LIBRARY}) - - if (ENABLE_OCI_IMAGE) - target_link_libraries(libisulad_tools ${LIBARCHIVE_LIBRARY}) -diff --git a/src/cmd/isulad/main.c b/src/cmd/isulad/main.c -index 0cb7b50e..1e51a8e7 100644 ---- a/src/cmd/isulad/main.c -+++ b/src/cmd/isulad/main.c -@@ -1254,6 +1254,9 @@ static int isulad_server_init_common() - goto out; - } - #endif -+ // clean tmpdir before image module init -+ // because tmpdir will remove failed if chroot mount point exist under tmpdir -+ isulad_tmpdir_cleaner(); +@@ -64,7 +64,7 @@ target_include_directories(libisula PUBLIC - if (volume_init(args->json_confs->graph) != 0) { - ERROR("Failed to init volume"); -diff --git a/src/daemon/modules/api/leftover_cleanup_api.h b/src/daemon/modules/api/leftover_cleanup_api.h -index 26c4509b..0a8f9e0e 100644 ---- a/src/daemon/modules/api/leftover_cleanup_api.h -+++ b/src/daemon/modules/api/leftover_cleanup_api.h -@@ -31,6 +31,8 @@ void clean_module_fill_ctx(cleanup_ctx_data_t data_type, void *data); + # set libisula FLAGS + set_target_properties(libisula PROPERTIES PREFIX "") +-target_link_libraries(libisula ${LIBYAJL_LIBRARY} ${SELINUX_LIBRARY} ${ISULA_LIBUTILS_LIBRARY} ${LIBARCHIVE_LIBRARY} ${LIBTAR_LIBRARY} ${WEBSOCKET_LIBRARY} ${CRYPTO_LIBRARY}) ++target_link_libraries(libisula ${LIBYAJL_LIBRARY} ${SELINUX_LIBRARY} ${ISULA_LIBUTILS_LIBRARY} ${LIBARCHIVE_LIBRARY} ${CAP_LIBRARY} ${LIBTAR_LIBRARY} ${WEBSOCKET_LIBRARY} ${CRYPTO_LIBRARY}) - void clean_module_do_clean(); + if (GRPC_CONNECTOR) + target_link_libraries(libisula -Wl,--as-needed -lstdc++) +@@ -111,7 +111,7 @@ target_include_directories(isulad PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/utils/http + ) -+void isulad_tmpdir_cleaner(void); -+ - #if defined(__cplusplus) || defined(c_plusplus) - } - #endif -diff --git a/src/daemon/modules/container/leftover_cleanup/cleanup.c b/src/daemon/modules/container/leftover_cleanup/cleanup.c -index 664988b5..eb9b5afb 100644 ---- a/src/daemon/modules/container/leftover_cleanup/cleanup.c -+++ b/src/daemon/modules/container/leftover_cleanup/cleanup.c -@@ -12,7 +12,11 @@ - * Create: 2022-10-31 - * Description: provide cleanup functions - *********************************************************************************/ -+#include -+ - #include "utils.h" +-target_link_libraries(isulad ${LIBYAJL_LIBRARY} ${SYSTEMD_LIBRARY} ${SELINUX_LIBRARY} ${LIBARCHIVE_LIBRARY} ${LIBTAR_LIBRARY} ${WEBSOCKET_LIBRARY} ${CRYPTO_LIBRARY}) ++target_link_libraries(isulad ${LIBYAJL_LIBRARY} ${SYSTEMD_LIBRARY} ${SELINUX_LIBRARY} ${LIBARCHIVE_LIBRARY} ${CAP_LIBRARY} ${LIBTAR_LIBRARY} ${WEBSOCKET_LIBRARY} ${CRYPTO_LIBRARY}) + target_link_libraries(isulad -ldl ${ZLIB_LIBRARY} ${ISULA_LIBUTILS_LIBRARY} -lpthread libhttpclient) + if (ENABLE_EMBEDDED_IMAGE) + target_link_libraries(isulad ${SQLITE3_LIBRARY}) +diff --git a/src/cmd/isulad/main.c b/src/cmd/isulad/main.c +index 47bd6e2..633de61 100644 +--- a/src/cmd/isulad/main.c ++++ b/src/cmd/isulad/main.c +@@ -71,6 +71,8 @@ + #include "utils_verify.h" + #include "volume_api.h" + #include "opt_log.h" +#include "utils_fs.h" +#include "path.h" - #include "cleanup.h" - #include "oci_rootfs_clean.h" -@@ -132,3 +136,79 @@ void cleaners_do_clean(struct cleaners *clns, struct clean_ctx *ctx) - } - } + #ifdef GRPC_CONNECTOR + #include "clibcni/api.h" +@@ -383,6 +385,87 @@ out: + return ret; } -+ + +// always return true; +// if umount/remove failed, just ignore it +static bool walk_isulad_tmpdir_cb(const char *path_name, const struct dirent *sub_dir, void *context) @@ -155,7 +132,7 @@ index 664988b5..eb9b5afb 100644 + +// try to umount/remove isulad_tmpdir/tar-chroot-XXX directory +// ignore return value -+void do_isulad_tmpdir_cleaner(void) ++static void do_isulad_tmpdir_cleaner(void) +{ + char *isula_tmp_dir = NULL; + @@ -169,32 +146,53 @@ index 664988b5..eb9b5afb 100644 + + return; +} -diff --git a/src/daemon/modules/container/leftover_cleanup/cleanup.h b/src/daemon/modules/container/leftover_cleanup/cleanup.h -index 8dd5e9bd..7ad124f4 100644 ---- a/src/daemon/modules/container/leftover_cleanup/cleanup.h -+++ b/src/daemon/modules/container/leftover_cleanup/cleanup.h -@@ -45,6 +45,7 @@ void destroy_cleaners(struct cleaners *clns); ++ ++static void isulad_tmpdir_cleaner(void) ++{ ++ do_isulad_tmpdir_cleaner(); ++} ++ + int check_and_save_pid(const char *fn) + { + int fd = -1; +@@ -1166,6 +1249,10 @@ static int isulad_server_init_common() + goto out; + } - void cleaners_do_clean(struct cleaners *clns, struct clean_ctx *ctx); ++ // clean tmpdir before image module init ++ // because tmpdir will remove failed if chroot mount point exist under tmpdir ++ isulad_tmpdir_cleaner(); ++ + if (volume_init(args->json_confs->graph) != 0) { + ERROR("Failed to init volume"); + goto out; +diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt +index 00a096e..47fc7e7 100644 +--- a/src/daemon/modules/image/CMakeLists.txt ++++ b/src/daemon/modules/image/CMakeLists.txt +@@ -96,7 +96,7 @@ target_link_libraries(${LIB_ISULAD_IMG} + ${DEVMAPPER_LIBRARY} + ${LIBTAR_LIBRARY} + ${SELINUX_LIBRARY} +- -lpthread -lcrypto -larchive -lz libhttpclient) ++ -lpthread -lcrypto -larchive -lcap -lz libhttpclient) -+void do_isulad_tmpdir_cleaner(void); + target_compile_definitions(${LIB_ISULAD_IMG} PRIVATE LIB_ISULAD_IMG_SO) - #if defined(__cplusplus) || defined(c_plusplus) - } -diff --git a/src/daemon/modules/container/leftover_cleanup/leftover_cleanup_api.c b/src/daemon/modules/container/leftover_cleanup/leftover_cleanup_api.c -index a20dbc3a..fc5b55e1 100644 ---- a/src/daemon/modules/container/leftover_cleanup/leftover_cleanup_api.c -+++ b/src/daemon/modules/container/leftover_cleanup/leftover_cleanup_api.c -@@ -76,3 +76,7 @@ void clean_module_do_clean() - g_clean_ctx = NULL; - } +diff --git a/src/utils/cutils/utils.h b/src/utils/cutils/utils.h +index 29a0ec9..7ecf866 100644 +--- a/src/utils/cutils/utils.h ++++ b/src/utils/cutils/utils.h +@@ -368,7 +368,6 @@ int util_read_pid_ppid_info(uint32_t pid, pid_ppid_info_t *pid_info); + void util_parse_user_group(const char *username, char **user, char **group, char **tmp_dup); -+void isulad_tmpdir_cleaner(void) -+{ -+ do_isulad_tmpdir_cleaner(); -+} + defs_map_string_object * dup_map_string_empty_object(defs_map_string_object *src); +- + #ifdef __cplusplus + } + #endif diff --git a/src/utils/tar/util_archive.c b/src/utils/tar/util_archive.c -index 630ad8f8..c72e63b8 100644 +index a752203..c48472d 100644 --- a/src/utils/tar/util_archive.c +++ b/src/utils/tar/util_archive.c @@ -27,6 +27,10 @@ @@ -340,10 +338,10 @@ index 630ad8f8..c72e63b8 100644 static bool overlay_whiteout_convert_read(struct archive_entry *entry, const char *dst_path, map_t *unpacked_path_map) { bool do_write = true; -@@ -597,6 +719,12 @@ int archive_unpack(const struct io_read_wrapper *content, const char *dstdir, co +@@ -589,6 +711,12 @@ int archive_unpack(const struct io_read_wrapper *content, const char *dstdir, co int keepfds[] = { -1, -1, -1 }; int pipe_stderr[2] = { -1, -1 }; - char errbuf[BUFSIZ + 1] = { 0 }; + char errbuf[BUFSIZ] = { 0 }; + char *safe_dir = NULL; + + if (make_safedir_is_noexec(dstdir, &safe_dir) != 0) { @@ -353,7 +351,7 @@ index 630ad8f8..c72e63b8 100644 if (pipe2(pipe_stderr, O_CLOEXEC) != 0) { ERROR("Failed to create pipe"); -@@ -629,9 +757,9 @@ int archive_unpack(const struct io_read_wrapper *content, const char *dstdir, co +@@ -621,9 +749,9 @@ int archive_unpack(const struct io_read_wrapper *content, const char *dstdir, co goto child_out; } @@ -366,7 +364,7 @@ index 630ad8f8..c72e63b8 100644 ret = -1; goto child_out; } -@@ -669,6 +797,13 @@ cleanup: +@@ -661,6 +789,13 @@ cleanup: if (errmsg != NULL && strlen(errbuf) != 0) { *errmsg = util_strdup_s(errbuf); } @@ -380,9 +378,9 @@ index 630ad8f8..c72e63b8 100644 return ret; } -@@ -982,6 +1117,12 @@ int archive_chroot_tar(char *path, char *file, char **errmsg) +@@ -961,6 +1096,12 @@ int archive_chroot_tar(char *path, char *file, char **errmsg) int keepfds[] = { -1, -1 }; - char errbuf[BUFSIZ + 1] = { 0 }; + char errbuf[BUFSIZ] = { 0 }; int fd = 0; + char *safe_dir = NULL; + @@ -393,7 +391,7 @@ index 630ad8f8..c72e63b8 100644 if (pipe2(pipe_for_read, O_CLOEXEC) != 0) { ERROR("Failed to create pipe"); -@@ -1021,9 +1162,9 @@ int archive_chroot_tar(char *path, char *file, char **errmsg) +@@ -1000,9 +1141,9 @@ int archive_chroot_tar(char *path, char *file, char **errmsg) goto child_out; } @@ -406,7 +404,7 @@ index 630ad8f8..c72e63b8 100644 ret = -1; goto child_out; } -@@ -1064,7 +1205,13 @@ cleanup: +@@ -1043,7 +1184,13 @@ cleanup: if (errmsg != NULL && strlen(errbuf) != 0) { *errmsg = util_strdup_s(errbuf); } @@ -421,7 +419,7 @@ index 630ad8f8..c72e63b8 100644 return ret; } -@@ -1169,6 +1316,16 @@ static int archive_context_close(void *context, char **err) +@@ -1148,6 +1295,16 @@ static int archive_context_close(void *context, char **err) ret = -1; } @@ -438,7 +436,7 @@ index 630ad8f8..c72e63b8 100644 free(marshaled); free(ctx); return ret; -@@ -1192,10 +1349,10 @@ int archive_chroot_untar_stream(const struct io_read_wrapper *context, const cha +@@ -1171,10 +1328,10 @@ int archive_chroot_untar_stream(const struct io_read_wrapper *context, const cha .src_base = src_base, .dst_base = dst_base }; @@ -452,7 +450,7 @@ index 630ad8f8..c72e63b8 100644 return -1; } -@@ -1232,8 +1389,8 @@ int archive_chroot_untar_stream(const struct io_read_wrapper *context, const cha +@@ -1211,8 +1368,8 @@ int archive_chroot_untar_stream(const struct io_read_wrapper *context, const cha goto child_out; } @@ -463,7 +461,7 @@ index 630ad8f8..c72e63b8 100644 ret = -1; goto child_out; } -@@ -1262,6 +1419,12 @@ child_out: +@@ -1241,6 +1398,12 @@ child_out: close(pipe_stream[0]); pipe_stream[0] = -1; @@ -476,7 +474,7 @@ index 630ad8f8..c72e63b8 100644 ctx = util_common_calloc_s(sizeof(struct archive_context)); if (ctx == NULL) { goto cleanup; -@@ -1292,6 +1455,13 @@ cleanup: +@@ -1271,6 +1434,13 @@ cleanup: ret = (cret != 0) ? cret : ret; close_archive_pipes_fd(pipe_stderr, 2); close_archive_pipes_fd(pipe_stream, 2); @@ -490,7 +488,7 @@ index 630ad8f8..c72e63b8 100644 return ret; } -@@ -1306,6 +1476,12 @@ int archive_chroot_tar_stream(const char *chroot_dir, const char *tar_path, cons +@@ -1285,6 +1455,12 @@ int archive_chroot_tar_stream(const char *chroot_dir, const char *tar_path, cons int ret = -1; pid_t pid; struct archive_context *ctx = NULL; @@ -503,7 +501,7 @@ index 630ad8f8..c72e63b8 100644 if (pipe(pipe_stderr) != 0) { ERROR("Failed to create pipe: %s", strerror(errno)); -@@ -1343,9 +1519,9 @@ int archive_chroot_tar_stream(const char *chroot_dir, const char *tar_path, cons +@@ -1322,9 +1498,9 @@ int archive_chroot_tar_stream(const char *chroot_dir, const char *tar_path, cons goto child_out; } @@ -516,7 +514,7 @@ index 630ad8f8..c72e63b8 100644 ret = -1; goto child_out; } -@@ -1395,6 +1571,8 @@ child_out: +@@ -1374,6 +1550,8 @@ child_out: ctx->stderr_fd = pipe_stderr[0]; pipe_stderr[0] = -1; ctx->pid = pid; @@ -525,7 +523,7 @@ index 630ad8f8..c72e63b8 100644 reader->close = archive_context_close; reader->context = ctx; -@@ -1406,6 +1584,15 @@ free_out: +@@ -1385,6 +1563,15 @@ free_out: close_archive_pipes_fd(pipe_stderr, 2); close_archive_pipes_fd(pipe_stream, 2); free(ctx); @@ -541,6 +539,27 @@ index 630ad8f8..c72e63b8 100644 return ret; } +diff --git a/test/image/oci/storage/layers/CMakeLists.txt b/test/image/oci/storage/layers/CMakeLists.txt +index 4cae382..e9374cd 100644 +--- a/test/image/oci/storage/layers/CMakeLists.txt ++++ b/test/image/oci/storage/layers/CMakeLists.txt +@@ -61,7 +61,7 @@ target_link_libraries(${DRIVER_EXE} + ${CMAKE_THREAD_LIBS_INIT} + ${ISULA_LIBUTILS_LIBRARY} + ${LIBTAR_LIBRARY} +- -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz) ++ -lwebsockets -lcrypto -lyajl -larchive -lcap ${SELINUX_LIBRARY} -ldevmapper -lz) + + add_test(NAME ${DRIVER_EXE} COMMAND ${DRIVER_EXE} --gtest_output=xml:${DRIVER_EXE}-Results.xml) + +@@ -134,6 +134,6 @@ target_link_libraries(${LAYER_EXE} + ${CMAKE_THREAD_LIBS_INIT} + ${ISULA_LIBUTILS_LIBRARY} + ${LIBTAR_LIBRARY} +- -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz) ++ -lwebsockets -lcrypto -lyajl -larchive -lcap ${SELINUX_LIBRARY} -ldevmapper -lz) + + add_test(NAME ${LAYER_EXE} COMMAND ${LAYER_EXE} --gtest_output=xml:${LAYER_EXE}-Results.xml) -- 2.25.1 diff --git a/0106-link-libcap-for-storage_layers_ut-and-storage_d.patch b/0106-link-libcap-for-storage_layers_ut-and-storage_d.patch deleted file mode 100644 index c6a0891dacb5c29a696e082297fe420c3a8efab5..0000000000000000000000000000000000000000 --- a/0106-link-libcap-for-storage_layers_ut-and-storage_d.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 64fe739caf3fa473d3b503efb42eaa29774f46d6 Mon Sep 17 00:00:00 2001 -From: zhongtao -Date: Wed, 9 Aug 2023 02:39:56 +0000 -Subject: [PATCH 10/11] !2100 link libcap for storage_layers_ut and - storage_driver_ut * link libcap for storage_layers_ut and storage_driver_ut - ---- - test/image/oci/storage/layers/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/image/oci/storage/layers/CMakeLists.txt b/test/image/oci/storage/layers/CMakeLists.txt -index ae0ac9c3..330a8306 100644 ---- a/test/image/oci/storage/layers/CMakeLists.txt -+++ b/test/image/oci/storage/layers/CMakeLists.txt -@@ -65,7 +65,7 @@ target_link_libraries(${DRIVER_EXE} - ${CMAKE_THREAD_LIBS_INIT} - ${ISULA_LIBUTILS_LIBRARY} - ${LIBTAR_LIBRARY} -- -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz) -+ -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz -lcap) - - add_test(NAME ${DRIVER_EXE} COMMAND ${DRIVER_EXE} --gtest_output=xml:${DRIVER_EXE}-Results.xml) - set_tests_properties(${DRIVER_EXE} PROPERTIES TIMEOUT 120) -@@ -143,7 +143,7 @@ target_link_libraries(${LAYER_EXE} - ${CMAKE_THREAD_LIBS_INIT} - ${ISULA_LIBUTILS_LIBRARY} - ${LIBTAR_LIBRARY} -- -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz) -+ -lwebsockets -lcrypto -lyajl -larchive ${SELINUX_LIBRARY} -ldevmapper -lz -lcap) - - add_test(NAME ${LAYER_EXE} COMMAND ${LAYER_EXE} --gtest_output=xml:${LAYER_EXE}-Results.xml) - set_tests_properties(${LAYER_EXE} PROPERTIES TIMEOUT 120) --- -2.25.1 - diff --git a/iSulad.spec b/iSulad.spec index 39b4b99a7c0a4075bf0f740831e782c608d10c18..9c0db3053d354f5e66b12102862be61c59a8fbb3 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.8 -%global _release 20210518.144540.git5288ed93 +%global _release 20210518.144540.git5288ed94 %global is_systemd 1 Name: iSulad @@ -116,8 +116,8 @@ Patch101: 0101-CI-use-docker.io-registry.patch Patch102: 0102-CI-fix-integration_check.sh.patch Patch103: 0103-optimize-token-generation.patch Patch104: 0104-fix-string-array-initialization-failure.patch -Patch105: 0105-fix-loading-of-nsswitch-based-config-inside-chr.patch -Patch106: 0106-link-libcap-for-storage_layers_ut-and-storage_d.patch +Patch105: 0105-suppress-proxy-connect-headers-message +Patch106: 0106-fix-loading-of-nsswitch-based-config-inside-chroot-u.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -320,7 +320,13 @@ fi %endif %changelog -* Tue May 18 2021 wangfengtu - 2.0.8-20210518.144540.git5288ed93 +* Tue May 18 2021 zhongtao - 2.0.8-20210518.144540.git5288ed94 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: adaptation modification for fixing loading of nsswitch based config inside chroot under glibc + +* Tue May 18 2021 zhongtao - 2.0.8-20210518.144540.git5288ed93 - Type: bugfix - ID: NA - SUG: NA