diff options
author | Ian Moone <gentoo@chaoslab.org> | 2018-12-09 16:12:07 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2018-12-09 11:31:45 -0500 |
commit | 5f9654787649f3b8f0e9d8cbaceb8669fc0e8287 (patch) | |
tree | 1c96a97e8eced9e5be3b9706bd7ff71b8c233fc8 | |
parent | travis.yml: Bump portage to 2.3.52 (diff) | |
download | libressl-5f9654787649f3b8f0e9d8cbaceb8669fc0e8287.tar.gz libressl-5f9654787649f3b8f0e9d8cbaceb8669fc0e8287.tar.bz2 libressl-5f9654787649f3b8f0e9d8cbaceb8669fc0e8287.zip |
dev-qt/qtnetwork: Sync with main tree; Drop 5.11.2
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r-- | dev-qt/qtnetwork/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.6.patch | 48 | ||||
-rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.8.patch | 74 | ||||
-rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild | 70 |
4 files changed, 0 insertions, 193 deletions
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 16d76f2..0dca291 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,2 @@ DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 -DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.6.patch b/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.6.patch deleted file mode 100644 index 5621934..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.6.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naurp old_qt/config.tests/unix/openssl11/openssl.cpp new_qt/config.tests/unix/openssl11/openssl.cpp ---- old_qt/config.tests/unix/openssl11/openssl.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/config.tests/unix/openssl11/openssl.cpp 2018-10-20 08:31:20.497180387 +0900 -@@ -39,7 +39,7 @@ - - #include <openssl/opensslv.h> - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # error "OpenSSL >= 1.1 is required" - #endif - -diff -Naurp old_qt/src/network/ssl/qsslcontext_openssl.cpp new_qt/src/network/ssl/qsslcontext_openssl.cpp ---- old_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-10-20 08:34:24.613169930 +0900 -@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSs - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); - if (cctx) { -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp ---- old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-10-20 08:37:48.682266708 +0900 -@@ -406,7 +406,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return); - DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); - DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h ---- old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-10-20 08:39:53.219936039 +0900 -@@ -356,7 +356,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, - int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); - int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); - X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *q_SSL_CONF_CTX_new(); - void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); - void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.8.patch b/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.8.patch deleted file mode 100644 index 191c31c..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.11.2-libressl-2.8.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -Naurp old_qt/config.tests/unix/openssl11/openssl.cpp new_qt/config.tests/unix/openssl11/openssl.cpp ---- old_qt/config.tests/unix/openssl11/openssl.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/config.tests/unix/openssl11/openssl.cpp 2018-10-20 08:31:20.497180387 +0900 -@@ -39,7 +39,7 @@ - - #include <openssl/opensslv.h> - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # error "OpenSSL >= 1.1 is required" - #endif - -diff -Naurp old_qt/src/network/ssl/qsslcontext_openssl.cpp new_qt/src/network/ssl/qsslcontext_openssl.cpp ---- old_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-10-20 08:34:24.613169930 +0900 -@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSs - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); - if (cctx) { -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp ---- old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-10-20 08:37:48.682266708 +0900 -@@ -406,7 +406,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return); - DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); - DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h ---- old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-09-13 13:25:10.000000000 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-10-20 08:39:53.219936039 +0900 -@@ -356,7 +356,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, - int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); - int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); - X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *q_SSL_CONF_CTX_new(); - void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); - void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); ---- old_qt/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2018-11-07 21:44:50.366794902 -0500 -+++ new_qt/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2018-11-07 21:46:55.736431477 -0500 -@@ -78,8 +78,8 @@ - unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); - BIO *q_BIO_new_file(const char *filename, const char *mode); - void q_ERR_clear_error(); --Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); --Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); -+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); -+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - int q_CRYPTO_num_locks(); - void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); - void q_CRYPTO_set_id_callback(unsigned long (*a)()); ---- old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-11-07 21:37:09.688810659 -0500 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-11-07 21:48:12.575595832 -0500 -@@ -190,8 +190,8 @@ - #endif - DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return) - DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) --DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) --DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) - DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) - DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild deleted file mode 100644 index 7668ec8..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -fi - -IUSE="bindist connman libproxy libressl networkmanager +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV} - >=sys-libs/zlib-1.2.5 - connman? ( ~dev-qt/qtdbus-${PV} ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_prepare() { - has_version '>=dev-libs/libressl-2.8.0' && \ - eapply "${FILESDIR}/${P}-libressl-2.8.patch" - - has_version '<dev-libs/libressl-2.8.0' && \ - eapply "${FILESDIR}/${P}-libressl-2.6.patch" - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(use connman || use networkmanager && echo -dbus-linked) - $(qt_use libproxy) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} |