From 6871ed211e30873945a090f773297bd548d73f7f Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Thu, 8 Sep 2011 08:14:47 +0000 Subject: [PATCH] security fix: upstream patch that blacklists all DigiNotar intermediates and root certificates. bug #382171 Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64 --- x11-libs/qt-core/ChangeLog | 10 +- x11-libs/qt-core/Manifest | 25 ++- .../files/blacklist-diginotar-certs.diff | 93 +++++++++ x11-libs/qt-core/qt-core-4.7.2-r2.ebuild | 184 ++++++++++++++++++ x11-libs/qt-core/qt-core-4.7.3-r1.ebuild | 183 +++++++++++++++++ 5 files changed, 493 insertions(+), 2 deletions(-) create mode 100644 x11-libs/qt-core/files/blacklist-diginotar-certs.diff create mode 100644 x11-libs/qt-core/qt-core-4.7.2-r2.ebuild create mode 100644 x11-libs/qt-core/qt-core-4.7.3-r1.ebuild diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 8816487eccac..3f31124a6710 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.136 2011/08/17 16:54:36 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.137 2011/09/08 08:14:47 wired Exp $ + +*qt-core-4.7.3-r1 (08 Sep 2011) +*qt-core-4.7.2-r2 (08 Sep 2011) + + 08 Sep 2011; Alex Alexander +qt-core-4.7.2-r2.ebuild, + +qt-core-4.7.3-r1.ebuild, +files/blacklist-diginotar-certs.diff: + security fix: upstream patch that blacklists all DigiNotar intermediates and + root certificates. bug #382171 17 Aug 2011; Chí-Thanh Christopher Nguyễn qt-core-4.6.3-r1.ebuild: diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest index c0254e35d4cf..2bf894020dfd 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -1,3 +1,7 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX blacklist-diginotar-certs.diff 6625 RMD160 2df3bab37c581f131f76f1fd5e681ef2f7731441 SHA1 7a8eae73d6da9ae4f400682bf135796d5320f97d SHA256 b41797e1b25767caf5b178e766348f70daf273a0ec84a0527d8c3eea4413493e AUX blacklist_ssl.patch 3839 RMD160 769b5652df6d626ef4436afcdae8fc6f927c4c47 SHA1 1301a6f353ab1eda382ab9dd3fdc7134a30a1884 SHA256 33800ce89fe0d62ba08a8fad515df048f78f481ebc8726b1244f27895a84193b AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b @@ -14,6 +18,25 @@ EBUILD qt-core-4.6.2-r1.ebuild 5126 RMD160 e24950ab4204a2154999fbd9269706916001e EBUILD qt-core-4.6.3-r1.ebuild 5152 RMD160 194ba5fb6c7e4dab5df9178eefa154e793ef9062 SHA1 6ff2ffca0d1a75851e1a43b1c70a740e941bd6d0 SHA256 5c0f165ff65927bb9c3fa5d96d1967b1df593d02b8a8b9549bb7cb7d9f8a19c9 EBUILD qt-core-4.6.3.ebuild 5100 RMD160 3f9e08774345467f07cd41b6a63d7d0f45d9fc21 SHA1 578d1e2cc808c33b354c58a40fef6fbb34a880cf SHA256 a4934b896faf01a41fc37f6756fadabd865e550eb1c58aef3261027ccd7891d7 EBUILD qt-core-4.7.2-r1.ebuild 5120 RMD160 7ca4d3dfbcf4613ad3e61e5deb7d8acc73b64b79 SHA1 c004f5e7270e5acbaad16c6fe2a1e839605f68ed SHA256 11a5cf49834e0238460e11d096d342bc4647a9ae3430ccf6dbee9a20f7f20dd4 +EBUILD qt-core-4.7.2-r2.ebuild 5180 RMD160 f41ceea48c45327bfc417a344e08065aab5ac4da SHA1 5b810598d8b66f2da2dd3ee1b112bd520a662907 SHA256 23a3271fe8950b3d4f8b9e68748a12753ed7afd8b7a8e89985eeba2bdc97b806 +EBUILD qt-core-4.7.3-r1.ebuild 5145 RMD160 15fc91e044bce6256c058d718956946e2bac44ed SHA1 eb6ae2c5f61b5270b7023ccc4f187ab47539dce5 SHA256 9f78ef2e73ab2053776cf4c04b7035e1ef15866883d86498d50d543beba95600 EBUILD qt-core-4.7.3.ebuild 5073 RMD160 967a5ce2abb2e75fed6212c91c3fea7dce92e13d SHA1 d8ddcb0130db836494cc4ebf1cc992f5770536de SHA256 f8585c33daa1b8b2dd7471213321c89987997bb86bf3d8143640d8d4f4f6f194 -MISC ChangeLog 18124 RMD160 cdbad4297b9213a4254bf79ca8f6b6d9e56c6d30 SHA1 9f6ce0854624f109040cc6e9ae4dbb1dcab1da19 SHA256 c7e71e3eaa9619300ac02f0bd2508191dc7f8f883bdc2ea4ddb4baef6b890744 +MISC ChangeLog 18441 RMD160 57697a7c324903da70696d8a914073a2286fba6a SHA1 699b049b349effce3d5daa7ef38fc021d5ff7d11 SHA256 36791559382724ddd21538ee733b927eded100efc38da233b281e2efb1dfef02 MISC metadata.xml 802 RMD160 0341afae262322299759a5a33bae9a42e5b7801c SHA1 b564551c1b4a7902e09200255c6c0a6ede646a23 SHA256 a84f88402ece782e8ac52ad0b90eea94e5bd563ca0a7956e1d89f1263d7f2925 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCgAGBQJOaHmNAAoJEDZF8K7rm0r6wbYP/itEeM815Pi9y3TFQhtNCfez +23MS8igefUvmpKGTpBZy8AuTf+MiRRZSWO5HdjN9m4uX8diAkW4Hce7IE6BBfysb +BQabt/KbkeZ3lZ9nTW7hcdmwbCmGfaVuhC6X+JQab2MxPIAOiuO1yFvwTBgIG4DW +9jEmewcCaP05NRCQ3LzJzuuU5ICPOPv/FGfi6Bs6UjKZvhT2Dop1EA5EbOG7uhVj +1mSK8Heu96rZ+w9g/ec8BSlK7333IO8IksWw4iVMxPxzjA+ejltTxtw7tkZjddfq +jNgfEYtR5iSmxNnDlsUsSpABUJAa9f3GG1LXiBGylBOcPcAzjfwpkYrGlETAMQVP +2x/Az3O+JJzm323A0Kbx4YA/gFcQ1IKP8gtNe16w93B+j1UDPGcbcADuRA7eK9VM +X/vz8BukNV+F7sg8ZjMj+KtcGN5XPXr51uEEl0dEIC5RPTjlO/gIIguXKyycRvPP +JTTftlVgpW9ktvg6MnYM3u4e9qxO/YX/3Lph7QFv8CAJxI+JszT8BeDQsZCQZxzH +7HaZpcJSyiAeLJBNYbQv9F3meo5Nu1HwM3RA5ayRyW1KigyusqJluIbVIgxT6Tu2 +TdR+NtL8gNZ9CLF5LH7Of1T7p7gxe3QfTOqSd3+HVzLnB6OIIBSJ9sgI8/V5r4Q2 +3kvNcLkFqtlFoLSIpWN7 +=HYD3 +-----END PGP SIGNATURE----- diff --git a/x11-libs/qt-core/files/blacklist-diginotar-certs.diff b/x11-libs/qt-core/files/blacklist-diginotar-certs.diff new file mode 100644 index 000000000000..e37af240f38a --- /dev/null +++ b/x11-libs/qt-core/files/blacklist-diginotar-certs.diff @@ -0,0 +1,93 @@ +http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/ + +gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=382171 + +diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp +index 328c5c2..1ae98f4 100644 +--- a/src/network/ssl/qsslcertificate.cpp ++++ b/src/network/ssl/qsslcertificate.cpp +@@ -803,22 +803,47 @@ QList QSslCertificatePrivate::certificatesFromDer(const QByteAr + // These certificates are known to be fraudulent and were created during the comodo + // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html + static const char *certificate_blacklist[] = { +- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", +- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", +- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", +- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", +- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", +- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", +- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", +- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", +- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", ++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo ++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo ++ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo ++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo ++ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo ++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo ++ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo ++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo ++ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo ++ ++ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar ++ "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root ++ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root ++ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root ++ "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA ++ "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2" ++ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root ++ ++ "1184640176", "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust ++ "120000525", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust ++ "120000505", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust ++ "120000515", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust ++ "20015536", "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government ++ "20001983", "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government ++ "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root ++ "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate ++// "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate ++// "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach ++// "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach ++ "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust ++ "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust + 0 + }; + + bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate) + { + for (int a = 0; certificate_blacklist[a] != 0; a++) { +- if (certificate.serialNumber() == certificate_blacklist[a]) ++ QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]); ++ if (certificate.serialNumber() == certificate_blacklist[a++] && ++ (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName || ++ certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName)) + return true; + } + return false; +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index 141d80a..b8e6c4c 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake() + X509 *x509 = q_SSL_get_peer_certificate(ssl); + configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509); + q_X509_free(x509); +- if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) { +- q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); +- q->setSocketError(QAbstractSocket::SslHandshakeFailedError); +- emit q->error(QAbstractSocket::SslHandshakeFailedError); +- plainSocket->disconnectFromHost(); +- return false; ++ ++ // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer) ++ foreach (const QSslCertificate &cert, configuration.peerCertificateChain) { ++ if (QSslCertificatePrivate::isBlacklisted(cert)) { ++ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); ++ q->setSocketError(QAbstractSocket::SslHandshakeFailedError); ++ emit q->error(QAbstractSocket::SslHandshakeFailedError); ++ plainSocket->disconnectFromHost(); ++ return false; ++ } + } + + // Start translating errors. diff --git a/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild b/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild new file mode 100644 index 000000000000..c0732f393a7c --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild,v 1.1 2011/09/08 08:14:47 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !> "${S}"/src/plugins/codecs/${i}/${i}.pro + done + + qt4-build_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" + sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" +} + +src_configure() { + unset QMAKESPEC + + myconf="${myconf} + $(qt_use glib) + $(qt_use iconv) + $(qt_use optimized-qmake) + $(qt_use ssl openssl) + $(qt_use qt3support) + $(qt_use jit javascript-jit)" + + myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng + -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns + -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl + -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools + -no-cups -no-xsync -no-xinput -no-multimedia" + qt4-build_src_configure +} + +src_compile() { + # bug 259736 + unset QMAKESPEC + qt4-build_src_compile +} + +src_install() { + dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" + + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; + fi + # use freshly built libraries + local DYLD_FPATH= + [[ -d "${S}"/lib/QtCore.framework ]] \ + && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) + DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ + LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations faied" + insinto ${QTTRANSDIR#${EPREFIX}} + doins translations/*.qm || die "doins translations failed" + + setqtenv + fix_library_files + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs+=:${EPREFIX}/usr/${libdir}/qt4 + done + + cat <<-EOF > "${T}/44qt4" + LDPATH="${libdirs:1}" + EOF + doenvd "${T}/44qt4" + + dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed" + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "Failed to move qconfig.pri" + + # Framework hacking + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then + #TODO do this better + sed -i -e '2a#include \n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || + die "dosym failed" + else + sed -i -e '2a#include \n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h \ + || die "sed for qconfig.h failed" + fi + + if use glib; then + QCONFIG_DEFINE="$(use glib && echo QT_GLIB) + $(use ssl && echo QT_OPENSSL)" + install_qconfigs + fi + # remove .la files + find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm + # remove some unnecessary headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ +qatomic_windows.h,\ +qatomic_windowsce.h,\ +qt_windows.h} + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} diff --git a/x11-libs/qt-core/qt-core-4.7.3-r1.ebuild b/x11-libs/qt-core/qt-core-4.7.3-r1.ebuild new file mode 100644 index 000000000000..224ab66546ee --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.7.3-r1.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.3-r1.ebuild,v 1.1 2011/09/08 08:14:47 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !> "${S}"/src/plugins/codecs/${i}/${i}.pro + done + + qt4-build_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" + sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" +} + +src_configure() { + unset QMAKESPEC + + myconf="${myconf} + $(qt_use glib) + $(qt_use iconv) + $(qt_use optimized-qmake) + $(qt_use ssl openssl) + $(qt_use qt3support) + $(qt_use jit javascript-jit)" + + myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng + -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns + -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl + -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools + -no-cups -no-xsync -no-xinput -no-multimedia" + qt4-build_src_configure +} + +src_compile() { + # bug 259736 + unset QMAKESPEC + qt4-build_src_compile +} + +src_install() { + dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" + + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; + fi + # use freshly built libraries + local DYLD_FPATH= + [[ -d "${S}"/lib/QtCore.framework ]] \ + && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) + DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ + LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations faied" + insinto ${QTTRANSDIR#${EPREFIX}} + doins translations/*.qm || die "doins translations failed" + + setqtenv + fix_library_files + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs+=:${EPREFIX}/usr/${libdir}/qt4 + done + + cat <<-EOF > "${T}/44qt4" + LDPATH="${libdirs:1}" + EOF + doenvd "${T}/44qt4" + + dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed" + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "Failed to move qconfig.pri" + + # Framework hacking + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then + #TODO do this better + sed -i -e '2a#include \n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || + die "dosym failed" + else + sed -i -e '2a#include \n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h \ + || die "sed for qconfig.h failed" + fi + + if use glib; then + QCONFIG_DEFINE="$(use glib && echo QT_GLIB) + $(use ssl && echo QT_OPENSSL)" + install_qconfigs + fi + # remove .la files + find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm + # remove some unnecessary headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ +qatomic_windows.h,\ +qatomic_windowsce.h,\ +qt_windows.h} + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} -- 2.26.2