Upgrade to 2.1.0

3 files changed, 20 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d08ff7fad797..f69cd16daa18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = msquic
 	pkgdesc = Microsoft implementation of the IETF QUIC protocol (release)
-	pkgver = 2.0.3
+	pkgver = 2.1.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/microsoft/msquic
@@ -13,16 +13,16 @@ pkgbase = msquic
 	depends = glibc
 	provides = libmsquic.so
 	conflicts = libmsquic.so
-	noextract = clog-9cbba2eea80d11faba83266c7f0f5e3b72a1f266.tar.gz
-	noextract = googletest-ae1b7ad4308249bfa928e65d1a33be117fc0992c.tar.gz
-	noextract = openssl-c3d4eb57dc74ba18ce70acee68b9a086ccc806aa.tar.gz
-	source = msquic-2.0.3.tar.gz::https://github.com/microsoft/msquic/archive/refs/tags/v2.0.3.tar.gz
-	source = clog-9cbba2eea80d11faba83266c7f0f5e3b72a1f266.tar.gz::https://github.com/microsoft/CLOG/archive/9cbba2eea80d11faba83266c7f0f5e3b72a1f266.tar.gz
-	source = googletest-ae1b7ad4308249bfa928e65d1a33be117fc0992c.tar.gz::https://github.com/google/googletest/archive/ae1b7ad4308249bfa928e65d1a33be117fc0992c.tar.gz
-	source = openssl-c3d4eb57dc74ba18ce70acee68b9a086ccc806aa.tar.gz::https://github.com/quictls/openssl/archive/c3d4eb57dc74ba18ce70acee68b9a086ccc806aa.tar.gz
-	sha512sums = c434111cb01eeae5e58901d15bfec3a544a07f38507f6676908c7804ec419ab6edc99ce33ea05c4565e6c2482acda73a5b95a51d3c9819a426f22f868dbe061b
-	sha512sums = b4f69af2e3676570179590cd752ccb5b9d771b6221369214c16ab6d03763c498350474722fdfdc0b3937f689c4c8dd057ae46c58787a6277bf06f9dca592f270
-	sha512sums = 4a921ee7fdcb508ea1b59fad2bf20405a6f1dbd754ffd1dea4d1845805a14e8c67614dd3082f97a0da9c138751ca082fe55812f6f38b480b074bfe4c76d074bd
-	sha512sums = 69ddbe18961b563f2b6d045d8046ec875080e526d5615cda2c3b374b50ba72e0b7b36132bcd5cdda8bbcb7f8ee5ac43160cd2988740f8df4492435e5879d3266
+	noextract = clog-a4f472c5fe2c8298c0ada2e24717458c45a17eb1.tar.gz
+	noextract = googletest-dd7a9d29a33de34836c345c3b753d4eba15c5f44.tar.gz
+	noextract = openssl-f105ac0bfdae1ce009b8fd86bc6d9f65e5576352.tar.gz
+	source = msquic-2.1.0.tar.gz::https://github.com/microsoft/msquic/archive/refs/tags/v2.1.0.tar.gz
+	source = clog-a4f472c5fe2c8298c0ada2e24717458c45a17eb1.tar.gz::https://github.com/microsoft/CLOG/archive/a4f472c5fe2c8298c0ada2e24717458c45a17eb1.tar.gz
+	source = googletest-dd7a9d29a33de34836c345c3b753d4eba15c5f44.tar.gz::https://github.com/google/googletest/archive/dd7a9d29a33de34836c345c3b753d4eba15c5f44.tar.gz
+	source = openssl-f105ac0bfdae1ce009b8fd86bc6d9f65e5576352.tar.gz::https://github.com/quictls/openssl/archive/f105ac0bfdae1ce009b8fd86bc6d9f65e5576352.tar.gz
+	sha512sums = ff663e505189026f9b3a0317134850a02af5e205b96452f9d9ec6a6740d4e5d4238a265984900601266dcf75a110061c7ecc3308bb85f8e9d14a6ed9e949f388
+	sha512sums = 593ebae4f2dd0f76c56b21b849cceaa9847bd2fc5eea511b3c6236c577e869134381e3d20a1511e7c649b4e305501f6689004880d8155fb0e3ce8cbe18e4f2c2
+	sha512sums = ad897fa82f7b17c8ad59376e039b026b092973495a41b30527afd656714302bb05dd8564c77f18cf13a8e6f952df2e6483d79a25ee30cdfd9211078ecd1ee5cb
+	sha512sums = 97224db510d8e3a92f591484847a8e66280dcaa5305c9646715608c385dd7fea74e9cbd6e8f9663aa7f5b7e8d593e14cfcdbf3ea3f85f04030b9a62a2880a0c1
 
 pkgname = msquic
