- 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] OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=79
This commit is contained in:
parent
4f07b6c990
commit
921495db7a
6
_service
6
_service
@ -2,12 +2,12 @@
|
||||
<service name="download_url">
|
||||
<param name="protocol">http</param>
|
||||
<param name="host">ftp.gnu.org</param>
|
||||
<param name="path">/gnu/coreutils/coreutils-8.8.tar.xz</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.8.tar.xz</param>
|
||||
<param name="file">_service:download_url:coreutils-8.9.tar.xz</param>
|
||||
<param name="verifier">sha256</param>
|
||||
<param name="checksum">a92ed61ae68408a7f5eaa09db54333014a87295d05ab5a96ce2d55e3144b6336</param>
|
||||
<param name="checksum">ca22d06effd0c8bc506a7c57932d0ed08d7dbc75629a92264d67d34982f2b5b7</param>
|
||||
</service>
|
||||
<service name="set_version">
|
||||
</service>
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a92ed61ae68408a7f5eaa09db54333014a87295d05ab5a96ce2d55e3144b6336
|
||||
size 4729080
|
@ -1,162 +0,0 @@
|
||||
#
|
||||
# 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.8
|
||||
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.8.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
|
||||
#Post 8.8 fix that will be in later releases
|
||||
Patch33: coreutils-split_suffix.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
|
||||
%patch33
|
||||
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
|
@ -19,8 +19,8 @@
|
||||
|
||||
Index: lib/linebuffer.h
|
||||
===================================================================
|
||||
--- lib/linebuffer.h.orig 2010-04-23 15:44:00.000000000 +0200
|
||||
+++ lib/linebuffer.h 2011-01-03 20:00:54.739680122 +0100
|
||||
--- lib/linebuffer.h.orig 2011-01-01 22:19:27.000000000 +0100
|
||||
+++ lib/linebuffer.h 2011-01-05 14:05:49.026494005 +0100
|
||||
@@ -21,6 +21,11 @@
|
||||
|
||||
# include <stdio.h>
|
||||
@ -45,8 +45,8 @@ Index: lib/linebuffer.h
|
||||
/* Initialize linebuffer LINEBUFFER for use. */
|
||||
Index: src/cut.c
|
||||
===================================================================
|
||||
--- src/cut.c.orig 2010-08-14 01:49:07.000000000 +0200
|
||||
+++ src/cut.c 2011-01-03 20:01:11.939175331 +0100
|
||||
--- src/cut.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/cut.c 2011-01-05 14:05:49.027494034 +0100
|
||||
@@ -28,6 +28,11 @@
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
@ -639,8 +639,8 @@ Index: src/cut.c
|
||||
if (optind == argc)
|
||||
Index: src/expand.c
|
||||
===================================================================
|
||||
--- src/expand.c.orig 2010-08-14 01:49:07.000000000 +0200
|
||||
+++ src/expand.c 2011-01-03 20:00:54.786681475 +0100
|
||||
--- src/expand.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/expand.c 2011-01-05 14:05:49.091495874 +0100
|
||||
@@ -38,12 +38,29 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
@ -830,8 +830,8 @@ Index: src/expand.c
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
Index: src/fold.c
|
||||
===================================================================
|
||||
--- src/fold.c.orig 2010-11-27 16:06:22.000000000 +0100
|
||||
+++ src/fold.c 2011-01-03 20:01:42.604058242 +0100
|
||||
--- src/fold.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/fold.c 2011-01-05 14:05:49.116496593 +0100
|
||||
@@ -22,12 +22,34 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
@ -1232,8 +1232,8 @@ Index: src/fold.c
|
||||
case 's': /* Break at word boundaries. */
|
||||
Index: src/join.c
|
||||
===================================================================
|
||||
--- src/join.c.orig 2010-09-17 11:13:45.000000000 +0200
|
||||
+++ src/join.c 2011-01-03 20:01:11.027149071 +0100
|
||||
--- src/join.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/join.c 2011-01-05 14:05:49.157497772 +0100
|
||||
@@ -22,18 +22,32 @@
|
||||
#include <sys/types.h>
|
||||
#include <getopt.h>
|
||||
@ -1718,8 +1718,8 @@ Index: src/join.c
|
||||
case NOCHECK_ORDER_OPTION:
|
||||
Index: src/pr.c
|
||||
===================================================================
|
||||
--- src/pr.c.orig 2010-08-14 01:49:07.000000000 +0200
|
||||
+++ src/pr.c 2011-01-03 20:00:54.888684411 +0100
|
||||
--- src/pr.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/pr.c 2011-01-05 14:05:49.170498145 +0100
|
||||
@@ -312,6 +312,32 @@
|
||||
|
||||
#include <getopt.h>
|
||||
@ -2444,8 +2444,8 @@ Index: src/pr.c
|
||||
|
||||
Index: src/sort.c
|
||||
===================================================================
|
||||
--- src/sort.c.orig 2010-12-20 12:20:41.000000000 +0100
|
||||
+++ src/sort.c 2011-01-03 20:01:11.886173804 +0100
|
||||
--- src/sort.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/sort.c 2011-01-05 14:05:49.184498547 +0100
|
||||
@@ -22,11 +22,20 @@
|
||||
|
||||
#include <config.h>
|
||||
@ -2520,7 +2520,7 @@ Index: src/sort.c
|
||||
|
||||
/* Flag to remove consecutive duplicate lines from the output.
|
||||
Only the last of a sequence of equal lines will be output. */
|
||||
@@ -768,6 +797,46 @@ reap_all (void)
|
||||
@@ -775,6 +804,46 @@ reap_all (void)
|
||||
reap (-1);
|
||||
}
|
||||
|
||||
@ -2567,7 +2567,7 @@ Index: src/sort.c
|
||||
/* Clean up any remaining temporary files. */
|
||||
|
||||
static void
|
||||
@@ -1200,7 +1269,7 @@ zaptemp (char const *name)
|
||||
@@ -1207,7 +1276,7 @@ zaptemp (char const *name)
|
||||
free (node);
|
||||
}
|
||||
|
||||
@ -2576,7 +2576,7 @@ Index: src/sort.c
|
||||
|
||||
static int
|
||||
struct_month_cmp (void const *m1, void const *m2)
|
||||
@@ -1215,7 +1284,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. */
|
||||
|
||||
static void
|
||||
@ -2585,7 +2585,7 @@ Index: src/sort.c
|
||||
{
|
||||
size_t i;
|
||||
|
||||
@@ -1227,7 +1296,7 @@ inittables (void)
|
||||
@@ -1234,7 +1303,7 @@ inittables (void)
|
||||
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 (hard_LC_TIME)
|
||||
{
|
||||
@@ -1309,6 +1378,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);
|
||||
}
|
||||
|
||||
@ -2679,7 +2679,7 @@ Index: src/sort.c
|
||||
/* Specify the amount of main memory to use when sorting. */
|
||||
static void
|
||||
specify_sort_size (int oi, char c, char const *s)
|
||||
@@ -1537,7 +1684,7 @@ buffer_linelim (struct buffer const *buf
|
||||
@@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf
|
||||
by KEY in LINE. */
|
||||
|
||||
static char *
|
||||
@ -2688,7 +2688,7 @@ Index: src/sort.c
|
||||
{
|
||||
char *ptr = line->text, *lim = ptr + line->length - 1;
|
||||
size_t sword = key->sword;
|
||||
@@ -1546,10 +1693,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
|
||||
is absent. */
|
||||
|
||||
@ -2701,7 +2701,7 @@ Index: src/sort.c
|
||||
++ptr;
|
||||
if (ptr < lim)
|
||||
++ptr;
|
||||
@@ -1575,11 +1722,70 @@ begfield (struct line const *line, struc
|
||||
@@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc
|
||||
return ptr;
|
||||
}
|
||||
|
||||
@ -2773,7 +2773,7 @@ Index: src/sort.c
|
||||
{
|
||||
char *ptr = line->text, *lim = ptr + line->length - 1;
|
||||
size_t eword = key->eword, echar = key->echar;
|
||||
@@ -1594,10 +1800,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.
|
||||
Otherwise, leave PTR pointing at the first `blank' character after
|
||||
the preceding field. */
|
||||
@ -2786,7 +2786,7 @@ Index: src/sort.c
|
||||
++ptr;
|
||||
if (ptr < lim && (eword || echar))
|
||||
++ptr;
|
||||
@@ -1643,10 +1849,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. */
|
||||
@ -2799,7 +2799,7 @@ Index: src/sort.c
|
||||
if (newlim)
|
||||
lim = newlim;
|
||||
}
|
||||
@@ -1677,6 +1883,130 @@ limfield (struct line const *line, struc
|
||||
@@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc
|
||||
return ptr;
|
||||
}
|
||||
|
||||
@ -2930,7 +2930,7 @@ Index: src/sort.c
|
||||
/* 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
|
||||
file wasn't terminated by a newline, supply one. Set up BUF's line
|
||||
@@ -1763,8 +2093,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
|
||||
@@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
|
||||
else
|
||||
{
|
||||
if (key->skipsblanks)
|
||||
@ -2955,7 +2955,7 @@ Index: src/sort.c
|
||||
line->keybeg = line_start;
|
||||
}
|
||||
}
|
||||
@@ -1885,7 +2229,7 @@ human_numcompare (char const *a, char co
|
||||
@@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co
|
||||
hideously fast. */
|
||||
|
||||
static int
|
||||
@ -2964,7 +2964,7 @@ Index: src/sort.c
|
||||
{
|
||||
while (blanks[to_uchar (*a)])
|
||||
a++;
|
||||
@@ -1895,6 +2239,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);
|
||||
}
|
||||
|
||||
@ -2990,7 +2990,7 @@ Index: src/sort.c
|
||||
static int
|
||||
general_numcompare (char const *sa, char const *sb)
|
||||
{
|
||||
@@ -1927,7 +2290,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. */
|
||||
|
||||
static int
|
||||
@ -2999,7 +2999,7 @@ Index: src/sort.c
|
||||
{
|
||||
size_t lo = 0;
|
||||
size_t hi = MONTHS_PER_YEAR;
|
||||
@@ -2202,13 +2565,12 @@ debug_key (struct line const *line, stru
|
||||
@@ -2209,13 +2572,12 @@ debug_key (struct line const *line, stru
|
||||
char saved = *lim;
|
||||
*lim = '\0';
|
||||
|
||||
@ -3015,7 +3015,7 @@ Index: src/sort.c
|
||||
else if (key->general_numeric)
|
||||
ignore_value (strtold (beg, &tighter_lim));
|
||||
else if (key->numeric || key->human_numeric)
|
||||
@@ -2352,7 +2714,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)
|
||||
&& !(key->schar || key->echar);
|
||||
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 && key->schar)
|
||||
|| (!key->skipeblanks && key->echar)))
|
||||
@@ -2410,11 +2772,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"));
|
||||
}
|
||||
|
||||
@ -3109,7 +3109,7 @@ Index: src/sort.c
|
||||
{
|
||||
struct keyfield *key = keylist;
|
||||
|
||||
@@ -2499,7 +2933,7 @@ keycompare (struct line const *a, struct
|
||||
@@ -2506,7 +2940,7 @@ keycompare (struct line const *a, struct
|
||||
else if (key->human_numeric)
|
||||
diff = human_numcompare (ta, tb);
|
||||
else if (key->month)
|
||||
@ -3118,7 +3118,7 @@ Index: src/sort.c
|
||||
else if (key->random)
|
||||
diff = compare_random (ta, tlena, tb, tlenb);
|
||||
else if (key->version)
|
||||
@@ -2615,6 +3049,179 @@ keycompare (struct line const *a, struct
|
||||
@@ -2622,6 +3056,179 @@ keycompare (struct line const *a, struct
|
||||
return key->reverse ? -diff : diff;
|
||||
}
|
||||
|
||||
@ -3298,7 +3298,7 @@ Index: src/sort.c
|
||||
/* Compare two lines A and B, returning negative, zero, or positive
|
||||
depending on whether A compares less than, equal to, or greater than B. */
|
||||
|
||||
@@ -4077,7 +4684,7 @@ main (int argc, char **argv)
|
||||
@@ -4084,7 +4691,7 @@ main (int argc, char **argv)
|
||||
initialize_exit_failure (SORT_FAILURE);
|
||||
|
||||
hard_LC_COLLATE = hard_locale (LC_COLLATE);
|
||||
@ -3307,7 +3307,7 @@ Index: src/sort.c
|
||||
hard_LC_TIME = hard_locale (LC_TIME);
|
||||
#endif
|
||||
|
||||
@@ -4098,6 +4705,29 @@ main (int argc, char **argv)
|
||||
@@ -4105,6 +4712,29 @@ main (int argc, char **argv)
|
||||
thousands_sep = -1;
|
||||
}
|
||||
|
||||
@ -3337,7 +3337,7 @@ Index: src/sort.c
|
||||
have_read_stdin = false;
|
||||
inittables ();
|
||||
|
||||
@@ -4368,13 +4998,34 @@ main (int argc, char **argv)
|
||||
@@ -4375,13 +5005,34 @@ main (int argc, char **argv)
|
||||
|
||||
case 't':
|
||||
{
|
||||
@ -3376,7 +3376,7 @@ Index: src/sort.c
|
||||
else
|
||||
{
|
||||
/* Provoke with `sort -txx'. Complain about
|
||||
@@ -4385,9 +5036,12 @@ main (int argc, char **argv)
|
||||
@@ -4392,9 +5043,12 @@ main (int argc, char **argv)
|
||||
quote (optarg));
|
||||
}
|
||||
}
|
||||
@ -3393,8 +3393,8 @@ Index: src/sort.c
|
||||
|
||||
Index: src/unexpand.c
|
||||
===================================================================
|
||||
--- src/unexpand.c.orig 2010-08-14 01:49:07.000000000 +0200
|
||||
+++ src/unexpand.c 2011-01-03 20:00:54.944686024 +0100
|
||||
--- src/unexpand.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/unexpand.c 2011-01-05 14:05:49.249500416 +0100
|
||||
@@ -39,12 +39,29 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
@ -3650,8 +3650,8 @@ Index: src/unexpand.c
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
Index: src/uniq.c
|
||||
===================================================================
|
||||
--- src/uniq.c.orig 2010-08-14 01:49:07.000000000 +0200
|
||||
+++ src/uniq.c 2011-01-03 20:00:54.970686773 +0100
|
||||
--- src/uniq.c.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ src/uniq.c 2011-01-05 14:05:49.291501624 +0100
|
||||
@@ -21,6 +21,16 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
@ -4021,8 +4021,8 @@ Index: src/uniq.c
|
||||
check_chars = SIZE_MAX;
|
||||
Index: tests/Makefile.am
|
||||
===================================================================
|
||||
--- tests/Makefile.am.orig 2010-12-19 07:45:15.000000000 +0100
|
||||
+++ tests/Makefile.am 2011-01-03 20:00:55.003687723 +0100
|
||||
--- tests/Makefile.am.orig 2010-12-17 07:35:51.000000000 +0100
|
||||
+++ tests/Makefile.am 2011-01-05 14:05:49.316502343 +0100
|
||||
@@ -234,6 +234,7 @@ TESTS = \
|
||||
misc/sort-debug-keys \
|
||||
misc/sort-debug-warn \
|
||||
@ -4044,8 +4044,8 @@ Index: tests/Makefile.am
|
||||
pr/0FFnt \
|
||||
Index: tests/misc/cut
|
||||
===================================================================
|
||||
--- tests/misc/cut.orig 2010-01-01 14:06:47.000000000 +0100
|
||||
+++ tests/misc/cut 2011-01-03 20:00:55.028688443 +0100
|
||||
--- tests/misc/cut.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ tests/misc/cut 2011-01-05 14:06:41.365998730 +0100
|
||||
@@ -26,7 +26,7 @@ use strict;
|
||||
my $prog = 'cut';
|
||||
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 @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.
|
||||
['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"}],
|
||||
['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}],
|
||||
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
Index: tests/misc/mb1.I
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ tests/misc/mb1.I 2011-01-03 20:00:55.070689652 +0100
|
||||
+++ tests/misc/mb1.I 2011-01-05 14:05:49.384504297 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Apple@10
|
||||
+Banana@5
|
||||
@ -4076,7 +4076,7 @@ Index: tests/misc/mb1.I
|
||||
Index: tests/misc/mb1.X
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ tests/misc/mb1.X 2011-01-03 20:00:55.095690372 +0100
|
||||
+++ tests/misc/mb1.X 2011-01-05 14:05:49.425505477 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Banana@5
|
||||
+Apple@10
|
||||
@ -4085,7 +4085,7 @@ Index: tests/misc/mb1.X
|
||||
Index: tests/misc/mb2.I
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ tests/misc/mb2.I 2011-01-03 20:00:55.120691091 +0100
|
||||
+++ tests/misc/mb2.I 2011-01-05 14:05:49.451506224 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Apple@AA10@@20
|
||||
+Banana@AA5@@30
|
||||
@ -4094,7 +4094,7 @@ Index: tests/misc/mb2.I
|
||||
Index: tests/misc/mb2.X
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ tests/misc/mb2.X 2011-01-03 20:00:55.145691812 +0100
|
||||
+++ tests/misc/mb2.X 2011-01-05 14:05:49.476506942 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Citrus@AA20@@5
|
||||
+Cherry@AA30@@10
|
||||
@ -4103,7 +4103,7 @@ Index: tests/misc/mb2.X
|
||||
Index: tests/misc/sort-mb-tests
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ tests/misc/sort-mb-tests 2011-01-03 20:00:55.170692531 +0100
|
||||
+++ tests/misc/sort-mb-tests 2011-01-05 14:05:49.518508150 +0100
|
||||
@@ -0,0 +1,58 @@
|
||||
+#! /bin/sh
|
||||
+case $# in
|
||||
|
@ -9,9 +9,9 @@ Subject: [PATCH 2/7] update man page for pam
|
||||
|
||||
Index: doc/coreutils.texi
|
||||
===================================================================
|
||||
--- doc/coreutils.texi.orig 2011-01-03 13:26:32.123209450 +0100
|
||||
+++ doc/coreutils.texi 2011-01-03 13:26:32.351216024 +0100
|
||||
@@ -15265,8 +15265,11 @@ to certain shells, etc.).
|
||||
--- doc/coreutils.texi.orig 2011-01-05 14:27:40.715232991 +0100
|
||||
+++ doc/coreutils.texi 2011-01-05 14:27:41.929267939 +0100
|
||||
@@ -15290,8 +15290,11 @@ to certain shells, etc.).
|
||||
@findex syslog
|
||||
@command{su} can optionally be compiled to use @code{syslog} to report
|
||||
failed, and optionally successful, @command{su} attempts. (If the system
|
||||
@ -25,7 +25,7 @@ Index: doc/coreutils.texi
|
||||
|
||||
The program accepts the following options. Also see @ref{Common options}.
|
||||
|
||||
@@ -15347,33 +15350,6 @@ Exit status:
|
||||
@@ -15372,33 +15375,6 @@ Exit status:
|
||||
the exit status of the subshell otherwise
|
||||
@end display
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
||||
Index: configure
|
||||
===================================================================
|
||||
--- configure.orig 2010-12-22 17:44:57.000000000 +0100
|
||||
+++ configure 2011-01-03 13:26:32.207211872 +0100
|
||||
@@ -3418,7 +3418,6 @@ as_fn_append ac_func_list " alarm"
|
||||
--- configure.orig 2011-01-04 12:23:03.000000000 +0100
|
||||
+++ configure 2011-01-05 14:27:40.804235553 +0100
|
||||
@@ -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/select.h"
|
||||
as_fn_append ac_func_list " nl_langinfo"
|
||||
@ -12,9 +12,9 @@ Index: configure
|
||||
as_fn_append ac_func_list " readlinkat"
|
||||
Index: m4/gnulib-comp.m4
|
||||
===================================================================
|
||||
--- m4/gnulib-comp.m4.orig 2010-12-22 14:40:52.000000000 +0100
|
||||
+++ m4/gnulib-comp.m4 2011-01-03 13:26:32.227212448 +0100
|
||||
@@ -1188,7 +1188,6 @@ AC_DEFUN([gl_INIT],
|
||||
--- m4/gnulib-comp.m4.orig 2011-01-01 22:23:14.000000000 +0100
|
||||
+++ m4/gnulib-comp.m4 2011-01-05 14:27:40.806235609 +0100
|
||||
@@ -1190,7 +1190,6 @@ AC_DEFUN([gl_INIT],
|
||||
# Code from module printf-frexpl:
|
||||
gl_FUNC_PRINTF_FREXPL
|
||||
# Code from module printf-safe:
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: src/sort.c
|
||||
===================================================================
|
||||
--- src/sort.c.orig 2011-01-03 13:26:31.630195231 +0100
|
||||
+++ src/sort.c 2011-01-03 13:26:31.981205354 +0100
|
||||
@@ -3127,7 +3127,8 @@ keycompare_mb (const struct line *a, con
|
||||
--- src/sort.c.orig 2011-01-05 14:27:40.227218942 +0100
|
||||
+++ src/sort.c 2011-01-05 14:27:40.574228931 +0100
|
||||
@@ -3134,7 +3134,8 @@ keycompare_mb (const struct line *a, con
|
||||
if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \
|
||||
STATE = state_bak; \
|
||||
if (!ignore) \
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: doc/coreutils.texi
|
||||
===================================================================
|
||||
--- doc/coreutils.texi.orig 2010-12-19 07:45:18.000000000 +0100
|
||||
+++ doc/coreutils.texi 2011-01-03 13:27:22.226654328 +0100
|
||||
--- doc/coreutils.texi.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ doc/coreutils.texi 2011-01-05 14:28:30.410663582 +0100
|
||||
@@ -65,8 +65,6 @@
|
||||
* fold: (coreutils)fold invocation. Wrap long input lines.
|
||||
* 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
|
||||
|
||||
@command{date}: Print or set system date and time
|
||||
@@ -13662,8 +13658,6 @@ information.
|
||||
@@ -13683,8 +13679,6 @@ information.
|
||||
* arch invocation:: Print machine hardware name.
|
||||
* nproc invocation:: Print the number of processors.
|
||||
* uname invocation:: Print system information.
|
||||
@ -38,7 +38,7 @@ Index: doc/coreutils.texi
|
||||
* uptime invocation:: Print system uptime and load.
|
||||
@end menu
|
||||
|
||||
@@ -14485,55 +14479,6 @@ Print the kernel version.
|
||||
@@ -14507,55 +14501,6 @@ Print the kernel version.
|
||||
|
||||
@exitstatus
|
||||
|
||||
@ -96,8 +96,8 @@ Index: doc/coreutils.texi
|
||||
|
||||
Index: man/Makefile.am
|
||||
===================================================================
|
||||
--- man/Makefile.am.orig 2010-03-13 16:14:09.000000000 +0100
|
||||
+++ man/Makefile.am 2011-01-03 13:26:32.151210256 +0100
|
||||
--- man/Makefile.am.orig 2011-01-01 22:19:23.000000000 +0100
|
||||
+++ man/Makefile.am 2011-01-05 14:27:40.742233767 +0100
|
||||
@@ -197,7 +197,7 @@ check-x-vs-1:
|
||||
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
||||
t=$@-t; \
|
||||
@ -109,9 +109,9 @@ Index: man/Makefile.am
|
||||
rm $$t
|
||||
Index: man/Makefile.in
|
||||
===================================================================
|
||||
--- man/Makefile.in.orig 2010-12-22 17:06:32.000000000 +0100
|
||||
+++ man/Makefile.in 2011-01-03 13:26:32.185211238 +0100
|
||||
@@ -1634,7 +1634,7 @@ check-x-vs-1:
|
||||
--- man/Makefile.in.orig 2011-01-04 12:23:07.000000000 +0100
|
||||
+++ man/Makefile.in 2011-01-05 14:27:40.768234515 +0100
|
||||
@@ -1641,7 +1641,7 @@ check-x-vs-1:
|
||||
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
||||
t=$@-t; \
|
||||
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -23,7 +23,7 @@ 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.8
|
||||
Version: 8.9
|
||||
Release: 1
|
||||
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
|
||||
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
|
||||
@ -36,7 +36,7 @@ Source: coreutils-%{version}.tar.xz
|
||||
Source1: su.pamd
|
||||
Source2: su.default
|
||||
Source3: baselibs.conf
|
||||
Source4: coreutils-8.8.de.po
|
||||
Source4: coreutils-8.9.de.po
|
||||
Patch0: coreutils-misc.patch
|
||||
Patch1: coreutils-no_hostname_and_hostid.patch
|
||||
Patch2: coreutils-gl_printf_safe.patch
|
||||
@ -55,8 +55,6 @@ 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
|
||||
#Post 8.8 fix that will be in later releases
|
||||
Patch33: coreutils-split_suffix.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# this will create a cycle, broken up randomly - coreutils is just too core to have other
|
||||
# prerequires
|
||||
@ -96,7 +94,6 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
|
||||
%patch30 -p1
|
||||
%patch31
|
||||
%patch32
|
||||
%patch33
|
||||
cp %{S:4} po/de.po
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user