Created attachment 839861 [details] davfs2-1.6.1:20221204-163421.log.gz >>> Installing (1 of 1) net-fs/davfs2-1.6.1::gentoo * checking 24 files for package collisions * Package 'net-fs/davfs2-1.6.1' has internal collisions between non- * identical files (located in separate directories in the installation * image (${D}) corresponding to merged directories in the target * filesystem (${ROOT})): * * /usr/bin/mount.davfs * /sbin/mount.davfs * /usr/sbin/mount.davfs * Differences: type, mode * * /usr/bin/umount.davfs * /sbin/umount.davfs * /usr/sbin/umount.davfs * Differences: type, mode * * Package 'net-fs/davfs2-1.6.1' NOT merged due to internal collisions * between non-identical files. If necessary, refer to your elog messages * for the whole content of the above message. $ emerge --info net-fs/davfs2 Portage 3.0.38.1 (python 3.10.8-final-0, default/linux/amd64/17.1, gcc-11.3.0, glibc-2.36-r5, 5.15.81-gentoo x86_64) ================================================================= System Settings ================================================================= System uname: Linux-5.15.81-gentoo-x86_64-AMD_EPYC_Processor_-with_IBPB-with-glibc2.36 KiB Mem: 1978124 total, 438180 free KiB Swap: 2097148 total, 2096636 free Timestamp of repository gentoo: Sat, 03 Dec 2022 15:00:01 +0000 Head commit of repository gentoo: b4da792341f9574edb9356d2b42c4d239e7014d1 Head commit of repository puleglot: 96aa5a98fef588567de2606d5d5cce3751e69faf sh dash 0.5.11.5 ld GNU ld (Gentoo 2.38 p4) 2.38 app-misc/pax-utils: 1.3.5::gentoo app-shells/bash: 5.1_p16-r2::gentoo dev-lang/perl: 5.34.1-r4::gentoo dev-lang/python: 3.10.8_p3::gentoo dev-lang/rust-bin: 1.65.0::gentoo dev-util/cmake: 3.24.3::gentoo dev-util/meson: 0.63.3::gentoo sys-apps/baselayout: 2.9::gentoo sys-apps/sandbox: 2.29::gentoo sys-apps/systemd: 251.7::gentoo sys-devel/autoconf: 2.71-r5::gentoo sys-devel/automake: 1.16.5::gentoo sys-devel/binutils: 2.38-r2::gentoo sys-devel/binutils-config: 5.4.1::gentoo sys-devel/gcc: 11.3.0::gentoo sys-devel/gcc-config: 2.8::gentoo sys-devel/libtool: 2.4.7::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.15-r3::gentoo (virtual/os-headers) sys-libs/glibc: 2.36-r5::gentoo Repositories: gentoo location: /var/db/repos/gentoo sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-rsync-verify-metamanifest: yes sync-rsync-verify-jobs: 2 sync-rsync-verify-max-age: 24 sync-rsync-extra-opts: puleglot location: /var/db/repos/puleglot sync-type: git sync-uri: https://puleglot.ru/git/gentoo/puleglot-overlay.git masters: gentoo priority: 900 local location: /usr/local/portage masters: gentoo priority: 1000 ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/easy-rsa /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -pipe" DISTDIR="/var/cache/distfiles" EMERGE_DEFAULT_OPTS="--dynamic-deps=n --with-bdeps=y --binpkg-respect-use=y --ask-enter-invalid" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live buildsyspkg cgroup clean-logs compress-build-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms split-log strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="http://mirror.hetzner.de/gentoo/ http://distfiles.gentoo.org/" LANG="ru_RU.utf8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j1" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" RUSTFLAGS="-C opt-level=2" SHELL="/bin/bash" USE="acl aio amd64 bash-completion bzip2 caps cli crypt device-mapper dri fortran gdbm hardened iconv icu idn ipv6 libglvnd libtirpc lz4 lzma maildir multilib ncurses nls nptl openmp pam pcre perl pie python readline sasl seccomp ssl ssp systemd test-rust tls udev unicode urandom vim-syntax xattr xtpax xz zlib zstd" ABI_X86="64" ADA_TARGET="gnat_2021" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="pc" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en ru" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_10" PYTHON_TARGETS="python3_10" RUBY_TARGETS="ruby27" USERLAND="GNU" VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, SIZE, STRINGS, STRIP, YACC, YFLAGS ================================================================= Package Settings ================================================================= net-fs/davfs2-1.6.0::gentoo was built with the following: USE="nls" ABI_X86="(64)"
Created attachment 839867 [details] 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch
(In reply to Alexander Tsoy from comment #1) > Created attachment 839867 [details] > 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch Probably needs ${EPREFIX} given when comparing if it should make the symlinks, it does: if test "$(sbindir)" != "$(ssbindir)"; then And sbindir would be ${EPREFIX}/usr/sbin ...that aside, wrt USE=split-usr, probably(?) no worth in keeping /sbin symlinks at all even on non-merged, mount does look in /usr/sbin (e.g. fuse3 doesn't install a /sbin/mount.fuse3 symlink, only keeps it in /usr/sbin)
Comment on attachment 839867 [details] 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch ssbindir should probably include ${EPREFIX}. Also, I think you could pass it as an argument to econf instead of as an environment variable. That would make the econf call look a little nicer.
(In reply to Ionen Wolkens from comment #2) > ...that aside, wrt USE=split-usr, probably(?) no worth in keeping /sbin > symlinks at all even on non-merged, mount does look in /usr/sbin (e.g. fuse3 > doesn't install a /sbin/mount.fuse3 symlink, only keeps it in /usr/sbin) Just want to point out that only works on Gentoo because we pass this to configure in sys-apps/util-linux: --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
Ah good to know, upstream doing this makes sense then.
Created attachment 839909 [details] 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch Thanks!
Comment on attachment 839909 [details] 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch ${ssbindir} needs to be quoted when passed as an argument. eg. econf ... ssbindir="${ssbindir}"
Created attachment 840171 [details] 0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 commit bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 Author: Alexander Tsoy <alexander@tsoy.me> AuthorDate: 2022-12-04 16:56:47 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2022-12-05 19:44:16 +0000 net-fs/davfs2: fix file collision with merged-usr Closes: https://bugs.gentoo.org/884323 Signed-off-by: Alexander Tsoy <alexander@tsoy.me> Signed-off-by: Mike Gilbert <floppym@gentoo.org> net-fs/davfs2/davfs2-1.6.1.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) Additionally, it has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c4b791fb76f3846286c0cabe3c62a4514645da commit 14c4b791fb76f3846286c0cabe3c62a4514645da Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2022-12-05 19:41:30 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2022-12-05 19:44:16 +0000 net-fs/davfs2: apply merged-usr fix to stable ebuild Also revbump to ensure new binpkgs get generated. Bug: https://bugs.gentoo.org/884323 Signed-off-by: Mike Gilbert <floppym@gentoo.org> .../davfs2/{davfs2-1.6.0.ebuild => davfs2-1.6.0-r1.ebuild} | 13 ++++++++++--- .../davfs2/{davfs2-1.6.1.ebuild => davfs2-1.6.1-r1.ebuild} | 0 2 files changed, 10 insertions(+), 3 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed99419996b7319286dba751fc576e8cbe9de5f commit fed99419996b7319286dba751fc576e8cbe9de5f Author: Eli Schwartz <eschwartz93@gmail.com> AuthorDate: 2024-01-01 00:37:34 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-01-01 01:11:07 +0000 net-fs/davfs2: remove questionable USE=split-usr In bug 884323 it was noted that merged-usr systems get a conflict, because upstream attempted to install a symlink in /sbin pointing to /usr/sbin. It was noted in the bug that /sbin isn't needed at all, despite which the chosen solution was to add IUSE=split-usr and conditionally create the (useless) symlink. In version 1.7.0 upstream dropped this entirely, indicating they don't think it's a terribly good idea either. Take this opportunity to revert everything and go install exclusively to /usr/sbin, which should have been the original solution all along. Bug: https://bugs.gentoo.org/884323 Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> Signed-off-by: Sam James <sam@gentoo.org> net-fs/davfs2/davfs2-1.6.0-r2.ebuild | 61 ++++++++++++++++++++++ ...vfs2-1.6.1-r1.ebuild => davfs2-1.6.1-r2.ebuild} | 13 ++--- 2 files changed, 64 insertions(+), 10 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9750c1ac923f43e8337990ff1b5a6fb156b34019 commit 9750c1ac923f43e8337990ff1b5a6fb156b34019 Author: Eli Schwartz <eschwartz93@gmail.com> AuthorDate: 2024-01-01 00:31:12 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-01-01 01:11:07 +0000 net-fs/davfs2: remove pointless no-op USE=split-usr In bug 884323 it was noted that merged-usr systems get a conflict, because upstream attempted to install a symlink in /sbin pointing to /usr/sbin. It was noted in the bug that /sbin isn't needed at all, despite which the chosen solution was to add IUSE=split-usr and conditionally create the (useless) symlink. In version 1.7.0 upstream dropped this entirely, so no symlink is created either way -- but we still defined the USE flag and invalidated binpkg changed-use matches. Also we wasted ebuild real estate redefining the src_install function. Get rid of this dead weight. Bug: https://bugs.gentoo.org/884323 Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> Signed-off-by: Sam James <sam@gentoo.org> net-fs/davfs2/davfs2-1.7.0.ebuild | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
