Bug 884591 – net-mail/courier-imap and mail-filter/maildrop: file collision with merged-usr

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Dennis Lichtenthäler 2022-12-06 15:02:48 UTC]

The merge-usr script complains on a system with both net-mail/courier-imap and mail-filter/maildrop installed:

ERROR: Conflict for file '/usr/sbin/makedat': [Errno 17] File exists: '/usr/bin/makedat'
ERROR: Leaving '/usr/sbin' as a directory due to prior errors                 

net-mail/courier-imap owns /usr/sbin/makedat
mail-filter/maildrop owns /usr/bin/makedat


Reproducible: Always

[Comment 1 Marco Scardovi (scardracs) 2023-01-14 12:57:56 UTC]

I can confirm it in a clean LXD container

[Comment 2 Larry the Git Cow 2023-01-23 20:57:11 UTC]

The bug has been referenced in the following commit(s):

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

commit b39a25dcf5017d7d6abb3119bebe463c6178bd65
Author:     Alfredo Tupone <[e-mail]>
AuthorDate: 2023-01-23 20:47:25 +0000
Commit:     Alfredo Tupone <[e-mail]>
CommitDate: 2023-01-23 20:55:59 +0000

    net-mail/courier-makedat: new package, add 3.1.0
    
    Bug: https://bugs.gentoo.org/884591
    Signed-off-by: Alfredo Tupone <[e-mail]>

 net-mail/courier-makedat/Manifest                  |  1 +
 .../courier-makedat/courier-makedat-3.1.0.ebuild   | 53 ++++++++++++
 .../files/courier-makedat-3.1.0-gentoo.patch       | 97 ++++++++++++++++++++++
 net-mail/courier-makedat/metadata.xml              | 11 +++
 4 files changed, 162 insertions(+)

[Comment 3 Larry the Git Cow 2023-01-23 21:41:53 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a0718d96d9cbeab78bc10e4edd9a3ffe4a2298

commit 37a0718d96d9cbeab78bc10e4edd9a3ffe4a2298
Author:     Alfredo Tupone <[e-mail]>
AuthorDate: 2023-01-23 21:40:46 +0000
Commit:     Alfredo Tupone <[e-mail]>
CommitDate: 2023-01-23 21:41:25 +0000

    mail-filter/maildrop: use net-mail/courier-makedat
    
    Bug: https://bugs.gentoo.org/884591
    Signed-off-by: Alfredo Tupone <[e-mail]>

 .../maildrop/files/maildrop-3.0.2-makedat.patch    |  67 ++++++++++
 mail-filter/maildrop/maildrop-3.0.2-r1.ebuild      | 144 +++++++++++++++++++++
 mail-filter/maildrop/metadata.xml                  |   5 +-
 3 files changed, 215 insertions(+), 1 deletion(-)

[Comment 4 Larry the Git Cow 2023-01-23 22:07:48 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdc644d9281aa4db34c108420ab24481e11c8ee

commit 5fdc644d9281aa4db34c108420ab24481e11c8ee
Author:     Alfredo Tupone <[e-mail]>
AuthorDate: 2023-01-23 22:07:20 +0000
Commit:     Alfredo Tupone <[e-mail]>
CommitDate: 2023-01-23 22:07:20 +0000

    net-mail/courier-imap: use courier-makedat
    
    Closes: https://bugs.gentoo.org/884591
    Signed-off-by: Alfredo Tupone <[e-mail]>

 net-mail/courier-imap/courier-imap-5.2.1-r1.ebuild | 258 +++++++++++++++++++++
 .../files/courier-imap-5.2.1-makedat.patch         |  34 +++
 2 files changed, 292 insertions(+)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c161cb2e5928454d2209809fcc2ed98465512d

commit 47c161cb2e5928454d2209809fcc2ed98465512d
Author:     Alfredo Tupone <[e-mail]>
AuthorDate: 2023-01-23 22:06:35 +0000
Commit:     Alfredo Tupone <[e-mail]>
CommitDate: 2023-01-23 22:06:35 +0000

    net-mail/courier-makedat: keyword 3.1.0 for ~loong
    
    Bug: https://bugs.gentoo.org/884591
    Signed-off-by: Alfredo Tupone <[e-mail]>

 net-mail/courier-makedat/courier-makedat-3.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)