diff options
Diffstat (limited to 'abs/core/coreutils/coreutils-6.10-configuration.patch')
| -rw-r--r-- | abs/core/coreutils/coreutils-6.10-configuration.patch | 98 |
1 files changed, 62 insertions, 36 deletions
diff --git a/abs/core/coreutils/coreutils-6.10-configuration.patch b/abs/core/coreutils/coreutils-6.10-configuration.patch index f80ab84..b9bddda 100644 --- a/abs/core/coreutils/coreutils-6.10-configuration.patch +++ b/abs/core/coreutils/coreutils-6.10-configuration.patch @@ -1,32 +1,9 @@ -diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut ---- coreutils-6.12-orig/tests/misc/cut 2008-05-17 08:41:11.000000000 +0200 -+++ coreutils-6.12/tests/misc/cut 2008-06-02 11:13:08.000000000 +0200 -@@ -26,7 +26,7 @@ - my $prog = 'cut'; - my $try = "Try \`$prog --help' for more information.\n"; - my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; --my $inval = "$prog: invalid byte or field list\n$try"; -+my $inval = "$prog: invalid byte, character or field list\n$try"; - my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; - - my @Tests = -@@ -140,8 +140,8 @@ - ['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}], - - # None of the following invalid ranges provoked an error up to coreutils-6.9. -- ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, -- {ERR=>"$prog: invalid decreasing range\n$try"}], -+ ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, -+ {ERR=>"$prog: invalid byte, character or field list\n$try"}], - ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux --- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200 +++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200 @@ -38,6 +28,7 @@ # successfully, in spite of the invalid context string. - + . $srcdir/test-lib.sh +require_selinux_ @@ -46,17 +23,66 @@ diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.s skip_test_ "this system (or maybe just" \ "the current file system) lacks SELinux support" ;; -diff -urp coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.11/gnulib-tests/test-getaddrinfo.c ---- coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c -+++ coreutils-6.11/gnulib-tests/test-getaddrinfo.c -@@ -70,6 +70,10 @@ int simple (char *host, char *service) - if (res == EAI_NODATA) - return 0; - -+ /* Do not fail this test for temporary name resolution errors. */ -+ if (res == EAI_AGAIN) -+ return 0; +diff -urNp coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c coreutils-7.1/gnulib-tests/test-getaddrinfo.c +--- coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c 2009-01-27 21:33:19.000000000 +0100 ++++ coreutils-7.1/gnulib-tests/test-getaddrinfo.c 2009-02-25 13:52:59.000000000 +0100 +@@ -36,6 +36,8 @@ + # define dbgprintf if (0) printf + #endif + ++static int skip = 0; ++ + /* BeOS does not have AF_UNSPEC. */ + #ifndef AF_UNSPEC + # define AF_UNSPEC 0 +@@ -52,6 +54,9 @@ int simple (char *host, char *service) + struct addrinfo *ai0, *ai; + int res; + ++ if (skip) ++ return 0; + - return 1; - } + dbgprintf ("Finding %s service %s...\n", host, service); + /* This initializes "hints" but does not use it. Is there a reason +@@ -72,8 +77,12 @@ int simple (char *host, char *service) + in-law's farm. */ + if (res == EAI_AGAIN) + { +- fprintf (stderr, "skipping getaddrinfo test: no network?\n"); +- return 77; ++ if (!skip) ++ { ++ skip++; ++ fprintf (stderr, "skipping getaddrinfo test: no network?\n"); ++ return 77; ++ } + } + /* IRIX reports EAI_NONAME for "https". Don't fail the test + merely because of this. */ +diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c +--- coreutils-7.1-orig/src/ls.c 2009-02-25 13:23:59.000000000 +0100 ++++ coreutils-7.1/src/ls.c 2009-02-25 13:25:20.000000000 +0100 +@@ -38,10 +38,6 @@ + #include <config.h> + #include <sys/types.h> + +-#ifdef HAVE_CAP +-# include <sys/capability.h> +-#endif +- + #if HAVE_TERMIOS_H + # include <termios.h> + #endif +@@ -84,6 +80,10 @@ + #include "system.h" + #include <fnmatch.h> + ++#ifdef HAVE_CAP ++# include <sys/capability.h> ++#endif ++ + #include "acl.h" + #include "argmatch.h" + #include "dev-ino.h" + |