From 75fc75ae1f0481ffdb78450e801a9b443ba641bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Mar 2018 10:55:17 +0100 Subject: gentoo resync : 31.03.2018 --- www-client/qupzilla/Manifest | 4 - .../files/qupzilla-2.1.2-openssl-1.1.0.patch | 103 ------------------ www-client/qupzilla/qupzilla-2.1.2.ebuild | 117 --------------------- 3 files changed, 224 deletions(-) delete mode 100644 www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch delete mode 100644 www-client/qupzilla/qupzilla-2.1.2.ebuild (limited to 'www-client/qupzilla') diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest index 65562ceb51a0..d2abdbd4920a 100644 --- a/www-client/qupzilla/Manifest +++ b/www-client/qupzilla/Manifest @@ -1,8 +1,4 @@ -AUX qupzilla-2.1.2-openssl-1.1.0.patch 4631 BLAKE2B 27ede6f8ac9f198b147bf3eddecbe9f78c50dff050f3e9bd8565620847eec1cb6fb3c3f8164a51f7220b9365c275ce9ea4321e0e7e99976170748a75ef674c8c SHA512 0171a9d64c4202c3893767c962b7951d6f431d7e70a7de1385e80c097dd6d1e55fd77be8da3621a9d15cb6982a92d4049e0dc6058c00b7bf7fc90439d659479f -DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343 DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c9238d561bf6a2583214e43b23c53c825c8274b51ff0e34ced8aac6077c12dad60968d88abe810ccb35dbd2a457e0e SHA512 78e02141f18268a5f31a896c49e4f6cbd709e609dfcdb50277fc20123526e5316b79ede612dcac74ff07103334c381e4d657b18b6e187a10983d5a44a649858a -DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315 -EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d EBUILD qupzilla-2.2.5.ebuild 3168 BLAKE2B 80a43b236bad4887ce94d26580e0018a53169f10fa2dd78b3e09617197e0ad8a87d69386da4bb502703ccb431bf49a84fa92f4ff8332b493c3e0717586ef089a SHA512 3a68d13d169239d0d939b9fbf28c27143e2f91668006b17a6e660e0bb7781f9029e57b5c5ed5d63446f38656753e25cfa5420d990079827ad9fc4b8db0594529 MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d diff --git a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch b/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch deleted file mode 100644 index 42effa56d5cc..000000000000 --- a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch +++ /dev/null @@ -1,103 +0,0 @@ -From efc4725e91e10ccfef257143408d3a683e74a866 Mon Sep 17 00:00:00 2001 -From: Jose Rios -Date: Mon, 1 May 2017 02:12:26 +0100 -Subject: [PATCH] Fixed compilation for Openssl 1.1.0 - -Most of libcrypto and libssl internal structures were made -opaque in this version not allowing to instatiate them in -the stack. - -More info: - * https://www.openssl.org/news/openssl-1.1.0-notes.html - * https://github.com/openssl/openssl/issues/962#issuecomment-208792020 ---- - src/lib/tools/aesinterface.cpp | 28 ++++++++++++++++------------ - src/lib/tools/aesinterface.h | 4 ++-- - 2 files changed, 18 insertions(+), 14 deletions(-) - -diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp -index fa33eb3..29ed37e 100644 ---- a/src/lib/tools/aesinterface.cpp -+++ b/src/lib/tools/aesinterface.cpp -@@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent) - : QObject(parent) - , m_ok(false) - { -- EVP_CIPHER_CTX_init(&m_encodeCTX); -- EVP_CIPHER_CTX_init(&m_decodeCTX); -+ m_encodeCTX = EVP_CIPHER_CTX_new(); -+ m_decodeCTX = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(m_encodeCTX); -+ EVP_CIPHER_CTX_init(m_decodeCTX); - } - - AesInterface::~AesInterface() - { -- EVP_CIPHER_CTX_cleanup(&m_encodeCTX); -- EVP_CIPHER_CTX_cleanup(&m_decodeCTX); -+ EVP_CIPHER_CTX_cleanup(m_encodeCTX); -+ EVP_CIPHER_CTX_cleanup(m_decodeCTX); -+ EVP_CIPHER_CTX_free(m_encodeCTX); -+ EVP_CIPHER_CTX_free(m_decodeCTX); - } - - bool AesInterface::isOk() -@@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra - int result = 0; - if (evpMode == EVP_PKEY_MO_ENCRYPT) { - m_iVector = createRandomData(EVP_MAX_IV_LENGTH); -- result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData()); -+ result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData()); - } - else if (evpMode == EVP_PKEY_MO_DECRYPT) { -- result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData()); -+ result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData()); - } - - if (result == 0) { -@@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray & - uchar* ciphertext = (uchar*)malloc(cipherlength); - - // allows reusing of 'm_encodeCTX' for multiple encryption cycles -- EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL); -+ EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL); - - // update ciphertext, c_len is filled with the length of ciphertext generated, - // dataLength is the size of plaintext in bytes -- EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength); -+ EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength); - - // update ciphertext with the final remaining bytes -- EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength); -+ EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength); - - dataLength = cipherlength + finalLength; - QByteArray out((char*)ciphertext, dataLength); -@@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray - // because we have padding ON, we must allocate an extra cipher block size of memory - uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE); - -- EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL); -- EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength); -- int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength); -+ EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL); -+ EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength); -+ int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength); - - cipherLength = plainTextLength + finalLength; - -diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h -index e0debc6..c3c940c 100644 ---- a/src/lib/tools/aesinterface.h -+++ b/src/lib/tools/aesinterface.h -@@ -50,8 +50,8 @@ class QUPZILLA_EXPORT AesInterface : public QObject - private: - bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray()); - -- EVP_CIPHER_CTX m_encodeCTX; -- EVP_CIPHER_CTX m_decodeCTX; -+ EVP_CIPHER_CTX* m_encodeCTX; -+ EVP_CIPHER_CTX* m_decodeCTX; - - bool m_ok; - QByteArray m_iVector; diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild deleted file mode 100644 index 2ea1fc82dbec..000000000000 --- a/www-client/qupzilla/qupzilla-2.1.2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES - fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP ka_GE - lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr - sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn - zh_CN zh_HK zh_TW" - -PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e' -PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive - -inherit l10n qmake-utils xdg-utils - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git" -else - MY_P=QupZilla-${PV} - SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz" - KEYWORDS="amd64 ~arm x86" - S=${WORKDIR}/${MY_P} -fi - -DESCRIPTION="A cross-platform web browser using QtWebEngine" -HOMEPAGE="https://www.qupzilla.com/" -SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs" - -RDEPEND=" - >=dev-qt/qtcore-5.7.1:5 - >=dev-qt/qtdeclarative-5.7.1:5[widgets] - >=dev-qt/qtgui-5.7.1:5 - >=dev-qt/qtnetwork-5.7.1:5[ssl] - >=dev-qt/qtprintsupport-5.7.1:5 - >=dev-qt/qtsql-5.7.1:5[sqlite] - >=dev-qt/qtwebchannel-5.7.1:5 - >=dev-qt/qtwebengine-5.7.1:5[widgets] - >=dev-qt/qtwidgets-5.7.1:5 - >=dev-qt/qtx11extras-5.7.1:5 - x11-libs/libxcb:= - dbus? ( >=dev-qt/qtdbus-5.7.1:5 ) - gnome-keyring? ( gnome-base/gnome-keyring ) - kwallet? ( kde-frameworks/kwallet:5 ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND} - >=dev-qt/linguist-tools-5.7.1:5 - >=dev-qt/qtconcurrent-5.7.1:5 - virtual/pkgconfig -" - -DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md ) - -PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" ) - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - # get extra plugins into qupzilla build tree - mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die - - rm_loc() { - # remove localizations the user has not specified - sed -i -e "/${1}.ts/d" translations/translations.pri || die - rm translations/${1}.ts || die - } - - # remove outdated prebuilt localizations - rm -rf bin/locale || die - - # remove empty locale - rm translations/empty.ts || die - - l10n_find_plocales_changes translations '' .ts - l10n_for_each_disabled_locale_do rm_loc - - default -} - -src_configure() { - # see BUILDING document for explanation of options - export \ - QUPZILLA_PREFIX="${EPREFIX}/usr" \ - USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \ - DEBUG_BUILD=$(usex debug true '') \ - DISABLE_DBUS=$(usex dbus '' true) \ - GNOME_INTEGRATION=$(usex gnome-keyring true '') \ - KDE_INTEGRATION=$(usex kwallet true '') \ - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '') - - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} -- cgit v1.2.3