Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 439486 - dev-lang/php-5.3.18 - suhosin-patch-5.3.9-0.9.10.patch fails
Summary: dev-lang/php-5.3.18 - suhosin-patch-5.3.9-0.9.10.patch fails
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: PHP Bugs
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-24 08:48 UTC by Росен Александров
Modified: 2012-10-26 20:45 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
suhosin-patch.out (suhosin-patch-5.3.9-0.9.10.patch.out,80.88 KB, text/plain)
2012-10-24 08:48 UTC, Росен Александров
Details
Suhosin patch modified for php-5.3.18 (suhosin-patch-5.3.9-0.9.10-dwokfur.patch,192.06 KB, patch)
2012-10-26 19:40 UTC, Attila Tóth
Details | Diff
Suhosin patch diff for php-5.3.18 (suhosin.diff,998 bytes, patch)
2012-10-26 19:40 UTC, Attila Tóth
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Росен Александров 2012-10-24 08:48:49 UTC
Created attachment 327290 [details]
suhosin-patch.out

Hello!

Today i update my system, and see the php suhosin patch fails to patch.
Sorry for my bad english!
Comment 1 Ole Markus With (RETIRED) gentoo-dev 2012-10-25 08:04:12 UTC
Sorry. Forgot to remove suhosin for this version. Done now in CVS.
Comment 2 Росен Александров 2012-10-25 11:05:56 UTC
So this version will not provide suhosin ?
Comment 3 Ole Markus With (RETIRED) gentoo-dev 2012-10-25 11:16:22 UTC
We only provide the suhosin patch when upstream provides it. Generally we consider it a dead project and to be avoided.
Comment 4 Attila Tóth 2012-10-26 18:18:31 UTC
1. issue command: ebuild /usr/portage/dev-lang/php/php-5.3.18.ebuild unpack
2. change to the work directory
3. edit the suhosin patch there
3a. search for lsapi
3b. replace 2004 with 2012 in the lines referring the original file after insertion
4. ebuild /usr/portage/dev-lang/php/php-5.3.18.ebuild prepare - the patch should apply clean now
5. compile, install, qmerge, clean

Regards:
Dw.
Comment 5 Росен Александров 2012-10-26 18:36:28 UTC
(In reply to comment #4)
> 1. issue command: ebuild /usr/portage/dev-lang/php/php-5.3.18.ebuild unpack
> 2. change to the work directory
> 3. edit the suhosin patch there
> 3a. search for lsapi
> 3b. replace 2004 with 2012 in the lines referring the original file after
> insertion
> 4. ebuild /usr/portage/dev-lang/php/php-5.3.18.ebuild prepare - the patch
> should apply clean now
> 5. compile, install, qmerge, clean
> 
> Regards:
> Dw.

Please attach a fixed patch.
Comment 6 Attila Tóth 2012-10-26 19:40:30 UTC
Created attachment 327492 [details, diff]
Suhosin patch modified for php-5.3.18

Suhosin patch modified for php-5.3.18
Comment 7 Attila Tóth 2012-10-26 19:40:54 UTC
Created attachment 327494 [details, diff]
Suhosin patch diff for php-5.3.18

Suhosin patch diff for php-5.3.18
Comment 8 Росен Александров 2012-10-26 19:42:14 UTC
which of both? big or small ?
Comment 9 Attila Tóth 2012-10-26 20:45:03 UTC
(In reply to comment #8)
> which of both? big or small ?

Big is the modified patch itself, the small shows the modifications to the original patch.
You should either replace the original with the big one or apply the small after unpack in $WORKDIR.