diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-10-19 14:05:41 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-10-19 14:05:41 +0000 |
commit | 8913aab738fa79f1d3b0e41b11289e48285edb7b (patch) | |
tree | 4437b30354e386c31db1f9b1828694aa2c759bc4 /dev-libs/libxml2 | |
parent | Let people emerge this by default (#472932), reconsider when it starts to sup... (diff) | |
download | historical-8913aab738fa79f1d3b0e41b11289e48285edb7b.tar.gz historical-8913aab738fa79f1d3b0e41b11289e48285edb7b.tar.bz2 historical-8913aab738fa79f1d3b0e41b11289e48285edb7b.zip |
Drop old
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r-- | dev-libs/libxml2/ChangeLog | 15 | ||||
-rw-r--r-- | dev-libs/libxml2/Manifest | 38 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch | 12 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch | 125 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch | 25 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch | 21 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch | 156 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch | 56 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch | 27 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch | 31 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch | 54 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch | 37 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.8.0-r3.ebuild | 228 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.9.0-r2.ebuild | 200 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.9.1.ebuild | 192 |
15 files changed, 19 insertions, 1198 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog index 8a9c9fb8a433..f73336aaa15a 100644 --- a/dev-libs/libxml2/ChangeLog +++ b/dev-libs/libxml2/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for dev-libs/libxml2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.402 2013/09/05 18:29:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.403 2013/10/19 14:05:37 pacho Exp $ + + 19 Oct 2013; Pacho Ramos <pacho@gentoo.org> + -files/libxml2-2.7.8-disable_static_modules.patch, + -files/libxml2-2.8.0-icu-linking.patch, + -files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch, + -files/libxml2-2.9.0-disable_static_modules.patch, + -files/libxml2-2.9.0-excessive-entity-expansion.patch, + -files/libxml2-2.9.0-large-file-parse.patch, + -files/libxml2-2.9.0-nsclean.patch, -files/libxml2-2.9.0-rand_seed.patch, + -files/libxml2-2.9.0-streaming-validation.patch, + -files/libxml2-2.9.0-thread-portability.patch, -libxml2-2.8.0-r3.ebuild, + -libxml2-2.9.0-r2.ebuild, -libxml2-2.9.1.ebuild: + Drop old 05 Sep 2013; Michał Górny <mgorny@gentoo.org> libxml2-2.9.0-r2.ebuild, libxml2-2.9.1-r1.ebuild, libxml2-2.9.1.ebuild: diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 1493ce8a5c8d..38e5e476c103 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -2,54 +2,26 @@ Hash: SHA256 AUX libxml2-2.7.1-catalog_path.patch 2209 SHA256 b3343f0611f9cb6e55bf62047a988653e3e9cc50f194b18adbc330b455236290 SHA512 99c1953865c560d2b7a01cf5fd61b1c5150857f3df8a9753ca583f6ff0a99e01c02d2586bb12220a615cf9c40a540dbe0d17996c0547bc0d20cbeefd6b45682d WHIRLPOOL 9b4daf434b38a0ae8103f02625ae033e7a94012a18cabc981f34b93fe8b422477905b74cfee300eb6a37e1af8bd358dd84804a5d0b6be8645ae9ee3e4c6fcd9b -AUX libxml2-2.7.8-disable_static_modules.patch 365 SHA256 2f2ade9ee034af32cbd6600d45b2e23d3153dd9bb57a07a9f364836d24b189df SHA512 021c81b33802877d6fe11c8b8df86a9d4ed3dd5a7944c544abd40228805ffcab9cce9fb48b4299c164abf66d0b9815153f86851e3ebbf5004b76fe03cc54ed7e WHIRLPOOL 0c95f97d5d7fecf04f59020ae60d58d216770dce7711370f6c394ea1796c81c7087599c52a31640e27e0f60464da26e3e72a7014fbc6b9739aa2af222a73b53e -AUX libxml2-2.8.0-icu-linking.patch 3890 SHA256 69b37a49e8b9f0d71eda75a2c438426373c96290cd57a7f2c662a82066ce3b2b SHA512 c4caffcbf5e4baef4564fa9cf93a539622da61b849f2505360e0ca2243a5433cf2a318cd4df5e338bbe1a8650763d5af2894ce5d1b16196ada7b96983031c712 WHIRLPOOL 3716f2ed5cfb9fcf1024c17aa4d26a83f68c13a2d57ab64c52ba26676b6f681ad48575ac5070a679fd9ed3b3b1d11f2270bb2f281fd639159d545e5d816c3eaf -AUX libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch 692 SHA256 fd86a145f57c425f00d55a0ac515442ecb22a76462a256797a7b1d385953997f SHA512 1ef15347ddf7c34649b7664a2f9164f906ce2d4019280c2543d7209010626f3aadbba9abafb26b4bce64f6c51cfad417a1a5a4caab4a836989f753f05083cb3d WHIRLPOOL 582f19fa221fc6815ec977c6c8e74fcd5556299c10791f1be6eee1db4bfc11f509e02c157ae5afbe6cda89cf694dd82aae367425bee8e029408063d013b315df AUX libxml2-2.8.0_rc1-winnt.patch 2392 SHA256 c18b2c15550b3ff4709a85cd18d16368928319b1b7fd8875dc34acd67076b134 SHA512 e78d010c82f18386b4f0ff84497585755b43416563bccd11f8e4dbf0153ca8842934fe05dce6c2373d8360574a2165795a78ea991682aed9610000d2bfcb0164 WHIRLPOOL a87eefa17ad113ae4aed14744715b4e1781e0869a3bb789bdf4f243bdb3687d0d4b6ee2addc85bf5b2f86b9d1cc442d946f0329011f033e3a7855ae0ad79b745 -AUX libxml2-2.9.0-disable_static_modules.patch 837 SHA256 745a4c7006874fbbbf30bd4ed07622a496445bf848a60f5ad5100889016f482a SHA512 7ced4510bcd3380f2910cac7420ab727de931939b9012f4ba034b66b32803f4e773fd81850451aa8a24530cc2d0898cebb3a329b42ab3c5daa41be63ae4303ec WHIRLPOOL 1584c94b2f8c583caa84a2ee8e2b23e31a3ef7060dba7f6c0c73fcdf7ec529e9cdc33294781465779ca7d7e6ef5265d7c0d158947ca5b3a7ba0a083333453a67 -AUX libxml2-2.9.0-excessive-entity-expansion.patch 5358 SHA256 a2675ed02fa9c28931c200eaa10f54ed167b8e7571d0d1c649db07fe3992c205 SHA512 a4ca8a2935be8357fef64f8fea7d590a90d840c92467d4254d9a250c83741f8c46ae1733f8a53badf929c4608fe82296790c343f2cebb8357dcb1ae5f593bbf9 WHIRLPOOL 278250976bb251382144c35e42912272259824862ce1a8078e2f2864fef369bd9d3845ad5d52ed0a04e3078aca6cc0ecbb6888fa0090203a76a331c8d4c4baa4 -AUX libxml2-2.9.0-large-file-parse.patch 1597 SHA256 c7ae7c9e94720f7ef1adfc5e60b0559a7a0ca0b302e8058b994f0b84b97f9ab6 SHA512 e049379b2e8cc26f6a6e348842eaa3955005834f61d56c53538ee0bd8a7cdda5cc51df8ed590a37799b1e04e692c2ef0954fb5728fb848a2e9d62162e5a761db WHIRLPOOL e360313cbf9b88f3fb6e80da44232a4d5ca84a43a9528fd2c5f102a4b47cee2da093fef24733afd958fb1c57df89d2ed30d079262b75be747e6e5ead8b3f2976 AUX libxml2-2.9.0-manual-python.patch 1409 SHA256 647023249861bece60c719c49421a539342ab11a9c9023ee3175e29faaa24974 SHA512 1e06c52c729752d5bb72ac57ec0aa5c384eed49f79d38088eb9514c0a15c0f433309cd60ebfabbe75bf6166d93d1c7eb2a5ba6fd44a18bea8583590fdbcb3f11 WHIRLPOOL ec9653cab65af8833fef1264fe96ceeb8863047a3f699b8e69afbe8e5e47ef50e4e589a62d305d58352f560507cb606e45e1be5603b3b3758474fa192bb51506 -AUX libxml2-2.9.0-nsclean.patch 806 SHA256 3f135045a44423e7e50269bbc2464af50a86f33beef08bb0af6922091b39c9f2 SHA512 6cdf243fe5424a0506645930c7fa1fe38bb43d712bec6f5d88ffb3abfb70ce9af1414ddbde3c5266af53bd3a6a8ef26c5322ae701853ec008a53b9f6dc8b79c5 WHIRLPOOL 92ff510b095214b1a548abe0c19b475cf5d8885a8feec5e804e5e351a468bf5e30af9bacc2744da66b6a488661d9763f8fba1e6ee1de60f7e7602a45415561e0 -AUX libxml2-2.9.0-rand_seed.patch 845 SHA256 3a7c229c664aade8eb454da19f90cae3d9927d4c76859c85070da13c36565f7a SHA512 caca91890785959317943aae8b21dbed4bbc3a93cbee8d52101ee38f554ca464bb423962c4f52adf515361bdaf655b6bd3a664ff7503e8777f0cb9d4938d6eed WHIRLPOOL a3404a6311b433927c44467263235faf407437efbb52fc95d8fc65b42e1ad44b8c0c7181b07e0251aa186c07e74d6350b3568407c0e09a185659740bbe5e668d -AUX libxml2-2.9.0-streaming-validation.patch 1639 SHA256 295f3012c24d96fca5c38ca32449e3651ed85e1592db910631c7ef380b515d26 SHA512 efa42db1bae6cef4ad078d8550939a18f2e796499d428038ac1c1028466b8472963f26ade3142e89a4475c9a0c54daec0909510e7080b34538ff89ad2e82a3f1 WHIRLPOOL 188cc683b6631bb0d01ba941cf2405802cbd02ea7eb8b1a772a8511f948467f53e5a60e0463fab516c4fb11517eb7fa1e4e2d1856a537348ccbf473deae2b2fe AUX libxml2-2.9.0-thread-alloc.patch 1819 SHA256 ab0e44f05903ea70babeff17aaac09f344c9ce069264ecb4f27f9a6929c6af73 SHA512 80308f3f0087bcc0f08848e10c75b6333247f960190940e7a20575ce41d382fbd46350b0b8631a6c877f8edb06bcc930659c9e9e8ea71bc381f0a4287c22c935 WHIRLPOOL 24c4ba69c70ff949848795418cbfe59326c09a0b90126c67853fe7ee39854a824c56e092e7dacfe6a969eb4d451e6d2354c382c03e6d5c657eab07a50c14babe -AUX libxml2-2.9.0-thread-portability.patch 1385 SHA256 0839bbd63e3eaa083e91e34d3c8a04700d2dc1e8242117f27d941bd16cfd9e32 SHA512 e07933f7c6a2170c822652c2216f90a60f3334a67d6ffa01e3ed9958842b0634bb4c0bb32d410dcbf99f82b091d8398adb4cf3e0666efa62a29084e1f7111ff8 WHIRLPOOL 29301cdc15e4ac04f3f03bf15099a4c70492b6b77f1bd3461613ac465311aabdb2c4dbcdefce5a2494fbbec155079fb50bd1b86904759df3c92734265ea8e405 AUX libxml2-2.9.1-compression-detection.patch 3415 SHA256 02497f74371338b681e372b3fa6cdb3d24aa675caaa7a2e50fcf9bb117f29951 SHA512 28e1b914d60dea06d72de0523d289a4dca82ab3c505d796a223880fecebe22578369400a31f5d0f6ac02375e171ccb96368c0eb06ddaa67d9be377fc37c03357 WHIRLPOOL ca3eddb2ae8cdd088bb6b6a62c697a56d149a1134b892d2108d20baed4f4d951b8709604ac9d1b6cb8d6371a41b730c01e295de463242c6986401e25b518e622 AUX libxml2-2.9.1-missing-break.patch 670 SHA256 98681d90b279174160e8bd3901f468544a7956d163c86473a60756be05191bad SHA512 2efee76fffd0da39e197b9a51bcc3925323ae4e1e861f55daec9ae7872166b24ed207970ef8573d306c267215f1ddf5439b45f2cb6b6d308bf749b22accf5c97 WHIRLPOOL f51d55103ad2060c883091e23554e5d70724fa4b2a58767b6d15143f447f445aa09df1ad7ac022f84d53f5339478e4f9ab8624918ab61f44402e6f59b2a7785e AUX libxml2-2.9.1-non-ascii-cr-lf.patch 5842 SHA256 1613e564814437ab1ddc28cb468cdebaff7e46587b364a4a6c7904c7b8da78b9 SHA512 1db9a31c1457e5ca6cb4397eb898a93e8985f1c73a5e213cbc1b70bc569fcef08c77af2f9123ed5b814903acda6cdf2e8b38434c81665f4456c8de4adb9345eb WHIRLPOOL adf9bb6dbff21494439589dc4f7b41d0719e0905811acc6719f637deffc0257f5aaf82534b8bf7761793a4ab7ecb12232a3de9d86c01391e6137043dbda22678 AUX libxml2-2.9.1-python-2.6.patch 912 SHA256 5a6e6def4dda78be1f44eb72c0e108f9c5deb4e74324d7845d024d643042c0b7 SHA512 9bf67f06301e1c59b232b00540305cf570b9dc32e8ac7b91d7bcfe188a668dfa6e5cfa13399267f9683ff484df317433536ad1a4d0c49a4ed068ea55d841cee2 WHIRLPOOL 99de5f267813e0f6ae13e408bc6e596bdd228cf7b72f3f38e2edeceff4ed6fc1ad1a2b1ee1e1d85bd4d3a7f9a27e215e8d1d7f264f3a2e25e3d8313dfd46d3d7 AUX libxml2-2.9.1-python3.patch 1328 SHA256 3702b2aec5e40b906358d13c11864fa0933b83f908f634171310e912bd6c2cd9 SHA512 29bbc4c4e58d8a5f24b6c58f61b3adef916becd2ba0a4c098faf5e889d0537d7f696237045b47a239b323babf637aa220f964d18cc047b8fb1bd3bf3b829d85c WHIRLPOOL ace0531053dbf8b0d8bafeb8ea03e1ff972608cc44dee8b238163264d43e8e8ffff8550066b30946b8f9a185f05f58b3a7e0892939802a0fc54e0a2c6963d0f0 AUX libxml2-2.9.1-python3a.patch 1745 SHA256 0df91eae57ccd8db35c80ae479ea155c1b1cb28d6793b0526792a0d02c835028 SHA512 0d5b253af29fa88c1d7011d9f977283fd37aa6899689fad00b4c05cb7aa412fbaffcdc514a03a3da69708e5b347aa7519a901ffa2ae3fa271e9bca53efd802af WHIRLPOOL 61e8a7cd40ddfa89e6997bd47a8d9491e3f6bd15208c6448f6c2d61c99de4c4da6da6257d95eefeed7399cc768de0fb3658f3a441e8c78983cf91ed77b107c85 -DIST libxml2-2.8.0-namespace-node-patches.tar.bz2 4929 SHA256 659f4d9fa8971346f545492474a95e655a84c47fe02978c418528b1ad3e23af2 SHA512 37e4b985ebce9fc69f1e58eccb3281d5bc1786e3d886b5a0649d47d2564a998f95dac3b6214bfc597c993828f9d1c43cd1edb60ded8058c376e4ce024036e06d WHIRLPOOL 4209036c5ae8cdf9ab75d248fbb92e042e343f6f806d2c3fffcfa24bfa97cb156d323bec8b867a8df929b1f19f84f922cfbbd23eda6c490447e545b26f4ccf95 -DIST libxml2-2.8.0.tar.gz 4915203 SHA256 f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a SHA512 e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4 WHIRLPOOL 3731ba80e6f6d6eba4d12d39ff564c81f9c26ff79df8c3f7bd264c5b27332732552186f5e9f3ff10661b1571cda0b75ac966fc65d0cbb3da9e73791f6b2369ad -DIST libxml2-2.9.0.tar.gz 5161069 SHA256 ad25d91958b7212abdc12b9611cfb4dc4e5cddb6d1e9891532f48aacee422b82 SHA512 b13268ea3725a8b534974ece33981b001324164e5687df94b0d15c77189070e2a5d9f08c1646e5492e70a607ca0adf00788772fcf300ac2d4a110e9bf57d4afe WHIRLPOOL 652e3b1e9b4241cd9bb7ab5f5c1261091378693057cb552b7f0517ebf7e48569abefde06707d4b2f56a08c13b693dcec76bdc360d7cd11937464bb4f87161116 DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb SHA512 7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b WHIRLPOOL 5d2874527b637e666ca6afe710991aecb60c490de38edbe09a703c8e80c776d3f121544cc383146c336d46c573f3a3c9a2491c6c9cd5f22c5474d66dcb8ecf9b DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11 DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d -EBUILD libxml2-2.8.0-r3.ebuild 6477 SHA256 11f5a45d6503026370de2e934d41ceb0cbab46db23e81c2b4e9676982a4add2c SHA512 a2fea4c2fde2a22d1d0a12666f05284465f17ed30c85b9b2c3d950193cf5a68adbb8677e9eca66486d14c36cee56ee8e6f1e6d4350256cfb8c7a8a8f28acefa8 WHIRLPOOL 5a95367e539ee18cabe1062617c91d3d9e47f704dc56643dedb61310f9f085563a23e1f8a468688ea9e40e2c0a5921cb07e4c006cccecb95e66d795aec7f34a9 -EBUILD libxml2-2.9.0-r2.ebuild 6394 SHA256 b0e04256a125e024a79f8b7d7023b16f25de849c2c38a82ee9f33be3cb2672e2 SHA512 22c8a03ac3be96618e2ed3dd137aea84c9c641f919a3e7c03135c3d8e77dbd2718f9f6a1d60ceb409bf75d219da3f4da7f1b04a6d513e5f9fa1f5913dcb3abf1 WHIRLPOOL 807123eb99c870beff95a3d834c3f9da436557adaaddc9ad25109f5bb385486041712da374c149e16a621e6e662a8320572b0bd63a675b43bbc4981dc42d42ed EBUILD libxml2-2.9.1-r1.ebuild 6035 SHA256 5088948bb8947231a40d6e5019b371f4fecd48658ec9a9f80d1892be34e486b4 SHA512 4b69e395aae9c80f063aa99dec25837f414575e05d249e8b347d421520173da3847fb334ef10c3f07ef6bd322d7f4f8ee8276f63a38cc41d3bf3ed6f6f5382a3 WHIRLPOOL 2f318cfec477d777dc8dc8c38ff47aabdb0b7956c2ccf57273c0a2d16c347a35284eab79375b67efe122e023b474681af29f9f7fd4bc8417a6277a0e86e86f29 -EBUILD libxml2-2.9.1.ebuild 6054 SHA256 042d8b3b5023c95f12c130e522fd99547df441a369fee936d5b2b7d74367fc73 SHA512 a7dce89abc01a3d053938743f7931516c95c5aace5be0e3e64b0e5c8ae655c145a951b2cd6e5bc10282626ee372f7294c444f0691b211cee55e0989845e80bd4 WHIRLPOOL b217da40d0c25a832f0d73fa3ee71518d64b8371f43e4a34892b905b035ccb40c8b686117d91bf9aa60b41104c10a136c79fb27c027d22f39ab866506e49cd6c -MISC ChangeLog 56995 SHA256 d0f8846a654680139fe0f95b872a1fc5453bab63e5fa2de15b50059e0f30e171 SHA512 b821eec3772a3238a49474ce56f7e2640ae25b7e4f1a5ce42883452e473aecbf366b846dd8bc7071c7956e36cbee0703c2fa21fea25aa22f1c1b6b66a48fe2c2 WHIRLPOOL 1cd6b96bb4bca58db55f26c762ab246facd564f4b546bde9b141297b5777d16da50f227734859cae072173e5f45f10d86f277fdfdae25f2793ebf2d1e08950a1 +MISC ChangeLog 57621 SHA256 f35d97b8094ff914d50257f43fceb6b4503de96e3dc745db15a97391681d4b4b SHA512 41156c8c6e7c340b5b4bf9311536bbba78eefde4b69238f1a244e960a506305028d377d7b18d0f549beb1e296c845d5265b32fd8d258c5e6c2dfcef1a2d06bb5 WHIRLPOOL 706080ef45dc3c804f1266bb0b596ce530a76a15790ef7da50497cdc5c8883b1442471963824388eb443df06efb01a51f525f79608a97853bfb0872d0a9769d6 MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJSKM3LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAVwP/0HINIYCicsNO/YAn4FX1jLF -eeN44YKWHpwYCg8oXWZrSM6n4VNcitAl0jtknYlmfpIc06xLYD+xZLhHcx6IO/dS -nv7QLGXp5xfgEfx9KG+q1BoHFxXOUnrO2zOWYxyls2RASzWMIV58VEjHM8H2JeUJ -exbndpxSKa2g86sBrTJ5hvcEjgDdJVjtaTaYZxpA3+a/VAlWuXQA2XT+Lb6xAajN -zzawZXO0a+NjfCOe9uH+VqRvWHYRjhqIOFVOQNVEw8NhmtugvRwRIyh5D3xyd9wy -2gnuFLZDTtX3dd2wZ2qYipfLWKJY5BKJAk2qXPIGVQHRQpMfrceqIaHly4meNwHg -k2wG1xh8byz7Pz+r99gFOtAKXsT+y1lcRC/rVtk3qsdVEpLTaeyzO31lMoF0nYLn -ffgVx4ZKacvDW97oZGiTa3BFnlShLZ1ws1Sb0QtPgxSuVX3ckphyeKEMfIq+nXX/ -HUNzFiX9nL6pG3EGdJSmFyZX5JdnAJDxsRCPgxRQajD1+xSRwrNmC0ji227mmvm9 -aYzqQV308vwmWVAOi91NbOgAYoXaT6H5ASLRVRUUSLOn/dGSEiX24HFXdbEzgHtm -9/y5jbq/+fJRhH8CxeV/rw3UQ1PsgFUik2HcpQ+MRyVw8aewXtD3UsaiA632HT5J -8FqdNkow7vMEKgRKdgv4 -=9HQl +iEYEAREIAAYFAlJikbIACgkQCaWpQKGI+9S+KACfYvEi//WvSCGoomdPbqbAi0lG +FdcAn2yABZDlYVS6v2f5fM9mEpSXxRSv +=+V/J -----END PGP SIGNATURE----- diff --git a/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch b/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch deleted file mode 100644 index 5f47e1d619cf..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- python/Makefile.am -+++ python/Makefile.am -@@ -21,7 +21,8 @@ - libxml.py \ - libxml2-python-api.xml - --libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -+libxml2mod_la_CPPFLAGS = -shared -+libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -shared - - if WITH_PYTHON - mylibs = \ diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch b/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch deleted file mode 100644 index 92c9a98c655c..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 6ee653ecbef38c0e57860903541f1f3c97dbe75b Mon Sep 17 00:00:00 2001 -From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> -Date: Sat, 26 May 2012 17:37:43 +0000 -Subject: [PATCH] Handle ICU_LIBS as LIBADD, not LDFLAGS to prevent linking - errors - ---- - Makefile.am | 2 +- - configure.in | 15 ++++++++------- - libxml-2.0-uninstalled.pc.in | 2 +- - libxml-2.0.pc.in | 2 +- - 4 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index f82cefa..0b25666 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ bin_PROGRAMS = xmllint xmlcatalog - bin_SCRIPTS=xml2-config - - lib_LTLIBRARIES = libxml2.la --libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@ -+libxml2_la_LIBADD = @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@ - - if USE_VERSION_SCRIPT - LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms -diff --git a/configure.in b/configure.in -index 0fb4983..ac45b58 100644 ---- a/configure.in -+++ b/configure.in -@@ -97,7 +97,7 @@ dnl - dnl zlib option might change flags, so we save them initially - dnl - _cppflags="${CPPFLAGS}" --_ldflags="${LDFLAGS}" -+_libs="${LIBS}" - - AC_ARG_WITH(c14n, - [ --with-c14n add the Canonicalization support (on)]) -@@ -154,7 +154,7 @@ AC_ARG_WITH(readline, - if test "$withval" != "no" -a "$withval" != "yes"; then - RDL_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" -- LDFLAGS="${LDFLAGS} -L$withval/lib" -+ LIBS="${LIBS} -L$withval/lib" - fi - ]) - AC_ARG_WITH(regexps, -@@ -190,7 +190,7 @@ AC_ARG_WITH(zlib, - if test "$withval" != "no" -a "$withval" != "yes"; then - Z_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" -- LDFLAGS="${LDFLAGS} -L$withval/lib" -+ LIBS="${LIBS} -L$withval/lib" - fi - ]) - AC_ARG_WITH(lzma, -@@ -198,7 +198,7 @@ AC_ARG_WITH(lzma, - if test "$withval" != "no" -a "$withval" != "yes"; then - LZMA_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" -- LDFLAGS="${LDFLAGS} -L$withval/lib" -+ LIBS="${LIBS} -L$withval/lib" - fi - ]) - AC_ARG_WITH(coverage, -@@ -428,7 +428,7 @@ AC_SUBST(LZMA_LIBS) - AC_SUBST(WITH_LZMA) - - CPPFLAGS=${_cppflags} --LDFLAGS=${_ldflags} -+LIBS=${_libs} - - echo Checking headers - -@@ -1365,14 +1365,14 @@ XML_LIBTOOLLIBS="libxml2.la" - AC_SUBST(WITH_ICONV) - - WITH_ICU=0 -+ICU_LIBS="" - if test "$with_icu" != "yes" ; then - echo Disabling ICU support - else - ICU_CONFIG=icu-config - if ${ICU_CONFIG} --cflags >/dev/null 2>&1 - then -- ICU_LIBS=`icu-config --ldflags` -- LDFLAGS="$LDFLAGS $ICU_LIBS" -+ ICU_LIBS=`${ICU_CONFIG} --ldflags` - WITH_ICU=1 - echo Enabling ICU support - else -@@ -1380,6 +1380,7 @@ else - fi - fi - AC_SUBST(WITH_ICU) -+AC_SUBST(ICU_LIBS) - - WITH_ISO8859X=1 - if test "$WITH_ICONV" != "1" ; then -diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in -index 0a4c833..cab6834 100644 ---- a/libxml-2.0-uninstalled.pc.in -+++ b/libxml-2.0-uninstalled.pc.in -@@ -8,5 +8,5 @@ Name: libXML - Version: @VERSION@ - Description: libXML library version2. - Requires: --Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ -+Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ - Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 31a1b8c..f5f5f03 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -9,5 +9,5 @@ Version: @VERSION@ - Description: libXML library version2. - Requires: - Libs: -L${libdir} -lxml2 --Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ -+Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ --- -1.7.8.6 - diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch b/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch deleted file mode 100644 index be9cfee03a9f..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Mon, 29 Oct 2012 10:39:55 +0800 -Subject: [PATCH] Fix potential out of bound access - ---- - parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index 0d8d7f2..bd634e9 100644 ---- a/parser.c -+++ b/parser.c -@@ -4076,7 +4076,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { - goto error; - - if ((in_space) && (normalize)) { -- while (buf[len - 1] == 0x20) len--; -+ while ((len > 0) && (buf[len - 1] == 0x20)) len--; - } - buf[len] = 0; - if (RAW == '<') { --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch b/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch deleted file mode 100644 index a7a8215d861b..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/python/Makefile.am b/python/Makefile.am -index 4a8b5d5..b976893 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -19,13 +19,14 @@ if WITH_PYTHON - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -- -I$(PYTHON_INCLUDES) -+ -I$(PYTHON_INCLUDES) \ -+ -shared - - python_LTLIBRARIES = libxml2mod.la - - libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c - libxml2mod_la_LIBADD = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION) --libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -+libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared - - BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch b/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch deleted file mode 100644 index d7ff539d40c1..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Tue, 19 Feb 2013 10:21:49 +0800 -Subject: [PATCH] Detect excessive entities expansion upon replacement - -If entities expansion in the XML parser is asked for, -it is possble to craft relatively small input document leading -to excessive on-the-fly content generation. -This patch accounts for those replacement and stop parsing -after a given threshold. it can be bypassed as usual with the -HUGE parser option. ---- - include/libxml/parser.h | 1 + - parser.c | 44 ++++++++++++++++++++++++++++++++++++++------ - parserInternals.c | 2 ++ - 3 files changed, 41 insertions(+), 6 deletions(-) - -diff --git a/include/libxml/parser.h b/include/libxml/parser.h -index e1346e4..3f5730d 100644 ---- a/include/libxml/parser.h -+++ b/include/libxml/parser.h -@@ -310,6 +310,7 @@ struct _xmlParserCtxt { - xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */ - - int input_id; /* we need to label inputs */ -+ unsigned long sizeentcopy; /* volume of entity copy */ - }; - - /** -diff --git a/parser.c b/parser.c -index 91f8c90..ddf3b5b 100644 ---- a/parser.c -+++ b/parser.c -@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID, - */ - static int - xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, -- xmlEntityPtr ent) -+ xmlEntityPtr ent, size_t replacement) - { - size_t consumed = 0; - -@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, - return (0); - if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) - return (1); -- if (size != 0) { -+ if (replacement != 0) { -+ if (replacement < XML_MAX_TEXT_LENGTH) -+ return(0); -+ -+ /* -+ * If the volume of entity copy reaches 10 times the -+ * amount of parsed data and over the large text threshold -+ * then that's very likely to be an abuse. -+ */ -+ if (ctxt->input != NULL) { -+ consumed = ctxt->input->consumed + -+ (ctxt->input->cur - ctxt->input->base); -+ } -+ consumed += ctxt->sizeentities; -+ -+ if (replacement < XML_PARSER_NON_LINEAR * consumed) -+ return(0); -+ } else if (size != 0) { - /* - * Do the check based on the replacement size of the entity - */ -@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, - */ - return (0); - } -- - xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); - return (1); - } -@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; - if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; - if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - xmlFreeNodeList(list); - return; - } -- if (xmlParserEntityCheck(ctxt, 0, ent)) { -+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) { - xmlFreeNodeList(list); - return; - } -@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - xmlNodePtr nw = NULL, cur, firstChild = NULL; - - /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ -+ /* - * when operating on a reader, the entities definitions - * are always owning the entities subtree. - if (ctxt->parseMode == XML_PARSE_READER) -@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - } else if ((list == NULL) || (ctxt->inputNr > 0)) { - xmlNodePtr nw = NULL, cur, next, last, - firstChild = NULL; -+ -+ /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ - /* - * Copy the entity child list and make it the new - * entity child list. The goal is to make sure any -@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt) - ctxt->catalogs = NULL; - ctxt->nbentities = 0; - ctxt->sizeentities = 0; -+ ctxt->sizeentcopy = 0; - xmlInitNodeInfoSeq(&ctxt->node_seq); - - if (ctxt->attsDefault != NULL) { -diff --git a/parserInternals.c b/parserInternals.c -index 02032d5..f8a7041 100644 ---- a/parserInternals.c -+++ b/parserInternals.c -@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) - ctxt->charset = XML_CHAR_ENCODING_UTF8; - ctxt->catalogs = NULL; - ctxt->nbentities = 0; -+ ctxt->sizeentities = 0; -+ ctxt->sizeentcopy = 0; - ctxt->input_id = 1; - xmlInitNodeInfoSeq(&ctxt->node_seq); - return(0); --- -1.8.1.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch b/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch deleted file mode 100644 index 61de4d624a8f..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 153cf15905cf4ec080612ada6703757d10caba1e Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Fri, 26 Oct 2012 13:50:47 +0800 -Subject: [PATCH] Fix large parse of file from memory - -https://bugzilla.redhat.com/show_bug.cgi?id=862969 -The new code trying to detect excessive input lookup would -just get wrong sometimes in the case of very large file parsed -directly from memory. ---- - libxml.h | 2 ++ - parser.c | 1 + - xmlIO.c | 2 +- - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libxml.h b/libxml.h -index efe285b..7558b5f 100644 ---- a/libxml.h -+++ b/libxml.h -@@ -91,6 +91,8 @@ void __xmlGlobalInitMutexDestroy(void); - int __xmlRandom(void); - #endif - -+int xmlNop(void); -+ - #ifdef IN_LIBXML - #ifdef __GNUC__ - #ifdef PIC -diff --git a/parser.c b/parser.c -index 43f53d9..0d8d7f2 100644 ---- a/parser.c -+++ b/parser.c -@@ -2025,6 +2025,7 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) { - static void xmlGROW (xmlParserCtxtPtr ctxt) { - if ((((ctxt->input->end - ctxt->input->cur) > XML_MAX_LOOKUP_LIMIT) || - ((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) && -+ ((ctxt->input->buf) && (ctxt->input->buf->readcallback != xmlNop)) && - ((ctxt->options & XML_PARSE_HUGE) == 0)) { - xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup"); - ctxt->instate = XML_PARSER_EOF; -diff --git a/xmlIO.c b/xmlIO.c -index f8f438b..44254e4 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -800,7 +800,7 @@ xmlCheckFilename (const char *path) - return 1; - } - --static int -+int - xmlNop(void) { - return(0); - } --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch b/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch deleted file mode 100644 index 994363fa9def..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 711b15d545713b3a34a51ce8163d1162533647c9 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 25 Oct 2012 19:23:26 +0800 -Subject: [PATCH] Fix a bug in the nsclean option of the parser - -Raised as a side effect of: -https://bugzilla.gnome.org/show_bug.cgi?id=663844 ---- - parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index 19f1217..43f53d9 100644 ---- a/parser.c -+++ b/parser.c -@@ -1540,7 +1540,7 @@ nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL) - { - if (ctxt->options & XML_PARSE_NSCLEAN) { - int i; -- for (i = 0;i < ctxt->nsNr;i += 2) { -+ for (i = ctxt->nsNr - 2;i >= 0;i -= 2) { - if (ctxt->nsTab[i] == prefix) { - /* in scope */ - if (ctxt->nsTab[i + 1] == URL) --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch b/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch deleted file mode 100644 index 7798a2c7b27e..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e7715a5963afebfb027120db6914926ec9a7373d Mon Sep 17 00:00:00 2001 -From: Wouter Van Rooy <rooywo@vasco.com> -Date: Fri, 14 Sep 2012 14:39:42 +0800 -Subject: [PATCH] rand_seed should be static in dict.c - -For https://bugzilla.gnome.org/show_bug.cgi?id=683933 -rand_seed should be a static variable in dict.c - -We ran into a problem with another library that exports rand_seed as a -function. Combined with 2.7.8 this was not a problem but later versions -have this problem. ---- - dict.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dict.c b/dict.c -index 9935a25..164c7f2 100644 ---- a/dict.c -+++ b/dict.c -@@ -143,7 +143,7 @@ static int xmlDictInitialized = 0; - /* - * Internal data for random function, protected by xmlDictMutex - */ --unsigned int rand_seed = 0; -+static unsigned int rand_seed = 0; - #endif - #endif - --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch b/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch deleted file mode 100644 index 5fa2d6f0c157..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6c91aa384f48ff6d406553a6dd47fd556c1ef2e6 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 25 Oct 2012 15:33:59 +0800 -Subject: [PATCH] Fix a regression in 2.9.0 breaking validation while - streaming - -https://bugzilla.gnome.org/show_bug.cgi?id=684774 -with help from Kjell Ahlstedt <kjell.ahlstedt@bredband.net> ---- - SAX2.c | 2 +- - parser.c | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/SAX2.c b/SAX2.c -index a24abc8..3eea39a 100644 ---- a/SAX2.c -+++ b/SAX2.c -@@ -2202,7 +2202,7 @@ xmlSAX2StartElementNs(void *ctx, - (ctxt->myDoc->intSubset->elements == NULL) && - (ctxt->myDoc->intSubset->attributes == NULL) && - (ctxt->myDoc->intSubset->entities == NULL)))) { -- xmlErrValid(ctxt, XML_ERR_NO_DTD, -+ xmlErrValid(ctxt, XML_DTD_NO_DTD, - "Validation failed: no DTD found !", NULL, NULL); - ctxt->validate = 0; - } -diff --git a/parser.c b/parser.c -index 28b0d80..19f1217 100644 ---- a/parser.c -+++ b/parser.c -@@ -11633,7 +11633,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { - "PP: Parsing internal subset\n"); - #endif - ctxt->inSubset = 1; -- ctxt->progressive = 1; -+ ctxt->progressive = 0; - ctxt->checkIndex = 0; - xmlParseDocTypeDecl(ctxt); - if (RAW == '[') { -@@ -12219,7 +12219,10 @@ xmldecl_done: - } - ctxt->instate = XML_PARSER_EOF; - } -- return((xmlParserErrors) ctxt->errNo); -+ if (ctxt->wellFormed == 0) -+ return((xmlParserErrors) ctxt->errNo); -+ else -+ return(0); - } - - /************************************************************************ --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch deleted file mode 100644 index a85d6129174d..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001 -From: Friedrich Haubensak <hsk@fli-leibniz.de> -Date: Wed, 12 Sep 2012 17:34:53 +0200 -Subject: [PATCH] Fix a thread portability problem - -cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10 - -I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in -a structure assignment anyway ---- - threads.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/threads.c b/threads.c -index f206149..7e85a26 100644 ---- a/threads.c -+++ b/threads.c -@@ -146,6 +146,7 @@ struct _xmlRMutex { - static pthread_key_t globalkey; - static pthread_t mainthread; - static pthread_once_t once_control = PTHREAD_ONCE_INIT; -+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; - static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; - #elif defined HAVE_WIN32_THREADS - #if defined(HAVE_COMPILER_TLS) -@@ -915,7 +916,7 @@ xmlCleanupThreads(void) - #ifdef HAVE_PTHREAD_H - if ((libxml_is_threaded) && (pthread_key_delete != NULL)) - pthread_key_delete(globalkey); -- once_control = PTHREAD_ONCE_INIT; -+ once_control = once_control_init; - #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) - if (globalkey != TLS_OUT_OF_INDEXES) { - xmlGlobalStateCleanupHelperParams *p; --- -1.8.0 - diff --git a/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild b/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild deleted file mode 100644 index 4904067c975d..000000000000 --- a/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild,v 1.10 2013/07/11 03:23:35 tetromino Exp $ - -EAPI="4" -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="xml" -PYTHON_USE_WITH_OPT="python" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" - -inherit libtool flag-o-matic eutils python autotools prefix - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="m68k" -IUSE="debug doc examples icu ipv6 lzma python readline static-libs test" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} ) - http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-namespace-node-patches.tar.bz2" - -RDEPEND="sys-libs/zlib - icu? ( dev-libs/icu ) - lzma? ( app-arch/xz-utils ) - readline? ( sys-libs/readline )" - -DEPEND="${RDEPEND} - hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" - -S="${WORKDIR}/${PN}-${PV%_rc*}" - -pkg_setup() { - use python && python_pkg_setup -} - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - unpack "${P}-namespace-node-patches.tar.bz2" - cd "${S}" - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - fi -} - -src_prepare() { - # Patches needed for prefix support - epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - epunt_cxx - - epatch "${FILESDIR}/${PN}-2.7.8-disable_static_modules.patch" - - # Prevent linking to out-of-build-tree libxml2, bug #417539 - epatch "${FILESDIR}/${PN}-2.8.0-icu-linking.patch" - - # Namespace nodes require special treatment, bug #434344 - epatch ../patch/*.patch - - # Buffer underflow in xmlParseAttValueComplex, bug #444836; fixed in 2.9.1 - epatch "${FILESDIR}/${PN}-2.8.0-xmlParseAttValueComplex-underflow.patch" - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize - - # Python bindings are built/tested/installed manually. - sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed 1 failed" - - # Use Gentoo's python-config naming scheme - sed -e 's/python$PYTHON_VERSION-config/python-config-$PYTHON_VERSION/' \ - -i configure.in || die "sed 2 failed" - - eautoreconf -} - -src_configure() { - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - - local myconf=( - --with-html-subdir=${PF}/html - --docdir="${EPREFIX}/usr/share/doc/${PF}" - $(use_with debug run-debug) - $(use_with icu) - $(use_with lzma) - $(use_with python) - $(use_with readline) - $(use_with readline history) - $(use_enable ipv6) - $(use_enable static-libs static) ) - - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - econf "${myconf[@]}" -} - -src_compile() { - default - - if use python; then - python_copy_sources python - building() { - emake PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ - PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" - } - python_execute_function -s --source-dir python building - fi -} - -src_test() { - default - - if use python; then - testing() { - emake test - } - python_execute_function -s --source-dir python testing - fi -} - -src_install() { - emake DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ - install || die "Installation failed" - - # on windows, xmllint is installed by interix libxml2 in parent prefix. - # this is the version to use. the native winnt version does not support - # symlinks, which makes repoman fail if the portage tree is linked in - # from another location (which is my default). -- mduft - if [[ ${CHOST} == *-winnt* ]]; then - rm -rf "${ED}"/usr/bin/xmllint - rm -rf "${ED}"/usr/bin/xmlcatalog - fi - - if use python; then - installation() { - emake DESTDIR="${D}" \ - PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - } - python_execute_function -s --source-dir python installation - - python_clean_installation_image - fi - - rm -rf "${ED}"/usr/share/doc/${P} - dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* - - if ! use python; then - rm -rf "${ED}"/usr/share/doc/${PF}/python - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV} - fi - - if ! use doc; then - rm -rf "${ED}"/usr/share/gtk-doc - rm -rf "${ED}"/usr/share/doc/${PF}/html - fi - - if ! use examples; then - rm -rf "${ED}/usr/share/doc/${PF}/examples" - rm -rf "${ED}/usr/share/doc/${PF}/python/examples" - fi - - # Always remove useless .la files - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" -} - -pkg_postinst() { - if use python; then - python_mod_optimize drv_libxml2.py libxml2.py - fi - - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [ "${ROOT}" != "/" ] - then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [ ! -e ${CATALOG} ]; then - [ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > ${CATALOG} - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -pkg_postrm() { - if use python; then - python_mod_cleanup drv_libxml2.py libxml2.py - fi -} diff --git a/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild deleted file mode 100644 index 4ace086cc61f..000000000000 --- a/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild,v 1.14 2013/09/05 18:29:53 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="xml" - -inherit libtool flag-o-matic eutils python-r1 autotools prefix - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug examples icu ipv6 lzma python readline static-libs test" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20080827.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" - -RDEPEND="sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= )" - -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" - -S="${WORKDIR}/${PN}-${PV%_rc*}" - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - cd "${S}" - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - # Patches needed for prefix support - epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - -# epunt_cxx # if we don't eautoreconf - - epatch "${FILESDIR}/${PN}-2.9.0-disable_static_modules.patch" - - # Important patches from 2.9.1 - epatch "${FILESDIR}/${P}-rand_seed.patch" \ - "${FILESDIR}/${P}-thread-portability.patch" \ - "${FILESDIR}/${P}-streaming-validation.patch" \ - "${FILESDIR}/${P}-nsclean.patch" \ - "${FILESDIR}/${P}-large-file-parse.patch" \ - "${FILESDIR}/${P}-thread-alloc.patch" - - # Buffer underflow in xmlParseAttValueComplex, bug #444836; fixed in 2.9.1 - epatch "${FILESDIR}/${PN}-2.8.0-xmlParseAttValueComplex-underflow.patch" - - # Entity expansion DoS, bug #458430; fixed in 2.9.1 - epatch "${FILESDIR}/${PN}-2.9.0-excessive-entity-expansion.patch" - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize - - # Python bindings are built/tested/installed manually. - epatch "${FILESDIR}/${PN}-2.9.0-manual-python.patch" - - eautoreconf -} - -src_configure() { - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - econf \ - -with-html-subdir=${PF}/html \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with readline history) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) -} - -src_compile() { - default - if use python; then - python_copy_sources - python_foreach_impl libxml2_py_emake - fi -} - -src_test() { - default - use python && python_foreach_impl libxml2_py_emake test -} - -src_install() { - emake DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install - - # on windows, xmllint is installed by interix libxml2 in parent prefix. - # this is the version to use. the native winnt version does not support - # symlinks, which makes repoman fail if the portage tree is linked in - # from another location (which is my default). -- mduft - if [[ ${CHOST} == *-winnt* ]]; then - rm -rf "${ED}"/usr/bin/xmllint - rm -rf "${ED}"/usr/bin/xmlcatalog - fi - - if use python; then - python_foreach_impl libxml2_py_emake DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi - - rm -rf "${ED}"/usr/share/doc/${P} - dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* - - if ! use python; then - rm -rf "${ED}"/usr/share/doc/${PF}/python - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV} - fi - - if ! use examples; then - rm -rf "${ED}/usr/share/doc/${PF}/examples" - rm -rf "${ED}/usr/share/doc/${PF}/python/examples" - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [[ ! -e ${CATALOG} ]]; then - [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake \ - PYTHON="${PYTHON}" \ - PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ - PYTHON_LIBS="$(python-config --ldflags)" \ - PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" \ - PYTHON_VERSION=${EPYTHON/python} "$@" - popd > /dev/null -} diff --git a/dev-libs/libxml2/libxml2-2.9.1.ebuild b/dev-libs/libxml2/libxml2-2.9.1.ebuild deleted file mode 100644 index 783c11032d52..000000000000 --- a/dev-libs/libxml2/libxml2-2.9.1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1.ebuild,v 1.4 2013/09/05 18:29:53 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -PYTHON_REQ_USE="xml" - -inherit libtool flag-o-matic eutils python-r1 autotools prefix - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug examples icu ipv6 lzma python readline static-libs test" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20080827.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" - -RDEPEND="sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= )" - -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" - -S="${WORKDIR}/${PN}-${PV%_rc*}" - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - cd "${S}" - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - # Patches needed for prefix support - epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - -# epunt_cxx # if we don't eautoreconf - - # Important patches from 2.9.2 - epatch "${FILESDIR}/${P}-missing-break.patch" \ - "${FILESDIR}/${P}-python-2.6.patch" \ - "${FILESDIR}/${P}-compression-detection.patch" \ - "${FILESDIR}/${P}-non-ascii-cr-lf.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=703979 - epatch "${FILESDIR}/${PN}-2.9.1-python3.patch" - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize - - # Python bindings are built/tested/installed manually. - epatch "${FILESDIR}/${PN}-2.9.0-manual-python.patch" - - eautoreconf -} - -src_configure() { - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - econf \ - -with-html-subdir=${PF}/html \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with readline history) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) -} - -src_compile() { - default - if use python; then - python_copy_sources - python_foreach_impl libxml2_py_emake - fi -} - -src_test() { - default - use python && python_foreach_impl libxml2_py_emake test -} - -src_install() { - emake DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install - - # on windows, xmllint is installed by interix libxml2 in parent prefix. - # this is the version to use. the native winnt version does not support - # symlinks, which makes repoman fail if the portage tree is linked in - # from another location (which is my default). -- mduft - if [[ ${CHOST} == *-winnt* ]]; then - rm -rf "${ED}"/usr/bin/xmllint - rm -rf "${ED}"/usr/bin/xmlcatalog - fi - - if use python; then - python_foreach_impl libxml2_py_emake DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi - - rm -rf "${ED}"/usr/share/doc/${P} - dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* - - if ! use python; then - rm -rf "${ED}"/usr/share/doc/${PF}/python - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV} - fi - - if ! use examples; then - rm -rf "${ED}/usr/share/doc/${PF}/examples" - rm -rf "${ED}/usr/share/doc/${PF}/python/examples" - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [[ ! -e ${CATALOG} ]]; then - [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake \ - PYTHON="${PYTHON}" \ - PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ - PYTHON_LIBS="$(python-config --ldflags)" \ - PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" "$@" - popd > /dev/null -} |