summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch44
-rw-r--r--meta/packages/coreutils/coreutils_5.1.3.bb5
2 files changed, 47 insertions, 2 deletions
diff --git a/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch b/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch
new file mode 100644
index 0000000000..cde2731477
--- /dev/null
+++ b/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch
@@ -0,0 +1,44 @@
1# On Ubuntu edgy (and perhaps other distributions), eaccess is provided by
2# unistd.h - This renames the function so as not to conflict.
3
4--- coreutils-5.1.3/src/test.c.old 2006-08-17 15:29:41.000000000 +0100
5+++ coreutils-5.1.3/src/test.c 2006-08-17 15:30:44.000000000 +0100
6@@ -125,7 +125,7 @@
7 /* Do the same thing access(2) does, but use the effective uid and gid. */
8
9 static int
10-eaccess (char const *file, int mode)
11+_eaccess (char const *file, int mode)
12 {
13 static int have_ids;
14 static uid_t uid, euid;
15@@ -158,7 +158,7 @@
16 return result;
17 }
18 #else
19-# define eaccess(F, M) euidaccess (F, M)
20+# define _eaccess(F, M) euidaccess (F, M)
21 #endif
22
23 /* Increment our position in the argument list. Check that we're not
24@@ -623,17 +623,17 @@
25
26 case 'r': /* file is readable? */
27 unary_advance ();
28- value = -1 != eaccess (argv[pos - 1], R_OK);
29+ value = -1 != _eaccess (argv[pos - 1], R_OK);
30 return (TRUE == value);
31
32 case 'w': /* File is writable? */
33 unary_advance ();
34- value = -1 != eaccess (argv[pos - 1], W_OK);
35+ value = -1 != _eaccess (argv[pos - 1], W_OK);
36 return (TRUE == value);
37
38 case 'x': /* File is executable? */
39 unary_advance ();
40- value = -1 != eaccess (argv[pos - 1], X_OK);
41+ value = -1 != _eaccess (argv[pos - 1], X_OK);
42 return (TRUE == value);
43
44 case 'O': /* File is owned by you? */
diff --git a/meta/packages/coreutils/coreutils_5.1.3.bb b/meta/packages/coreutils/coreutils_5.1.3.bb
index 31af80907d..2f7476c2dd 100644
--- a/meta/packages/coreutils/coreutils_5.1.3.bb
+++ b/meta/packages/coreutils/coreutils_5.1.3.bb
@@ -3,11 +3,12 @@ SECTION = "base"
3DESCRIPTION = "A collection of core GNU utilities." 3DESCRIPTION = "A collection of core GNU utilities."
4RREPLACES = "textutils shellutils fileutils" 4RREPLACES = "textutils shellutils fileutils"
5RPROVIDES = "textutils shellutils fileutils" 5RPROVIDES = "textutils shellutils fileutils"
6PR = "r7" 6PR = "r8"
7 7
8SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ 8SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
9 file://install-cross.patch;patch=1;pnum=0 \ 9 file://install-cross.patch;patch=1;pnum=0 \
10 file://man.patch;patch=1" 10 file://man.patch;patch=1 \
11 file://rename-eaccess.patch;patch=1"
11 12
12inherit autotools 13inherit autotools
13 14