Date: Thursday, October 20, 2011 @ 19:02:24 Author: andrea Revision: 140993
Prepare 4.8 Modified: qt/trunk/PKGBUILD Deleted: qt/trunk/blacklist-diginotar-certs.diff --------------------------------+ PKGBUILD | 177 ++++++++++++++++++--------------------- blacklist-diginotar-certs.diff | 89 ------------------- 2 files changed, 82 insertions(+), 184 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-20 22:47:43 UTC (rev 140992) +++ PKGBUILD 2011-10-20 23:02:24 UTC (rev 140993) @@ -4,138 +4,125 @@ pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.7.4 -pkgrel=3 +pkgver=4.8.0rc1 +_pkgver=4.8.0-rc1 +pkgrel=1 arch=('i686' 'x86_64') -url='http://qt.nokia.com/' +url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2') options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" +_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0" +source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'blacklist-diginotar-certs.diff') -md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf' + 'qtconfig.desktop') +md5sums=('3e003b671384df8d1cb77dd6cc804934' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'd875a2a7639de3bd63dc519c13b4d069') + '6b771c8a81dd90b45e8a79afa0e5bbfd') build() { - unset QMAKESPEC - export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + cd "${srcdir}"/${_pkgfqn} - # FS#24601 - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - cd $srcdir/$_pkgfqn + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf - sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -largefile \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -xmlpatterns \ - -no-phonon \ - -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -no-rpath \ - -openssl-linked \ - -silent \ - -optimized-qmake \ - -dbus \ - -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib - make + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -no-declarative-debug \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make } package_qt() { - pkgdesc='A cross-platform application and UI framework' + pkgdesc='A cross-platform application and UI framework (GUI libraries)' depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') install='qt.install' - - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png - install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png - install -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install - # install license addition - install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } package_qt-private-headers(){ pkgdesc="Qt private headers for development" depends=("qt=${pkgver}") - install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} for i in QtCore QtDeclarative QtGui QtScript; do - cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ - ${pkgdir}/usr/include/${i}/ + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ done for i in corelib declarative gui script; do - cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ done } Deleted: blacklist-diginotar-certs.diff =================================================================== --- blacklist-diginotar-certs.diff 2011-10-20 22:47:43 UTC (rev 140992) +++ blacklist-diginotar-certs.diff 2011-10-20 23:02:24 UTC (rev 140993) @@ -1,89 +0,0 @@ -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<QSslCertificate> 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.