security version bump, remove old

Package-Manager: portage-2.2.0_alpha11/cvs/Linux x86_64

5 files changed, 24 insertions, 11 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 7cb208184348..2bbc6afff3db 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.455 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.456 2011/01/06 23:35:43 mabi Exp $
+
+*php-5.3.5 (06 Jan 2011)
+*php-5.2.17 (06 Jan 2011)
+
+  06 Jan 2011; Matti Bickel <mabi@gentoo.org>
+  files/eblits/pkg_postinst-v2.eblit, -php-5.2.16-r1.ebuild,
+  +php-5.2.17.ebuild, -php-5.3.4-r1.ebuild, +php-5.3.5.ebuild:
+  security version bump, remove old
 
   05 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.16-r1.ebuild,
   php-5.3.4-r1.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 51e28ec5758f..b4f293ac467a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,7 +6,7 @@ AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7a
 AUX eblits/common-v1.eblit 379 RMD160 60b526e9a736553f6e4883c9fb9525464192bde2 SHA1 97c4e1c9475d73227f26cbef80640f43d838af6f SHA256 65c909a6d0501a6746518f539c4a4021426469cbf20b2a212fb0d60b48da5362
 AUX eblits/common-v2.eblit 379 RMD160 595fd6c6be1e0ac15012ea78497a4d2c287c6754 SHA1 98e28261e32bda53c7dfef88def615f633af7c44 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194
 AUX eblits/pkg_postinst-v1.eblit 2402 RMD160 2d02fb26a6ad1424fe1ca4060fc97e5ecca6c0a2 SHA1 17a1e4f9db1035759a5ca1feb32e0ead088f563a SHA256 a2c493c8f50558872a3adb76c8ac24d23e9cf34e09610959be4836202ee73aa9
-AUX eblits/pkg_postinst-v2.eblit 2093 RMD160 bf707d07b7bc7014f27da38a1b830f908f6c0de8 SHA1 3b5f9e22b16f55eccd4b59f5211ee389159099e3 SHA256 c5c1ef0cc0286553669f3748d4a7883a9e3fc3e149d28ad6c7aeb7e4bb4f40ff
+AUX eblits/pkg_postinst-v2.eblit 2104 RMD160 e2aa76ea32be95a280f91bbe040aafcb81c4dfb4 SHA1 8816759a7c8de3ea34c54caad4caffce536cb829 SHA256 723e10763ac5fc3b026d824d8c6435b91ed301f73614befebaacb686cc605db1
 AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
 AUX eblits/pkg_setup-v2.eblit 527 RMD160 c8700795e0c3a38538622a02d2dd7d5a34438783 SHA1 affda60b6e4501fb2bc0d50f6d63b6bc78cd6205 SHA256 f7dca5b41844d87cbbcf06d3f46952d892ff0edf58a8b0fc7ba79459180596b5
 AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99
@@ -29,20 +29,25 @@ AUX php-fpm.init 385 RMD160 0e266738ceb3853ce335db6375b5438bdea597db SHA1 bce556
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-5.2.14.tar.bz2 9055945 RMD160 f699488f5b266a1c5e36df570c4d5896dc4e0aea SHA1 311b44b2c0f2eea8ab8dab876d2a6b6e7a55632e SHA256 515b5fd41258798d59b93d86b0d752ab0b03e5738c32af444fba1907763c2bd1
 DIST php-5.2.16.tar.bz2 9090930 RMD160 2ab6de444af478f3b2b3a8a074c1656e8da0a4e1 SHA1 b4d11c6593614fa4ad8bf133f622208ee5e8e9af SHA256 790c4aeb77064a17e3c985fac0fbd7ac3635bc53c7ce7c80bd7c39239e338603
+DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.3.tar.bz2 10662227 RMD160 9edb51663feac9b787f8382012893f1ac98fec6a SHA1 9f66716b341119e4e4f8fe3d81b7d0a5daf3cbc8 SHA256 f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a
 DIST php-5.3.4.tar.bz2 10804376 RMD160 dffbeced87117fd34c948de3ebdde01a25c24dae SHA1 0b33926e78e1683e3383b3b5c840ee60ba669b0b SHA256 a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d