diff --git a/PKGBUILD b/PKGBUILD
index 06fc8b255ea3..75ad8a498e8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Florian Maunier <fmauneko@dissidence.ovh>
 pkgname=msquic
-pkgver=2.0.3
-_clog_commit=9cbba2eea80d11faba83266c7f0f5e3b72a1f266
-_googletest_commit=ae1b7ad4308249bfa928e65d1a33be117fc0992c
-_openssl_commit=c3d4eb57dc74ba18ce70acee68b9a086ccc806aa
+pkgver=2.1.0
+_clog_commit=a4f472c5fe2c8298c0ada2e24717458c45a17eb1
+_googletest_commit=dd7a9d29a33de34836c345c3b753d4eba15c5f44
+_openssl_commit=f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
 pkgrel=1
 epoch=1
 pkgdesc="Microsoft implementation of the IETF QUIC protocol (release)"
@@ -18,10 +18,10 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/microsoft/$pkgname/archive/
         "clog-$_clog_commit.tar.gz::https://github.com/microsoft/CLOG/archive/$_clog_commit.tar.gz"
         "googletest-$_googletest_commit.tar.gz::https://github.com/google/googletest/archive/$_googletest_commit.tar.gz"
         "openssl-$_openssl_commit.tar.gz::https://github.com/quictls/openssl/archive/$_openssl_commit.tar.gz")
-sha512sums=('c434111cb01eeae5e58901d15bfec3a544a07f38507f6676908c7804ec419ab6edc99ce33ea05c4565e6c2482acda73a5b95a51d3c9819a426f22f868dbe061b'
-            'b4f69af2e3676570179590cd752ccb5b9d771b6221369214c16ab6d03763c498350474722fdfdc0b3937f689c4c8dd057ae46c58787a6277bf06f9dca592f270'
-            '4a921ee7fdcb508ea1b59fad2bf20405a6f1dbd754ffd1dea4d1845805a14e8c67614dd3082f97a0da9c138751ca082fe55812f6f38b480b074bfe4c76d074bd'
-            '69ddbe18961b563f2b6d045d8046ec875080e526d5615cda2c3b374b50ba72e0b7b36132bcd5cdda8bbcb7f8ee5ac43160cd2988740f8df4492435e5879d3266')
+sha512sums=('ff663e505189026f9b3a0317134850a02af5e205b96452f9d9ec6a6740d4e5d4238a265984900601266dcf75a110061c7ecc3308bb85f8e9d14a6ed9e949f388'
+            '593ebae4f2dd0f76c56b21b849cceaa9847bd2fc5eea511b3c6236c577e869134381e3d20a1511e7c649b4e305501f6689004880d8155fb0e3ce8cbe18e4f2c2'
+            'ad897fa82f7b17c8ad59376e039b026b092973495a41b30527afd656714302bb05dd8564c77f18cf13a8e6f952df2e6483d79a25ee30cdfd9211078ecd1ee5cb'
+            '97224db510d8e3a92f591484847a8e66280dcaa5305c9646715608c385dd7fea74e9cbd6e8f9663aa7f5b7e8d593e14cfcdbf3ea3f85f04030b9a62a2880a0c1')
 noextract=("clog-$_clog_commit.tar.gz"
            "googletest-$_googletest_commit.tar.gz"
            "openssl-$_openssl_commit.tar.gz")
