testing/coreutils
SHA256
3
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

Accepting request 67545 from Base:System

Browse Source 
Accepted submit request 67545 from user coolo

OBS-URL: https://build.opensuse.org/request/show/67545
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=57
This commit is contained in:
Marcus Rückert 2011-04-15 18:12:13 +00:00 committed by Git OBS Bridge
commit 815244e381
15 changed files with 134 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_service
View File

@ -1,13 +1,13 @@
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">ftp.gnu.org</param>
<param name="path">/gnu/coreutils/coreutils-8.10.tar.xz</param>
</service>
<param name="host">ftp.gnu.org</param><param name="protocol">ftp</param><param name="path">/gnu/coreutils/coreutils-8.11.tar.xz</param></service>
<service name="verify_file">
<param name="file">_service:download_url:coreutils-8.10.tar.xz</param>
<param name="file">_service:download_url:coreutils-8.11.tar.xz</param>
<param name="verifier">sha256</param>
<param name="checksum">8258785cbab6580f2e0376769a7b98ab3e1ddfca2d6f48e5490a51688d0bee83</param>
<param name="checksum">9c03e0de95ac6ec65129eaf0b3605982a77d8fedaeca5b665ad44fe901695b3b</param>
</service>
<service name="set_version">
</service>

3
_service:download_url:coreutils-8.10.tar.xz
View File

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

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

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

11
_service:set_version:coreutils-testsuite.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/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.10
Release: 2
Version: 8.11
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
@ -37,7 +37,7 @@ Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch1: coreutils-remove_hostname_documentation.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
@ -55,9 +55,6 @@ Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
#Next two patches added after 8.10 release so should be obsolete with next release
Patch34: coreutils-compute_range_endpoint.patch
Patch35: coreutils-fix_sparse_fiemap_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
@ -99,8 +96,6 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch31
%patch32
%patch33
%patch34 -p1
%patch35 -p1
%build
AUTOPOINT=true autoreconf -fi

14
_service:set_version: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/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.10
Release: 2
Version: 8.11
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
@ -37,7 +37,7 @@ Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch1: coreutils-remove_hostname_documentation.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
@ -50,16 +50,11 @@ 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
Patch26: coreutils-readd_documentation.patch
#
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
#Next two patches added after 8.10 release so should be obsolete with next release
Patch34: coreutils-compute_range_endpoint.patch
Patch35: coreutils-fix_sparse_fiemap_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
@ -95,14 +90,11 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26
#
%patch30 -p1
%patch31
%patch32
%patch33
%patch34 -p1
%patch35 -p1
%build
AUTOPOINT=true autoreconf -fi

3
coreutils-8.11.tar.xz Normal file
View File

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

50
coreutils-compute_range_endpoint.patch
View File

