Accepting request 42290 from home:psmt:branches:openSUSE:Factory
Copy from home:psmt:branches:openSUSE:Factory/coreutils based on submit request 42290 from user psmt OBS-URL: https://build.opensuse.org/request/show/42290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=40
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
e8115bede0
commit
3d1a43cebf
@ -1,5 +1,7 @@
|
||||
--- coreutils-7.1/lib/linebuffer.h
|
||||
+++ coreutils-7.1/lib/linebuffer.h
|
||||
Index: lib/linebuffer.h
|
||||
===================================================================
|
||||
--- coreutils-7.1/lib/linebuffer.h.orig 2008-09-18 09:08:01.000000000 +0200
|
||||
+++ coreutils-7.1/lib/linebuffer.h 2010-06-29 18:49:31.855522069 +0200
|
||||
@@ -21,6 +21,11 @@
|
||||
|
||||
# include <stdio.h>
|
||||
@ -22,8 +24,10 @@
|
||||
};
|
||||
|
||||
/* Initialize linebuffer LINEBUFFER for use. */
|
||||
--- coreutils-7.1/src/cut.c
|
||||
+++ coreutils-7.1/src/cut.c
|
||||
Index: src/cut.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/cut.c.orig 2008-09-18 09:06:57.000000000 +0200
|
||||
+++ coreutils-7.1/src/cut.c 2010-06-29 18:49:31.855522069 +0200
|
||||
@@ -28,6 +28,12 @@
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
@ -606,8 +610,10 @@
|
||||
}
|
||||
|
||||
if (optind == argc)
|
||||
--- coreutils-7.1/src/expand.c
|
||||
+++ coreutils-7.1/src/expand.c
|
||||
Index: src/expand.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/expand.c.orig 2008-11-10 14:17:52.000000000 +0100
|
||||
+++ coreutils-7.1/src/expand.c 2010-06-29 18:49:31.871522014 +0200
|
||||
@@ -37,11 +37,31 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
@ -836,8 +842,10 @@
|
||||
|
||||
if (have_read_stdin && fclose (stdin) != 0)
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
--- coreutils-7.1/src/fold.c
|
||||
+++ coreutils-7.1/src/fold.c
|
||||
Index: src/fold.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/fold.c.orig 2008-09-18 09:06:57.000000000 +0200
|
||||
+++ coreutils-7.1/src/fold.c 2010-06-29 18:49:31.896029818 +0200
|
||||
@@ -22,6 +22,19 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
@ -1250,8 +1258,10 @@
|
||||
break;
|
||||
|
||||
case 's': /* Break at word boundaries. */
|
||||
--- coreutils-7.1/src/join.c
|
||||
+++ coreutils-7.1/src/join.c
|
||||
Index: src/join.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/join.c.orig 2008-11-10 14:17:52.000000000 +0100
|
||||
+++ coreutils-7.1/src/join.c 2010-06-29 18:49:31.923528009 +0200
|
||||
@@ -22,6 +22,16 @@
|
||||
#include <sys/types.h>
|
||||
#include <getopt.h>
|
||||
@ -1689,8 +1699,10 @@
|
||||
}
|
||||
break;
|
||||
|
||||
--- coreutils-7.1/src/pr.c
|
||||
+++ coreutils-7.1/src/pr.c
|
||||
Index: src/pr.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/pr.c.orig 2009-01-27 22:11:25.000000000 +0100
|
||||
+++ coreutils-7.1/src/pr.c 2010-06-29 18:49:31.931969742 +0200
|
||||
@@ -312,6 +312,32 @@
|
||||
|
||||
#include <getopt.h>
|
||||
@ -2419,8 +2431,10 @@
|
||||
/* We've just printed some files and need to clean up things before
|
||||
looking for more options and printing the next batch of files.
|
||||
|
||||
--- coreutils-7.1/src/sort.c
|
||||
+++ coreutils-7.1/src/sort.c
|
||||
Index: src/sort.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/sort.c.orig 2009-01-30 19:46:06.000000000 +0100
|
||||
+++ coreutils-7.1/src/sort.c 2010-06-29 18:51:17.203522566 +0200
|
||||
@@ -26,6 +26,19 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
@ -3057,18 +3071,17 @@
|
||||
{
|
||||
struct keyfield const *key = keylist;
|
||||
|
||||
@@ -2022,12 +2456,189 @@ keycompare (const struct line *a, const
|
||||
@@ -2022,11 +2456,190 @@ keycompare (const struct line *a, const
|
||||
|
||||
return 0;
|
||||
|
||||
- greater:
|
||||
+greater:
|
||||
diff = 1;
|
||||
- not_equal:
|
||||
+ diff = 1;
|
||||
+not_equal:
|
||||
return key->reverse ? -diff : diff;
|
||||
}
|
||||
|
||||
+ return key->reverse ? -diff : diff;
|
||||
+}
|
||||
+
|
||||
+#if HAVE_MBRTOWC
|
||||
+static int
|
||||
+keycompare_mb (const struct line *a, const struct line *b)
|
||||
@ -3113,6 +3126,8 @@
|
||||
+ (texta, textb));
|
||||
+ *lima = savea, *limb = saveb;
|
||||
+ }
|
||||
+ else if (key->version)
|
||||
+ diff = compare_version (texta, lena, textb, lenb);
|
||||
+ else if (key->month)
|
||||
+ diff = getmonth (texta, lena) - getmonth (textb, lenb);
|
||||
+ else
|
||||
@ -3240,16 +3255,16 @@
|
||||
+ return 0;
|
||||
+
|
||||
+greater:
|
||||
+ diff = 1;
|
||||
diff = 1;
|
||||
- not_equal:
|
||||
+not_equal:
|
||||
+ return key->reverse ? -diff : diff;
|
||||
+}
|
||||
return key->reverse ? -diff : diff;
|
||||
}
|
||||
+#endif
|
||||
+
|
||||
|
||||
/* Compare two lines A and B, returning negative, zero, or positive
|
||||
depending on whether A compares less than, equal to, or greater than B. */
|
||||
|
||||
@@ -2857,6 +3468,11 @@ set_ordering (const char *s, struct keyf
|
||||
@@ -2857,6 +3470,11 @@ set_ordering (const char *s, struct keyf
|
||||
break;
|
||||
case 'M':
|
||||
key->month = true;
|
||||
@ -3261,7 +3276,7 @@
|
||||
break;
|
||||
case 'n':
|
||||
key->numeric = true;
|
||||
@@ -2915,7 +3531,7 @@ main (int argc, char **argv)
|
||||
@@ -2915,7 +3533,7 @@ main (int argc, char **argv)
|
||||
initialize_exit_failure (SORT_FAILURE);
|
||||
|
||||
hard_LC_COLLATE = hard_locale (LC_COLLATE);
|
||||
@ -3270,7 +3285,7 @@
|
||||
hard_LC_TIME = hard_locale (LC_TIME);
|
||||
#endif
|
||||
|
||||
@@ -2928,14 +3544,40 @@ main (int argc, char **argv)
|
||||
@@ -2928,14 +3546,40 @@ main (int argc, char **argv)
|
||||
add support for multibyte decimal points. */
|
||||
decimal_point = to_uchar (locale->decimal_point[0]);
|
||||
if (! decimal_point || locale->decimal_point[1])
|
||||
@ -3313,7 +3328,7 @@
|
||||
have_read_stdin = false;
|
||||
inittables ();
|
||||
|
||||
@@ -3196,13 +3838,32 @@ main (int argc, char **argv)
|
||||
@@ -3196,13 +3840,32 @@ main (int argc, char **argv)
|
||||
|
||||
case 't':
|
||||
{
|
||||
@ -3350,7 +3365,7 @@
|
||||
else
|
||||
{
|
||||
/* Provoke with `sort -txx'. Complain about
|
||||
@@ -3213,9 +3874,12 @@ main (int argc, char **argv)
|
||||
@@ -3213,9 +3876,12 @@ main (int argc, char **argv)
|
||||
quote (optarg));
|
||||
}
|
||||
}
|
||||
@ -3364,8 +3379,10 @@
|
||||
}
|
||||
break;
|
||||
|
||||
--- coreutils-7.1/src/unexpand.c
|
||||
+++ coreutils-7.1/src/unexpand.c
|
||||
Index: src/unexpand.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/unexpand.c.orig 2008-11-10 14:17:52.000000000 +0100
|
||||
+++ coreutils-7.1/src/unexpand.c 2010-06-29 18:49:31.975522293 +0200
|
||||
@@ -38,11 +38,34 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
@ -3653,8 +3670,10 @@
|
||||
|
||||
if (have_read_stdin && fclose (stdin) != 0)
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
--- coreutils-7.1/src/uniq.c
|
||||
+++ coreutils-7.1/src/uniq.c
|
||||
Index: src/uniq.c
|
||||
===================================================================
|
||||
--- coreutils-7.1/src/uniq.c.orig 2008-11-10 14:17:52.000000000 +0100
|
||||
+++ coreutils-7.1/src/uniq.c 2010-06-29 18:49:32.040030047 +0200
|
||||
@@ -22,6 +22,16 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
@ -3981,8 +4000,10 @@
|
||||
skip_chars = 0;
|
||||
skip_fields = 0;
|
||||
check_chars = SIZE_MAX;
|
||||
--- coreutils-7.1/tests/misc/cut
|
||||
+++ coreutils-7.1/tests/misc/cut
|
||||
Index: tests/misc/cut
|
||||
===================================================================
|
||||
--- coreutils-7.1/tests/misc/cut.orig 2008-09-18 09:06:57.000000000 +0200
|
||||
+++ coreutils-7.1/tests/misc/cut 2010-06-29 18:49:32.091533700 +0200
|
||||
@@ -26,7 +26,7 @@ use strict;
|
||||
my $prog = 'cut';
|
||||
my $try = "Try \`$prog --help' for more information.\n";
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 29 20:18:04 CEST 2010 - pth@suse.de
|
||||
|
||||
- Fix 'sort -V' not working because the i18n (mb handling) patch
|
||||
wasn't updated to handle the new option (bnc#615073).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 4 17:13:37 UTC 2010 - pth@novell.com
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/coreutils/
|
||||
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
|
||||
Group: System/Base
|
||||
Version: 7.1
|
||||
Release: 5
|
||||
Release: 6
|
||||
Provides: fileutils sh-utils stat textutils mktemp
|
||||
Obsoletes: fileutils sh-utils stat textutils mktemp
|
||||
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user