diff options
Diffstat (limited to 'build/external/patches')
12 files changed, 21 insertions, 532 deletions
diff --git a/build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch deleted file mode 100644 index 80f3bcb684f..00000000000 --- a/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h -index 06d62f9..de33b86 100644 ---- a/deps/picotls/include/picotls.h -+++ b/deps/picotls/include/picotls.h -@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { - size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); - size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, - const void *aad, size_t aadlen); -+ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, -+ const void *iv, const void *aad, size_t aadlen); - } ptls_aead_context_t; - - /** -diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c -index 70d2fef..f98f7b4 100644 ---- a/deps/picotls/lib/picotls.c -+++ b/deps/picotls/lib/picotls.c -@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp - { - size_t off = 0; - -+ if(ctx->do_encrypt) -+ { -+ uint8_t iv[PTLS_MAX_IV_SIZE]; -+ ptls_aead__build_iv(ctx, iv, seq); -+ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); -+ } -+ - ptls_aead_encrypt_init(ctx, seq, aad, aadlen); - off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); - off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); - - diff --git a/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch deleted file mode 100644 index 3ac90c7d0aa..00000000000 --- a/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 202cc52..b5c2bee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,6 +40,8 @@ SET(UNITTEST_SOURCE_FILES - t/stream-concurrency.c - t/test.c) - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_EXECUTABLE(cli ${PICOTLS_OPENSSL_FILES} src/cli.c) -@@ -50,6 +52,16 @@ TARGET_LINK_LIBRARIES(test.t quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS}) - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index cda6aad..62b23b7 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -5,6 +5,7 @@ PROJECT(picotls) - - FIND_PACKAGE(PkgConfig REQUIRED) - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR} deps/cifra/src/ext deps/cifra/src deps/micro-ecc deps/picotest include) - SET(MINICRYPTO_LIBRARY_FILES -@@ -97,3 +98,12 @@ IF (BUILD_FUZZER) - - - ENDIF() -+ -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) diff --git a/build/external/patches/quicly_0.0.5-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.5-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch deleted file mode 100644 index 80f3bcb684f..00000000000 --- a/build/external/patches/quicly_0.0.5-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h -index 06d62f9..de33b86 100644 ---- a/deps/picotls/include/picotls.h -+++ b/deps/picotls/include/picotls.h -@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { - size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); - size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, - const void *aad, size_t aadlen); -+ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, -+ const void *iv, const void *aad, size_t aadlen); - } ptls_aead_context_t; - - /** -diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c -index 70d2fef..f98f7b4 100644 ---- a/deps/picotls/lib/picotls.c -+++ b/deps/picotls/lib/picotls.c -@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp - { - size_t off = 0; - -+ if(ctx->do_encrypt) -+ { -+ uint8_t iv[PTLS_MAX_IV_SIZE]; -+ ptls_aead__build_iv(ctx, iv, seq); -+ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); -+ } -+ - ptls_aead_encrypt_init(ctx, seq, aad, aadlen); - off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); - off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); - - diff --git a/build/external/patches/quicly_0.0.5-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.5-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.5-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch b/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch deleted file mode 100644 index 589d8cde125..00000000000 --- a/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/quicly.c b/lib/quicly.c -index 95d5f13..3f4fd18 100644 ---- a/lib/quicly.c -+++ b/lib/quicly.c -@@ -351,7 +351,10 @@ static __thread int64_t now; - - static void update_now(quicly_context_t *ctx) - { -- now = ctx->now->cb(ctx->now); -+ int64_t newval = ctx->now->cb(ctx->now); -+ -+ if (now < newval) -+ now = newval; - } - - /** diff --git a/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch deleted file mode 100644 index 80f3bcb684f..00000000000 --- a/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h -index 06d62f9..de33b86 100644 ---- a/deps/picotls/include/picotls.h -+++ b/deps/picotls/include/picotls.h -@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { - size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); - size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, - const void *aad, size_t aadlen); -+ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, -+ const void *iv, const void *aad, size_t aadlen); - } ptls_aead_context_t; - - /** -diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c -index 70d2fef..f98f7b4 100644 ---- a/deps/picotls/lib/picotls.c -+++ b/deps/picotls/lib/picotls.c -@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp - { - size_t off = 0; - -+ if(ctx->do_encrypt) -+ { -+ uint8_t iv[PTLS_MAX_IV_SIZE]; -+ ptls_aead__build_iv(ctx, iv, seq); -+ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); -+ } -+ - ptls_aead_encrypt_init(ctx, seq, aad, aadlen); - off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); - off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); - - diff --git a/build/external/patches/quicly_0.0.6-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.6-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.6-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.0.7-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.7-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.7-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.0.8-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.8-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.8-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.0.9-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.9-vpp/0001-cmake-install.patch deleted file mode 100644 index 0ca7d2986d4..00000000000 --- a/build/external/patches/quicly_0.0.9-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5478d3..156df4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,6 +65,8 @@ IF (WITH_DTRACE) - ENDIF () - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_CUSTOM_COMMAND( -@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index 874b9be..14411e2 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -12,6 +12,7 @@ IF (WITH_DTRACE) - MESSAGE(STATUS "Enabling USDT support") - ENDIF () - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES( - deps/cifra/src/ext -@@ -131,6 +132,15 @@ ELSE () - MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") - ENDIF () - -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) - - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/build/external/patches/quicly_0.1.0-vpp/0001-quicly-send-assert-consistency.patch b/build/external/patches/quicly_0.1.0-vpp/0001-quicly-send-assert-consistency.patch new file mode 100644 index 00000000000..2e0caaf1c9b --- /dev/null +++ b/build/external/patches/quicly_0.1.0-vpp/0001-quicly-send-assert-consistency.patch @@ -0,0 +1,21 @@ +diff --git a/lib/quicly.c b/lib/quicly.c +index 71fa149..668677f 100644 +--- a/lib/quicly.c ++++ b/lib/quicly.c +@@ -3631,10 +3631,14 @@ int quicly_send(quicly_conn_t *conn, quicly_datagram_t **packets, size_t *num_pa + * progress (i.e. due to the payload of lost packet being cancelled), then PTO for the previously sent packet. To accomodate + * that, we allow to rerun the do_send function just once. + */ +- if (s.num_packets == 0 && conn->egress.loss.alarm_at <= now) { ++ if (conn->egress.loss.alarm_at <= now) { + assert(conn->egress.loss.alarm_at == now); +- if ((ret = do_send(conn, &s)) != 0) +- return ret; ++ if (s.num_packets == 0) { ++ if ((ret = do_send(conn, &s)) != 0) ++ return ret; ++ } else { ++ conn->egress.loss.alarm_at = now + 1; ++ } + } + assert_consistency(conn, 1); |