Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 631584

Summary: app-crypt/heimdal-7.* has file merge conflict for pagsh with net-fs/openafs
Product: Gentoo Linux Reporter: Tommie <tommie>
Component: Current packagesAssignee: Gentoo Kerberos Maintainers <kerberos>
Status: RESOLVED FIXED    
Severity: normal CC: bircoph, np-hardass
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: emerge --info

Description Tommie 2017-09-20 20:43:59 UTC
Created attachment 495692 [details]
emerge --info

In heimdal-1.5.3, pagsh was being renamed to kpagsh to avoid this collision. That renaming has been removed in 7.*.

* Messages for package app-crypt/heimdal-7.4.0:
*
* Detected file collision(s):
*
*      /usr/share/man/man1/pagsh.1.bz2
*      /usr/bin/pagsh
*
* Searching all installed packages for file collisions...
*
* Press Ctrl-C to Stop
*
* net-fs/openafs-1.6.20.1:0::gentoo
*      /usr/bin/pagsh
*      /usr/share/man/man1/pagsh.1.bz2
*
* Package 'app-crypt/heimdal-7.4.0' NOT merged due to file collisions.
* If necessary, refer to your elog messages for the whole content of the
* above message.
Comment 1 Larry the Git Cow gentoo-dev 2019-01-05 14:01:58 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee38441e0210b8d43f22bb8afe100d5c2a1c58c

commit 2ee38441e0210b8d43f22bb8afe100d5c2a1c58c
Author:     Andrew Savchenko <bircoph@gentoo.org>
AuthorDate: 2019-01-05 13:51:54 +0000
Commit:     Andrew Savchenko <bircoph@gentoo.org>
CommitDate: 2019-01-05 14:00:13 +0000

    net-fs/openafs: 1.8.2 version bump
    
    - Update to upstream version 1.8.2 and patches from 1_8_x branch
      till 20181001. This fixes some open Gentoo bugs:
        472184 (probably), 544162, 603890 (likely), 640874, 642542.
    - Merge openafs-kernel back into openafs:
      - save lots of build time (configure, compilling common code);
      - original split was required due to problems in the build system
        (e.g. -j1) which are fixed now.
      Now kernels < 4.21 are supported.
    - Add support for new features:
      - enable gssapi via kerberos;
      - allow to choose between namei and inode file servers;
      - add Tivoli TSM API support;
      - conrol ubik-read-while-write mode;
      - deprecate kauth tools (may be enabled via flag);
      - add support for perl bindings via swig;
    - Docs:
      - build api docs (using doxygen);
      - Build PDF docs, support all three generators (fop, dblatex,
        docbook2pdf).
    - Avoid file collision with heimdal (bug 631584).
    
    The client is tested on various configurations, the server is not.
    
    Closes: https://bugs.gentoo.org/472184
    Closes: https://bugs.gentoo.org/544162
    Closes: https://bugs.gentoo.org/603890
    Closes: https://bugs.gentoo.org/631584
    Closes: https://bugs.gentoo.org/640874
    Closes: https://bugs.gentoo.org/642542
    Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
    Package-Manager: Portage-2.3.53, Repoman-2.3.11

 net-fs/openafs/Manifest             |   3 +
 net-fs/openafs/metadata.xml         |  16 +-
 net-fs/openafs/openafs-1.8.2.ebuild | 341 ++++++++++++++++++++++++++++++++++++
 3 files changed, 358 insertions(+), 2 deletions(-)