@ -1,50 +0,0 @@
>From 43be5f4911f252ac298ac19865487f543c12db02 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 7 Feb 2011 08:29:33 +0100
Subject: [PATCH] cut: don't segfault for large unbounded range
* src/cut.c (set_fields): When computing the maximum range endpoint,
take into consideration the start of any unbounded range, like "999-".
* NEWS (Bug fixes): Mention it.
* tests/misc/cut (big-unbounded-b,c,f): Add tests.
Reported by Paul Marinescu in http://debbugs.gnu.org/7993
The bug was introduced on 2004-12-04 via commit 7380cf79.
---
NEWS | 6 ++++++
src/cut.c | 2 ++
tests/misc/cut | 4 ++++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/cut.c b/src/cut.c
index 3f8e3e6..e2fe851 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -496,6 +496,8 @@ set_fields (const char *fieldstr)
if (rp[i].hi > max_range_endpoint)
max_range_endpoint = rp[i].hi;
}
+ if (max_range_endpoint < eol_range_start)
+ max_range_endpoint = eol_range_start;
/* Allocate an array large enough so that it may be indexed by
the field numbers corresponding to all finite ranges
diff --git a/tests/misc/cut b/tests/misc/cut
index 4353994..c905ba9 100755
--- a/tests/misc/cut
+++ b/tests/misc/cut
@@ -150,6 +150,10 @@ my @Tests =
{ERR=>$no_endpoint}],
['inval5', '-f', '1-,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
['inval6', '-f', '-1,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
+ # This would evoke a segfault from 5.3.0..6.10
+ ['big-unbounded-b', '--output-d=:', '-b1234567890-', {IN=>''}, {OUT=>''}],
+ ['big-unbounded-c', '--output-d=:', '-c1234567890-', {IN=>''}, {OUT=>''}],
+ ['big-unbounded-f', '--output-d=:', '-f1234567890-', {IN=>''}, {OUT=>''}],
);
@Tests = triple_test \@Tests;
--
1.7.4.2.g597a6

182
coreutils-fix_sparse_fiemap_test.patch
View File

@ -1,182 +0,0 @@
From: Pádraig Brady <P <at> draigBrady.com>
Subject: Re: coreutils-8.10 released [stable]
Newsgroups: gmane.comp.gnu.coreutils.general
Date: 2011-02-07 12:39:27 GMT (2 days, 22 hours and 55 minutes ago)
On 05/02/11 13:59, Jim Meyering wrote:
> Pádraig Brady wrote:
>> Yep, just did that, and got a couple of failures for sparse-fiemap
>> on and ext3 and loopback ext4 file systems.
>> On a very quick glance, I think cp is OK and that the filefrag
>> matching is a bit brittle.
>> Attached are filefrag outputs.
>
> I saw similar differences, but I think they were due to the fact that
> the kernel had not yet forced cp's metadata update to disk when filefrag
> does its FIEMAP ioctl
>
> Uncommenting the "sync" just after the "cp" in the sparse-fiemap test
> solved the problem (for me it arose only on rawhide's btrfs) but made
> the test take a lot more time, as mentioned in the comment.
It seems that the sync is needed for ext4 loopback also, on my system.
However for ext3, the extents between src and dst still don't match up.
My systems uses a 4K block size and is 2.6.35.10-72.fc14.i686
For now, I've disabled (indirectly) using ext3 for fiemap-perf and
sparse-fiemap in the attached.
> Instead of that sync, using filefrag's -s option may
> have the same result without the unwanted overhead.
That doesn't work actually which baffles me.
I got the e2fsprogs source rpm to verify that
FIEMAP_FLAG_SYNC was set, so I guess this is a kernel issue
(on ext4 loop back at least).
Though I was able to get a a working sync restricted to the file
by using dd in the attached patch.
Even with that, the test only takes about 10s on my old laptop, so
I didn't bother tagging the test as EXPENSIVE.
cheers,
Pádraig.
From 1da62d67ce4d4c78b98bc947c9367a10f1bdba9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P <at> draigBrady.com>
Date: Fri, 4 Feb 2011 22:05:20 +0000
Subject: [PATCH] test: improve the fiemap_capable_ check
* tests/cp/fiemap-2: Enable the fiemap check for files, which
will enable the test on ext3.
* tests/cp/fiemap-perf: Comment why we're not enabling for ext3.
* tests/cp/sparse-fiemap: Ditto.
* tests/fiemap-capable: A new python script to determine
if a specified path supports fiemap.
* tests/init.cfg (fiemap_capable_): Use the new python script.
* tests/Makefile.am (EXTRA_DIST): Include the new python script.
---
tests/Makefile.am | 1 +
tests/cp/fiemap-2 | 3 ++-
tests/cp/fiemap-perf | 2 ++
tests/cp/sparse-fiemap | 12 ++++++++----
tests/fiemap-capable | 16 ++++++++++++++++
tests/init.cfg | 9 ++++-----
6 files changed, 33 insertions(+), 10 deletions(-)
create mode 100644 tests/fiemap-capable
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 751b327..8aa56cd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
check.mk \
envvar-check \
filefrag-extent-compare \
+ fiemap-capable \
init.cfg \
init.sh \
lang-default \
diff --git a/tests/cp/fiemap-2 b/tests/cp/fiemap-2
index a17076c..691ead2 100755
--- a/tests/cp/fiemap-2
+++ b/tests/cp/fiemap-2
@@ -20,7 +20,8 @@
print_ver_ cp
# Require a fiemap-enabled FS.
-fiemap_capable_ . \
+touch fiemap_chk # check a file rather than current dir for best coverage
+fiemap_capable_ fiemap_chk \
|| skip_ "this file system lacks FIEMAP support"
# Exercise the code that handles a file ending in a hole.
diff --git a/tests/cp/fiemap-perf b/tests/cp/fiemap-perf
index 7369a7d..dbb2a81 100755
--- a/tests/cp/fiemap-perf
+++ b/tests/cp/fiemap-perf
@@ -20,6 +20,8 @@
print_ver_ cp
# Require a fiemap-enabled FS.
+# Note we don't check a file here as that could enable
+# the test on ext3 where emulated extent scanning can be slow.
fiemap_capable_ . \
|| skip_ "this file system lacks FIEMAP support"
diff --git a/tests/cp/sparse-fiemap b/tests/cp/sparse-fiemap
index f224b5b..fc27869 100755
--- a/tests/cp/sparse-fiemap
+++ b/tests/cp/sparse-fiemap
@@ -19,6 +19,8 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ cp
+# Note we don't check a file here as that could enable
+# the test on ext3 where this test is seen to fail.
if fiemap_capable_ . ; then
: # Current dir is on a partition with working extents. Good!
else
@@ -66,11 +68,13 @@ for i in $(seq 1 2 21); do
$PERL -e 'BEGIN { $n = '$i' * 1024; *F = *STDOUT }' \
-e 'for (1..'$j') { sysseek (*F, $n, 1)' \
-e '&& syswrite (*F, chr($_)x$n) or die "$!"}' > j1 || fail=1
- # sync
+
+ # Note the explicit fdatasync is used here as
+ # it was seen that `filefrag -s` (FIEMAP_FLAG_SYNC) was
+ # ineffective on ext4 loopback on Linux 2.6.35.10-72.fc14.i686
+ dd if=/dev/null of=j1 conv=notrunc,fdatasync
cp --sparse=always j1 j2 || fail=1
- # sync
- # Technically we may need the 'sync' uses above, but
- # uncommenting them makes this test take much longer.
+ dd if=/dev/null of=j2 conv=notrunc,fdatasync
cmp j1 j2 || fail=1
filefrag -v j1 | grep extent \
diff --git a/tests/fiemap-capable b/tests/fiemap-capable
new file mode 100644
index 0000000..05c6926
--- /dev/null
+++ b/tests/fiemap-capable
@@ -0,0 +1,16 @@
+import struct, fcntl, sys, os
+
+def sizeof(t): return struct.calcsize(t)
+IOCPARM_MASK = 0x7f
+IOC_OUT = 0x40000000
+IOC_IN = 0x80000000
+IOC_INOUT = (IOC_IN|IOC_OUT)
+def _IOWR(x,y,t): return (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)
+
+try:
+ fd = os.open (len (sys.argv) == 2 and sys.argv[1] or '.', os.O_RDONLY)
+ struct_fiemap = '=qqllll'
+ FS_IOC_FIEMAP = _IOWR (ord ('f'), 11, struct_fiemap)
+ fcntl.ioctl (fd, FS_IOC_FIEMAP, struct.pack(struct_fiemap, 0,~0,0,0,0,0))
+except:
+ sys.exit (1)
diff --git a/tests/init.cfg b/tests/init.cfg
index b2d1bab..f49c5cf 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -295,13 +295,12 @@ require_proc_pid_status_()
kill $pid
}
-# Return nonzero if the specified directory is on a file system for
-# which FIEMAP support exists, and the file system type is new enough
-# (unlike ext2 and ext3) that it is hard to find an instance *without*
-# FIEMAP support.
+# Return nonzero if the specified path is on a file system for
+# which FIEMAP support exists. Note some file systems (like ext3)
+# only support FIEMAP for files, not directories.
fiemap_capable_()
{
- df -T -t btrfs -t xfs -t ext4 -t ocfs2 -t gfs2 "$@"
+ python $abs_srcdir/fiemap-capable "$@"
}
# Does the current (working-dir) file system support sparse files?
--
1.7.3.4

14
coreutils-gl_printf_safe.patch
View File

@ -1,20 +1,20 @@
Index: configure
===================================================================
--- 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"
--- configure.orig 2011-04-13 21:22:30.000000000 +0200
+++ configure 2011-04-14 14:39:11.027077753 +0200
@@ -3513,7 +3513,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"
-gl_printf_safe=yes
as_fn_append ac_header_list " priv.h"
as_fn_append ac_header_list " pthread.h"
as_fn_append ac_func_list " readlinkat"
as_fn_append ac_header_list " utmp.h"
Index: m4/gnulib-comp.m4
===================================================================
--- 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],
--- m4/gnulib-comp.m4.orig 2011-04-09 09:51:23.000000000 +0200
+++ m4/gnulib-comp.m4 2011-04-14 14:38:04.363003296 +0200
@@ -1217,7 +1217,6 @@ AC_DEFUN([gl_INIT],
# Code from module printf-frexpl:
gl_FUNC_PRINTF_FREXPL
# Code from module printf-safe:

100
coreutils-readd_documentation.patch
View File

@ -1,100 +0,0 @@
The documentation for hostname and hostid was missing from
coreutils 8.10 texinfo documentation. While not documenting hostname
could be argued, the man page of hostid directly refers to the
non-existing texinfo documentation.
Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig 2011-04-01 13:46:18.000000000 +0200
+++ doc/coreutils.texi 2011-04-01 14:08:23.423850965 +0200
@@ -65,6 +65,7 @@
* fold: (coreutils)fold invocation. Wrap long input lines.
* groups: (coreutils)groups invocation. Print group names a user is in.
* head: (coreutils)head invocation. Output the first part of files.
+* hostid: (coreutils)hostid invocation. Print numeric host identifier.
* id: (coreutils)id invocation. Print user identity.
* install: (coreutils)install invocation. Copy and change attributes.
* join: (coreutils)join invocation. Join lines on a common field.
@@ -195,7 +196,7 @@ Free Documentation License''.
* File name manipulation:: dirname basename pathchk mktemp
* Working context:: pwd stty printenv tty
* User information:: id logname whoami groups users who
-* System context:: date arch nproc uname uptime
+* System context:: date arch nproc uname uptime hostname hostid
* SELinux context:: chcon runcon
* Modified command invocation:: chroot env nice nohup stdbuf su timeout
* Process control:: kill
@@ -413,6 +414,8 @@ System context
* nproc invocation:: Print the number of processors
* uname invocation:: Print system information
* uptime invocation:: Print system uptime and load
+* hostname invocation:: Print or set system name
+* hostid invocation:: Print numeric host identifier.
@command{date}: Print or set system date and time
@@ -13758,6 +13761,8 @@ information.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
* uptime invocation:: Print system uptime and load.
+* hostname invocation:: Print or set system name.
+* hostid invocation:: Print numeric host identifier.
@end menu
@node date invocation
@@ -14610,6 +14615,55 @@ also include processes in the uninterrup
those processes which are waiting for disk I/O). The Linux kernel
includes uninterruptible processes.
+@node hostname invocation
+@section @command{hostname}: Print or set system name
+
+@pindex hostname
+@cindex setting the hostname
+@cindex printing the hostname
+@cindex system name, printing
+@cindex appropriate privileges
+
+With no arguments, @command{hostname} prints the name of the current host
+system. With one argument, it sets the current host name to the
+specified string. You must have appropriate privileges to set the host
+name. Synopsis:
+
+@example
+hostname [@var{name}]
+@end example
+
+The only options are @option{--help} and @option{--version}. @xref{Common
+options}.
+
+@exitstatus
+
+
+@node hostid invocation
+@section @command{hostid}: Print numeric host identifier.
+
+@pindex hostid
+@cindex printing the host identifier
+
+@command{hostid} prints the numeric identifier of the current host
+in hexadecimal. This command accepts no arguments.
+The only options are @option{--help} and @option{--version}.
+@xref{Common options}.
+
+For example, here's what it prints on one system I use:
+
+@example
+$ hostid
+1bac013d
+@end example
+
+On that system, the 32-bit quantity happens to be closely
+related to the system's Internet address, but that isn't always
+the case.
+
+@exitstatus
+
+
@node SELinux context
@chapter SELinux context

68
coreutils-no_hostname_and_hostid.patch → coreutils-remove_hostname_documentation.patch
View File

@ -1,44 +1,57 @@
Index: doc/coreutils.texi
===================================================================
--- 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.
--- doc/coreutils.texi.orig 2011-04-04 13:43:03.000000000 +0200
+++ doc/coreutils.texi 2011-04-04 13:47:21.655051052 +0200
@@ -66,7 +66,6 @@
* groups: (coreutils)groups invocation. Print group names a user is in.
* head: (coreutils)head invocation. Output the first part of files.
-* hostid: (coreutils)hostid invocation. Print numeric host identifier.
* hostid: (coreutils)hostid invocation. Print numeric host identifier.
-* hostname: (coreutils)hostname invocation. Print or set system name.
* id: (coreutils)id invocation. Print user identity.
* install: (coreutils)install invocation. Copy and change attributes.
* join: (coreutils)join invocation. Join lines on a common field.
@@ -197,7 +195,7 @@ Free Documentation License''.
@@ -197,7 +196,7 @@ Free Documentation License''.
* File name manipulation:: dirname basename pathchk mktemp
* Working context:: pwd stty printenv tty
* User information:: id logname whoami groups users who
-* System context:: date arch nproc uname hostname hostid uptime
+* System context:: date arch nproc uname uptime
+* System context:: date arch nproc uname hostid uptime
* SELinux context:: chcon runcon
* Modified command invocation:: chroot env nice nohup stdbuf su timeout
* Process control:: kill
@@ -413,8 +411,6 @@ System context
@@ -414,7 +413,6 @@ System context
* date invocation:: Print or set system date and time
* nproc invocation:: Print the number of processors
* uname invocation:: Print system information
-* hostname invocation:: Print or set system name
-* hostid invocation:: Print numeric host identifier
* hostid invocation:: Print numeric host identifier
* uptime invocation:: Print system uptime and load
@command{date}: Print or set system date and time
@@ -13683,8 +13679,6 @@ information.
@@ -13761,7 +13759,6 @@ information.
* arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
-* hostname invocation:: Print or set system name.
-* hostid invocation:: Print numeric host identifier.
* hostid invocation:: Print numeric host identifier.
* uptime invocation:: Print system uptime and load.
@end menu
@@ -14523,15 +14520,6 @@ easily available, as is the case with Li
Print the machine hardware name (sometimes called the hardware class
or hardware type).
@@ -14507,55 +14501,6 @@ Print the kernel version.
-@item -n
-@itemx --nodename
-@opindex -n
-@opindex --nodename
-@cindex hostname
-@cindex node name
-@cindex network node name
-Print the network node hostname.
-
@item -p
@itemx --processor
@opindex -p
@@ -14585,30 +14573,6 @@ Print the kernel version.
@exitstatus
@ -66,34 +79,9 @@ Index: doc/coreutils.texi
-
-@exitstatus
-
-
-@node hostid invocation
-@section @command{hostid}: Print numeric host identifier
-
-@pindex hostid
-@cindex printing the host identifier
-
-@command{hostid} prints the numeric identifier of the current host
-in hexadecimal. This command accepts no arguments.
-The only options are @option{--help} and @option{--version}.
-@xref{Common options}.
-
-For example, here's what it prints on one system I use:
-
-@example
-$ hostid
-1bac013d
-@end example
-
-On that system, the 32-bit quantity happens to be closely
-related to the system's Internet address, but that isn't always
-the case.
-
-@exitstatus
-
@node uptime invocation
@section @command{uptime}: Print system uptime and load
@node hostid invocation
@section @command{hostid}: Print numeric host identifier
Index: man/Makefile.am
===================================================================
--- man/Makefile.am.orig 2011-01-01 22:19:23.000000000 +0100

95
coreutils-split_suffix.patch
View File

@ -1,95 +0,0 @@
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

11
coreutils-testsuite.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/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.10
Release: 2
Version: 8.11
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
@ -37,7 +37,7 @@ Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch1: coreutils-remove_hostname_documentation.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
@ -55,9 +55,6 @@ Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
#Next two patches added after 8.10 release so should be obsolete with next release
Patch34: coreutils-compute_range_endpoint.patch
Patch35: coreutils-fix_sparse_fiemap_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
@ -99,8 +96,6 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch31
%patch32
%patch33
%patch34 -p1
%patch35 -p1
%build
AUTOPOINT=true autoreconf -fi

76
coreutils.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Thu Apr 14 14:46:41 CEST 2011 - pth@suse.de
- Update to 8.11:
* Bug fixes
cp -a --link would not create a hardlink to a symlink, instead
copying the symlink and then not preserving its timestamp.
[bug introduced in coreutils-8.0]
cp now avoids FIEMAP issues with BTRFS before Linux 2.6.38,
which could result in corrupt copies of sparse files.
[bug introduced in coreutils-8.10]
cut could segfault when invoked with a user-specified output
delimiter and an unbounded range like "-f1234567890-".
[bug introduced in coreutils-5.3.0]
du would infloop when given --files0-from=DIR
[bug introduced in coreutils-7.1]
sort no longer spawns 7 worker threads to sort 16 lines
[bug introduced in coreutils-8.6]
touch built on Solaris 9 would segfault when run on Solaris 10
[bug introduced in coreutils-8.8]
wc would dereference a NULL pointer upon an early out-of-memory error
[bug introduced in coreutils-7.1]
** New features
dd now accepts the 'nocache' flag to the iflag and oflag options,
which will discard any cache associated with the files, or
processed portion thereof.
dd now warns that 'iflag=fullblock' should be used,
in various cases where partial reads can cause issues.
** Changes in behavior
cp now avoids syncing files when possible, when doing a FIEMAP copy.
The sync is only needed on Linux kernels before 2.6.39.
[The sync was introduced in coreutils-8.10]
cp now copies empty extents efficiently, when doing a FIEMAP copy.
It no longer reads the zero bytes from the input, and also can
efficiently create a hole in the output file when --sparse=always
is specified.
df now aligns columns consistently, and no longer wraps entries
with longer device identifiers, over two lines.
install now rejects its long-deprecated --preserve_context option.
Use --preserve-context instead.
test now accepts "==" as a synonym for "="
-------------------------------------------------------------------
Tue Apr 5 15:13:42 CEST 2011 - pth@suse.de
- Adapt coreutils-testsuite.spec to changes in patches.
-------------------------------------------------------------------
Tue Apr 5 11:40:19 CEST 2011 - pth@suse.de
- Remove unneeded split_suffix patch.
-------------------------------------------------------------------
Mon Apr 4 16:13:04 CEST 2011 - pth@suse.de
- Remove the last patch as it isn't needed. It was an old patch
that removed the documentation for both hostname and hostid.
I've modified that to only remove the hostname documentation.
-------------------------------------------------------------------
Fri Apr 1 15:34:49 CEST 2011 - pth@suse.de

12
coreutils.spec
View File

@ -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.10
Version: 8.11
Release: 2
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
@ -37,7 +37,7 @@ Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Patch0: coreutils-misc.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch1: coreutils-remove_hostname_documentation.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
@ -50,16 +50,11 @@ 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
Patch26: coreutils-readd_documentation.patch
#
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
#Next two patches added after 8.10 release so should be obsolete with next release
Patch34: coreutils-compute_range_endpoint.patch
Patch35: coreutils-fix_sparse_fiemap_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
@ -95,14 +90,11 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26
#
%patch30 -p1
%patch31
%patch32
%patch33
%patch34 -p1
%patch35 -p1
%build
AUTOPOINT=true autoreconf -fi