rpm/coreutils
SHA256
1
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

Accepting request 57153 from Base:System

Browse Source 
Accepted submit request 57153 from user psmt

OBS-URL: https://build.opensuse.org/request/show/57153
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=49
This commit is contained in:
Berthold Gunreben 2011-01-07 08:34:48 +00:00 committed by Git OBS Bridge
commit ea32df477f
15 changed files with 12949 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">ftp.gnu.org</param>
<param name="path">/gnu/coreutils/coreutils-8.9.tar.xz</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:coreutils-8.9.tar.xz</param>
<param name="verifier">sha256</param>
<param name="checksum">ca22d06effd0c8bc506a7c57932d0ed08d7dbc75629a92264d67d34982f2b5b7</param>
</service>
<service name="set_version">
</service>
</services>

3
_service:download_url:coreutils-8.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca22d06effd0c8bc506a7c57932d0ed08d7dbc75629a92264d67d34982f2b5b7
size 4726864

159
_service:set_version:coreutils.spec Normal file
View File

@ -0,0 +1,159 @@
#
# spec file for package coreutils (Version 8.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: coreutils
Summary: GNU Core Utilities
BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz
Url: http://www.gnu.org/software/coreutils/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.9
Release: 0
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
AutoReqProv: on
PreReq: %{install_info_prereq}
Recommends: %{name}-lang = %version
Requires: pam >= 1.1.1.90
Source: coreutils-%{version}.tar.xz
Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Source4: coreutils-8.9.de.po
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
Patch6: coreutils-i18n-infloop.patch
Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch
Patch20: coreutils-8.6-pam-support-for-su.diff
Patch21: coreutils-8.6-update-man-page-for-pam.diff
Patch22: coreutils-8.6-log-all-su-attempts.diff
Patch23: coreutils-8.6-set-sane-default-path.diff
Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff
Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
#
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
#PreReq: permissions
%description
Basic file, shell, and text manipulation utilities. The package
contains the following programs:
[ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp
csplit cut date dd df dir dircolors dirname du echo env expand expr
factor false fmt fold groups head id install join kill link ln logname
ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup od paste pathchk
pinky pr printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum
sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split
stat stty su sum sync tac tail tee test timeout touch tr true tsort tty
uname unexpand uniq unlink uptime users vdir wc who whoami yes
%lang_package
%prep
%setup -q
%patch4
%patch5
%patch6
%patch0
%patch1
%patch2
%patch8
%patch16
%patch20
%patch21
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
#
%patch30 -p1
%patch31
%patch32
cp %{S:4} po/de.po
%build
AUTOPOINT=true autoreconf -fi
export CFLAGS="%optflags -Wall"
%configure --without-included-regex \
--enable-install-program=arch,su \
gl_cv_func_printf_directive_n=yes \
gl_cv_func_isnanl_works=yes \
DEFAULT_POSIX2_VERSION=199209
make -C po update-po
make %{?_smp_mflags} V=1
%install
%makeinstall
test -f $RPM_BUILD_ROOT%{_bindir}/su || \
install src/su $RPM_BUILD_ROOT%{_bindir}/su
install -d $RPM_BUILD_ROOT/bin
for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum
do
mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT/bin/$i
test $i = su && echo -n '%%attr(4755,root,root) '
echo /bin/$i
done > bin.files
ln -sf ../../bin/{basename,sort,stat,touch,readlink,md5sum} $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d
install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su
install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su-l
install -d -m 755 $RPM_BUILD_ROOT/etc/default
install -m 644 $RPM_SOURCE_DIR/su.default $RPM_BUILD_ROOT/etc/default/su
echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
%find_lang %name
%post
%install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
# may fail if permissions is not there, but there is no way around that
%run_permissions
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
%verifyscript
%verify_permissions -e /bin/su
%clean
rm -rf $RPM_BUILD_ROOT
%files -f bin.files
%defattr(-,root,root)
%doc README NEWS
%config /etc/pam.d/su
%config /etc/pam.d/su-l
%config(noreplace) /etc/default/su
%{_bindir}/*
%{_libdir}/%{name}
%doc %{_infodir}/coreutils.info*.gz
%doc %{_mandir}/man1/*.1.gz
%dir %{_prefix}/share/locale/*/LC_TIME
%files lang -f %name.lang
%defattr(-,root,root)
%changelog

122
coreutils-8.6-i18n.patch
View File

@ -19,8 +19,8 @@
Index: lib/linebuffer.h Index: lib/linebuffer.h
=================================================================== ===================================================================
--- lib/linebuffer.h.orig 2010-06-10 18:45:26.000000000 +0200 --- lib/linebuffer.h.orig 2011-01-01 22:19:27.000000000 +0100
+++ lib/linebuffer.h 2010-11-11 16:26:25.524211797 +0100 +++ lib/linebuffer.h 2011-01-05 14:05:49.026494005 +0100
@@ -21,6 +21,11 @@ @@ -21,6 +21,11 @@
# include <stdio.h> # include <stdio.h>
@ -45,8 +45,8 @@ Index: lib/linebuffer.h
/* Initialize linebuffer LINEBUFFER for use. */ /* Initialize linebuffer LINEBUFFER for use. */
Index: src/cut.c Index: src/cut.c
=================================================================== ===================================================================
--- src/cut.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/cut.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/cut.c 2010-11-11 16:28:46.581137538 +0100 +++ src/cut.c 2011-01-05 14:05:49.027494034 +0100
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
#include <assert.h> #include <assert.h>
#include <getopt.h> #include <getopt.h>
@ -639,8 +639,8 @@ Index: src/cut.c
if (optind == argc) if (optind == argc)
Index: src/expand.c Index: src/expand.c
=================================================================== ===================================================================
--- src/expand.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/expand.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/expand.c 2010-11-11 16:26:25.580221695 +0100 +++ src/expand.c 2011-01-05 14:05:49.091495874 +0100
@@ -38,12 +38,29 @@ @@ -38,12 +38,29 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
@ -830,8 +830,8 @@ Index: src/expand.c
error (EXIT_FAILURE, errno, "-"); error (EXIT_FAILURE, errno, "-");
Index: src/fold.c Index: src/fold.c
=================================================================== ===================================================================
--- src/fold.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/fold.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/fold.c 2010-11-11 16:27:26.402969548 +0100 +++ src/fold.c 2011-01-05 14:05:49.116496593 +0100
@@ -22,12 +22,34 @@ @@ -22,12 +22,34 @@
#include <getopt.h> #include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
@ -961,7 +961,7 @@ Index: src/fold.c
- return false; - return false;
- } - }
fadvise (stdin, FADVISE_SEQUENTIAL); fadvise (istream, FADVISE_SEQUENTIAL);
@@ -171,6 +199,15 @@ fold_file (char const *filename, size_t @@ -171,6 +199,15 @@ fold_file (char const *filename, size_t
bool found_blank = false; bool found_blank = false;
@ -1232,8 +1232,8 @@ Index: src/fold.c
case 's': /* Break at word boundaries. */ case 's': /* Break at word boundaries. */
Index: src/join.c Index: src/join.c
=================================================================== ===================================================================
--- src/join.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/join.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/join.c 2010-11-11 16:29:37.838194915 +0100 +++ src/join.c 2011-01-05 14:05:49.157497772 +0100
@@ -22,18 +22,32 @@ @@ -22,18 +22,32 @@
#include <sys/types.h> #include <sys/types.h>
#include <getopt.h> #include <getopt.h>
@ -1718,8 +1718,8 @@ Index: src/join.c
case NOCHECK_ORDER_OPTION: case NOCHECK_ORDER_OPTION:
Index: src/pr.c Index: src/pr.c
=================================================================== ===================================================================
--- src/pr.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/pr.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/pr.c 2010-11-11 16:26:25.640232300 +0100 +++ src/pr.c 2011-01-05 14:05:49.170498145 +0100
@@ -312,6 +312,32 @@ @@ -312,6 +312,32 @@
#include <getopt.h> #include <getopt.h>
@ -2444,8 +2444,8 @@ Index: src/pr.c
Index: src/sort.c Index: src/sort.c
=================================================================== ===================================================================
--- src/sort.c.orig 2010-10-14 11:39:14.000000000 +0200 --- src/sort.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/sort.c 2010-11-11 16:26:54.553341480 +0100 +++ src/sort.c 2011-01-05 14:05:49.184498547 +0100
@@ -22,11 +22,20 @@ @@ -22,11 +22,20 @@
#include <config.h> #include <config.h>
@ -2467,7 +2467,7 @@ Index: src/sort.c
#include "system.h" #include "system.h"
#include "argmatch.h" #include "argmatch.h"
#include "error.h" #include "error.h"
@@ -159,12 +168,34 @@ static int thousands_sep; @@ -163,12 +172,34 @@ static int thousands_sep;
/* Nonzero if the corresponding locales are hard. */ /* Nonzero if the corresponding locales are hard. */
static bool hard_LC_COLLATE; static bool hard_LC_COLLATE;
@ -2503,7 +2503,7 @@ Index: src/sort.c
/* The kind of blanks for '-b' to skip in various options. */ /* The kind of blanks for '-b' to skip in various options. */
enum blanktype { bl_start, bl_end, bl_both }; enum blanktype { bl_start, bl_end, bl_both };
@@ -328,13 +359,11 @@ static bool reverse; @@ -335,13 +366,11 @@ static bool reverse;
they were read if all keys compare equal. */ they were read if all keys compare equal. */
static bool stable; static bool stable;
@ -2520,8 +2520,8 @@ Index: src/sort.c
/* Flag to remove consecutive duplicate lines from the output. /* Flag to remove consecutive duplicate lines from the output.
Only the last of a sequence of equal lines will be output. */ Only the last of a sequence of equal lines will be output. */
@@ -782,6 +811,46 @@ reap_some (void) @@ -775,6 +804,46 @@ reap_all (void)
update_proc (pid); reap (-1);
} }
+/* Function pointers. */ +/* Function pointers. */
@ -2567,7 +2567,7 @@ Index: src/sort.c
/* Clean up any remaining temporary files. */ /* Clean up any remaining temporary files. */
static void static void
@@ -1205,7 +1274,7 @@ zaptemp (char const *name) @@ -1207,7 +1276,7 @@ zaptemp (char const *name)
free (node); free (node);
} }
@ -2576,7 +2576,7 @@ Index: src/sort.c
static int static int
struct_month_cmp (void const *m1, void const *m2) struct_month_cmp (void const *m1, void const *m2)
@@ -1220,7 +1289,7 @@ struct_month_cmp (void const *m1, void c @@ -1222,7 +1291,7 @@ struct_month_cmp (void const *m1, void c
/* Initialize the character class tables. */ /* Initialize the character class tables. */
static void static void
@ -2585,7 +2585,7 @@ Index: src/sort.c
{ {
size_t i; size_t i;
@@ -1232,7 +1301,7 @@ inittables (void) @@ -1234,7 +1303,7 @@ inittables (void)
fold_toupper[i] = toupper (i); fold_toupper[i] = toupper (i);
} }
@ -2594,7 +2594,7 @@ Index: src/sort.c
/* If we're not in the "C" locale, read different names for months. */ /* If we're not in the "C" locale, read different names for months. */
if (hard_LC_TIME) if (hard_LC_TIME)
{ {
@@ -1314,6 +1383,84 @@ specify_nmerge (int oi, char c, char con @@ -1316,6 +1385,84 @@ specify_nmerge (int oi, char c, char con
xstrtol_fatal (e, oi, c, long_options, s); xstrtol_fatal (e, oi, c, long_options, s);
} }
@ -2679,7 +2679,7 @@ Index: src/sort.c
/* Specify the amount of main memory to use when sorting. */ /* Specify the amount of main memory to use when sorting. */
static void static void
specify_sort_size (int oi, char c, char const *s) specify_sort_size (int oi, char c, char const *s)
@@ -1540,7 +1687,7 @@ buffer_linelim (struct buffer const *buf @@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf
by KEY in LINE. */ by KEY in LINE. */
static char * static char *
@ -2688,7 +2688,7 @@ Index: src/sort.c
{ {
char *ptr = line->text, *lim = ptr + line->length - 1; char *ptr = line->text, *lim = ptr + line->length - 1;
size_t sword = key->sword; size_t sword = key->sword;
@@ -1549,10 +1696,10 @@ begfield (struct line const *line, struc @@ -1553,10 +1700,10 @@ begfield (struct line const *line, struc
/* The leading field separator itself is included in a field when -t /* The leading field separator itself is included in a field when -t
is absent. */ is absent. */
@ -2701,7 +2701,7 @@ Index: src/sort.c
++ptr; ++ptr;
if (ptr < lim) if (ptr < lim)
++ptr; ++ptr;
@@ -1578,11 +1725,70 @@ begfield (struct line const *line, struc @@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc
return ptr; return ptr;
} }
@ -2773,7 +2773,7 @@ Index: src/sort.c
{ {
char *ptr = line->text, *lim = ptr + line->length - 1; char *ptr = line->text, *lim = ptr + line->length - 1;
size_t eword = key->eword, echar = key->echar; size_t eword = key->eword, echar = key->echar;
@@ -1597,10 +1803,10 @@ limfield (struct line const *line, struc @@ -1601,10 +1807,10 @@ limfield (struct line const *line, struc
`beginning' is the first character following the delimiting TAB. `beginning' is the first character following the delimiting TAB.
Otherwise, leave PTR pointing at the first `blank' character after Otherwise, leave PTR pointing at the first `blank' character after
the preceding field. */ the preceding field. */
@ -2786,7 +2786,7 @@ Index: src/sort.c
++ptr; ++ptr;
if (ptr < lim && (eword || echar)) if (ptr < lim && (eword || echar))
++ptr; ++ptr;
@@ -1646,10 +1852,10 @@ limfield (struct line const *line, struc @@ -1650,10 +1856,10 @@ limfield (struct line const *line, struc
*/ */
/* Make LIM point to the end of (one byte past) the current field. */ /* Make LIM point to the end of (one byte past) the current field. */
@ -2799,7 +2799,7 @@ Index: src/sort.c
if (newlim) if (newlim)
lim = newlim; lim = newlim;
} }
@@ -1680,6 +1886,130 @@ limfield (struct line const *line, struc @@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc
return ptr; return ptr;
} }
@ -2930,7 +2930,7 @@ Index: src/sort.c
/* Fill BUF reading from FP, moving buf->left bytes from the end /* Fill BUF reading from FP, moving buf->left bytes from the end
of buf->buf to the beginning first. If EOF is reached and the of buf->buf to the beginning first. If EOF is reached and the
file wasn't terminated by a newline, supply one. Set up BUF's line file wasn't terminated by a newline, supply one. Set up BUF's line
@@ -1766,8 +2096,22 @@ fillbuf (struct buffer *buf, FILE *fp, c @@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
else else
{ {
if (key->skipsblanks) if (key->skipsblanks)
@ -2955,7 +2955,7 @@ Index: src/sort.c
line->keybeg = line_start; line->keybeg = line_start;
} }
} }
@@ -1888,7 +2232,7 @@ human_numcompare (char const *a, char co @@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co
hideously fast. */ hideously fast. */
static int static int
@ -2964,7 +2964,7 @@ Index: src/sort.c
{ {
while (blanks[to_uchar (*a)]) while (blanks[to_uchar (*a)])
a++; a++;
@@ -1898,6 +2242,25 @@ numcompare (char const *a, char const *b @@ -1902,6 +2246,25 @@ numcompare (char const *a, char const *b
return strnumcmp (a, b, decimal_point, thousands_sep); return strnumcmp (a, b, decimal_point, thousands_sep);
} }
@ -2990,7 +2990,7 @@ Index: src/sort.c
static int static int
general_numcompare (char const *sa, char const *sb) general_numcompare (char const *sa, char const *sb)
{ {
@@ -1930,7 +2293,7 @@ general_numcompare (char const *sa, char @@ -1934,7 +2297,7 @@ general_numcompare (char const *sa, char
Return 0 if the name in S is not recognized. */ Return 0 if the name in S is not recognized. */
static int static int
@ -2999,9 +2999,9 @@ Index: src/sort.c
{ {
size_t lo = 0; size_t lo = 0;
size_t hi = MONTHS_PER_YEAR; size_t hi = MONTHS_PER_YEAR;
@@ -2204,13 +2567,12 @@ debug_key (struct line const *line, stru @@ -2209,13 +2572,12 @@ debug_key (struct line const *line, stru
{ char saved = *lim;
char saved = *lim; *lim = '\0'; *lim = '\0';
- while (blanks[to_uchar (*beg)]) - while (blanks[to_uchar (*beg)])
- beg++; - beg++;
@ -3015,7 +3015,7 @@ Index: src/sort.c
else if (key->general_numeric) else if (key->general_numeric)
ignore_value (strtold (beg, &tighter_lim)); ignore_value (strtold (beg, &tighter_lim));
else if (key->numeric || key->human_numeric) else if (key->numeric || key->human_numeric)
@@ -2354,7 +2716,7 @@ key_warnings (struct keyfield const *gke @@ -2359,7 +2721,7 @@ key_warnings (struct keyfield const *gke
bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key)
&& !(key->schar || key->echar); && !(key->schar || key->echar);
bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */
@ -3024,7 +3024,7 @@ Index: src/sort.c
&& ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned))
|| (!key->skipsblanks && key->schar) || (!key->skipsblanks && key->schar)
|| (!key->skipeblanks && key->echar))) || (!key->skipeblanks && key->echar)))
@@ -2412,11 +2774,83 @@ key_warnings (struct keyfield const *gke @@ -2417,11 +2779,83 @@ key_warnings (struct keyfield const *gke
error (0, 0, _("option `-r' only applies to last-resort comparison")); error (0, 0, _("option `-r' only applies to last-resort comparison"));
} }
@ -3109,7 +3109,7 @@ Index: src/sort.c
{ {
struct keyfield *key = keylist; struct keyfield *key = keylist;
@@ -2501,7 +2935,7 @@ keycompare (struct line const *a, struct @@ -2506,7 +2940,7 @@ keycompare (struct line const *a, struct
else if (key->human_numeric) else if (key->human_numeric)
diff = human_numcompare (ta, tb); diff = human_numcompare (ta, tb);
else if (key->month) else if (key->month)
@ -3118,7 +3118,7 @@ Index: src/sort.c
else if (key->random) else if (key->random)
diff = compare_random (ta, tlena, tb, tlenb); diff = compare_random (ta, tlena, tb, tlenb);
else if (key->version) else if (key->version)
@@ -2617,6 +3051,179 @@ keycompare (struct line const *a, struct @@ -2622,6 +3056,179 @@ keycompare (struct line const *a, struct
return key->reverse ? -diff : diff; return key->reverse ? -diff : diff;
} }
@ -3298,7 +3298,7 @@ Index: src/sort.c
/* Compare two lines A and B, returning negative, zero, or positive /* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */ depending on whether A compares less than, equal to, or greater than B. */
@@ -4006,7 +4613,7 @@ main (int argc, char **argv) @@ -4084,7 +4691,7 @@ main (int argc, char **argv)
initialize_exit_failure (SORT_FAILURE); initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE); hard_LC_COLLATE = hard_locale (LC_COLLATE);
@ -3307,7 +3307,7 @@ Index: src/sort.c
hard_LC_TIME = hard_locale (LC_TIME); hard_LC_TIME = hard_locale (LC_TIME);
#endif #endif
@@ -4027,6 +4634,29 @@ main (int argc, char **argv) @@ -4105,6 +4712,29 @@ main (int argc, char **argv)
thousands_sep = -1; thousands_sep = -1;
} }
@ -3337,7 +3337,7 @@ Index: src/sort.c
have_read_stdin = false; have_read_stdin = false;
inittables (); inittables ();
@@ -4297,13 +4927,34 @@ main (int argc, char **argv) @@ -4375,13 +5005,34 @@ main (int argc, char **argv)
case 't': case 't':
{ {
@ -3376,7 +3376,7 @@ Index: src/sort.c
else else
{ {
/* Provoke with `sort -txx'. Complain about /* Provoke with `sort -txx'. Complain about
@@ -4314,9 +4965,12 @@ main (int argc, char **argv) @@ -4392,9 +5043,12 @@ main (int argc, char **argv)
quote (optarg)); quote (optarg));
} }
} }
@ -3393,8 +3393,8 @@ Index: src/sort.c
Index: src/unexpand.c Index: src/unexpand.c
=================================================================== ===================================================================
--- src/unexpand.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/unexpand.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/unexpand.c 2010-11-11 16:26:25.692241489 +0100 +++ src/unexpand.c 2011-01-05 14:05:49.249500416 +0100
@@ -39,12 +39,29 @@ @@ -39,12 +39,29 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
@ -3650,8 +3650,8 @@ Index: src/unexpand.c
error (EXIT_FAILURE, errno, "-"); error (EXIT_FAILURE, errno, "-");
Index: src/uniq.c Index: src/uniq.c
=================================================================== ===================================================================
--- src/uniq.c.orig 2010-10-11 19:35:11.000000000 +0200 --- src/uniq.c.orig 2011-01-01 22:19:23.000000000 +0100
+++ src/uniq.c 2010-11-11 16:29:55.653342929 +0100 +++ src/uniq.c 2011-01-05 14:05:49.291501624 +0100
@@ -21,6 +21,16 @@ @@ -21,6 +21,16 @@
#include <getopt.h> #include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
@ -4021,9 +4021,9 @@ Index: src/uniq.c
check_chars = SIZE_MAX; check_chars = SIZE_MAX;
Index: tests/Makefile.am Index: tests/Makefile.am
=================================================================== ===================================================================
--- tests/Makefile.am.orig 2010-10-12 13:13:20.000000000 +0200 --- tests/Makefile.am.orig 2010-12-17 07:35:51.000000000 +0100
+++ tests/Makefile.am 2010-11-11 16:26:25.772255629 +0100 +++ tests/Makefile.am 2011-01-05 14:05:49.316502343 +0100
@@ -230,6 +230,7 @@ TESTS = \ @@ -234,6 +234,7 @@ TESTS = \
misc/sort-debug-keys \ misc/sort-debug-keys \
misc/sort-debug-warn \ misc/sort-debug-warn \
misc/sort-files0-from \ misc/sort-files0-from \
@ -4031,7 +4031,7 @@ Index: tests/Makefile.am
misc/sort-float \ misc/sort-float \
misc/sort-merge \ misc/sort-merge \
misc/sort-merge-fdlimit \ misc/sort-merge-fdlimit \
@@ -486,6 +487,10 @@ TESTS = \ @@ -498,6 +499,10 @@ TESTS = \
$(root_tests) $(root_tests)
pr_data = \ pr_data = \
@ -4044,8 +4044,8 @@ Index: tests/Makefile.am
pr/0FFnt \ pr/0FFnt \
Index: tests/misc/cut Index: tests/misc/cut
=================================================================== ===================================================================
--- tests/misc/cut.orig 2010-10-11 19:35:11.000000000 +0200 --- tests/misc/cut.orig 2011-01-01 22:19:23.000000000 +0100
+++ tests/misc/cut 2010-11-11 16:26:25.796259871 +0100 +++ tests/misc/cut 2011-01-05 14:06:41.365998730 +0100
@@ -26,7 +26,7 @@ use strict; @@ -26,7 +26,7 @@ use strict;
my $prog = 'cut'; my $prog = 'cut';
my $try = "Try \`$prog --help' for more information.\n"; my $try = "Try \`$prog --help' for more information.\n";
@ -4055,7 +4055,7 @@ Index: tests/misc/cut
my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
my @Tests = my @Tests =
@@ -141,7 +141,7 @@ my @Tests = @@ -143,7 +143,7 @@ my @Tests =
# None of the following invalid ranges provoked an error up to coreutils-6.9. # None of the following invalid ranges provoked an error up to coreutils-6.9.
['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
@ -4063,11 +4063,11 @@ Index: tests/misc/cut
+ {ERR=>"$prog: invalid byte, character or field list\n$try"}], + {ERR=>"$prog: invalid byte, character or field list\n$try"}],
['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
['inval3', '-f', '4,-', {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}], ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
Index: tests/misc/mb1.I Index: tests/misc/mb1.I
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tests/misc/mb1.I 2010-11-11 16:26:25.828265527 +0100 +++ tests/misc/mb1.I 2011-01-05 14:05:49.384504297 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+Apple＠10 +Apple＠10
+Banana＠5 +Banana＠5
@ -4076,7 +4076,7 @@ Index: tests/misc/mb1.I
Index: tests/misc/mb1.X Index: tests/misc/mb1.X
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tests/misc/mb1.X 2010-11-11 16:26:25.860271180 +0100 +++ tests/misc/mb1.X 2011-01-05 14:05:49.425505477 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+Banana＠5 +Banana＠5
+Apple＠10 +Apple＠10
@ -4085,7 +4085,7 @@ Index: tests/misc/mb1.X
Index: tests/misc/mb2.I Index: tests/misc/mb2.I
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tests/misc/mb2.I 2010-11-11 16:26:25.896277545 +0100 +++ tests/misc/mb2.I 2011-01-05 14:05:49.451506224 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+Apple＠ＡＡ10＠＠20 +Apple＠ＡＡ10＠＠20
+Banana＠ＡＡ5＠＠30 +Banana＠ＡＡ5＠＠30
@ -4094,7 +4094,7 @@ Index: tests/misc/mb2.I
Index: tests/misc/mb2.X Index: tests/misc/mb2.X
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tests/misc/mb2.X 2010-11-11 16:26:25.924282493 +0100 +++ tests/misc/mb2.X 2011-01-05 14:05:49.476506942 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+Citrus＠ＡＡ20＠＠5 +Citrus＠ＡＡ20＠＠5
+Cherry＠ＡＡ30＠＠10 +Cherry＠ＡＡ30＠＠10
@ -4103,7 +4103,7 @@ Index: tests/misc/mb2.X
Index: tests/misc/sort-mb-tests Index: tests/misc/sort-mb-tests
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tests/misc/sort-mb-tests 2010-11-11 16:26:25.952287441 +0100 +++ tests/misc/sort-mb-tests 2011-01-05 14:05:49.518508150 +0100
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
+#! /bin/sh +#! /bin/sh
+case $# in +case $# in

37
coreutils-8.6-pam-support-for-su.diff
View File

@ -9,11 +9,11 @@ Subject: [PATCH 1/7] pam support for su
src/su.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/su.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 278 insertions(+), 6 deletions(-) 3 files changed, 278 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac Index: configure.ac
index 4ac30e8..eacd57f 100644 ===================================================================
--- a/configure.ac --- configure.ac.orig 2011-01-03 13:27:37.268088087 +0100
+++ b/configure.ac +++ configure.ac 2011-01-03 13:28:05.256895209 +0100
@@ -135,6 +135,20 @@ fi @@ -134,6 +134,20 @@ fi
AC_FUNC_FORK AC_FUNC_FORK
@ -34,10 +34,10 @@ index 4ac30e8..eacd57f 100644
optional_bin_progs= optional_bin_progs=
AC_CHECK_FUNCS([chroot], AC_CHECK_FUNCS([chroot],
gl_ADD_PROG([optional_bin_progs], [chroot])) gl_ADD_PROG([optional_bin_progs], [chroot]))
diff --git a/src/Makefile.am b/src/Makefile.am Index: src/Makefile.am
index 00c7ff7..bc27274 100644 ===================================================================
--- a/src/Makefile.am --- src/Makefile.am.orig 2011-01-03 13:27:37.268088087 +0100
+++ b/src/Makefile.am +++ src/Makefile.am 2011-01-03 13:28:16.038206110 +0100
@@ -351,8 +351,8 @@ factor_LDADD += $(LIB_GMP) @@ -351,8 +351,8 @@ factor_LDADD += $(LIB_GMP)
# for getloadavg # for getloadavg
uptime_LDADD += $(GETLOADAVG_LIBS) uptime_LDADD += $(GETLOADAVG_LIBS)
@ -49,10 +49,10 @@ index 00c7ff7..bc27274 100644
# for various ACL functions # for various ACL functions
copy_LDADD += $(LIB_ACL) copy_LDADD += $(LIB_ACL)
diff --git a/src/su.c b/src/su.c Index: src/su.c
index f8f5b61..1d3d007 100644 ===================================================================
--- a/src/su.c --- src/su.c.orig 2011-01-03 13:27:37.268088087 +0100
+++ b/src/su.c +++ src/su.c 2011-01-03 13:28:16.177210120 +0100
@@ -37,6 +37,16 @@ @@ -37,6 +37,16 @@
restricts who can su to UID 0 accounts. RMS considers that to restricts who can su to UID 0 accounts. RMS considers that to
be fascist. be fascist.
@ -106,7 +106,7 @@ index f8f5b61..1d3d007 100644
static struct option const longopts[] = static struct option const longopts[] =
{ {
{"command", required_argument, NULL, 'c'}, {"command", required_argument, NULL, 'c'},
@@ -200,7 +224,164 @@ log_su (struct passwd const *pw, bool successful) @@ -200,7 +224,164 @@ log_su (struct passwd const *pw, bool su
} }
#endif #endif
@ -271,7 +271,7 @@ index f8f5b61..1d3d007 100644
Return true if the user gives the correct password for entry PW, Return true if the user gives the correct password for entry PW,
false if not. Return true without asking for a password if run by UID 0 false if not. Return true without asking for a password if run by UID 0
or if PW has an empty password. */ or if PW has an empty password. */
@@ -208,10 +389,52 @@ log_su (struct passwd const *pw, bool successful) @@ -208,10 +389,52 @@ log_su (struct passwd const *pw, bool su
static bool static bool
correct_password (const struct passwd *pw) correct_password (const struct passwd *pw)
{ {
@ -325,7 +325,7 @@ index f8f5b61..1d3d007 100644
endspent (); endspent ();
if (sp) if (sp)
@@ -232,6 +455,7 @@ correct_password (const struct passwd *pw) @@ -232,6 +455,7 @@ correct_password (const struct passwd *p
encrypted = crypt (unencrypted, correct); encrypted = crypt (unencrypted, correct);
memset (unencrypted, 0, strlen (unencrypted)); memset (unencrypted, 0, strlen (unencrypted));
return STREQ (encrypted, correct); return STREQ (encrypted, correct);
@ -333,7 +333,7 @@ index f8f5b61..1d3d007 100644
} }
/* Update `environ' for the new shell based on PW, with SHELL being /* Update `environ' for the new shell based on PW, with SHELL being
@@ -274,19 +498,41 @@ modify_environment (const struct passwd *pw, const char *shell) @@ -274,19 +498,41 @@ modify_environment (const struct passwd
} }
} }
} }
@ -400,6 +400,3 @@ index f8f5b61..1d3d007 100644
if (simulate_login && chdir (pw->pw_dir) != 0) if (simulate_login && chdir (pw->pw_dir) != 0)
error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
--
1.7.1

15
coreutils-8.6-update-man-page-for-pam.diff
View File

@ -7,11 +7,11 @@ Subject: [PATCH 2/7] update man page for pam
doc/coreutils.texi | 34 +++++----------------------------- doc/coreutils.texi | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-) 1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/doc/coreutils.texi b/doc/coreutils.texi Index: doc/coreutils.texi
index 4d17ed1..27681da 100644 ===================================================================
--- a/doc/coreutils.texi --- doc/coreutils.texi.orig 2011-01-05 14:27:40.715232991 +0100
+++ b/doc/coreutils.texi +++ doc/coreutils.texi 2011-01-05 14:27:41.929267939 +0100
@@ -15172,8 +15172,11 @@ to certain shells, etc.). @@ -15290,8 +15290,11 @@ to certain shells, etc.).
@findex syslog @findex syslog
@command{su} can optionally be compiled to use @code{syslog} to report @command{su} can optionally be compiled to use @code{syslog} to report
failed, and optionally successful, @command{su} attempts. (If the system failed, and optionally successful, @command{su} attempts. (If the system
@ -25,7 +25,7 @@ index 4d17ed1..27681da 100644
The program accepts the following options. Also see @ref{Common options}. The program accepts the following options. Also see @ref{Common options}.
@@ -15254,33 +15257,6 @@ Exit status: @@ -15372,33 +15375,6 @@ Exit status:
the exit status of the subshell otherwise the exit status of the subshell otherwise
@end display @end display
@ -59,6 +59,3 @@ index 4d17ed1..27681da 100644
@node timeout invocation @node timeout invocation
@section @command{timeout}: Run a command with a time limit @section @command{timeout}: Run a command with a time limit
--
1.7.1

3
coreutils-8.6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78355c37dfeb9d2df1413caee5832d3ac561d1c54debee3fbfc9afbd87f5ed41
size 4662112

12475
coreutils-8.9.de.po Normal file
View File

File diff suppressed because it is too large Load Diff

12
coreutils-gl_printf_safe.patch
View File

@ -1,8 +1,8 @@
Index: configure Index: configure
=================================================================== ===================================================================
--- configure.orig 2010-10-15 16:51:34.000000000 +0200 --- configure.orig 2011-01-04 12:23:03.000000000 +0100
+++ configure 2010-11-11 15:41:45.854686621 +0100 +++ configure 2011-01-05 14:27:40.804235553 +0100
@@ -3399,7 +3399,6 @@ as_fn_append ac_func_list " alarm" @@ -3423,7 +3423,6 @@ as_fn_append ac_func_list " alarm"
as_fn_append ac_header_list " sys/statvfs.h" as_fn_append ac_header_list " sys/statvfs.h"
as_fn_append ac_header_list " sys/select.h" as_fn_append ac_header_list " sys/select.h"
as_fn_append ac_func_list " nl_langinfo" as_fn_append ac_func_list " nl_langinfo"
@ -12,9 +12,9 @@ Index: configure
as_fn_append ac_func_list " readlinkat" as_fn_append ac_func_list " readlinkat"
Index: m4/gnulib-comp.m4 Index: m4/gnulib-comp.m4
=================================================================== ===================================================================
--- m4/gnulib-comp.m4.orig 2010-10-06 00:44:51.000000000 +0200 --- m4/gnulib-comp.m4.orig 2011-01-01 22:23:14.000000000 +0100
+++ m4/gnulib-comp.m4 2010-11-11 15:40:57.318112527 +0100 +++ m4/gnulib-comp.m4 2011-01-05 14:27:40.806235609 +0100
@@ -1181,7 +1181,6 @@ AC_DEFUN([gl_INIT], @@ -1190,7 +1190,6 @@ AC_DEFUN([gl_INIT],
# Code from module printf-frexpl: # Code from module printf-frexpl:
gl_FUNC_PRINTF_FREXPL gl_FUNC_PRINTF_FREXPL
# Code from module printf-safe: # Code from module printf-safe:

6
coreutils-i18n-infloop.patch
View File

@ -1,8 +1,8 @@
Index: src/sort.c Index: src/sort.c
=================================================================== ===================================================================
--- src/sort.c.orig 2010-11-11 16:30:21.993997426 +0100 --- src/sort.c.orig 2011-01-05 14:27:40.227218942 +0100
+++ src/sort.c 2010-11-11 16:30:39.685123508 +0100 +++ src/sort.c 2011-01-05 14:27:40.574228931 +0100
@@ -3129,7 +3129,8 @@ keycompare_mb (const struct line *a, con @@ -3134,7 +3134,8 @@ keycompare_mb (const struct line *a, con
if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \
STATE = state_bak; \ STATE = state_bak; \
if (!ignore) \ if (!ignore) \

22
coreutils-8.6.patch → coreutils-misc.patch
View File

@ -1,8 +1,8 @@
Index: gnulib-tests/test-isnanl.h Index: gnulib-tests/test-isnanl.h
=================================================================== ===================================================================
--- gnulib-tests/test-isnanl.h.orig 2010-11-11 16:30:21.945988942 +0100 --- gnulib-tests/test-isnanl.h.orig 2010-11-27 16:11:07.000000000 +0100
+++ gnulib-tests/test-isnanl.h 2010-11-11 16:30:46.330297732 +0100 +++ gnulib-tests/test-isnanl.h 2011-01-03 13:26:31.990205613 +0100
@@ -63,7 +63,7 @@ main () @@ -48,7 +48,7 @@ main ()
/* Quiet NaN. */ /* Quiet NaN. */
ASSERT (isnanl (NaNl ())); ASSERT (isnanl (NaNl ()));
@ -11,7 +11,7 @@ Index: gnulib-tests/test-isnanl.h
/* A bit pattern that is different from a Quiet NaN. With a bit of luck, /* A bit pattern that is different from a Quiet NaN. With a bit of luck,
it's a Signalling NaN. */ it's a Signalling NaN. */
{ {
@@ -105,6 +105,7 @@ main () @@ -90,6 +90,7 @@ main ()
{ LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) }; { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
ASSERT (isnanl (x.value)); ASSERT (isnanl (x.value));
} }
@ -19,7 +19,7 @@ Index: gnulib-tests/test-isnanl.h
/* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities,
Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in
Intel IA-64 Architecture Software Developer's Manual, Volume 1: Intel IA-64 Architecture Software Developer's Manual, Volume 1:
@@ -138,6 +139,7 @@ main () @@ -123,6 +124,7 @@ main ()
ASSERT (isnanl (x.value)); ASSERT (isnanl (x.value));
} }
#endif #endif
@ -29,8 +29,8 @@ Index: gnulib-tests/test-isnanl.h
} }
Index: src/system.h Index: src/system.h
=================================================================== ===================================================================
--- src/system.h.orig 2010-11-11 16:30:21.945988942 +0100 --- src/system.h.orig 2010-07-07 12:08:06.000000000 +0200
+++ src/system.h 2010-11-11 16:30:46.334298438 +0100 +++ src/system.h 2011-01-03 13:26:32.043207142 +0100
@@ -138,7 +138,7 @@ enum @@ -138,7 +138,7 @@ enum
# define DEV_BSIZE BBSIZE # define DEV_BSIZE BBSIZE
#endif #endif
@ -42,8 +42,8 @@ Index: src/system.h
/* Extract or fake data from a `struct stat'. /* Extract or fake data from a `struct stat'.
Index: tests/misc/help-version Index: tests/misc/help-version
=================================================================== ===================================================================
--- tests/misc/help-version.orig 2010-11-11 16:30:21.945988942 +0100 --- tests/misc/help-version.orig 2010-05-31 10:21:14.000000000 +0200
+++ tests/misc/help-version 2010-11-11 16:30:46.382306922 +0100 +++ tests/misc/help-version 2011-01-03 13:26:32.068207863 +0100
@@ -250,6 +250,7 @@ parted_setup () { args="-s $tmp_in mklab @@ -250,6 +250,7 @@ parted_setup () { args="-s $tmp_in mklab
for i in $built_programs; do for i in $built_programs; do
# Skip these. # Skip these.
@ -54,8 +54,8 @@ Index: tests/misc/help-version
echo z |gzip > $zin echo z |gzip > $zin
Index: tests/other-fs-tmpdir Index: tests/other-fs-tmpdir
=================================================================== ===================================================================
--- tests/other-fs-tmpdir.orig 2010-11-11 16:30:21.945988942 +0100 --- tests/other-fs-tmpdir.orig 2010-01-01 14:06:47.000000000 +0100
+++ tests/other-fs-tmpdir 2010-11-11 16:30:46.418313284 +0100 +++ tests/other-fs-tmpdir 2011-01-03 13:26:32.109209046 +0100
@@ -43,6 +43,8 @@ for d in $CANDIDATE_TMP_DIRS; do @@ -43,6 +43,8 @@ for d in $CANDIDATE_TMP_DIRS; do
fi fi

18
coreutils-no_hostname_and_hostid.patch
View File

@ -1,7 +1,7 @@
Index: doc/coreutils.texi Index: doc/coreutils.texi
=================================================================== ===================================================================
--- doc/coreutils.texi.orig 2010-11-11 16:30:59.012538722 +0100 --- doc/coreutils.texi.orig 2011-01-01 22:19:23.000000000 +0100
+++ doc/coreutils.texi 2010-11-11 16:31:03.953411789 +0100 +++ doc/coreutils.texi 2011-01-05 14:28:30.410663582 +0100
@@ -65,8 +65,6 @@ @@ -65,8 +65,6 @@
* fold: (coreutils)fold invocation. Wrap long input lines. * fold: (coreutils)fold invocation. Wrap long input lines.
* groups: (coreutils)groups invocation. Print group names a user is in. * groups: (coreutils)groups invocation. Print group names a user is in.
@ -29,7 +29,7 @@ Index: doc/coreutils.texi
* uptime invocation:: Print system uptime and load * uptime invocation:: Print system uptime and load
@command{date}: Print or set system date and time @command{date}: Print or set system date and time
@@ -13514,8 +13510,6 @@ information. @@ -13683,8 +13679,6 @@ information.
* arch invocation:: Print machine hardware name. * arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors. * nproc invocation:: Print the number of processors.
* uname invocation:: Print system information. * uname invocation:: Print system information.
@ -38,7 +38,7 @@ Index: doc/coreutils.texi
* uptime invocation:: Print system uptime and load. * uptime invocation:: Print system uptime and load.
@end menu @end menu
@@ -14337,55 +14331,6 @@ Print the kernel version. @@ -14507,55 +14501,6 @@ Print the kernel version.
@exitstatus @exitstatus
@ -96,8 +96,8 @@ Index: doc/coreutils.texi
Index: man/Makefile.am Index: man/Makefile.am
=================================================================== ===================================================================
--- man/Makefile.am.orig 2010-11-11 16:30:59.012538722 +0100 --- man/Makefile.am.orig 2011-01-01 22:19:23.000000000 +0100
+++ man/Makefile.am 2010-11-11 16:31:03.953411789 +0100 +++ man/Makefile.am 2011-01-05 14:27:40.742233767 +0100
@@ -197,7 +197,7 @@ check-x-vs-1: @@ -197,7 +197,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \ t=$@-t; \
@ -109,9 +109,9 @@ Index: man/Makefile.am
rm $$t rm $$t
Index: man/Makefile.in Index: man/Makefile.in
=================================================================== ===================================================================
--- man/Makefile.in.orig 2010-11-11 16:30:59.012538722 +0100 --- man/Makefile.in.orig 2011-01-04 12:23:07.000000000 +0100
+++ man/Makefile.in 2010-11-11 16:31:16.511630860 +0100 +++ man/Makefile.in 2011-01-05 14:27:40.768234515 +0100
@@ -1614,7 +1614,7 @@ check-x-vs-1: @@ -1641,7 +1641,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \ t=$@-t; \
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\

95
coreutils-split_suffix.patch Normal file
View File

@ -0,0 +1,95 @@
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Thu, 30 Dec 2010 01:36:59 +0000
Subject: [PATCH] split: fix the suffix length calculation
* src/split.c (set_suffix_length): Only auto calculate
the suffix length when the number of files is specified.
* tests/misc/split-a: Add a case to trigger the bug.
* NEWS: Mention the fix.
---
NEWS | 6 ++++++
src/split.c | 32 ++++++++++++++++++++------------
tests/misc/split-a | 5 +++++
3 files changed, 31 insertions(+), 12 deletions(-)
--- src/split.c
+++ src/split.c
@@ -78,6 +78,13 @@ static bool elide_empty_files;
input to output, which is much slower, so disabled by default. */
static bool unbuffered;
+/* The split mode to use. */
+enum Split_type
+{
+ type_undef, type_bytes, type_byteslines, type_lines, type_digits,
+ type_chunk_bytes, type_chunk_lines, type_rr
+};
+
/* For long options that have no equivalent short option, use a
non-character as a pseudo short option, starting with CHAR_MAX + 1. */
enum
@@ -105,16 +112,21 @@ static struct option const longopts[] =
};
static void
-set_suffix_length (uintmax_t n_units)
+set_suffix_length (uintmax_t n_units, enum Split_type split_type)
{
#define DEFAULT_SUFFIX_LENGTH 2
size_t suffix_needed = 0;
- size_t alphabet_len = strlen (suffix_alphabet);
- bool alphabet_slop = (n_units % alphabet_len) != 0;
- while (n_units /= alphabet_len)
- suffix_needed++;
- suffix_needed += alphabet_slop;
+
+ if (split_type == type_chunk_bytes || split_type == type_chunk_lines
+ || split_type == type_rr)
+ {
+ size_t alphabet_len = strlen (suffix_alphabet);
+ bool alphabet_slop = (n_units % alphabet_len) != 0;
+ while (n_units /= alphabet_len)
+ suffix_needed++;
+ suffix_needed += alphabet_slop;
+ }
if (suffix_length) /* set by user */
{
@@ -780,11 +792,7 @@ int
main (int argc, char **argv)
{
struct stat stat_buf;
- enum
- {
- type_undef, type_bytes, type_byteslines, type_lines, type_digits,
- type_chunk_bytes, type_chunk_lines, type_rr
- } split_type = type_undef;
+ enum Split_type split_type = type_undef;
size_t in_blk_size = 0; /* optimal block size of input file device */
char *buf; /* file i/o buffer */
size_t page_size = getpagesize ();
@@ -984,7 +992,7 @@ main (int argc, char **argv)
usage (EXIT_FAILURE);
}
- set_suffix_length (n_units);
+ set_suffix_length (n_units, split_type);
/* Get out the filename arguments. */
--- tests/misc/split-a
+++ tests/misc/split-a
@@ -63,4 +63,9 @@ for f in $files; do
n=$(expr $n + 1)
done
+# Ensure that -a is independent of -[bCl]
+split -a2 -b1000 < /dev/null || fail=1
+split -a2 -l1000 < /dev/null || fail=1
+split -a2 -C1000 < /dev/null || fail=1
+
Exit $fail
--
1.7.3.4

82
coreutils.changes
View File

@ -1,3 +1,85 @@
-------------------------------------------------------------------
Wed Jan 5 14:25:16 CET 2011 - pth@suse.de
- Update to 8.9:
Bug fixes
split no longer creates files with a suffix length that
is dependent on the number of bytes or lines per file.
[bug introduced in coreutils-8.8]
-------------------------------------------------------------------
Mon Jan 3 19:32:57 CET 2011 - pth@suse.de
- Update to 8.8. Changes since 8.6:
Bug fixes:
cp -u no longer does unnecessary copying merely because the source
has finer-grained time stamps than the destination.
od now prints floating-point numbers without losing information, and
it no longer omits spaces between floating-point columns in some cases.
sort -u with at least two threads could attempt to read through a
corrupted pointer. [bug introduced in coreutils-8.6]
sort with at least two threads and with blocked output would busy-loop
(spinlock) all threads, often using 100% of available CPU cycles to
do no work. I.e., "sort < big-file | less" could waste a lot of power.
[bug introduced in coreutils-8.6]
sort with at least two threads no longer segfaults due to use of pointers
into the stack of an expired thread. [bug introduced in coreutils-8.6]
sort --compress no longer mishandles subprocesses' exit statuses,
no longer hangs indefinitely due to a bug in waiting for subprocesses,
and no longer generates many more than NMERGE subprocesses.
sort -m -o f f ... f no longer dumps core when file descriptors are limited.
csplit no longer corrupts heap when writing more than 999 files,
nor does it leak memory for every chunk of input processed
[the bugs were present in the initial implementation]
tail -F once again notices changes in a currently unavailable
remote directory [bug introduced in coreutils-7.5]
Changes in behavior:
sort will not create more than 8 threads by default due to diminishing
performance gains. Also the --parallel option is no longer restricted
to the number of available processors.
cp --attributes-only now completely overrides --reflink.
Previously a reflink was needlessly attempted.
stat's %X, %Y, and %Z directives once again print only the integer
part of seconds since the epoch. This reverts a change from
coreutils-8.6, that was deemed unnecessarily disruptive.
To obtain a nanosecond-precision time stamp for %X use %.X;
if you want (say) just 3 fractional digits, use %.3X.
Likewise for %Y and %Z.
stat's new %W format directive would print floating point seconds.
However, with the above change to %X, %Y and %Z, we've made %W work
the same way as the others.
New features:
split accepts the --number option to generate a specific number of files.
- Add a complete german translation.
- Add upstreams patch for suffix calculation in split.
-------------------------------------------------------------------
Wed Dec 22 15:53:13 UTC 2010 - pth@novell.com
- Use software services.
- Remove coreutils tarball.
- Don't use version specific patches as it breaks automatic
updates.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 17 08:33:10 UTC 2010 - coolo@novell.com Wed Nov 17 08:33:10 UTC 2010 - coolo@novell.com

25
coreutils.spec
View File

@ -23,8 +23,8 @@ BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+ License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base Group: System/Base
Version: 8.6 Version: 8.9
Release: 2 Release: 1
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@ -36,7 +36,8 @@ Source: coreutils-%{version}.tar.xz
Source1: su.pamd Source1: su.pamd
Source2: su.default Source2: su.default
Source3: baselibs.conf Source3: baselibs.conf
Patch0: coreutils-%{version}.patch Source4: coreutils-8.9.de.po
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch Patch1: coreutils-no_hostname_and_hostid.patch
Patch2: coreutils-gl_printf_safe.patch Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch Patch4: coreutils-8.6-i18n.patch
@ -83,8 +84,8 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch2 %patch2
%patch8 %patch8
%patch16 %patch16
%patch20 -p1 %patch20
%patch21 -p1 %patch21
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1 %patch24 -p1
@ -93,6 +94,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch30 -p1 %patch30 -p1
%patch31 %patch31
%patch32 %patch32
cp %{S:4} po/de.po
%build %build
AUTOPOINT=true autoreconf -fi AUTOPOINT=true autoreconf -fi
@ -102,20 +104,9 @@ export CFLAGS="%optflags -Wall"
gl_cv_func_printf_directive_n=yes \ gl_cv_func_printf_directive_n=yes \
gl_cv_func_isnanl_works=yes \ gl_cv_func_isnanl_works=yes \
DEFAULT_POSIX2_VERSION=199209 DEFAULT_POSIX2_VERSION=199209
make -C po update-po
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
#%check
#if test $EUID -eq 0; then
# su nobody -c make %{?_smp_mflags} check VERBOSE=yes V=1
# make %{?_smp_mflags} check-root VERBOSE=yes V=1
#else
#%ifarch %arm
# make -k %{?_smp_mflags} check VERBOSE=yes V=1 || echo make check failed
#%else
# make %{?_smp_mflags} check VERBOSE=yes V=1
#%endif
#fi
%install %install
%makeinstall %makeinstall
test -f $RPM_BUILD_ROOT%{_bindir}/su || \ test -f $RPM_BUILD_ROOT%{_bindir}/su || \