[arch-commits] Commit in coreutils/trunk (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Jun 16 06:21:37 UTC 2008
Date: Monday, June 16, 2008 @ 02:21:37
Author: andyrtr
Revision: 2936
upgpkg: coreutils 6.12-1
Modified:
coreutils/trunk/PKGBUILD
coreutils/trunk/coreutils-6.10-configuration.patch
coreutils/trunk/coreutils-i18n.patch
------------------------------------+
PKGBUILD | 8 +--
coreutils-6.10-configuration.patch | 45 +++++++++++++--------
coreutils-i18n.patch | 72 +++++++++++++++++------------------
3 files changed, 69 insertions(+), 56 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-06-16 06:05:18 UTC (rev 2935)
+++ PKGBUILD 2008-06-16 06:21:37 UTC (rev 2936)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=coreutils
-pkgver=6.11
+pkgver=6.12
pkgrel=1
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=(i686 x86_64)
@@ -20,11 +20,11 @@
coreutils-pam.patch
coreutils-6.10-configuration.patch
su)
-md5sums=('4b638a895f6c7d0d4a8f62d60189fd9b'
- '0d70afbfe41462c200af6a9aa549bf32'
+md5sums=('2ca9ac69823dbd567b905a9e9f53c4f6'
+ '64991a860ddb98a9b7a2a5a0221a399a'
'18d3ba178e2691242287b59bd81aedb9'
'8810a22cdc05d502a69b59511e9abf79'
- '20460d4b04bd4f51d1c3236d96fd8df7'
+ 'e0f3edab474a4c96591c4f94a7962c9b'
'fa85e5cce5d723275b14365ba71a8aad')
build() {
Modified: coreutils-6.10-configuration.patch
===================================================================
--- coreutils-6.10-configuration.patch 2008-06-16 06:05:18 UTC (rev 2935)
+++ coreutils-6.10-configuration.patch 2008-06-16 06:21:37 UTC (rev 2936)
@@ -1,22 +1,33 @@
-diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing
---- coreutils-6.11-orig/tests/touch/no-create-missing 2008-04-19 23:34:23.000000000 +0200
-+++ coreutils-6.11/tests/touch/no-create-missing 2008-04-24 12:34:52.000000000 +0200
-@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test"
- # This test is ineffective unless /dev/stdout also works.
- if "$test" -w /dev/stdout >/dev/null &&
- "$test" ! -w /dev/stdout >&-; then
-- touch -c - >&- 2> /dev/null || fail=1
-+ strace touch -c - >&- || fail=1
- touch -cm - >&- 2> /dev/null || fail=1
- touch -ca - >&- 2> /dev/null || fail=1
- fi
-diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
+diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
+--- coreutils-6.12-orig/tests/misc/cut 2008-05-17 08:41:11.000000000 +0200
++++ coreutils-6.12/tests/misc/cut 2008-06-02 11:13:08.000000000 +0200
+@@ -26,7 +26,7 @@
+ my $prog = 'cut';
+ my $try = "Try \`$prog --help' for more information.\n";
+ my $from_1 = "$prog: fields and positions are numbered from 1\n$try";
+-my $inval = "$prog: invalid byte or field list\n$try";
++my $inval = "$prog: invalid byte, character or field list\n$try";
+ my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
+
+ my @Tests =
+@@ -140,8 +140,8 @@
+ ['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
+
+ # None of the following invalid ranges provoked an error up to coreutils-6.9.
+- ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
+- {ERR=>"$prog: invalid decreasing range\n$try"}],
++ ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
++ {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}],
+diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
--- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200
+++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200
-@@ -30,6 +30,7 @@ fi
- . $srcdir/../envvar-check
- . $srcdir/../lang-default
- . $srcdir/../test-lib.sh
+@@ -38,6 +28,7 @@
+ # successfully, in spite of the invalid context string.
+
+ . $srcdir/test-lib.sh
+require_selinux_
c=invalid-selinux-context
Modified: coreutils-i18n.patch
===================================================================
--- coreutils-i18n.patch 2008-06-16 06:05:18 UTC (rev 2935)
+++ coreutils-i18n.patch 2008-06-16 06:21:37 UTC (rev 2936)
@@ -1,9 +1,9 @@
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/sort/sort-mb-tests 2007-03-01 15:08:24.000000000 +0000
++++ coreutils-6.8+/tests/misc/sort-mb-tests 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,58 @@
+#! /bin/sh
+case $# in
-+ 0) xx='../../src/sort';;
++ 0) xx='../src/sort';;
+ *) xx="$1";;
+esac
+test "$VERBOSE" && echo=echo || echo=:
@@ -16,38 +16,38 @@
+locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
+errors=0
+
-+$xx -t ï¼ -k2 -n mb1.I > mb1.O
++$xx -t ï¼ -k2 -n misc/mb1.I > misc/mb1.O
+code=$?
+if test $code != 0; then
+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
+ errors=`expr $errors + 1`
+else
-+ cmp mb1.O $srcdir/mb1.X > /dev/null 2>&1
++ cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1
+ case $? in
+ 0) if test "$VERBOSE"; then $echo "passed mb1"; fi;;
-+ 1) $echo "Test mb1 failed: files mb1.O and $srcdir/mb1.X differ" 1>&2
-+ (diff -c mb1.O $srcdir/mb1.X) 2> /dev/null
++ 1) $echo "Test mb1 failed: files misc/mb1.O and $srcdir/misc/mb1.X differ" 1>&2
++ (diff -c misc/mb1.O $srcdir/misc/mb1.X) 2> /dev/null
+ errors=`expr $errors + 1`;;
+ 2) $echo "Test mb1 may have failed." 1>&2
-+ $echo The command "cmp mb1.O $srcdir/mb1.X" failed. 1>&2
++ $echo The command "cmp misc/mb1.O $srcdir/misc/mb1.X" failed. 1>&2
+ errors=`expr $errors + 1`;;
+ esac
+fi
+
-+$xx -t ï¼ -k4 -n mb2.I > mb2.O
++$xx -t ï¼ -k4 -n misc/mb2.I > misc/mb2.O
+code=$?
+if test $code != 0; then
+ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
+ errors=`expr $errors + 1`
+else
-+ cmp mb2.O $srcdir/mb2.X > /dev/null 2>&1
++ cmp misc/mb2.O $srcdir/misc/mb2.X > /dev/null 2>&1
+ case $? in
+ 0) if test "$VERBOSE"; then $echo "passed mb2"; fi;;
-+ 1) $echo "Test mb2 failed: files mb2.O and $srcdir/mb2.X differ" 1>&2
-+ (diff -c mb2.O $srcdir/mb2.X) 2> /dev/null
++ 1) $echo "Test mb2 failed: files misc/mb2.O and $srcdir/misc/mb2.X differ" 1>&2
++ (diff -c misc/mb2.O $srcdir/misc/mb2.X) 2> /dev/null
+ errors=`expr $errors + 1`;;
+ 2) $echo "Test mb2 may have failed." 1>&2
-+ $echo The command "cmp mb2.O $srcdir/mb2.X" failed. 1>&2
++ $echo The command "cmp misc/mb2.O $srcdir/misc/mb2.X" failed. 1>&2
+ errors=`expr $errors + 1`;;
+ esac
+fi
@@ -60,53 +60,55 @@
+test $errors = 0 || errors=1
+exit $errors
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/sort/mb2.I 2007-03-01 15:08:24.000000000 +0000
++++ coreutils-6.8+/tests/misc/mb2.I 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/sort/mb2.X 2007-03-01 15:08:24.000000000 +0000
++++ coreutils-6.8+/tests/misc/mb2.X 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/sort/mb1.I 2007-03-01 15:08:24.000000000 +0000
++++ coreutils-6.8+/tests/misc/mb1.I 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Appleï¼ 10
+Bananaï¼ 5
+Citrusï¼ 20
+Cherryï¼ 30
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/sort/mb1.X 2007-03-01 15:08:24.000000000 +0000
++++ coreutils-6.8+/tests/misc/mb1.X 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Bananaï¼ 5
+Appleï¼ 10
+Citrusï¼ 20
+Cherryï¼ 30
---- coreutils-6.8+/tests/sort/Makefile.am.i18n 2007-01-24 07:47:37.000000000 +0000
-+++ coreutils-6.8+/tests/sort/Makefile.am 2007-03-01 15:09:59.000000000 +0000
-@@ -66,12 +66,14 @@
- bigfield.O bigfield.E obs-inval.O obs-inval.E realloc-buf.O realloc-buf.E
- ##test-files-end
+diff -urN coreutils-6.12-orig/tests/Makefile.am coreutils-6.12/tests/Makefile.am
+--- coreutils-6.12-orig/tests/Makefile.am 2008-05-27 13:47:53.000000000 +0200
++++ coreutils-6.12/tests/Makefile.am 2008-06-02 10:06:03.000000000 +0200
+@@ -191,6 +191,7 @@
+ misc/shuf \
+ misc/sort \
+ misc/sort-compress \
++ misc/sort-mb-tests \
+ misc/sort-merge \
+ misc/sort-rand \
+ misc/split-a \
+@@ -391,6 +392,10 @@
+ $(root_tests)
--EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
--noinst_SCRIPTS = $x-tests
-+run_gen += mb1.0 mb2.0
-+
-+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) mb1.I mb1.X mb2.I mb2.X
-+noinst_SCRIPTS = $x-tests # $x-mb-tests
-
- editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
--TESTS = $x-tests
-+TESTS = $x-tests $x-mb-tests
-
- mk_script = $(srcdir)/../mk-script
- $(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+ pr_data = \
++ misc/mb1.X \
++ misc/mb1.I \
++ misc/mb2.X \
++ misc/mb2.I \
+ pr/0F \
+ pr/0FF \
+ pr/0FFnt \
--- coreutils-6.8+/lib/linebuffer.h.i18n 2005-05-14 07:44:24.000000000 +0100
+++ coreutils-6.8+/lib/linebuffer.h 2007-03-01 15:08:24.000000000 +0000
@@ -22,6 +22,11 @@
More information about the arch-commits
mailing list