Wed Sep 23 20:12:50 2020 UTC ()
coreutils: Backport SunOS "ln <x> ." fix.

Full update to latest release can come after the freeze.  Bump
PKGREVISION.


(jperkin)
diff -r1.77 -r1.78 pkgsrc/sysutils/coreutils/Makefile
diff -r1.36 -r1.37 pkgsrc/sysutils/coreutils/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/coreutils/patches/patch-src_ln.c
cvs diff -r1.77 -r1.78 pkgsrc/sysutils/coreutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/coreutils/Makefile 2020/08/31 18:11:26 1.77
+++ pkgsrc/sysutils/coreutils/Makefile 2020/09/23 20:12:50 1.78
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.77 2020/08/31 18:11:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.78 2020/09/23 20:12:50 jperkin Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4.include "../../sysutils/coreutils/Makefile.common" 4.include "../../sysutils/coreutils/Makefile.common"
5 5
6CONFIGURE_ARGS+= --without-gmp 6CONFIGURE_ARGS+= --without-gmp
7 7
8CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* 8CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
9 9
10# devel/id-utils installs a 'gid' program, so conflict with it 10# devel/id-utils installs a 'gid' program, so conflict with it
11# databases/geneweb a 'gwc' program, so conflict with it 11# databases/geneweb a 'gwc' program, so conflict with it
12# graphics/graphviz installs a 'gpr' program, so conflict with it 12# graphics/graphviz installs a 'gpr' program, so conflict with it
13CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 13CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
14CONFLICTS+= geneweb-[0-9]* 14CONFLICTS+= geneweb-[0-9]*
15CONFLICTS+= graphviz<1.12 15CONFLICTS+= graphviz<1.12
16 16
cvs diff -r1.36 -r1.37 pkgsrc/sysutils/coreutils/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/coreutils/distinfo 2019/12/15 11:49:28 1.36
+++ pkgsrc/sysutils/coreutils/distinfo 2020/09/23 20:12:50 1.37
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.36 2019/12/15 11:49:28 mef Exp $ 1$NetBSD: distinfo,v 1.37 2020/09/23 20:12:50 jperkin Exp $
2 2
3SHA1 (coreutils-8.31.tar.xz) = c62b5034a5b65daca33c50a60df87ebc44159faf 3SHA1 (coreutils-8.31.tar.xz) = c62b5034a5b65daca33c50a60df87ebc44159faf
4RMD160 (coreutils-8.31.tar.xz) = f672a6e3212d906555ba262edefb785c48badc70 4RMD160 (coreutils-8.31.tar.xz) = f672a6e3212d906555ba262edefb785c48badc70
5SHA512 (coreutils-8.31.tar.xz) = ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af 5SHA512 (coreutils-8.31.tar.xz) = ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
6Size (coreutils-8.31.tar.xz) = 5410140 bytes 6Size (coreutils-8.31.tar.xz) = 5410140 bytes
7SHA1 (patch-Makefile.in) = e012814dded9691c2269661e64fc02f8f12d2039 7SHA1 (patch-Makefile.in) = e012814dded9691c2269661e64fc02f8f12d2039
8SHA1 (patch-lib_fflush.c) = 856ad3e8d301d65ca3db23347a88651e5c7a75d7 8SHA1 (patch-lib_fflush.c) = 856ad3e8d301d65ca3db23347a88651e5c7a75d7
9SHA1 (patch-lib_string.in.h) = 4fcd9c511eed2bb476db0d7bb8cceba03c1da180 9SHA1 (patch-lib_string.in.h) = 4fcd9c511eed2bb476db0d7bb8cceba03c1da180
 10SHA1 (patch-src_ln.c) = 5f7fd7567de9fe7ec2d212098debde3d1aa90333
File Added: pkgsrc/sysutils/coreutils/patches/Attic/patch-src_ln.c
$NetBSD: patch-src_ln.c,v 1.1 2020/09/23 20:12:50 jperkin Exp $

Backport https://github.com/coreutils/coreutils/commit/3e0dff3925b5e521cae468087950e85b60002d1c

--- src/ln.c.orig	2019-01-05 10:36:22.000000000 +0000
+++ src/ln.c
@@ -603,7 +603,7 @@ main (int argc, char **argv)
     {
       if (n_files == 2 && !target_directory)
         link_errno = atomic_link (file[0], AT_FDCWD, file[1]);
-      if (link_errno < 0 || link_errno == EEXIST || link_errno == ENOTDIR)
+      if (link_errno < 0 || link_errno == EEXIST || link_errno == ENOTDIR || link_errno == EINVAL)
         {
           char const *d
             = target_directory ? target_directory : file[n_files - 1];