oasis

commit: 7a114f99095a1bf0d31474efc6f2235b44229d90
parent 991029ac4f300f1014670a7bedd41f4539e859a3
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 10 Jan 2020 21:28:27 -0800

openbsd: Fix pax -p flag with symlinks

Diffstat:
A
pkg/openbsd/patch/0032-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
26
++++++++++++++++++++++++++
M
pkg/openbsd/ver
2
+-

2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/pkg/openbsd/patch/0032-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch b/pkg/openbsd/patch/0032-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
@@ -0,0 +1,26 @@
+From afcab21e3980789807c930d417535e883533ef05 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 10 Jan 2020 21:40:03 -0800
+Subject: [PATCH] pax: Ignore EOPNOTSUPP from fchmodat
+
+Linux does not support changing the mode of symlinks.
+---
+ bin/pax/file_subs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
+index cfe56baa5a6..a66c0dd1f9d 100644
+--- a/bin/pax/file_subs.c
++++ b/bin/pax/file_subs.c
+@@ -793,7 +793,7 @@ void
+ set_pmode(char *fnm, mode_t mode)
+ {
+ 	mode &= ABITS;
+-	if (fchmodat(AT_FDCWD, fnm, mode, AT_SYMLINK_NOFOLLOW) == -1)
++	if (fchmodat(AT_FDCWD, fnm, mode, AT_SYMLINK_NOFOLLOW) == -1 && errno != EOPNOTSUPP)
+ 		syswarn(1, errno, "Could not set permissions on %s", fnm);
+ }
+ 
+-- 
+2.24.1
+
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
@@ -1 +1 @@
-6.6 r1
+6.6 r2