Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/files/, www-client/qupzilla/
Date: Fri, 30 Mar 2018 22:42:34
Message-Id: 1522449743.d6d62ad57f927ea43f7fe324b9cf71120993b1f1.asturm@gentoo
1 commit: d6d62ad57f927ea43f7fe324b9cf71120993b1f1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 30 22:08:07 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 30 22:42:23 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d62ad5
7
8 www-client/qupzilla: Drop 2.1.2
9
10 Package-Manager: Portage-2.3.27, Repoman-2.3.9
11
12 www-client/qupzilla/Manifest | 2 -
13 .../files/qupzilla-2.1.2-openssl-1.1.0.patch | 103 ------------------
14 www-client/qupzilla/qupzilla-2.1.2.ebuild | 117 ---------------------
15 3 files changed, 222 deletions(-)
16
17 diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
18 index 299cf17c5bb..a96e5058190 100644
19 --- a/www-client/qupzilla/Manifest
20 +++ b/www-client/qupzilla/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343
23 DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c9238d561bf6a2583214e43b23c53c825c8274b51ff0e34ced8aac6077c12dad60968d88abe810ccb35dbd2a457e0e SHA512 78e02141f18268a5f31a896c49e4f6cbd709e609dfcdb50277fc20123526e5316b79ede612dcac74ff07103334c381e4d657b18b6e187a10983d5a44a649858a
24 -DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
25 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
26
27 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
28 deleted file mode 100644
29 index 42effa56d5c..00000000000
30 --- a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
31 +++ /dev/null
32 @@ -1,103 +0,0 @@
33 -From efc4725e91e10ccfef257143408d3a683e74a866 Mon Sep 17 00:00:00 2001
34 -From: Jose Rios <joseriosneto@××××××××××.com>
35 -Date: Mon, 1 May 2017 02:12:26 +0100
36 -Subject: [PATCH] Fixed compilation for Openssl 1.1.0
37 -
38 -Most of libcrypto and libssl internal structures were made
39 -opaque in this version not allowing to instatiate them in
40 -the stack.
41 -
42 -More info:
43 - * https://www.openssl.org/news/openssl-1.1.0-notes.html
44 - * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
45 ----
46 - src/lib/tools/aesinterface.cpp | 28 ++++++++++++++++------------
47 - src/lib/tools/aesinterface.h | 4 ++--
48 - 2 files changed, 18 insertions(+), 14 deletions(-)
49 -
50 -diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp
51 -index fa33eb3..29ed37e 100644
52 ---- a/src/lib/tools/aesinterface.cpp
53 -+++ b/src/lib/tools/aesinterface.cpp
54 -@@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent)
55 - : QObject(parent)
56 - , m_ok(false)
57 - {
58 -- EVP_CIPHER_CTX_init(&m_encodeCTX);
59 -- EVP_CIPHER_CTX_init(&m_decodeCTX);
60 -+ m_encodeCTX = EVP_CIPHER_CTX_new();
61 -+ m_decodeCTX = EVP_CIPHER_CTX_new();
62 -+ EVP_CIPHER_CTX_init(m_encodeCTX);
63 -+ EVP_CIPHER_CTX_init(m_decodeCTX);
64 - }
65 -
66 - AesInterface::~AesInterface()
67 - {
68 -- EVP_CIPHER_CTX_cleanup(&m_encodeCTX);
69 -- EVP_CIPHER_CTX_cleanup(&m_decodeCTX);
70 -+ EVP_CIPHER_CTX_cleanup(m_encodeCTX);
71 -+ EVP_CIPHER_CTX_cleanup(m_decodeCTX);
72 -+ EVP_CIPHER_CTX_free(m_encodeCTX);
73 -+ EVP_CIPHER_CTX_free(m_decodeCTX);
74 - }
75 -
76 - bool AesInterface::isOk()
77 -@@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
78 - int result = 0;
79 - if (evpMode == EVP_PKEY_MO_ENCRYPT) {
80 - m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
81 -- result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
82 -+ result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
83 - }
84 - else if (evpMode == EVP_PKEY_MO_DECRYPT) {
85 -- result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
86 -+ result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
87 - }
88 -
89 - if (result == 0) {
90 -@@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray &
91 - uchar* ciphertext = (uchar*)malloc(cipherlength);
92 -
93 - // allows reusing of 'm_encodeCTX' for multiple encryption cycles
94 -- EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL);
95 -+ EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL);
96 -
97 - // update ciphertext, c_len is filled with the length of ciphertext generated,
98 - // dataLength is the size of plaintext in bytes
99 -- EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
100 -+ EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
101 -
102 - // update ciphertext with the final remaining bytes
103 -- EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength);
104 -+ EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength);
105 -
106 - dataLength = cipherlength + finalLength;
107 - QByteArray out((char*)ciphertext, dataLength);
108 -@@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray
109 - // because we have padding ON, we must allocate an extra cipher block size of memory
110 - uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE);
111 -
112 -- EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL);
113 -- EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
114 -- int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength);
115 -+ EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL);
116 -+ EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
117 -+ int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength);
118 -
119 - cipherLength = plainTextLength + finalLength;
120 -
121 -diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h
122 -index e0debc6..c3c940c 100644
123 ---- a/src/lib/tools/aesinterface.h
124 -+++ b/src/lib/tools/aesinterface.h
125 -@@ -50,8 +50,8 @@ class QUPZILLA_EXPORT AesInterface : public QObject
126 - private:
127 - bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray());
128 -
129 -- EVP_CIPHER_CTX m_encodeCTX;
130 -- EVP_CIPHER_CTX m_decodeCTX;
131 -+ EVP_CIPHER_CTX* m_encodeCTX;
132 -+ EVP_CIPHER_CTX* m_decodeCTX;
133 -
134 - bool m_ok;
135 - QByteArray m_iVector;
136
137 diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild
138 deleted file mode 100644
139 index 2ea1fc82dbe..00000000000
140 --- a/www-client/qupzilla/qupzilla-2.1.2.ebuild
141 +++ /dev/null
142 @@ -1,117 +0,0 @@
143 -# Copyright 1999-2017 Gentoo Foundation
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=6
147 -
148 -PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES
149 - fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP ka_GE
150 - lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr
151 - sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn
152 - zh_CN zh_HK zh_TW"
153 -
154 -PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
155 -PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
156 -
157 -inherit l10n qmake-utils xdg-utils
158 -
159 -if [[ ${PV} == *9999 ]]; then
160 - inherit git-r3
161 - EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
162 -else
163 - MY_P=QupZilla-${PV}
164 - SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
165 - KEYWORDS="amd64 ~arm x86"
166 - S=${WORKDIR}/${MY_P}
167 -fi
168 -
169 -DESCRIPTION="A cross-platform web browser using QtWebEngine"
170 -HOMEPAGE="https://www.qupzilla.com/"
171 -SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
172 -
173 -LICENSE="GPL-3"
174 -SLOT="0"
175 -IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
176 -
177 -RDEPEND="
178 - >=dev-qt/qtcore-5.7.1:5
179 - >=dev-qt/qtdeclarative-5.7.1:5[widgets]
180 - >=dev-qt/qtgui-5.7.1:5
181 - >=dev-qt/qtnetwork-5.7.1:5[ssl]
182 - >=dev-qt/qtprintsupport-5.7.1:5
183 - >=dev-qt/qtsql-5.7.1:5[sqlite]
184 - >=dev-qt/qtwebchannel-5.7.1:5
185 - >=dev-qt/qtwebengine-5.7.1:5[widgets]
186 - >=dev-qt/qtwidgets-5.7.1:5
187 - >=dev-qt/qtx11extras-5.7.1:5
188 - x11-libs/libxcb:=
189 - dbus? ( >=dev-qt/qtdbus-5.7.1:5 )
190 - gnome-keyring? ( gnome-base/gnome-keyring )
191 - kwallet? ( kde-frameworks/kwallet:5 )
192 - libressl? ( dev-libs/libressl:= )
193 - !libressl? ( dev-libs/openssl:0= )
194 -"
195 -DEPEND="${RDEPEND}
196 - >=dev-qt/linguist-tools-5.7.1:5
197 - >=dev-qt/qtconcurrent-5.7.1:5
198 - virtual/pkgconfig
199 -"
200 -
201 -DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
202 -
203 -PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" )
204 -
205 -src_unpack() {
206 - if [[ ${PV} == *9999 ]]; then
207 - git-r3_src_unpack
208 - fi
209 - default
210 -}
211 -
212 -src_prepare() {
213 - # get extra plugins into qupzilla build tree
214 - mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
215 -
216 - rm_loc() {
217 - # remove localizations the user has not specified
218 - sed -i -e "/${1}.ts/d" translations/translations.pri || die
219 - rm translations/${1}.ts || die
220 - }
221 -
222 - # remove outdated prebuilt localizations
223 - rm -rf bin/locale || die
224 -
225 - # remove empty locale
226 - rm translations/empty.ts || die
227 -
228 - l10n_find_plocales_changes translations '' .ts
229 - l10n_for_each_disabled_locale_do rm_loc
230 -
231 - default
232 -}
233 -
234 -src_configure() {
235 - # see BUILDING document for explanation of options
236 - export \
237 - QUPZILLA_PREFIX="${EPREFIX}/usr" \
238 - USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
239 - DEBUG_BUILD=$(usex debug true '') \
240 - DISABLE_DBUS=$(usex dbus '' true) \
241 - GNOME_INTEGRATION=$(usex gnome-keyring true '') \
242 - KDE_INTEGRATION=$(usex kwallet true '') \
243 - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
244 -
245 - eqmake5
246 -}
247 -
248 -src_install() {
249 - emake INSTALL_ROOT="${D}" install
250 - einstalldocs
251 -}
252 -
253 -pkg_postinst() {
254 - xdg_desktop_database_update
255 -}
256 -
257 -pkg_postrm() {
258 - xdg_desktop_database_update
259 -}