Summary: | app-admin/tripwire-2.4.1.2 fails to apply tripwire-friend-classes.patch with patch-2.6 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Nicolas <nico.pheulpin> |
Component: | Current packages | Assignee: | No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it <maintainer-needed> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | cla |
Priority: | High | ||
Version: | unspecified | ||
Hardware: | AMD64 | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 293570 | ||
Attachments: |
buildlog tripwire-2.4.1.2
emerge.info buildlog-full fconame.h buildlog -ccache tripwire-patch-options.patch Different behavior of patch-2.5.9 and patch-2.6 |
Description
Nicolas
2009-11-15 04:35:37 UTC
Please post your emerge --info. I can't reproduce it and it seems it's already fixed long, long ago by tripwire-friend-classes.patch: 08 Mar 2006; Tavis Ormandy <taviso@gentoo.org> +files/tripwire-friend-classes.patch, tripwire-2.3.1.2-r2.ebuild: add patch provided by Justin Findlay in #124839 to correctly declare friend classes Created attachment 210423 [details]
buildlog tripwire-2.4.1.2
Created attachment 210425 [details]
emerge.info
Thanks Nicolas. Could you upload /var/tmp/portage/app-admin/tripwire-2.4.1.2/work/tripwire-2.3.1-2/src/fco/fconame.h? I doubt patch doesn't apply for you, but i have no idea... (In reply to comment #2) > Created an attachment (id=210423) [details] > buildlog tripwire-2.4.1.2 > The build log is stripped, please attach the FULL build.log Created attachment 210458 [details]
buildlog-full
As wen can not reproduce it, please provide these info: find /usr/local -name '*.h' Upload /var/tmp/portage/app-admin/tripwire-2.4.1.2/work/tripwire-2.3.1-2/src/fco/fconame.h as requested before. Try to reproduce with disabled FEATURES="ccache" and report back here. Created attachment 210532 [details] fconame.h this is fconame.h > Thanks Nicolas. Could you upload > /var/tmp/portage/app-admin/tripwire-2.4.1.2/work/tripwire-2.3.1-2/src/fco/fconame.h? > I doubt patch doesn't apply for you, but i have no idea... > Created attachment 210535 [details] buildlog -ccache > find /usr/local -name '*.h' empty > Try to reproduce with disabled FEATURES="ccache" and report back here. Created attachment 210536 [details, diff]
tripwire-patch-options.patch
Does attached patch fix your problem?
Nicolas, please try downgrading sys-devel/patch to 2.5.9 and see whether the ebuild still fails. I can reproduce your failure with patch-2.6 but with patch-2.5.9 I can successfully build tripwire. thank you for your answers, both succed. Merge ok with patch-2.6 and Dawid's patch. and merge ok too with : patch-2.5.6 Created attachment 210569 [details]
Different behavior of patch-2.5.9 and patch-2.6
tripwire builds fine with patch-2.5.9 and patch-2.6 after applying Dawid's patch on my box. I couldn't find out why EPATCH_OPTS were necessary at all but maybe older patch version needed it.
Just for the record: Attached diff shows the different behavior of patch-2.5.9 and patch-2.6. With options '-l -F3', patch-2.6 does not match tripwire-portable-0.9 against existing tripwire-2.4.1.2 directory of the to be patch version but instead creates a new subdirectory within ${S} named tripwire-portable-0.9. In other words, the patch is not applied against the files compiled later.
(In reply to comment #13) > Created an attachment (id=210569) [details] > Different behavior of patch-2.5.9 and patch-2.6 > I already reported that bug to base-system (see bug #293570). > I couldn't find out why EPATCH_OPTS were necessary at all but maybe older patch version needed it. Me also. But there are more packages in the tree with EPATCH_OPTS="-F3 -l" though they are actually applying because patches have fixed headers. Probably I will drop this variable from the ebuild later. So finally we found the problem thus dropping EPATCH_OPTS from the ebuild. Thanks everyone participating in this bug. :) |