From 7b7499e33bca15b5dbf12bf5f71bed6a843d501d Mon Sep 17 00:00:00 2001
From: naddy <naddy@FreeBSD.org>
Date: Tue, 4 Feb 2003 00:13:01 +0000
Subject: Rename included eaccess() function to avoid clash with -CURRENT's
eaccess(2) system call.
PR: 46363
Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>
---
misc/sh-utils/Makefile | 4 ++--
misc/sh-utils/files/patch-src_test.c | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 misc/sh-utils/files/patch-src_test.c
(limited to 'misc/sh-utils')
diff --git a/misc/sh-utils/Makefile b/misc/sh-utils/Makefile
index 6909ae3..13c7531 100644
--- a/misc/sh-utils/Makefile
+++ b/misc/sh-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sh-utils
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= sh-utils
@@ -46,7 +46,7 @@ remove-info-files:
# Patch
#
-do-patch:
+post-patch:
.if !defined(WITH_SUID)
@${REINPLACE_CMD} -e 's/u\+s/u\+w/g' ${WRKSRC}/src/Makefile.in
.endif
diff --git a/misc/sh-utils/files/patch-src_test.c b/misc/sh-utils/files/patch-src_test.c
new file mode 100644
index 0000000..9448b25
--- /dev/null
+++ b/misc/sh-utils/files/patch-src_test.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/test.c.orig Tue Feb 4 00:43:33 2003
++++ src/test.c Tue Feb 4 00:43:50 2003
+@@ -153,6 +153,7 @@
+ return (stat (path, finfo));
+ }
+
++#define eaccess test_access
+ /* Do the same thing access(2) does, but use the effective uid and gid,
+ and don't make the mistake of telling root that any file is executable.
+ But this loses when the containing filesystem is mounted e.g. read-only. */
--
cgit v1.1