+DIST php-5.3.5.tar.bz2 10806092 RMD160 831018429b87c46da7571397e0d463b81ded11eb SHA1 355701b723fcb497581c368be4d6e572c150a5ea SHA256 a25ddae6a59d7345bcbb69ef2517784f56c2069af663ae4611e580cbdec77e22
 DIST php-patchset-5.2.14-r1.tar.bz2 8381 RMD160 7f562ac7df8f918f6d73f61c4e2096a88759889d SHA1 0453926bccfd5bd8089c311f6e16f1e4a8c08993 SHA256 f49aacef203cee8e7ad038492ed43e7677ed2d22e0fef07dc840195cacc95d34
 DIST php-patchset-5.2.16-r0.tar.bz2 8352 RMD160 8c844dd39d5d81aecebb21da4732aae6154e91bf SHA1 f598812b470f1c3afa2e037902ff040726720149 SHA256 4a4d6c5e1d014d3ada62c53a6d0c44dbf486be4a55d51b6541ac8979699ea7b4
+DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
 DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665867d216 SHA1 6f582a41c3f8b9c73677124a631cee3c4390e3f1 SHA256 aa331a07d00eb92a6a4d1ba937377e17ec4e3fa099c4295f4ccb5602ee583ae7
 DIST php-patchset-5.3.4-r0.tar.bz2 9482 RMD160 cf9325dd713a381a24d51447c2479358e7277d56 SHA1 f55d024e83343041d46715e5a48c5de88643afd1 SHA256 05c04f9b15efd12f3596a2013c51932b6d61d358705dbdc2d50ce38b71b69ab0
+DIST php-patchset-5.3.5-r0.tar.bz2 9479 RMD160 e8b90a8f064d3053a5fe233c758d34bedc450b25 SHA1 e8158b6741017c306f7f092a7592ee7007169df9 SHA256 29097986de2f19713c2aa530bcc1cd873f77aeacacba5405f325c460cfd46219
 DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
+DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c SHA1 76675242cfdeff763767900213346af622002490 SHA256 f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
 DIST suhosin-patch-5.3.4-0.9.10.patch.gz 41092 RMD160 e5105397a9e41997ad11d2a0be01c7e3c9d06c6e SHA1 a2ab4bd03a329ec56a1f8b99e12e59f1838e0da6 SHA256 6c920803f6a9f43881c7d8a938716cb572c2f43181fe5cd71f7bfb486825fddf
 EBUILD php-5.2.14.ebuild 9164 RMD160 893778d74f25ee5a0f1310be970499152102c7f6 SHA1 4f82548143854bcb759eda79a040b40d160408c3 SHA256 0c91e2a72176d103d377f328af20f759fd087ebb00e761b28d3fc372dfb09a59
-EBUILD php-5.2.16-r1.ebuild 9747 RMD160 96eba0cfd35d55555871142d4deacb62da431606 SHA1 be64098b5fcd507b9f1c30be0e024ea2b0b470ff SHA256 3c75b0307ed2681d108297fb3d1ac1dd4b50402c56f9f4572b216a3df1518fd7
 EBUILD php-5.2.16.ebuild 9735 RMD160 114bb0cbf4b7d85dc7f6dc76b90788d51c34e42d SHA1 ca30cf694a93eb2fcac277a1df8ea6858f911def SHA256 95397e84f43159d8ad71eb2a8975da119135077a6a326d57db36ef6859e75669
+EBUILD php-5.2.17.ebuild 9756 RMD160 bbafed248c8cb7e033f409671c86a6c54a5efa58 SHA1 11e4920cbe41f18f90ee1074a7bb7772a8234545 SHA256 33cdbe6e1eacb6238b4f0418e778d0be61b3a57b14d677ec4577232ac4ed01e6
 EBUILD php-5.3.3-r1.ebuild 9488 RMD160 c5bd926dcd856115535169df97eb8d66259c5922 SHA1 09a053a1c289aaeafddd85d97a57e2c8dcc728c6 SHA256 1204b3f0899e4bf721afd4aa4f2993d04281b62b433249692e8866b22d0cc9cf
