| 1 |
diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
|
| 2 |
--- coreutils-7.2-orig/gnulib-tests/gnulib.mk 2009-03-31 14:28:30.000000000 +0200
|
| 3 |
+++ coreutils-7.2/gnulib-tests/gnulib.mk 2009-04-01 12:37:00.000000000 +0200
|
| 4 |
@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
|
| 5 |
|
| 6 |
## begin gnulib module memchr-tests
|
| 7 |
|
| 8 |
-TESTS += test-memchr
|
| 9 |
-check_PROGRAMS += test-memchr
|
| 10 |
-EXTRA_DIST += test-memchr.c zerosize-ptr.h
|
| 11 |
+#TESTS += test-memchr
|
| 12 |
+#check_PROGRAMS += test-memchr
|
| 13 |
+#EXTRA_DIST += test-memchr.c zerosize-ptr.h
|
| 14 |
|
| 15 |
## end gnulib module memchr-tests
|
| 16 |
|
| 17 |
@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
|
| 18 |
|
| 19 |
## begin gnulib module strverscmp-tests
|
| 20 |
|
| 21 |
-TESTS += test-strverscmp
|
| 22 |
-check_PROGRAMS += test-strverscmp
|
| 23 |
-EXTRA_DIST += test-strverscmp.c
|
| 24 |
+#TESTS += test-strverscmp
|
| 25 |
+#check_PROGRAMS += test-strverscmp
|
| 26 |
+#EXTRA_DIST += test-strverscmp.c
|
| 27 |
|
| 28 |
## end gnulib module strverscmp-tests
|
| 29 |
|
| 30 |
diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
|
| 31 |
--- coreutils-6.11-orig/tests/test-lib.sh 2008-04-19 23:34:23.000000000 +0200
|
| 32 |
+++ coreutils-6.11/tests/test-lib.sh 2008-04-24 14:18:59.000000000 +0200
|
| 33 |
@@ -97,8 +97,8 @@ skip_if_()
|
| 34 |
|
| 35 |
require_selinux_()
|
| 36 |
{
|
| 37 |
- case `ls -Zd .` in
|
| 38 |
- '? .'|'unlabeled .')
|
| 39 |
+ case `ls --scontext -d . | cut -f1 -d" "` in
|
| 40 |
+ '?'|'unlabeled')
|
| 41 |
skip_test_ "this system (or maybe just" \
|
| 42 |
"the current file system) lacks SELinux support"
|
| 43 |
;;
|
| 44 |
diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
|
| 45 |
--- coreutils-7.1-orig/src/ls.c 2009-02-25 13:23:59.000000000 +0100
|
| 46 |
+++ coreutils-7.1/src/ls.c 2009-02-25 13:25:20.000000000 +0100
|
| 47 |
@@ -38,10 +38,6 @@
|
| 48 |
#include <config.h>
|
| 49 |
#include <sys/types.h>
|
| 50 |
|
| 51 |
-#ifdef HAVE_CAP
|
| 52 |
-# include <sys/capability.h>
|
| 53 |
-#endif
|
| 54 |
-
|
| 55 |
#if HAVE_TERMIOS_H
|
| 56 |
# include <termios.h>
|
| 57 |
#endif
|
| 58 |
@@ -84,6 +80,10 @@
|
| 59 |
#include "system.h"
|
| 60 |
#include <fnmatch.h>
|
| 61 |
|
| 62 |
+#ifdef HAVE_CAP
|
| 63 |
+# include <sys/capability.h>
|
| 64 |
+#endif
|
| 65 |
+
|
| 66 |
#include "acl.h"
|
| 67 |
#include "argmatch.h"
|
| 68 |
#include "dev-ino.h"
|