Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 293248 - app-admin/tripwire-2.4.1.2 fails to apply tripwire-friend-classes.patch with patch-2.6
Summary: app-admin/tripwire-2.4.1.2 fails to apply tripwire-friend-classes.patch with...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: High normal (vote)
Assignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: patch-2.6
  Show dependency tree
 
Reported: 2009-11-15 04:35 UTC by Nicolas
Modified: 2009-12-01 11:01 UTC (History)
1 user (show)

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


Attachments
buildlog tripwire-2.4.1.2 (build.log,8.12 KB, text/plain)
2009-11-16 16:16 UTC, Nicolas
Details
emerge.info (info.log,3.96 KB, text/plain)
2009-11-16 16:17 UTC, Nicolas
Details
buildlog-full (build.log,42.00 KB, text/plain)
2009-11-16 23:38 UTC, Nicolas
Details
fconame.h (fconame.h,8.47 KB, text/plain)
2009-11-17 17:45 UTC, Nicolas
Details
buildlog -ccache (build.log,42.47 KB, text/plain)
2009-11-17 17:59 UTC, Nicolas
Details
tripwire-patch-options.patch (tripwire-patch-options.patch,774 bytes, patch)
2009-11-17 18:12 UTC, Dawid Węgliński (RETIRED)
Details | Diff
Different behavior of patch-2.5.9 and patch-2.6 (tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2-25003.out.diff,1.06 MB, text/plain)
2009-11-18 11:24 UTC, Dustin Polke
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Nicolas 2009-11-15 04:35:37 UTC
app-admin/tripwire-2.4.1.2: fails to merge with error :

In file included from fcodatasourceiter.h:51,
                 from fcodatasourceiter.cpp:42:
fconame.h:147: erreur: ISO C++ forbids declaration of ‘cFCOName_i’ with no type
fconame.h:147: erreur: expected ‘;’ before ‘*’ token
make[3]: *** [fcodatasourceiter.o] Erreur 1


Reproducible: Always

Steps to Reproduce:
1. emerge =tripwire-2.4.1.2

Actual Results:  
Failed to emerge app-admin/tripwire-2.4.1.2

Expected Results:  
Installing app-admin/tripwire-2.4.1.2
Comment 1 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-16 13:41:21 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
Comment 2 Nicolas 2009-11-16 16:16:46 UTC
Created attachment 210423 [details]
buildlog tripwire-2.4.1.2
Comment 3 Nicolas 2009-11-16 16:17:41 UTC
Created attachment 210425 [details]
emerge.info
Comment 4 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-16 17:08:28 UTC
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...
Comment 5 Víctor Ostorga (RETIRED) gentoo-dev 2009-11-16 19:41:20 UTC
(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
Comment 6 Nicolas 2009-11-16 23:38:53 UTC
Created attachment 210458 [details]
buildlog-full
Comment 7 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-17 15:05:24 UTC
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.
Comment 8 Nicolas 2009-11-17 17:45:44 UTC
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...
>
Comment 9 Nicolas 2009-11-17 17:59:12 UTC
Created attachment 210535 [details]
buildlog -ccache

> find /usr/local -name '*.h'
empty


> Try to reproduce with disabled FEATURES="ccache" and report back here.
Comment 10 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-17 18:12:24 UTC
Created attachment 210536 [details, diff]
tripwire-patch-options.patch

Does attached patch fix your problem?
Comment 11 Dustin Polke 2009-11-17 18:47:21 UTC
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.
Comment 12 Nicolas 2009-11-18 00:26:37 UTC
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
Comment 13 Dustin Polke 2009-11-18 11:24:27 UTC
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.
Comment 14 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-18 12:15:46 UTC
(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.
Comment 15 Dawid Węgliński (RETIRED) gentoo-dev 2009-11-19 13:10:34 UTC
So finally we found the problem thus dropping EPATCH_OPTS from the ebuild. Thanks everyone participating in this bug. :)