-EBUILD php-5.3.4-r1.ebuild 9900 RMD160 c7b219355ceeb145bf0d002057a32908812c17fb SHA1 523d8571a5350d9cde8a56b1b079f9da1c481e57 SHA256 28f182454e99853cb76b99f62b26ca800f445d3096422f415b283c6143ebc1bf
 EBUILD php-5.3.4.ebuild 9862 RMD160 bb8726cb710456db7b73f6ce15ca24793c852596 SHA1 1adbb8fd61c4d4045b939a6a7e8ee0680ef70263 SHA256 4e997822e06369996ea5596c97b7d60591a1522f6e82f2c2d37fc9ec4d36e9e5
-MISC ChangeLog 77970 RMD160 3a89f0ae2f9d181e892445677ea855e955071424 SHA1 e917b2b8c9a33daff2412aa641d45e2e1ce6c529 SHA256 9dd9043b7cfd7180a1c6429e5c1a119fd0561e6c6347be5f875084f0e87e888f
+EBUILD php-5.3.5.ebuild 9897 RMD160 f7bf2c1eabfdc6abedb7e64c18cf9117f2ed0f2d SHA1 646be42f219b0e3129a92654ba8d25acb7f32d0e SHA256 baf40a39ee24dc3984a79f03aef391a826595e1a15ee6cb263c9023839748580
+MISC ChangeLog 78229 RMD160 cdb6e6cea209a3f190faa10cd2a5f1f824d0f746 SHA1 69fbd69898171b7afb5f9a043ea2e158fd81dd1c SHA256 9e26bbebc671ef934a540255c9840cb8986577b1bd67c59a494065d732056457
 MISC metadata.xml 2090 RMD160 5e8fc242c6035f8f3f12bd2ce2f77a5621398ac5 SHA1 3726febbe532141d65abccd6d6573ece6a3682c7 SHA256 0ba00cbf8509c6d9d21bf5d92759b32d5259051b4ed044fed71a4164460c65d8
diff --git a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
index b54c609c90ba..bf273f456bf7 100644
--- a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
+++ b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.9 2011/01/05 11:23:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.10 2011/01/06 23:35:43 mabi Exp $
 
 eblit-php-pkg_postinst() {
 	# Output some general info to the user
@@ -47,7 +47,7 @@ eblit-php-pkg_postinst() {
 	ls "${ROOT}"/etc/php/*-php5 &>/dev/null
 	if [[ $? -eq 0 ]]; then
 		ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
-		ewarn "files are now kept at ${ROOT}/etc/php/\$SAPI-php${SLOT}"
+		ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
 	fi
 	ewarn
 	ewarn "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
diff --git a/dev-lang/php/php-5.2.16-r1.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 0913884a1115..88410fa3ca8b 100644
--- a/dev-lang/php/php-5.2.16-r1.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16-r1.ebuild,v 1.2 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.1 2011/01/06 23:35:43 mabi Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ interbase msql oci8 sapdb solid"
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
 #SUHOSIN_VERSION="$PV-0.9.7"
-SUHOSIN_VERSION=""
+SUHOSIN_VERSION="5.2.16-0.9.7"
 EXPECTED_TEST_FAILURES=""
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-lang/php/php-5.3.4-r1.ebuild b/dev-lang/php/php-5.3.5.ebuild
index 9704173ef7aa..2b1fbccd47d0 100644
--- a/dev-lang/php/php-5.3.4-r1.ebuild
+++ b/dev-lang/php/php-5.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4-r1.ebuild,v 1.2 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5.ebuild,v 1.1 2011/01/06 23:35:43 mabi Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
-SUHOSIN_VERSION="${PV}-0.9.10"
+SUHOSIN_VERSION="5.3.4-0.9.10"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""