From 9d4aa26c5f48cd87c650feef86d62a116f8361d9 Mon Sep 17 00:00:00 2001 From: hauke Date: Mon, 15 Jul 2024 17:20:03 +0000 Subject: [PATCH] Properly handle EOPNOTSUPP by making sure we don't end up with two identical case values on OSes that #define one as the other; lifted from a lang/tcl85 patch. Unbreaks FreeBSD build. --- net/rsync/distinfo | 4 ++-- net/rsync/patches/patch-acls.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 39fe0c6e0a19..d23e9325e5ba 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.60 2024/05/22 09:49:36 bouyer Exp $ +$NetBSD: distinfo,v 1.61 2024/07/15 17:20:03 hauke Exp $ BLAKE2s (rsync-3.3.0.tar.gz) = 0b750564ba4fac3d52f0855633d8976902d040f335012bb99a72d7f95f7992e7 SHA512 (rsync-3.3.0.tar.gz) = df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10 Size (rsync-3.3.0.tar.gz) = 1153969 bytes SHA1 (patch-Makefile.in) = 34c3cc57846e451a0adbd19fcb19ae682b7e1ae3 -SHA1 (patch-acls.c) = 22b0170d00d11a797c0e50c9cd7b2ef5e8d4b3d1 +SHA1 (patch-acls.c) = 9be60c0c1abedc961fa95bba2bb23d802a09bc62 diff --git a/net/rsync/patches/patch-acls.c b/net/rsync/patches/patch-acls.c index 23dcddf046fa..322a89243cc9 100644 --- a/net/rsync/patches/patch-acls.c +++ b/net/rsync/patches/patch-acls.c @@ -1,14 +1,14 @@ -$NetBSD: patch-acls.c,v 1.1 2024/05/22 09:49:36 bouyer Exp $ +$NetBSD: patch-acls.c,v 1.2 2024/07/15 17:20:03 hauke Exp $ Properly handle EOPNOTSUPP ---- acls.c.orig 2024-05-22 11:29:32.963825978 +0200 -+++ acls.c 2024-05-22 11:30:07.507590619 +0200 -@@ -1101,6 +1101,9 @@ +--- acls.c.orig 2022-09-11 17:04:26.000000000 +0000 ++++ acls.c +@@ -1101,6 +1101,9 @@ int default_perms_for_dir(const char *dir) #ifdef ENOTSUP case ENOTSUP: #endif -+#ifdef EOPNOTSUPP ++#if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP)) + case EOPNOTSUPP: +#endif case ENOSYS: