Upgrade to MsQuic 2.2.2

2 files changed, 26 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1efa375e874f..a8205a9be926 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = msquic
 	pkgdesc = Microsoft implementation of the IETF QUIC protocol (release)
-	pkgver = 2.1.8
+	pkgver = 2.2.2
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/microsoft/msquic
@@ -13,16 +13,19 @@ pkgbase = msquic
 	depends = glibc
 	provides = libmsquic.so
 	conflicts = libmsquic.so
-	noextract = clog-a4f472c5fe2c8298c0ada2e24717458c45a17eb1.tar.gz
-	noextract = googletest-dd7a9d29a33de34836c345c3b753d4eba15c5f44.tar.gz
+	noextract = clog-ca6e640fbf7f53ec9de915f1f4d852c10d874d13.tar.gz
+	noextract = googletest-12a5852e451baabc79c63a86c634912c563d57bc.tar.gz
 	noextract = openssl-c3f5f36f5dadfa334119e940b7576a4abfa428c8.tar.gz
-	source = msquic-2.1.8.tar.gz::https://github.com/microsoft/msquic/archive/refs/tags/v2.1.8.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
+	noextract = openssl3-be9e773e8926fc76166a45cfe5a19362372db90c.tar.gz
+	source = msquic-2.2.2.tar.gz::https://github.com/microsoft/msquic/archive/refs/tags/v2.2.2.tar.gz
+	source = clog-ca6e640fbf7f53ec9de915f1f4d852c10d874d13.tar.gz::https://github.com/microsoft/CLOG/archive/ca6e640fbf7f53ec9de915f1f4d852c10d874d13.tar.gz
+	source = googletest-12a5852e451baabc79c63a86c634912c563d57bc.tar.gz::https://github.com/google/googletest/archive/12a5852e451baabc79c63a86c634912c563d57bc.tar.gz
 	source = openssl-c3f5f36f5dadfa334119e940b7576a4abfa428c8.tar.gz::https://github.com/quictls/openssl/archive/c3f5f36f5dadfa334119e940b7576a4abfa428c8.tar.gz
-	sha512sums = bbe73fcb69f067accd0f8f2a6ac73d030971d70de1f3b3d1ab1bbc43a885639d414b20cbd202d89de145e3bba40a91466ac6709b53bc6d7d0788e52d8865b50c
-	sha512sums = 593ebae4f2dd0f76c56b21b849cceaa9847bd2fc5eea511b3c6236c577e869134381e3d20a1511e7c649b4e305501f6689004880d8155fb0e3ce8cbe18e4f2c2
-	sha512sums = ad897fa82f7b17c8ad59376e039b026b092973495a41b30527afd656714302bb05dd8564c77f18cf13a8e6f952df2e6483d79a25ee30cdfd9211078ecd1ee5cb
+	source = openssl3-be9e773e8926fc76166a45cfe5a19362372db90c.tar.gz::https://github.com/quictls/openssl/archive/be9e773e8926fc76166a45cfe5a19362372db90c.tar.gz
+	sha512sums = 6fe01aa2f09e036d9ca6f8c1ff15a624c666bf45689cb532aedf08ea19898a59732aec2b8423e152e38fc5e6bfadebfc96b5b3d21c22df94cd0ade09308667d8
+	sha512sums = d7c4190174d8c4690ec50bfe010a0d557f911d2a17802d8caf9f0b4e13d5e06ef0ae828fc4c355157ff860929f5f4bab42e248665c5d9678891b286ee9eaeaef
+	sha512sums = 3f1fe26d8bf3bfa7c7be8ad5e9a80239cf88066cd5ca234be574d1d4a243ceb3e4991cf7d15ccb159312735416fefa905e4e1ef1ff6defc39b3c14248ac62b86
 	sha512sums = 04197a62a2e5ae8e280f45dae5a72d039d5c139f775b9f91e54985949e07ce13e347b5f46463bb68b3e8e2d78314c10311a7c11e5b606bbb1ba7ef60bedd7c74
+	sha512sums = a615090d5adce86f6333ac29d948680695ceaab4be18fdf9fbb4cd2390f20acf0aefdee1de42f0f4b2994327a668d3c0ecd9a85b04204616ea8f114e933d96fa
 
 pkgname = msquic
