qt5-qtbase: fix hardcoded prefix in ssl_certificate_path.patch

This commit is contained in:
Leonid Pliushch 2021-05-18 13:16:40 +03:00 committed by Yaksh Bariya
parent 78c7abfd51
commit 003c4f036d
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581

View File

@ -7,7 +7,7 @@ diff --color -uNr qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket.cpp q
<< "/opt/openssl/certs/" // HP-UX << "/opt/openssl/certs/" // HP-UX
- << "/etc/ssl/"; // OpenBSD - << "/etc/ssl/"; // OpenBSD
+ << "/etc/ssl/" // OpenBSD + << "/etc/ssl/" // OpenBSD
+ << "/data/data/com.termux/files/usr/etc/tls/"; // Termux + << "@TERMUX_PREFIX@/etc/tls/"; // Termux
} }
/*! /*!
@ -18,7 +18,7 @@ diff --color -uNr qtbase-everywhere-src-5.12.10/src/network/ssl/qsslsocket_opens
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva 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 systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
# endif # endif
+ systemCerts.append(QSslCertificate::fromPath(QLatin1String("/data/data/com.termux/files/usr/etc/tls/cert.pem"), QSsl::Pem)); // Termux ca-certificates + systemCerts.append(QSslCertificate::fromPath(QLatin1String("@TERMUX_PREFIX@/etc/tls/cert.pem"), QSsl::Pem)); // Termux ca-certificates
} }
#endif #endif
#ifdef QSSLSOCKET_DEBUG #ifdef QSSLSOCKET_DEBUG