rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from coreutils-5.2.1-22.src.rpm

Browse Source 
Mon Aug 16 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-22
- Fixed sort -t LSB test failure (bug #121154).
- Fixed join LSB test failure (bug #121153).
This commit is contained in:
cvsdist 2004-09-09 04:04:22 +00:00
parent 6d8c1f864f
commit 224ab6f415
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coreutils-i18n.patch
View File

@ -2329,7 +2329,7 @@
+ newtab_length = 1; + newtab_length = 1;
+ } + }
+ +
+ if (optarg[tab_length]) + if (optarg[newtab_length])
+ { + {
+ /* Provoke with `sort -txx'. Complain about + /* Provoke with `sort -txx'. Complain about
+ "multi-character tab" instead of "multibyte tab", so + "multi-character tab" instead of "multibyte tab", so
@ -3585,7 +3585,7 @@
xfields (line); xfields (line);
return true; return true;
} }
@@ -336,56 +502,116 @@ @@ -336,56 +502,114 @@
keycmp (struct line const *line1, struct line const *line2) keycmp (struct line const *line1, struct line const *line2)
{ {
/* Start of field to compare in each file. */ /* Start of field to compare in each file. */
@ -3712,10 +3712,8 @@
+ copy[1] = (unsigned char *) beg[1]; + copy[1] = (unsigned char *) beg[1];
} }
+#ifdef HAVE_MBRTOWC + if (HAVE_SETLOCALE && hard_LC_COLLATE)
+ if (MB_CUR_MAX > 1)
+ return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); + return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]);
+#endif
+ diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); + diff = memcmp (copy[0], copy[1], MIN (len[0], len[1]));
+ +
if (diff) if (diff)
@ -3725,7 +3723,7 @@
} }
/* Print field N of LINE if it exists and is nonempty, otherwise /* Print field N of LINE if it exists and is nonempty, otherwise
@@ -410,11 +636,18 @@ @@ -410,11 +634,18 @@
/* Print the join of LINE1 and LINE2. */ /* Print the join of LINE1 and LINE2. */
@ -3745,7 +3743,7 @@
outlist = outlist_head.next; outlist = outlist_head.next;
if (outlist) if (outlist)
@@ -430,12 +663,12 @@ @@ -430,12 +661,12 @@
if (o->file == 0) if (o->file == 0)
{ {
if (line1 == &uni_blank) if (line1 == &uni_blank)
@ -3760,7 +3758,7 @@
line = line1; line = line1;
field = join_field_1; field = join_field_1;
} }
@@ -449,7 +682,7 @@ @@ -449,7 +680,7 @@
o = o->next; o = o->next;
if (o == NULL) if (o == NULL)
break; break;
@ -3769,7 +3767,7 @@
} }
putchar ('\n'); putchar ('\n');
} }
@@ -467,23 +700,23 @@ @@ -467,23 +698,23 @@
prfield (join_field_1, line1); prfield (join_field_1, line1);
for (i = 0; i < join_field_1 && i < line1->nfields; ++i) for (i = 0; i < join_field_1 && i < line1->nfields; ++i)
{ {
@ -3797,7 +3795,7 @@
prfield (i, line2); prfield (i, line2);
} }
putchar ('\n'); putchar ('\n');
@@ -678,7 +911,7 @@ @@ -678,7 +909,7 @@
valid = true; valid = true;
} }
else else
@ -3806,7 +3804,7 @@
/* `0' must be all alone -- no `.FIELD'. */ /* `0' must be all alone -- no `.FIELD'. */
error (0, 0, _("invalid field specifier: `%s'"), s); error (0, 0, _("invalid field specifier: `%s'"), s);
} }
@@ -817,7 +1050,23 @@ @@ -817,7 +1048,23 @@
break; break;
case 't': case 't':

6
coreutils.spec
View File

@ -4,7 +4,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 5.2.1 Version: 5.2.1
Release: 21 Release: 22
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: ftp://alpha.gnu.org/gnu/coreutils/ Url: ftp://alpha.gnu.org/gnu/coreutils/
@ -244,6 +244,10 @@ fi
%_sbindir/chroot %_sbindir/chroot
%changelog %changelog
* Mon Aug 16 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-22
- Fixed sort -t LSB test failure (bug #121154).
- Fixed join LSB test failure (bug #121153).
* Wed Aug 11 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-21 * Wed Aug 11 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-21
- Apply upstream patch to fix 'cp -a' onto multiply-linked files (bug #128874). - Apply upstream patch to fix 'cp -a' onto multiply-linked files (bug #128874).
- SELinux patch fix: don't error out if lgetfilecon() returns ENODATA. - SELinux patch fix: don't error out if lgetfilecon() returns ENODATA.