Bug 413785

Summary:	dev-lang/php-5.3.11 suhosin patch fails to apply
Product:	Gentoo Linux	Reporter:	Jan Vesely <jano.vesely>
Component:	[OLD] Development	Assignee:	PHP Bugs <php-bugs>
Status:	RESOLVED FIXED
Severity:	normal	CC:	bug, jwbraun
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Bug Depends on:
Bug Blocks:	410957
Attachments:	patch out

Description Jan Vesely 2012-04-27 19:45:32 UTC

* Failed Patch: suhosin-patch-5.3.9-0.9.10-gentoo.patch !
 *  ( /var/tmp/portage/dev-lang/php-5.3.11/work/suhosin-patch-5.3.9-0.9.10-gentoo.patch )
 * 

might be related to: https://bugs.gentoo.org/show_bug.cgi?id=411935
but suhosin-patch-5.3.9-0.9.10-gentoo.patch.out looks weird.

Reproducible: Always

Steps to Reproduce:
1. emerge =php-5.3.11
Actual Results:  
 * Failed Patch: suhosin-patch-5.3.9-0.9.10-gentoo.patch !
 *  ( /var/tmp/portage/dev-lang/php-5.3.11/work/suhosin-patch-5.3.9-0.9.10-gentoo.patch )
 * 

Expected Results:  
emerge succeeds

Comment 1 Jan Vesely 2012-04-27 19:46:32 UTC

Created attachment 310295 [details]
patch out

Comment 2 Jan Vesely 2012-04-28 13:47:16 UTC

looks like it is https://bugs.gentoo.org/show_bug.cgi?id=411935 after all,
changing line 13:

-SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
+SUHOSIN_VERSION="5.3.9-0.9.10"

fixes the issue

Comment 3 Yoan Blanc 2012-04-28 13:48:28 UTC

Same here!

BTW the same bug for 5.3.11_rc2: #411935

Comment 4 Yoan Blanc 2012-04-28 15:21:09 UTC

(In reply to comment #2)
> looks like it is https://bugs.gentoo.org/show_bug.cgi?id=411935 after all,
> changing line 13:
> 
> -SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
> +SUHOSIN_VERSION="5.3.9-0.9.10"
> 
> fixes the issue

It does indeed.

Comment 5 Matti Bickel (RETIRED) gentoo-dev

2012-04-28 16:02:11 UTC

I've just reverted 5.3.11 (final) to use the upstream patch again. This change is indeed related to #411935.

PHP upstream seams to have fixed their files again and we missed that in the bump. Sorry about that. The CVS update should be on a mirror near you in the next few hours.