diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-08-10 23:58:55 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-08-10 23:58:55 +0000 |
| commit | 005a7d95a6ec0e5855b1da679df375624b885568 (patch) | |
| tree | 052c47d14cdf5aa40f43930f3339b09820b23079 /dev-lang/php | |
| parent | no-herd (diff) | |
| download | gentoo-2-005a7d95a6ec0e5855b1da679df375624b885568.tar.gz gentoo-2-005a7d95a6ec0e5855b1da679df375624b885568.tar.bz2 gentoo-2-005a7d95a6ec0e5855b1da679df375624b885568.zip | |
Retry with manually diffed patch.
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/php/files/digest-php-4.4.3-r1 | 6 | ||||
| -rw-r--r-- | dev-lang/php/php-4.4.3-r1.ebuild | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index a1d97ea3a606..be9d2a400b19 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/php # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.115 2006/08/10 23:43:32 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.116 2006/08/10 23:58:55 chtekk Exp $ + + 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: + Retry with manually diffed patch, works here now, hopefully out there too. ;) 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: Revert, now it got even worse, fails on some of my systems too. :S diff --git a/dev-lang/php/files/digest-php-4.4.3-r1 b/dev-lang/php/files/digest-php-4.4.3-r1 index f08155e73cd3..20089e185bd0 100644 --- a/dev-lang/php/files/digest-php-4.4.3-r1 +++ b/dev-lang/php/files/digest-php-4.4.3-r1 @@ -4,6 +4,6 @@ SHA256 4e09cd6cbd00e3a2199e6a68ab58875b133fea685500f2a35a2f7d348eaab44b hardenin MD5 9542117551c0e79f5bf21f46493094e7 php-4.4.3.tar.bz2 4461353 RMD160 36c91930af44e8a1ed59eb159e6131ae8f0c77f0 php-4.4.3.tar.bz2 4461353 SHA256 0f57da4b9d94f7febd37c0bc8e608e5aafafe744d094466723e04afb283407f7 php-4.4.3.tar.bz2 4461353 -MD5 f53d57eca61739837334f56df400f199 php-patchset-4.4.3-r1.tar.bz2 22814 -RMD160 389617d7e3ed41f67ea284a907cf9a347c5bf471 php-patchset-4.4.3-r1.tar.bz2 22814 -SHA256 16a7748f98cf8dbfeacebecdf57faed28e1176371ad89c62ce88c260811a0c41 php-patchset-4.4.3-r1.tar.bz2 22814 +MD5 faaec4cc87351f608d590ae79eb9e2f5 php-patchset-4.4.3-r2.tar.bz2 22765 +RMD160 2db94ad069169f537ae2963592ce6fb078d6a165 php-patchset-4.4.3-r2.tar.bz2 22765 +SHA256 0d1ca0f23da9ab68b3c8cc4cccc277764c3dfa096228179fe0354f7cbbc4ed67 php-patchset-4.4.3-r2.tar.bz2 22765 diff --git a/dev-lang/php/php-4.4.3-r1.ebuild b/dev-lang/php/php-4.4.3-r1.ebuild index a3bab9504ec6..7487afe7bbba 100644 --- a/dev-lang/php/php-4.4.3-r1.ebuild +++ b/dev-lang/php/php-4.4.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.3-r1.ebuild,v 1.5 2006/08/10 23:43:32 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.3-r1.ebuild,v 1.6 2006/08/10 23:58:55 chtekk Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -20,7 +20,7 @@ MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE="1" # php patch settings, general -PHP_PATCHSET_REV="1" +PHP_PATCHSET_REV="2" HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.13-gentoo.patch.gz" MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" # php patch settings, ebuild specific |