summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2013-03-03 11:02:46 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2013-03-03 11:02:46 +0000
commitf98f5ceb2c13b7e82b2f1457673bda0aa156c464 (patch)
tree272c87c1fae6f0f49de68fa01ec9cbf27afddb96 /dev-libs/boost
parentMark s390/sh stable. (diff)
downloadhistorical-f98f5ceb2c13b7e82b2f1457673bda0aa156c464.tar.gz
historical-f98f5ceb2c13b7e82b2f1457673bda0aa156c464.tar.bz2
historical-f98f5ceb2c13b7e82b2f1457673bda0aa156c464.zip
Apply security patch for bug #455464; add subslot definition; depend on the -r1 version of boost-build which might fix some build failures.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x1CD13C8AD4301342
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/ChangeLog9
-rw-r--r--dev-libs/boost/Manifest19
-rw-r--r--dev-libs/boost/boost-1.52.0-r6.ebuild (renamed from dev-libs/boost/boost-1.52.0-r5.ebuild)11
-rw-r--r--dev-libs/boost/files/boost-1.52.0-locale-utf.patch52
4 files changed, 76 insertions, 15 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index bc543281335b..8171ebeb115e 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.288 2013/02/04 20:19:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.289 2013/03/03 11:02:36 flameeyes Exp $
+
+*boost-1.52.0-r6 (03 Mar 2013)
+
+ 03 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org> +boost-1.52.0-r6.ebuild,
+ +files/boost-1.52.0-locale-utf.patch, -boost-1.52.0-r5.ebuild:
+ Apply security patch for bug #455464; add subslot definition; depend on the
+ -r1 version of boost-build which might fix some build failures.
*boost-1.53.0 (04 Feb 2013)
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 616c6e121ece..d853a97103b4 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,24 +10,25 @@ AUX boost-1.48.0-respect_python-buildid.patch 1648 SHA256 996395941b5518dd2782cb
AUX boost-1.48.0-support_dots_in_python-buildid.patch 625 SHA256 da1a6c1b501f6c3bd152b2d13ec690adc2566b159f0e489723ea84865d43b88d SHA512 3a8c3efd11eba1097312dd3141f8846e23578a0386701348ebc77279a02fecf4b715de2231c998bd426b0b63f3f1875f5f47833835a4b41b8e0723b9b5b35399 WHIRLPOOL cf9ad2c82ff1c68ce4ac6a685875e53b00d5f88aa0c562007c4dbe73610811eeaf9ce93a706d0fad46aea4322fe10e9b0bc4a73659d8b98540ebf96bb5288adb
AUX boost-1.51.0-respect_python-buildid.patch 1565 SHA256 a783cd262cfda7c0046a9a9f34dd91cdc48bc2442c4c466873e85ead818326bb SHA512 65a7456c63db5eeab862fdb6245ba3a26536e26b56be9ed7a502a3d5be91bc278cd4a22cf1c5a1d8917bdeaa6575cbf37a11bfc3e982272f56308117fd2b230e WHIRLPOOL fb430e9c5368540493e13fdadff94df426203c9e6776891a3fc421488266b39f7e5720e5f5d289665d62d753c9bce7a33198cf6e911d94961714c22d1452ac92
AUX boost-1.51.0-support_dots_in_python-buildid.patch 609 SHA256 189299e2ef3cde98584e60a5bdd8606894c19bceb0c4d40b38f04aae0aed0edd SHA512 0bf1e4cae598a098b8c252bab1938b29dd5d3ea19d9355156b14add27238e9359ad39a73d3afecb031efebd801215804ecebc11ca8fa6ac2b7b3c2f5ff9bc32f WHIRLPOOL ffc318bc06c33263906be6d0e565ef4c2e3fde9f6224cc5413c02cbe446d9f286c69153f4aee6f588472b058b9b4a37110b0be696bd22362989f1b6a8c8fc13e
+AUX boost-1.52.0-locale-utf.patch 2062 SHA256 8212150730073ba5b08aa9808afcb45d5ce90109cfc1ba90d22a673418ea003c SHA512 641a56541efb51e7db66c6c9eac65f8e0e62b4ad2c1b792ea573ce86fc62cd94327be75d22b8fdb84128e792977a2b450681d729a85b143146dc79a007ecefc4 WHIRLPOOL 67cfd6bd4591c3dcc47ad06aaa634e9c1598e0214635a66a1e57fb933b025aebc05cf3ddadd7309fdab353daa7b7880e468874c958e641604d4a7e3fa986fd96
AUX boost-1.52.0-tuple.patch 500 SHA256 dbf631c8c412ea12b3d63dd4b515e0d5f1383a13db18e13696bd33dee91645d7 SHA512 ed2790b35058a3bf91b49e5e1b61f1861e2ba8d8ec6f885e85d74d62e2182fd1768099660712a900e29a505fbf568f0235c748cca801ede836f67d2adbc6bcd1 WHIRLPOOL be88916331907ad528983e370619c9e734e122c7a1a0a2fb4a6df30f5ca9567884bfece928cab314ecdb425e6195a1b154a6c15722c6c860946ad356b4a4b502
AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
EBUILD boost-1.49.0-r2.ebuild 14407 SHA256 0b2876567540ccf696342fe43a67590fa03c60d13a2b7f8796d40c1344b54032 SHA512 4249e7059c0c54b3a11737d444a6453254aba27d3b247841323045ea269ef4091c2818394c257303ef144564a48f18991ab90eea9d9378203b46498e74a904c6 WHIRLPOOL 4a30c5cd4cbdcd6592f609fcdb4c16a2515d3748fe841ed560deccd45a0795b013a57533613967fe75efccb04eaf2e534a75861173805c96f2422d2f24ec2d94
-EBUILD boost-1.52.0-r5.ebuild 9192 SHA256 a18df966e8a9dee2739e3075ff026314f8a982b31ad721e0250e937098ce9963 SHA512 07dc87d14cb724f5ce4f6036c41c5d652a442100a8e903ead5fcf26330b821081feaeed6fba79d5abdbd4e428b5a86be7f5a5cf51b19ac11c20016337ba1543a WHIRLPOOL dd30a72812b322cc5cce325e3079b05ed243208bcc15a2a5d7f6f85400495fdb5f68693d4a0f70f6034af985632d54fc8f865054ee95a186f00d368d558f0377
+EBUILD boost-1.52.0-r6.ebuild 9246 SHA256 45e045e130df46b2ff72414ca8543448a3eb2e2710aa7c653bb29b4711aabeb9 SHA512 ae45739642f9743f8e00865bafa09bab137ca6bdb57c485f2f6e853fa6a4e1c32be8b86dd6ae42acdeb15c4e73cb119e782f71636ca1ee4782f59da97dc15c4e WHIRLPOOL 7c4b56c46c9a74cb246f0611219c36d543db63a16b8f0f088a19c580788f797b34317cd4ae4dff890a11cb9c97039634f00c935ea7c22d9438662a5a17888e93
EBUILD boost-1.53.0.ebuild 9116 SHA256 0f7c1a82107e83d92640d1843ade20d115844368398a1caeba3f44911ca316f0 SHA512 c9e64992f82bb18975c9567d2eff7d6208d0bef972e9b4abce09dcf875b53ae65374b46e68ee4ca3ca852c416b0112968787b5017a8de9b615582576d1a5a90a WHIRLPOOL 08616ded412a9e1502425772d27fcb937c52d22d252e64ed5db2daff2f9ced219853d34fe94d8a9eae09d1d7225d9e287fd4540321a2e2d6c467224b0a63ff1e
-MISC ChangeLog 49159 SHA256 a9774543fb1ce815cb74fa52ee89e07b60c55366ed029edee502fedcdff2eaea SHA512 28f10afbfbc81117bdcecb78b83e636ac226057fb7452c8b6aad607f3781e29c0841a0450aafa71afb6c1a47e9a27777a730f3215e8b2167a8fd986f401ef885 WHIRLPOOL 058b5176ecbf5fd09b201d9897efd47200ef2c258bd913d01cabcd9beee4d2d661a0ddc9fdf3063cd6ea1c325f5e4bd95f3074ee4136d5de7d49c6e8ee1fb0a8
+MISC ChangeLog 49482 SHA256 a2d7fa2f105f076a3aa1a690d39eec7a16d3f2e8a367abebbd2ccd8e3129c3df SHA512 2047d0c540f1b5c6d87fcd37b858e4e9a721e7b965a9c9dbe1f1787435a52861510d4820e5e1efe68d4086528070134d2cb513e28c845066c6106085117290d4 WHIRLPOOL 28125887019273db833ef7e764bcab49d631dda4b59e2797d716d8d93772bc9dd635261cb58d7fa469dc5513e80a88e27157dadbcf54576fb326123fbab5b844
MISC metadata.xml 1220 SHA256 12442e258455aa70d08879028a9bb0424d6a5ceea321984009ae7dd51af10c50 SHA512 163fa62be2cad395e8f9bb7779d105bd02be0e09ba4571c41accf707ec25b9ad0d15a62db90c2cc01660b3759235493c00d96f9b741a93fe857c4bea15ac52b9 WHIRLPOOL ae70da326b7b36689ee9a7f3c29921e9e4d85fd7f8b7863866ff9aa7a86eae2983fb12e23f7f0a0aac35a8c09572954ebf67212bb103bed4e15ee2e4ec764ba0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJREBfwAAoJEBzRPIrUMBNCmN4H/jxVkNoU3zA/FG97yAavk6yQ
-sOBp0xfK0p8LCX9rvnmQR5rr4Jv+j7cxb3IiBGartD0IoINTdHPXNVYYYbmUPisW
-HNZeGoVNN0RpwQcagGOPDn79Yww55gMAiHGoQpnVg3xqpkaGnzbHb7R4mwzNRXjI
-nQ6bvg9Nt0QeBVd0RKRan3edD2SjQl0j3DM7u6jAyKBLPdNY03lSwPhBLG8cRm7b
-LndTsEZKnLq5DuBhe9s0rBRWhv2Bd/CPMzuWKVKvTClyQDA3OcOreh/I4JThsbP5
-7frKykS1rNz1vbOqvUFxpN8FBFa50W2Vz5NE0jjz2cEJ/ghLfmrdpYiqIe2X2yY=
-=qUZQ
+iQEcBAEBCAAGBQJRMy3VAAoJEBzRPIrUMBNCb3sH/i7DiHJODWMILns8cx5ioFON
+wteGyq3QFTLtEV2Wxy5mLrd0ZUJ7Nx2Buev4AhzDNe6xs3VGExK0u1AgQrokzR8R
+nOAZfVPFFzLyS5oF9qEyHBFGlRPpb8TADWRKBJQvKXhUzstRS3LeYsT8QUxT5rzK
+4CUQX/c8k/5Ejel0CCRrhuzlrfMQ9ey2QxrP2XCo9R0ngtciWZ9LC95sfyR3DbQ+
+4EGxDknvryidyAmrbxwGISLqQ0Z4zXJAv84WGFgHNDiFLPgG0m81siMOktSVmaML
+KSd/9x/F8ojkjcQeKW3hEPUb+Xg04bXBOGehtpbVk1nvOfUsUKmbPKGIUAWYJi0=
+=v6Qd
-----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.52.0-r5.ebuild b/dev-libs/boost/boost-1.52.0-r6.ebuild
index 0f0f40b358d0..b300abdc133a 100644
--- a/dev-libs/boost/boost-1.52.0-r5.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r5.ebuild,v 1.1 2012/12/15 14:45:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild,v 1.1 2013/03/03 11:02:36 flameeyes Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -14,8 +14,8 @@ HOMEPAGE="http://www.boost.org/"
SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
LICENSE="Boost-1.0"
-SLOT=0
MAJOR_V="$(get_version_component_range 1-2)"
+SLOT="0/${MAJOR_V}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug doc icu +nls mpi python static-libs +threads tools"
@@ -26,7 +26,7 @@ RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
sys-libs/zlib
!app-admin/eselect-boost"
DEPEND="${RDEPEND}
- =dev-util/boost-build-${MAJOR_V}*"
+ =dev-util/boost-build-1.52.0-r1"
S=${WORKDIR}/${MY_P}
@@ -69,7 +69,8 @@ src_prepare() {
"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
"${FILESDIR}/remove-toolset-1.48.0.patch" \
- "${FILESDIR}/${PN}-1.52.0-tuple.patch"
+ "${FILESDIR}/${PN}-1.52.0-tuple.patch" \
+ "${FILESDIR}/${P}-locale-utf.patch"
# Avoid a patch for now
for file in libs/context/src/asm/*.S; do
diff --git a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
new file mode 100644
index 000000000000..7ef51e94797b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
@@ -0,0 +1,52 @@
+Index: boost/locale/utf.hpp
+===================================================================
+--- boost/locale/utf.hpp (revision 81589)
++++ boost/locale/utf.hpp (revision 81590)
+@@ -219,16 +219,22 @@
+ if(BOOST_LOCALE_UNLIKELY(p==e))
+ return incomplete;
+ tmp = *p++;
++ if (!is_trail(tmp))
++ return illegal;
+ c = (c << 6) | ( tmp & 0x3F);
+ case 2:
+ if(BOOST_LOCALE_UNLIKELY(p==e))
+ return incomplete;
+ tmp = *p++;
++ if (!is_trail(tmp))
++ return illegal;
+ c = (c << 6) | ( tmp & 0x3F);
+ case 1:
+ if(BOOST_LOCALE_UNLIKELY(p==e))
+ return incomplete;
+ tmp = *p++;
++ if (!is_trail(tmp))
++ return illegal;
+ c = (c << 6) | ( tmp & 0x3F);
+ }
+
+Index: libs/locale/test/test_codepage_converter.cpp
+===================================================================
+--- libs/locale/test/test_codepage_converter.cpp (revision 81589)
++++ libs/locale/test/test_codepage_converter.cpp (revision 81590)
+@@ -140,6 +140,20 @@
+ TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000
+ TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff
+
++ std::cout << "-- Invalid trail" << std::endl;
++ TEST_TO("\xC2\x7F",illegal);
++ TEST_TO("\xdf\x7F",illegal);
++ TEST_TO("\xe0\x7F\x80",illegal);
++ TEST_TO("\xef\xbf\x7F",illegal);
++ TEST_TO("\xe0\x7F\x80",illegal);
++ TEST_TO("\xef\xbf\x7F",illegal);
++ TEST_TO("\xf0\x7F\x80\x80",illegal);
++ TEST_TO("\xf4\x7f\xbf\xbf",illegal);
++ TEST_TO("\xf0\x90\x7F\x80",illegal);
++ TEST_TO("\xf4\x8f\x7F\xbf",illegal);
++ TEST_TO("\xf0\x90\x80\x7F",illegal);
++ TEST_TO("\xf4\x8f\xbf\x7F",illegal);
++
+ std::cout << "-- Invalid length" << std::endl;
+
+ /// Test that this actually works