Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 163944 - xorg-docs and freebsd-share have file collision
Summary: xorg-docs and freebsd-share have file collision
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: FreeBSD (show other bugs)
Hardware: x86 GNU/kFreeBSD
: High normal
Assignee: Gentoo/BSD Team
URL:
Whiteboard:
Keywords:
: 168159 (view as bug list)
Depends on:
Blocks:
 
Reported: 2007-01-26 18:02 UTC by Anonymous
Modified: 2009-12-25 16:37 UTC (History)
4 users (show)

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


Attachments
1.2-Xsecurity.patch (xorg-docs.patch,15.78 KB, text/plain)
2007-02-07 16:29 UTC, FENOY Gérald (RETIRED)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Anonymous 2007-01-26 18:02:08 UTC
When emerging xorg-docs-1.2 on Gentoo/FreeBSD, it report file collision for the file /usr/share/man/man7/security.7.bz2.
Running an equery belongs on it, shows it was installed by freebsd-share-6.2
Comment 1 Camille Huot (RETIRED) gentoo-dev 2007-02-06 17:27:28 UTC
The manual page installed by xorg-docs is named "XSECURITY" so I expect some x11 maintainer would agree to rename this file from security.7.bz2 to xsecurity.7.bz2 to prevent the conflict.

My 2 cents (sorry about not providing a nice patch)
Comment 2 FENOY Gérald (RETIRED) gentoo-dev 2007-02-07 16:29:56 UTC
Created attachment 109439 [details]
1.2-Xsecurity.patch

Hi cam,
I think that a solution to have the “Xsecurity" man page rather than the "security" (as it is the name used in other man pages provided by this ebuild) the best way is simply to add this patch and then append the x-modular "patchset  variable" (PATCHES) with it (${FILESDIR}/1.2-Xsecurity.patch).

HTH
Comment 3 Camille Huot (RETIRED) gentoo-dev 2007-02-12 18:24:58 UTC
I've done additional research and found that the FSH standard expects X manual documentation be suffixed by 'x':

http://www.pathname.com/fhs/pub/fhs-2.3.html#AEN1814
In addition, some large sets of application-specific manual pages have an additional suffix appended to the manual page filename. For example, the MH mail handling system manual pages must have mh appended to all MH manuals. All X Window System manual pages must have an x appended to the filename.

Then I looked at how the files are getting their names and I found a file, /usr/share/aclocal/xorg-macros.m4, which explicitly contains the bad value:
if test x$MISC_MAN_SUFFIX = x    ; then
    case $host_os in
        solaris*)       MISC_MAN_SUFFIX=5  ;;
        *)              MISC_MAN_SUFFIX=7  ;;
    esac
fi

Setting MISC_MAN_SUFFIX=7x here simply does the trick, and, I believe, in the right way.

It seems that it's not the first bug since x11-misc/util-macros, the package owning this file, already contains a patch to fix another error.
Comment 4 Camille Huot (RETIRED) gentoo-dev 2007-02-12 18:47:50 UTC
Please also note that the x11-drivers/xf86-input-keyboard package wants to install a /usr/share/man/man4x/keyboard.4.bz2 file that is already owned by FreeBSD too.
So DRIVER_MAN_SUFFIX (in /usr/share/aclocal/xorg-macros.m4) should be fixed as well, as the current fix only apply to Linux.
Morever, I believe x11-drivers/xf86-input-keyboard has to run eautoreconf to apply the fix.
Comment 5 Donnie Berkholz (RETIRED) gentoo-dev 2007-02-12 19:40:37 UTC
Let upstream make the decision, not FHS. We shouldn't be changing this crap locally.
Comment 6 Ed Catmur 2007-02-12 21:19:16 UTC
Wouldn't it be easier just to pass *_MAN_SUFFIX in to make and make install?  The documentation to XORG_MANPAGE_SECTIONS indicates that that is expected to be used:

# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
# Override default settings by setting environment variables
Comment 7 Donnie Berkholz (RETIRED) gentoo-dev 2007-02-13 00:47:40 UTC
Yes, I acknowledge there may be more than one way to do the wrong thing. =)
Comment 8 Camille Huot (RETIRED) gentoo-dev 2007-02-13 15:43:03 UTC
(In reply to comment #5)
> Let upstream make the decision, not FHS. We shouldn't be changing this crap
> locally.
> 

They indeed decided to remove the x suffix (https://bugs.freedesktop.org/show_bug.cgi?id=7855, https://bugs.freedesktop.org/show_bug.cgi?id=7927) and bugs are open about files I've seen conflicting:

keyboard.4
https://bugs.freedesktop.org/show_bug.cgi?id=9499

security.7
https://bugs.freedesktop.org/show_bug.cgi?id=9068
Comment 9 Roy Marples (RETIRED) gentoo-dev 2007-02-23 20:35:44 UTC
*** Bug 168159 has been marked as a duplicate of this bug. ***
Comment 10 Tomáš Chvátal (RETIRED) gentoo-dev 2009-12-25 16:37:58 UTC
no xorg-docs anymore in main tree.