summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2012-02-02 22:46:54 +0000
committerMatti Bickel <mabi@gentoo.org>2012-02-02 22:46:54 +0000
commit8c1514d3d95d366b59e7962e367d0697aef6cab5 (patch)
treec99e375e2f0c8ac96de85c943d1907a60693287e /dev-lang
parentMissing call to fdo-mime_mime_database_update (diff)
downloadhistorical-8c1514d3d95d366b59e7962e367d0697aef6cab5.tar.gz
historical-8c1514d3d95d366b59e7962e367d0697aef6cab5.tar.bz2
historical-8c1514d3d95d366b59e7962e367d0697aef6cab5.zip
use upstream suhosin patch instead of our own with php-5.3.10
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/ChangeLog5
-rw-r--r--dev-lang/php/Manifest5
-rw-r--r--dev-lang/php/php-5.3.10.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 01061f375d9d..fb69933e75d4 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.547 2012/02/02 22:29:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.548 2012/02/02 22:46:54 mabi Exp $
+
+ 02 Feb 2012; Matti Bickel <mabi@gentoo.org> php-5.3.10.ebuild:
+ use upstream suhosin patch instead of our own with php-5.3.10
*php-5.3.10 (02 Feb 2012)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0b9950ed31e6..8e9bdf067417 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -25,8 +25,9 @@ DIST php-patchset-5.3.10-r0.tar.bz2 7522 RMD160 84165162d1374557a297890ea546cd53
DIST php-patchset-5.3.9-r0.tar.bz2 7515 RMD160 b0f9951ab905e7eee2314ad09cf2af458a1c312d SHA1 9cd9d9624165329fe6b776aaa6686768de526403 SHA256 0224215adeee798109ef5ea5ab27543ba2687620d181b046464c2a49fa143029
DIST php-patchset-5.4.0_rc6-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
DIST suhosin-patch-5.3.9-0.9.10-gentoo.patch.gz 42028 RMD160 bcb3cf4fb983a67c83985fe1ddcf4f543b53d110 SHA1 fd3253e49e180345410bb14ecb1a7e924e300a97 SHA256 1d334e82d922eaa0415d3d3fe5bf3cf2a4ca6481dd528a73771d26b52d999454
-EBUILD php-5.3.10.ebuild 10707 RMD160 aa4769b8e43f1da6c1072d59ea41ca961e2b617d SHA1 8f7b89de87c32194721387bbc9513b78993e06a6 SHA256 1d5e44d275ef35b6ffa4a4e0135390a82a816daabadd4d154cf040d865269f46
+DIST suhosin-patch-5.3.9-0.9.10.patch.gz 40967 RMD160 ce43921fd9b183b154713ecda98294f6c68d5f22 SHA1 7b9ef5c3e0831154df0d6290aba0989ca90138ed SHA256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
+EBUILD php-5.3.10.ebuild 10700 RMD160 b54bbf8179fbcdb2a35456c51def88c56446cb21 SHA1 c64a0d1798763a89342f03cddac9e0faa358ac51 SHA256 7e0a5bf795c89cc8cdbfe9e83a9b810632aac8f47294f3dfbedd1b61537c0f4c
EBUILD php-5.3.9.ebuild 10697 RMD160 b3c340a0eaf7e2be329fc81ac71c003a470a1b02 SHA1 bfc49547b23be5920d713d764401f7f083d9acf1 SHA256 5712b0ac8007d6fe040bdae588220eca7654ed7f81b829e6ff2d9838d9c314ae
EBUILD php-5.4.0_rc6.ebuild 10615 RMD160 5b6df72057c3849a8b3489e5b8e528d39a164210 SHA1 b953436b72e0f24829b056ae52756586f4353bd7 SHA256 f111954bfd07ade453715d53a0e3d44996a5bbb8608698eba01e3ff04cf4c51d
-MISC ChangeLog 93367 RMD160 24d6c62736a859cfb998df11dd6de1cabb24d44e SHA1 e02d5a2052e4485124df9383c6bf91eee040e995 SHA256 a45cf2cf3070696296bc50434d45a9c2dd775fd1924d49365d44239e24b9e61d
+MISC ChangeLog 93497 RMD160 a50d3fa5c71a545a7765fd62cbd0fd3d6761ba81 SHA1 b322b91a776d301dc600485e08bd23cad65d245f SHA256 f1eaa677de93ac7d6e7d18fed76d2b6344803dadc98d7767a9bc7ad0528c23e3
MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
diff --git a/dev-lang/php/php-5.3.10.ebuild b/dev-lang/php/php-5.3.10.ebuild
index 4255907cd7c9..642df8818a4d 100644
--- a/dev-lang/php/php-5.3.10.ebuild
+++ b/dev-lang/php/php-5.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.1 2012/02/02 22:29:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.2 2012/02/02 22:46:54 mabi Exp $
EAPI=4
@@ -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 libtool
-SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
+SUHOSIN_VERSION="5.3.9-0.9.10"
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""