diff options
author | Davide Pesavento <pesa@gentoo.org> | 2014-01-26 18:14:09 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2014-01-26 18:14:09 +0000 |
commit | 5857ce879d0dd51ff514a4c5c29eb85c4f9d009a (patch) | |
tree | e2b44cd46eb1b21889df7b4210f815ec1ae7ab55 /dev-qt/qtcore | |
parent | hardened/linux/musl: switch to dev-util/pkgconf which does better in musl (diff) | |
download | historical-5857ce879d0dd51ff514a4c5c29eb85c4f9d009a.tar.gz historical-5857ce879d0dd51ff514a4c5c29eb85c4f9d009a.tar.bz2 historical-5857ce879d0dd51ff514a4c5c29eb85c4f9d009a.zip |
Cleanup.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/ChangeLog | 12 | ||||
-rw-r--r-- | dev-qt/qtcore/Manifest | 41 | ||||
-rw-r--r-- | dev-qt/qtcore/files/CVE-2013-0254.patch | 66 | ||||
-rw-r--r-- | dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch | 107 | ||||
-rw-r--r-- | dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch | 35 | ||||
-rw-r--r-- | dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch | 15 | ||||
-rw-r--r-- | dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch | 43 | ||||
-rw-r--r-- | dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch | 60 | ||||
-rw-r--r-- | dev-qt/qtcore/metadata.xml | 3 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-4.8.4-r4.ebuild | 183 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-4.8.4-r5.ebuild | 193 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-4.8.5.ebuild | 173 |
12 files changed, 27 insertions, 904 deletions
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog index 41cf4d2937ed..4e91ee29c362 100644 --- a/dev-qt/qtcore/ChangeLog +++ b/dev-qt/qtcore/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.41 2014/01/26 11:55:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.42 2014/01/26 17:47:41 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -files/CVE-2013-0254.patch, + -files/blacklist-mis-issued-Turktrust-certs.patch, + -files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch, + -files/moc-workaround-for-BOOST_JOIN.patch, + -files/rename-qAbs-function-for-timeval.patch, + -files/set-pkg-config-locations-directly-to-install-dir.patch, + -qtcore-4.8.4-r4.ebuild, -qtcore-4.8.4-r5.ebuild, -qtcore-4.8.5.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtcore-4.8.5-r1.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index c64327a0fab4..1fafe8d12295 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,38 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935 AUX CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch 4531 SHA256 fd6e59635ea7bc86fdc36333ecd77609ae5cdc52c3a388c3b0088887d9a21b72 SHA512 b81810d62e8652f91b787285e8208b42d723e89aef248aeca24f02cd84b4a098c82571ece7c8af9c25c0535bde61ee376b6c24992f55fbaef2dd77f54f14ef1a WHIRLPOOL f7e6d005c157314eba3501bb9fdcecdb1f0b317880d659ac42e9b17a79ba98892c6ad9b49651a81d2a8c5c77d9e6ab9b7953422435543b1e38f1eeef0865dbd3 AUX CVE-2013-4549-02-fully-expand-entities.patch 6117 SHA256 848dbcd78c2ae0a3f6acca07b48067c453f721adfbe4dcdc90ca8267eedbc065 SHA512 1564fc1e299704c7f51015fdf3213e3c85460d2950821f53f94bbf98c80275e845aa8804250081df9db8172ca26fde11070e21ce18b8ee17961689ceb96daac9 WHIRLPOOL ccf1494fd0b243aed5149d6f1ebaadb5bfefff4698a95fae6d006247a9daee493e8e4c567a2bc930efc7b22c27761207afd1c8fe8f104c5a3fed491a669d14e8 -AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5 -AUX fix-call-to-QMetaObject-metaCall-from-updateProperty.patch 1570 SHA256 bca22cbb85b852101ba90bb03a96922f35f8bc158e5781d62dcedea6481d832b SHA512 119c44be4cc2195dd593b5a4c3986b267a12a3e415c057f36ff953c980eaff9df68171440782d5e81803961df062fe25506bef8e564b220caf10ccfb462b6839 WHIRLPOOL 0a1931d941a8bfd62835864b4042019a5d96b44f4da04f911a9f721e30a0304d0aa24ce8205edbe222e0c6b37fb544fcb1c451ad8d6402d70554d1ee04e3fd1a AUX moc-boost-lexical-cast.patch 584 SHA256 dadd3eab516ee26f1c19f17dbcb7be46e7c9efba49924fa1d53cc0176491736a SHA512 ed2cc3d36ac8576cee42d1586b99913ce060a47e72c82890e7b5fe4fc500e857693f2348f4446ce7dfbd1bbdf6e51b99b57f2fc09d6c15f9075f10c4b5459fa6 WHIRLPOOL d4ee64605ad9dacd371519a9c08582c25ea891480c79795822cfe74e6bafb332d558dca5d024c6f369e3674fde5a89a15a7d79042093295ac9d0a0d516493583 -AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe874f6d408db447a3e078006c6f2d722e8c0b7 SHA512 9530a50fab3ef08c805b7a3b3e85ad2ea86c6c014a2e5702ca00a21e8445477699bc5280edcdce5defbc37fe43f50f7581677281ca9897fcc55ac68eefd3c81f WHIRLPOOL 302dc275378046661353cc69ac93a062d331f7932ca733b0dc1f1770604d54e698ff473477a8e082bac196134e7590573f5bb2ca895d17347dbcd471233b1d28 -AUX rename-qAbs-function-for-timeval.patch 1679 SHA256 0a8cc8677fffba64cca24a9810d3c7afe6137d4888de33ebf2ff5bea3a33d487 SHA512 14e818316c62a41851b8c3e80ef2b059eb830672e88cedb1b73c797ee137fc0fc056879db1262285c68c93e0e8c37d7fd16339530a8783f9697b4ce2e6c65054 WHIRLPOOL 106adacf22078e5032591a7c864e28d0ff081dbfb265d7087a37064ed3a0055804e935e31479ee22fddd722e17d234c8060e409409a41fc057f01efa0d9f8bb9 -AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -DIST qtcore-4.8.4-update-defaultNumberingSystem.patch.gz 7719 SHA256 69e4be2ad4d08067a6bc8708a164822128a8fa8226d90a0be02e89ba537d90fb SHA512 a8d1501223ffbeeb9898afd5ce7fc4839a6155ae2612d796eed674a01bf8d53241d627a60a179bf93cf3e0d338de5468b1495c97843166245f295df559c52b12 WHIRLPOOL f8027c78f1691d1a50b30bcfe53c8750727a1d49dc45233ebeab5a1d7388a4291fe74a9b35bff5417b48fcfbdeadab3dc130fade17012c95ca751d73b2814b4f -EBUILD qtcore-4.8.4-r4.ebuild 5218 SHA256 44f7a0a6c7bb22b838b7e5ff0ddd8da8bf70c891e914fa454d6f198751de9ded SHA512 af3015e641f8eeab5e48e949cffec9fa9b97691b3de20dd5bfc3c6a6d480d874da85168cb2f17a04a953cc275669aae0523fcc61f3c57a9b8bb1897e6dd277a3 WHIRLPOOL e3a8bea441ca667e0c6c100b1b3b37559d7fe47a628450586bdf102e0a0d507c09ed61210de86df378d55277731cd863406206af8306013abd5d5c54acd019ba -EBUILD qtcore-4.8.4-r5.ebuild 5513 SHA256 f35bf696783b5c3c998343ce75de7139b1c35eb921dfd27981c633d8f36e9bd9 SHA512 f42faa5b31eaafbb843fae66573a4d95ea574f589acc8733240dfa7c89d0a833e7aa0fb77d0987355e26497e0ffc5fc9b5ea82511e881a57bf5b3093ea660b3c WHIRLPOOL 1ebbc32a2491743b92bb1e5dd130cce0cd6efe832be7fa6642c68b0fdafc4329fecd35c8ac0c0349d129890ff644a0d6bfdd4ab6e0f183940de5268d0b66b751 EBUILD qtcore-4.8.5-r1.ebuild 4999 SHA256 dff2a669014633f428962001c8872b0685c7402fe04806f3cba4c2e7ec267d7a SHA512 d91eb2855bb543301ce4261b36a82104abd3a3e030a0f56d2b6efe6bf5b635c454f10a9c5916a55129f025ce5f2429785c1ccca748f44ae9e0e775cd64f26e9d WHIRLPOOL 6efecaff544000db98e67e8db7bb90837dbc621e61504ea781e4c0ceadef28798c8262c3516bdf2250d86e142f542f04be1ed63fadbfdd79b8b699ee4408e87e -EBUILD qtcore-4.8.5.ebuild 4857 SHA256 bd91a8cef1b938a207d7c05cef07d60f7e4d2cdac9d25e08477f40c14abf7679 SHA512 db2eedbed92461951201297caec5136e58da21bd70ea585a887ce76c1c00e59dad4ab7a269f0d397ca17088a7fa8d7a49a3f7c841926e867decc584d47355b6e WHIRLPOOL 80864fa6f8f96610eacfc33f410c6acb792a57845c28f3bfcd43071675994752116e17d3e4db654a11d2376baad49c5df59daccd8bac1a4dc43405ca65230422 -MISC ChangeLog 34056 SHA256 4b5c09a8e321930e4d3a5165168fb6ec4c88dbe20111ebba5d26c808244c899f SHA512 61a69c13a06996698b87f3335499f8d9fa4d32899b44658221ac286f6c0992252248d66236980e32a4569267c755b5cc8e8623fa7fea71447c9b4ebd35d9ae6f WHIRLPOOL 9dbcc3dbd746bc47a2ba600b0ef9b047fa98bfc41430e56c27a7a431561a7c768179d29075cd3a8cefcfac563a30bd0bd261150cbe3f38a1a8fb4e032128406c -MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824 +MISC ChangeLog 34519 SHA256 12fb03a6af89546f2946664c738e5ce08b90c77cc5a8749621d58915118d74f1 SHA512 85a20ff36a8a91b5c40c02dcf835970ef8d80777fc929b09ca39e1d2f617131e20103f5ab73d4754c22ef86b497af355163487072d3f3f4119d606c5f802e54f WHIRLPOOL b627a8db920a4598b7de099275b8558409e9c6cf02a54d3e6bf8ec73ef3a4304ab9f7aa5d70773dd757140e333a5fff33309b42525fb050597248bbfbaa4280d +MISC metadata.xml 652 SHA256 a88dbe9c440633e05448d8352cebb33dc4c0bdd5e2e2ed7f99c1a75ee1838ce2 SHA512 f5497c4916a7f99132eb394eb88b5d58771fee0d4c238c9a0af0a869947f2edfeeee3f48be56a879ac38a91a4ec09d1983825669afc786c65f8c53d718a035dc WHIRLPOOL f735442ba47063cc524afcd1c565694d4a3647c7d44a063039a1a9c046bb79014d805b92c2094b5ecf20799bd30253f23b66dd5ad9e21003e1a6ece2bf41a9cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfCAAoJELp701BxlEWfZdIQALCetwJrwMBeQiT+V3ucEFM4 -JeGM16zlJPdHu5JV7luyk/kjA/iTYJK7grQO17K0ntdg6tPO7xHUn2eocHwc5jfv -l5e0+bT3E0YuMPLjmK48RNVAi9Fq369/OrurVQMsH2RBuJrHyt1bMIhhkAuBv5ju -I4vhiCfyIgDamrOGVt48hUl62Tn1b5zkkwZjPTyf4ZQjbx5uw+K5N/RDYxnQvmaT -LsgWCSSzZNiArEIRc16TIYglGd4slrcwzi0Y/RrHexQVigUaXPKo48nLENRWf7kX -8Zyj82AK44Zcn7VBt5SCmX5zOIhxY+IEBLz7dUpRFOHwgdd4p+S2CSjZXAjmaIss -A+fj2QRGcr9TwjsZYSfNY+yF1vS+Ne7Bo+W/dBD9m0Kncg6Nv3oFm6bPaUDHZ9MX -OGGXi9OskA7dHyj6KlV04N0BvC/RVz1TXq8FCS4SlGTPc/qnTZgEd0Qvs0unK1K+ -CxXcefc/uu+gotd4b3VFORKLUyY94n/qJWtmyT3drClqsz2JUx4Dm6w7FqIDYree -IGX5VJNoDSuDq4JwcERtCUVBCk1b8592mjcw9+gHcW2wiJjrvkmGKpFkKV8hpVug -Xr7K6jde5LZSLfvpN8mqe5Fy04GxAolBnzmZeb2iU2osa/ySd0IMKs0MPFbIg/xk -CO8irNMW+9f7t8uJqDi3 -=V3n/ +iQIcBAEBCAAGBQJS5Uo+AAoJENXLsxwXqFxydMwP/Am6m7OFQ2wL9JindM8dR1ZQ +0JjPCV9rGJeA6Nbdy1XrfM3QLocnLsDHka4OHL4lr14KeouySDKdCCxS1NrHBdjF +Ifr7JzLi3IFfEkMp6Agbcv7la29VBaZMJ4qXb6KtHzjpsrsIw4rMQbbRgycjCE6Q +sUFGP2uWp+12wwwC5byRSuCP3+7hYTOh2cgWnRwD0wLjkMZSG6qERbDg2sZxXJMi +5fKo4apw+XSFSLdnHX8Ufb+5KyHhL23iOfNPYeWCGwjmp282H/WHr0ILSOZWUooS +CPEbrCVzJ3mSvADHM0HRHpEY7l8bB63gCCLz20Rd/opOr4BbbXqGkqY5LxrOuVhl +ughbjxgAGXX0xnrdkN2t8klHNrLe5oSCONW4XnSgTnuyF0Qsc9+kPb9PqSPO9zsL +BV9Pu+CzvW5Z90B/wCwLEOVaDAfVxKpp5Qm5bv5cvUjLEa4MuAGvH/qZtwKXLL5e +suiGxJXrsLO1KZgmvGB7nk6ejjXBlYBT0kX1oKJneVllVAnltZHcsIdXBTdv7eCo +0PUXKD4pmCoqZ8IX69AntttJUvExEsvsBQWwybhjbrmPaac5G+bXCp7TeCv2fL9X +NOLB2VyXh/EUvAIv5c2MB5RIgMExd4L1tW2ySBC3dGlaYOgToe97k4/X4xpDKni2 +Lyhij6hA0vKuRm3e8urE +=jNLI -----END PGP SIGNATURE----- diff --git a/dev-qt/qtcore/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch deleted file mode 100644 index 48cc05f1800d..000000000000 --- a/dev-qt/qtcore/files/CVE-2013-0254.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); --- -1.7.1 - diff --git a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch deleted file mode 100644 index c2245ccce0a0..000000000000 --- a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 -From: Peter Hartmann <phartmann@rim.com> -Date: Fri, 4 Jan 2013 11:06:14 +0100 -Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust - certificates - -Those certificates have erroneously set the CA attribute to true, -meaning everybody in possesion of their keys can issue certificates on -their own. - -backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase - -Task-number: QTBUG-28937 -Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/network/ssl/qsslcertificate.cpp | 3 +++ - ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ - .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ - 3 files changed, 58 insertions(+) - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 038187f..37799d1 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { - - "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust - "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust -+ -+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate -+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate - 0 - }; - -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -new file mode 100644 -index 0000000..33f2ef4 ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -@@ -0,0 +1,24 @@ -+-----BEGIN CERTIFICATE----- -+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow -+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr -+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz -+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA -+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 -+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R -+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa -+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r -+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF -+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw -+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K -+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l -+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA -+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 -+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp -+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC -+pWfGWA== -+-----END CERTIFICATE----- -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -new file mode 100644 -index 0000000..e9d048f ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -@@ -0,0 +1,31 @@ -+-----BEGIN CERTIFICATE----- -+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow -+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB -+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE -+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V -+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF -+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO -+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q -+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N -+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS -+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G -+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF -+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF -+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t -+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd -+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy -+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz -+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy -+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn -+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV -+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj -+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU -+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 -+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I -+hQ== -+-----END CERTIFICATE----- --- -1.8.1 - diff --git a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch deleted file mode 100644 index d59ac490785a..000000000000 --- a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> -Date: Sun, 3 Feb 2013 23:07:07 -0500 -Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty - -Create an array of arguments in the same way -QMetaObject::write does - -Task-number: QTBUG-29082 -Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 ---- - src/corelib/animation/qpropertyanimation.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp -index dcf779a..9869d7e 100644 ---- a/src/corelib/animation/qpropertyanimation.cpp -+++ b/src/corelib/animation/qpropertyanimation.cpp -@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast<void*>(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } --- -1.8.1.2 - diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch deleted file mode 100644 index fa82334d7d4b..000000000000 --- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 -+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 -@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ -+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch b/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch deleted file mode 100644 index a862ae83504c..000000000000 --- a/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 522c899b777eb25adb7e235baf0027c0c0a9119a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> -Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH] Rename qAbs Function for timeval - -This decouples it from qAbs which is declared as a constexpr under -certain compilation flags and enables for qtbase to be compiled with -GCC 4.8 - -Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c) -Reviewed-by: Olivier Goffart <ogoffart@woboq.com> ---- - src/corelib/kernel/qeventdispatcher_unix.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp -index df3cda1..abf1c29 100644 ---- a/src/corelib/kernel/qeventdispatcher_unix.cpp -+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -356,8 +356,7 @@ timeval QTimerInfoList::updateCurrentTime() - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { -@@ -406,7 +405,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - void QTimerInfoList::repairTimersIfNeeded() --- -1.8.2.1 - diff --git a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch deleted file mode 100644 index 46b9c28cfde4..000000000000 --- a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -Date: Tue, 8 Jan 2013 16:34:26 +0100 -Subject: [PATCH] set pkg-config *_location directly to install dir - -qmake tries to replace all occurrences of the install prefix with a -literal ${prefix}. of course this would mess up build paths which happen -to live under the prefix (this is untypical, but still), which would -break the sed magic in the subsequent install step. as qmake itself has -no use for the .pc files, it's ok to target them directly for the -install dir. we do the same with the include and lib dirs already. - -qt5 is already doing the right thing. - -Task-number: QTBUG-28807 -Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 -Reviewed-by: Davide Pesavento <davidepesa@gmail.com> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> - -diff --git a/src/qbase.pri b/src/qbase.pri -index 991c888..feec9d6 100644 ---- a/src/qbase.pri -+++ b/src/qbase.pri -@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER - - TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end - --qtPrepareTool(QMAKE_LUPDATE, lupdate) --qtPrepareTool(QMAKE_LRELEASE, lrelease) -- -+QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc - moc_dir.name = moc_location --moc_dir.variable = QMAKE_MOC -+moc_dir.variable = QMAKE_MOC_PC - -+QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic - uic_dir.name = uic_location --uic_dir.variable = QMAKE_UIC -+uic_dir.variable = QMAKE_UIC_PC - -+QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc - rcc_dir.name = rcc_location --rcc_dir.variable = QMAKE_RCC -+rcc_dir.variable = QMAKE_RCC_PC - -+QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate - lupdate_dir.name = lupdate_location --lupdate_dir.variable = QMAKE_LUPDATE -+lupdate_dir.variable = QMAKE_LUPDATE_PC - -+QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease - lrelease_dir.name = lrelease_location --lrelease_dir.variable = QMAKE_LRELEASE -+lrelease_dir.variable = QMAKE_LRELEASE_PC - - QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir - --- -1.8.1.1 - diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 5e30afebf876..9d8d98a6b84e 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.</flag> diff --git a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild deleted file mode 100644 index 7f9db1e9e6db..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.10 2013/04/08 15:04:10 pesa Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" - "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" - "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch" - "${FILESDIR}/CVE-2013-0254.patch" - "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - include/QtNetwork - include/QtScript - include/QtXml - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${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" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # 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 failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - 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 - 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 <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild deleted file mode 100644 index 0dd5bc4a9562..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild,v 1.10 2013/08/04 11:45:42 ago Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" - -SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${P}-update-defaultNumberingSystem.patch.gz" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" - "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" - "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch" - "${FILESDIR}/CVE-2013-0254.patch" - "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch" - "${FILESDIR}/rename-qAbs-function-for-timeval.patch" - "${WORKDIR}/${P}-update-defaultNumberingSystem.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - include/QtNetwork - include/QtScript - include/QtXml - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_unpack() { - qt4-build_src_unpack - unpack ${P}-update-defaultNumberingSystem.patch.gz -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${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" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # 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 failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - 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 - 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 <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtcore/qtcore-4.8.5.ebuild b/dev-qt/qtcore/qtcore-4.8.5.ebuild deleted file mode 100644 index ddfa09074fd4..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.5.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.9 2013/11/11 13:56:14 jer Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-boost-lexical-cast.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${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" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # 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 failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - 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 - 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 <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} |