From da8885cffb10ea911f1d5450bca9874dcd9c93a1 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:28:03 -0500 Subject: [PATCH 1/6] chore(windows): update Qt to 5.12.12 --- windows/cross-compile/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index de8f21181..52a6b252b 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -279,10 +279,10 @@ fi QT_PREFIX_DIR="$DEP_DIR/libqt5" QT_MAJOR=5 QT_MINOR=12 -QT_PATCH=11 +QT_PATCH=12 QT_VERSION=$QT_MAJOR.$QT_MINOR.$QT_PATCH -# hash from https://download.qt.io/archive/qt/5.12/5.12.11/single/qt-everywhere-src-5.12.11.tar.xz.mirrorlist -QT_HASH="0c4cdef158c61827d70d6111423166e2c62b539eaf303f36ad1d0aa8af900b95" +# hash from https://download.qt.io/archive/qt/5.12/5.12.12/single/qt-everywhere-src-5.12.12.tar.xz.mirrorlist +QT_HASH="1979a3233f689cb8b3e2783917f8f98f6a2e1821a70815fb737f020cd4b6ab06" QT_FILENAME="qt-everywhere-src-$QT_VERSION.tar.xz" if [ ! -f "$QT_PREFIX_DIR/done" ] then From 560751db883d56bdc65faca9c202c90916340e0b Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:29:24 -0500 Subject: [PATCH 2/6] chore(windows): update SQLCipher to 4.5.0 --- src/persistence/db/rawdatabase.cpp | 3 ++- windows/cross-compile/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/persistence/db/rawdatabase.cpp b/src/persistence/db/rawdatabase.cpp index 3d653dff3..e2b7c8aff 100644 --- a/src/persistence/db/rawdatabase.cpp +++ b/src/persistence/db/rawdatabase.cpp @@ -271,7 +271,8 @@ bool RawDatabase::setCipherParameters(SqlCipherParams params, const QString& dat const QString default4_xParams{"PRAGMA database.cipher_page_size = 4096;" "PRAGMA database.kdf_iter = 256000;" "PRAGMA database.cipher_hmac_algorithm = HMAC_SHA512;" - "PRAGMA database.cipher_kdf_algorithm = PBKDF2_HMAC_SHA512;"}; + "PRAGMA database.cipher_kdf_algorithm = PBKDF2_HMAC_SHA512;" + "PRAGMA database.cipher_memory_security = ON;"}; // got disabled by default in 4.5.0, so manually enable it QString defaultParams; switch(params) { diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 52a6b252b..b1bb14e8e 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -396,8 +396,8 @@ set -u # SQLCipher SQLCIPHER_PREFIX_DIR="$DEP_DIR/libsqlcipher" -SQLCIPHER_VERSION=v4.4.3 -SQLCIPHER_HASH="b8df69b998c042ce7f8a99f07cf11f45dfebe51110ef92de95f1728358853133" +SQLCIPHER_VERSION=v4.5.0 +SQLCIPHER_HASH="20c46a855c47d5a0a159fdcaa8491ec7bdbaa706a734ee52bc76188b929afb14" SQLCIPHER_FILENAME="$SQLCIPHER_VERSION.tar.gz" if [ ! -f "$SQLCIPHER_PREFIX_DIR/done" ] then From de84dcb89c36648f0b6e4e7d722c7f40b074621c Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:30:00 -0500 Subject: [PATCH 3/6] chore(windows): update FFmpeg to 4.4.1 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index b1bb14e8e..6874a2b6b 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -438,8 +438,8 @@ fi # FFmpeg FFMPEG_PREFIX_DIR="$DEP_DIR/libffmpeg" -FFMPEG_VERSION=4.3.2 -FFMPEG_HASH="46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" +FFMPEG_VERSION=4.4.1 +FFMPEG_HASH="eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02" FFMPEG_FILENAME="ffmpeg-$FFMPEG_VERSION.tar.xz" if [ ! -f "$FFMPEG_PREFIX_DIR/done" ] then From d08c37b5a41040c2e90bcb2d7980337aa5deb3fa Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:30:48 -0500 Subject: [PATCH 4/6] chore(windows): update Exif to 0.6.24 --- windows/cross-compile/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 6874a2b6b..c6fa48a13 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -638,15 +638,15 @@ fi # Exif EXIF_PREFIX_DIR="$DEP_DIR/libexif" -EXIF_VERSION="0.6.23" -EXIF_HASH="a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431" -EXIF_FILENAME="libexif-$EXIF_VERSION.tar.xz" +EXIF_VERSION="0.6.24" +EXIF_HASH="d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae" +EXIF_FILENAME="libexif-$EXIF_VERSION.tar.bz2" if [ ! -f "$EXIF_PREFIX_DIR/done" ] then rm -rf "$EXIF_PREFIX_DIR" mkdir -p "$EXIF_PREFIX_DIR" - curl $CURL_OPTIONS -O "https://github.com/libexif/libexif/releases/download/v${EXIF_VERSION}/libexif-${EXIF_VERSION}.tar.xz" + curl $CURL_OPTIONS -O "https://github.com/libexif/libexif/releases/download/v${EXIF_VERSION}/$EXIF_FILENAME" check_sha256 "$EXIF_HASH" "$EXIF_FILENAME" bsdtar --no-same-owner --no-same-permissions -xf $EXIF_FILENAME rm $EXIF_FILENAME From 2414593386d2d4004ccf29860d53cb31b1cc1737 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:31:15 -0500 Subject: [PATCH 5/6] chore(windows): update VPX to 1.11.0 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index c6fa48a13..5dcceeba3 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -797,8 +797,8 @@ fi # VPX VPX_PREFIX_DIR="$DEP_DIR/libvpx" -VPX_VERSION=v1.10.0 -VPX_HASH="85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a" +VPX_VERSION=v1.11.0 +VPX_HASH="965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83" VPX_FILENAME="libvpx-$VPX_VERSION.tar.gz" if [ ! -f "$VPX_PREFIX_DIR/done" ] then From d03c60e3b24333f9080791db83c2aa4cabb5353c Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 7 Dec 2021 04:31:42 -0500 Subject: [PATCH 6/6] chore(windows): Update toxcore to 0.2.13 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 5dcceeba3..79107085b 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -983,8 +983,8 @@ fi # Toxcore TOXCORE_PREFIX_DIR="$DEP_DIR/libtoxcore" -TOXCORE_VERSION=0.2.12 -TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0" +TOXCORE_VERSION=0.2.13 +TOXCORE_HASH="67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8" TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz" if [ ! -f "$TOXCORE_PREFIX_DIR/done" ] then