diff --git a/cmake_args.patch b/cmake_args.patch
deleted file mode 100644
index d69d5ed4ae79..000000000000
--- a/cmake_args.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 374b67a..e2b7795 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,9 +97,9 @@ else()
-     #set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/msquic/lib")
-     endif("${isSystemDir}" STREQUAL "-1")
- 
--    set(msquic_dest msquic)
--    set(main_lib_dest msquic/lib)
--    set(include_dest msquic/include)
-+    set(msquic_dest ${CMAKE_INSTALL_PREFIX})
-+    set(main_lib_dest lib)
-+    set(include_dest include)
- endif()
- 
- set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
-@@ -336,11 +336,11 @@ else()
-     set(CMAKE_C_FLAGS_DEBUG "-Og -ggdb3")
-     set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-     set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Ofast ${MARCH} -ggdb3 -DNDEBUG")
--    set(CMAKE_C_FLAGS_RELEASE "-Ofast ${MARCH} -DNDEBUG")
-+    #set(CMAKE_C_FLAGS_RELEASE "-Ofast ${MARCH} -DNDEBUG")
-     set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-     set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
-     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
--    set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-+    #set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
- 
-     list(APPEND QUIC_COMMON_FLAGS -fms-extensions -fPIC)
-     if (CX_PLATFORM STREQUAL "darwin")
-@@ -501,7 +501,7 @@ if(QUIC_TLS STREQUAL "openssl")
-             list(APPEND OPENSSL_CONFIG_FLAGS -latomic)
-         else()
-             set(OPENSSL_CONFIG_CMD ${CMAKE_CURRENT_SOURCE_DIR}/submodules/openssl/config
--                CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
-+                CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS})
-         endif()
-         add_custom_target(mkdir_openssl_build
-             COMMAND mkdir -p ${QUIC_BUILD_DIR}/submodules/openssl)
-diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
-index a59bb9e..bae4408 100644
---- a/src/bin/CMakeLists.txt
-+++ b/src/bin/CMakeLists.txt
-@@ -2,9 +2,9 @@
- # Licensed under the MIT License.
- 
- if(WIN32)
--    set(SOURCES winuser/dllmain.c winuser/msquic.rc $<TARGET_OBJECTS:MsQuicEtw_Resource>)
-+  set(SOURCES winuser/dllmain.c winuser/msquic.rc $<TARGET_OBJECTS:MsQuicEtw_Resource>)
- else()
--    set(SOURCES linux/init.c)
-+  set(SOURCES linux/init.c)
- endif()
- 
- add_library(msquic SHARED ${SOURCES})
-@@ -14,31 +14,39 @@ set_property(TARGET msquic PROPERTY FOLDER "libraries")
- target_link_libraries(msquic PRIVATE core platform inc warnings logging)
- 
- if(WIN32)
--    if(QUIC_UWP_BUILD)
--        target_link_libraries(msquic PUBLIC OneCoreUAP)
--    endif()
--    SET_TARGET_PROPERTIES(msquic
--        PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/winuser/msquic.def\"")
-+  if(QUIC_UWP_BUILD)
-+    target_link_libraries(msquic PUBLIC OneCoreUAP)
-+  endif()
-+  set_target_properties(
-+    msquic
-+    PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/winuser/msquic.def\""
-+  )
- else()
--    SET_TARGET_PROPERTIES(msquic
--        PROPERTIES LINK_FLAGS "-Wl,--version-script=\"${CMAKE_CURRENT_SOURCE_DIR}/linux/exports.txt\"")
-+  set_target_properties(
-+    msquic
-+    PROPERTIES LINK_FLAGS "-Wl,--version-script=\"${CMAKE_CURRENT_SOURCE_DIR}/linux/exports.txt\""
-+  )
- endif()
- 
--target_include_directories(msquic PUBLIC
--    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
--    $<INSTALL_INTERFACE:${include_dest}>)
-+target_include_directories(
-+  msquic PUBLIC
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
-+  $<INSTALL_INTERFACE:${include_dest}>
-+)
- 
--set(PUBLIC_HEADERS
--    ../inc/msquic.h
--    ../inc/msquic_winuser.h
--    ../inc/msquic_linux.h
--    ../inc/quic_sal_stub.h)
-+set(
-+  PUBLIC_HEADERS
-+  ../inc/msquic.h
-+  ../inc/msquic_winuser.h
-+  ../inc/msquic_linux.h
-+  ../inc/quic_sal_stub.h
-+)
- 
- install(TARGETS msquic EXPORT msquic DESTINATION "${main_lib_dest}")
- install(FILES ${PUBLIC_HEADERS} DESTINATION "${include_dest}")
- 
--configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
-+#configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
- 
--install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest})
-+#install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest})
- 
--install(EXPORT msquic DESTINATION ${msquic_dest})
-+#install(EXPORT msquic DESTINATION ${msquic_dest})