Merge branch 'main'

.gitmodules

@@ -28,3 +28,10 @@
 [submodule "third-party/googletest"]
 	path = third-party/googletest
 	url = https://github.com/google/googletest.git
+[submodule "third-party/utfcpp"]
+	branch = post-3.2.1-transmission
+	path = third-party/utfcpp
+	url = https://github.com/transmission/utfcpp
+[submodule "third-party/libdeflate"]
+	path = third-party/libdeflate
+	url = https://github.com/transmission/libdeflate

CMakeLists.txt

@@ -35,6 +35,7 @@ tr_auto_option(ENABLE_MAC           "Build Mac client" AUTO)
         option(INSTALL_LIB          "Install the library" OFF)
 tr_auto_option(RUN_CLANG_TIDY       "Run clang-tidy on the code" AUTO)
 tr_auto_option(USE_SYSTEM_EVENT2    "Use system event2 library" AUTO)
+tr_auto_option(USE_SYSTEM_DEFLATE   "Use system deflate library" AUTO)
 tr_auto_option(USE_SYSTEM_DHT       "Use system dht library" AUTO)
 tr_auto_option(USE_SYSTEM_MINIUPNPC "Use system miniupnpc library" AUTO)
 tr_auto_option(USE_SYSTEM_NATPMP    "Use system natpmp library" AUTO)
@@ -109,16 +110,17 @@ string(SUBSTRING "${TR_VCS_REVISION}" 0 10 TR_VCS_REVISION)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CURL_MINIMUM            7.28.0)
-set(EVENT2_MINIMUM          2.0.10)
-set(OPENSSL_MINIMUM         0.9.7)
 set(CYASSL_MINIMUM          3.0)
-set(POLARSSL_MINIMUM        1.2)
-set(ZLIB_MINIMUM            1.2.3)
-set(GTK_MINIMUM             3.4.0)
-set(GLIB_MINIMUM            2.50.1)
+set(DEFLATE_MINIMUM         1.9)
+set(EVENT2_MINIMUM          2.0.10)
 set(GIO_MINIMUM             2.26.0)
+set(GLIB_MINIMUM            2.50.1)
+set(GTK_MINIMUM             3.24.0)
 set(LIBAPPINDICATOR_MINIMUM 0.4.90)
+set(OPENSSL_MINIMUM         0.9.7)
+set(POLARSSL_MINIMUM        1.2)
 set(QT_MINIMUM              5.6)
+set(ZLIB_MINIMUM            1.2.3)
 
 if(WIN32)
     foreach(L C CXX)
@@ -142,6 +144,7 @@ if(WIN32)
     endforeach()
 endif()
 
+find_package(UtfCpp)
 find_package(Threads)
 find_package(PkgConfig QUIET)
 
@@ -318,6 +321,11 @@ endif()
 
 set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/third-party)
 
+tr_add_external_auto_library(DEFLATE libdeflate deflate)
+if(NOT USE_SYSTEM_DEFLATE)
+    set(DEFLATE_VERSION 1.9)
+endif()
+
 tr_add_external_auto_library(EVENT2 libevent event
     CMAKE_ARGS
         -DEVENT__DISABLE_OPENSSL:BOOL=ON

README.md

@@ -76,3 +76,18 @@ If for some reason you are unwilling or unable to do so, there is a shell script
     or
     $ docker-compose build --pull
     $ docker-compose run --rm code_style
+
+## Sponsors
+
+<table>
+ <tbody>
+  <tr>
+   <td align="center"><img alt="[MacStadium]" src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" height="30"/></td>
+   <td>macOS CI builds are running on a M1 Mac Mini provided by <a href="https://www.macstadium.com/opensource">MacStadium</a></td>
+  </tr>
+  <tr>
+   <td align="center"><img alt="[SignPath]" src="https://avatars.githubusercontent.com/u/34448643" height="30"/></td>
+   <td>Free code signing on Windows provided by <a href="https://signpath.io/">SignPath.io</a>, certificate by <a href="https://signpath.org/">SignPath Foundation</a></td>
+  </tr>
+ </tbody>
+</table>

appveyor.yml

@@ -2,11 +2,11 @@ version: '{build}'
 
 environment:
   AWS_ACCESS_KEY_ID:
-    secure: JH2KJ09654cSwhYup2MKb80kK60+nezvUmFzBay7tUI=
+    secure: WQRc7y9bDiWiLpjm9lXdw9Q7n4extWau3W1ztQdqMgU=
   AWS_SECRET_ACCESS_KEY:
-    secure: fum5aRKLhJvxh3UQhiQVt2acV4eke8GiGdMhHIW/uuQC7wztj4T9tJWp5IO1U7m4
+    secure: pP+D6ZtfXLDcEnl8pk/n3KApaV1fdGns4VkSyebs0zHzCutlvWj7ee16PalCcnBY
   AWS_S3_BUCKET_NAME:
-    secure: Bf3x1Iruxg+l3tp+an+g9kWhBexLLw/69gEt9bEu7Zk=
+    secure: Bf3x1Iruxg+l3tp+an+g9oE36EHxvyWrE8GTJzZh4Ss=
 
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
@@ -63,7 +63,7 @@ for:
           & (Join-Path $Env:APPVEYOR_BUILD_FOLDER release windows main.ps1) `
               -Mode Build `
               -BuildArch $env:TR_ARCH `
-              -PackDebugSyms:$($Env:APPVEYOR_REPO_BRANCH -eq "master" -or $Env:APPVEYOR_REPO_TAG -eq "true")
+              -PackDebugSyms:$($Env:APPVEYOR_REPO_BRANCH -eq "main" -or $Env:APPVEYOR_REPO_TAG -eq "true")
       } catch {
           Write-Error ("{1}{0}{2}{0}{3}" -f [Environment]::NewLine, $_.ToString(), $_.InvocationInfo.PositionMessage, $_.ScriptStackTrace) -ErrorAction Continue
           exit 1