summaryrefslogtreecommitdiff
path: root/sysutils/coreutils
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2020-09-23 20:12:50 +0000
committerjperkin <jperkin@pkgsrc.org>2020-09-23 20:12:50 +0000
commit4a702a6b6be1b4860fe2e02b0f4174a765c8320e (patch)
tree3f52a42798cc58d612132cbe3c240e1aaf659cd7 /sysutils/coreutils
parent8d509e6e78a06a5a12c64d078a2e1da210206a3b (diff)
downloadpkgsrc-4a702a6b6be1b4860fe2e02b0f4174a765c8320e.tar.gz
coreutils: Backport SunOS "ln <x> ." fix.
Full update to latest release can come after the freeze. Bump PKGREVISION.
Diffstat (limited to 'sysutils/coreutils')
-rw-r--r--sysutils/coreutils/Makefile4
-rw-r--r--sysutils/coreutils/distinfo3
-rw-r--r--sysutils/coreutils/patches/patch-src_ln.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index f5167005092..9c9c5bee9ba 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2020/08/31 18:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2020/09/23 20:12:50 jperkin Exp $
-PKGREVISION= 1
+PKGREVISION= 2
.include "../../sysutils/coreutils/Makefile.common"
CONFIGURE_ARGS+= --without-gmp
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 1fa459fb6a5..fed6d149f39 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2019/12/15 11:49:28 mef Exp $
+$NetBSD: distinfo,v 1.37 2020/09/23 20:12:50 jperkin Exp $
SHA1 (coreutils-8.31.tar.xz) = c62b5034a5b65daca33c50a60df87ebc44159faf
RMD160 (coreutils-8.31.tar.xz) = f672a6e3212d906555ba262edefb785c48badc70
@@ -7,3 +7,4 @@ Size (coreutils-8.31.tar.xz) = 5410140 bytes
SHA1 (patch-Makefile.in) = e012814dded9691c2269661e64fc02f8f12d2039
SHA1 (patch-lib_fflush.c) = 856ad3e8d301d65ca3db23347a88651e5c7a75d7
SHA1 (patch-lib_string.in.h) = 4fcd9c511eed2bb476db0d7bb8cceba03c1da180
+SHA1 (patch-src_ln.c) = 5f7fd7567de9fe7ec2d212098debde3d1aa90333
diff --git a/sysutils/coreutils/patches/patch-src_ln.c b/sysutils/coreutils/patches/patch-src_ln.c
new file mode 100644
index 00000000000..9b7534888f9
--- /dev/null
+++ b/sysutils/coreutils/patches/patch-src_ln.c
@@ -0,0 +1,15 @@
+$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];