commit compat-usrmerge for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package compat-usrmerge for openSUSE:Factory 
checked in at 2021-06-20 19:37:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compat-usrmerge (Old)
 and      /work/SRC/openSUSE:Factory/.compat-usrmerge.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "compat-usrmerge"

Sun Jun 20 19:37:43 2021 rev:3 rq:900396 version:84.87

Changes:
--------
--- /work/SRC/openSUSE:Factory/compat-usrmerge/compat-usrmerge.changes  
2021-06-11 00:17:44.833220324 +0200
+++ 
/work/SRC/openSUSE:Factory/.compat-usrmerge.new.2625/compat-usrmerge.changes    
    2021-06-20 19:37:44.553494251 +0200
@@ -1,0 +2,6 @@
+Tue Jun 15 15:27:41 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- another fix for split /usr to avoid running out of space (boo#1186781)
+- unsafe fallback also for ENOSYS on renameat2 as seen on WSL
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ convertfs ++++++
--- /var/tmp/diff_new_pack.HxuJFg/_old  2021-06-20 19:37:45.161495060 +0200
+++ /var/tmp/diff_new_pack.HxuJFg/_new  2021-06-20 19:37:45.161495060 +0200
@@ -78,7 +78,7 @@
     echo "Merge the copy with \`$ROOT/usr/$dir'."
     [[ -d "$ROOT/usr/${dir}.usrmerge" ]] \
         || mkdir -p "$ROOT/usr/${dir}.usrmerge"
-    cp -axT $CP_HARDLINK --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" 
"$ROOT/usr/${dir}.usrmerge"
+    cp -axT -l --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" 
"$ROOT/usr/${dir}.usrmerge"
     echo "Clean up duplicates in \`$ROOT/usr/$dir'."
     # delete all symlinks that have been backed up. /usr versions
     # override / ones

++++++ xmv.c ++++++
--- /var/tmp/diff_new_pack.HxuJFg/_old  2021-06-20 19:37:45.237495161 +0200
+++ /var/tmp/diff_new_pack.HxuJFg/_new  2021-06-20 19:37:45.237495161 +0200
@@ -70,7 +70,9 @@
        const char *source = argv[optind], *target = argv[optind+1];
        r = syscall (SYS_renameat2, AT_FDCWD, source, AT_FDCWD, target, 
RENAME_EXCHANGE);
        if (r < 0) {
-               if (errno != EINVAL) {
+               // FS not supporting RENAME_EXCHANGE -> EINVAL
+               // No renameat2 syscall -> ENOSYS (eg WSL)
+               if (errno != EINVAL && errno != ENOSYS) {
                        perror("renameat2");
                        return 1;
                }