From 78c7abfd51143001aa1ca2944ec059fb7894eca9 Mon Sep 17 00:00:00 2001 From: Simeon Huang Date: Sat, 15 May 2021 22:14:02 +0100 Subject: [PATCH] fix ca certificate path issue on QtNetwork SSL --- x11-packages/qt5-qtbase/build.sh | 2 +- .../qt5-qtbase/ssl_certificate_path.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 x11-packages/qt5-qtbase/ssl_certificate_path.patch diff --git a/x11-packages/qt5-qtbase/build.sh b/x11-packages/qt5-qtbase/build.sh index 1cc1634f6..ad594b963 100644 --- a/x11-packages/qt5-qtbase/build.sh +++ b/x11-packages/qt5-qtbase/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=5.12.10 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtbase-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=8088f174e6d28e779516c083b6087b6a9e3c8322b4bc161fd1b54195e3c86940 TERMUX_PKG_DEPENDS="dbus, double-conversion, harfbuzz, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, ttf-dejavu, freetype, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm, zlib" diff --git a/x11-packages/qt5-qtbase/ssl_certificate_path.patch b/x11-packages/qt5-qtbase/ssl_certificate_path.patch new file mode 100644 index 000000000..25877d9d8 --- /dev/null +++ b/x11-packages/qt5-qtbase/ssl_certificate_path.patch @@ -0,0 +1,24 @@ +diff --color -uNr qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket.cpp qtbase-everywhere-src-5.12.10.mod/src/network/ssl/qsslsocket.cpp +--- qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket.cpp 2020-09-21 14:16:21.000000000 +0100 ++++ qtbase-everywhere-src-5.12.10.mod/src/network/ssl/qsslsocket.cpp 2021-05-15 21:38:31.770873374 +0100 +@@ -2800,7 +2800,8 @@ + << "/usr/local/ssl/certs/" // Solaris + << "/etc/openssl/certs/" // BlackBerry + << "/opt/openssl/certs/" // HP-UX +- << "/etc/ssl/"; // OpenBSD ++ << "/etc/ssl/" // OpenBSD ++ << "/data/data/com.termux/files/usr/etc/tls/"; // Termux + } + + /*! +diff --color -uNr qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket_openssl.cpp qtbase-everywhere-src-5.12.10.mod/src/network/ssl/qsslsocket_openssl.cpp +--- qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket_openssl.cpp 2020-09-21 14:16:21.000000000 +0100 ++++ qtbase-everywhere-src-5.12.10.mod/src/network/ssl/qsslsocket_openssl.cpp 2021-05-15 21:36:38.303135420 +0100 +@@ -670,6 +670,7 @@ + systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva + systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss + # endif ++ systemCerts.append(QSslCertificate::fromPath(QLatin1String("/data/data/com.termux/files/usr/etc/tls/cert.pem"), QSsl::Pem)); // Termux ca-certificates + } + #endif + #ifdef QSSLSOCKET_DEBUG