diff --git a/PKGBUILD b/PKGBUILD
index bb534e1b6931..398d20a64753 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Florian Maunier <fmauneko@dissidence.ovh>
 pkgname=msquic
-pkgver=2.1.8
-_clog_commit=a4f472c5fe2c8298c0ada2e24717458c45a17eb1
-_googletest_commit=dd7a9d29a33de34836c345c3b753d4eba15c5f44
+pkgver=2.2.2
+_clog_commit=ca6e640fbf7f53ec9de915f1f4d852c10d874d13
+_googletest_commit=12a5852e451baabc79c63a86c634912c563d57bc
 _openssl_commit=c3f5f36f5dadfa334119e940b7576a4abfa428c8
+_openssl3_commit=be9e773e8926fc76166a45cfe5a19362372db90c
 pkgrel=1
 epoch=1
 pkgdesc="Microsoft implementation of the IETF QUIC protocol (release)"
@@ -17,14 +18,17 @@ conflicts=('libmsquic.so')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/microsoft/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
         "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=('bbe73fcb69f067accd0f8f2a6ac73d030971d70de1f3b3d1ab1bbc43a885639d414b20cbd202d89de145e3bba40a91466ac6709b53bc6d7d0788e52d8865b50c'
-            '593ebae4f2dd0f76c56b21b849cceaa9847bd2fc5eea511b3c6236c577e869134381e3d20a1511e7c649b4e305501f6689004880d8155fb0e3ce8cbe18e4f2c2'
-            'ad897fa82f7b17c8ad59376e039b026b092973495a41b30527afd656714302bb05dd8564c77f18cf13a8e6f952df2e6483d79a25ee30cdfd9211078ecd1ee5cb'
-            '04197a62a2e5ae8e280f45dae5a72d039d5c139f775b9f91e54985949e07ce13e347b5f46463bb68b3e8e2d78314c10311a7c11e5b606bbb1ba7ef60bedd7c74')
+        "openssl-$_openssl_commit.tar.gz::https://github.com/quictls/openssl/archive/$_openssl_commit.tar.gz"
+        "openssl3-$_openssl3_commit.tar.gz::https://github.com/quictls/openssl/archive/$_openssl3_commit.tar.gz")
+sha512sums=('6fe01aa2f09e036d9ca6f8c1ff15a624c666bf45689cb532aedf08ea19898a59732aec2b8423e152e38fc5e6bfadebfc96b5b3d21c22df94cd0ade09308667d8'
+            'd7c4190174d8c4690ec50bfe010a0d557f911d2a17802d8caf9f0b4e13d5e06ef0ae828fc4c355157ff860929f5f4bab42e248665c5d9678891b286ee9eaeaef'
+            '3f1fe26d8bf3bfa7c7be8ad5e9a80239cf88066cd5ca234be574d1d4a243ceb3e4991cf7d15ccb159312735416fefa905e4e1ef1ff6defc39b3c14248ac62b86'
+            '04197a62a2e5ae8e280f45dae5a72d039d5c139f775b9f91e54985949e07ce13e347b5f46463bb68b3e8e2d78314c10311a7c11e5b606bbb1ba7ef60bedd7c74'
+            'a615090d5adce86f6333ac29d948680695ceaab4be18fdf9fbb4cd2390f20acf0aefdee1de42f0f4b2994327a668d3c0ecd9a85b04204616ea8f114e933d96fa')
 noextract=("clog-$_clog_commit.tar.gz"
            "googletest-$_googletest_commit.tar.gz"
-           "openssl-$_openssl_commit.tar.gz")
+           "openssl-$_openssl_commit.tar.gz"
+           "openssl3-$_openssl3_commit.tar.gz")
 
 prepare() {
 	cd "$pkgname-$pkgver"
@@ -33,6 +37,7 @@ prepare() {
   tar xzf "$srcdir/clog-$_clog_commit.tar.gz" -C "submodules/clog" --strip-components=1
   tar xzf "$srcdir/googletest-$_googletest_commit.tar.gz" -C "submodules/googletest" --strip-components=1
   tar xzf "$srcdir/openssl-$_openssl_commit.tar.gz" -C "submodules/openssl" --strip-components=1
+  tar xzf "$srcdir/openssl3-$_openssl3_commit.tar.gz" -C "submodules/openssl3" --strip-components=1
 }
 
 build() {