[arch-commits] Commit in coreutils/trunk (3 files)
Allan McRae
allan at archlinux.org
Thu Jan 14 14:58:02 UTC 2010
Date: Thursday, January 14, 2010 @ 09:58:02
Author: allan
Revision: 63089
upgpkg: coreutils 8.4-1
upstream and patchset update
Modified:
coreutils/trunk/PKGBUILD
coreutils/trunk/coreutils-6.10-configuration.patch
coreutils/trunk/coreutils-i18n.patch
------------------------------------+
PKGBUILD | 8 +-
coreutils-6.10-configuration.patch | 135 +++++++++++++++++++++--------------
coreutils-i18n.patch | 4 -
3 files changed, 87 insertions(+), 60 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-14 14:35:12 UTC (rev 63088)
+++ PKGBUILD 2010-01-14 14:58:02 UTC (rev 63089)
@@ -3,7 +3,7 @@
# Contributor: judd <jvinet at zeroflux.org>
pkgname=coreutils
-pkgver=8.2
+pkgver=8.4
pkgrel=1
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
@@ -23,11 +23,11 @@
coreutils-pam.patch
coreutils-6.10-configuration.patch
su)
-md5sums=('dfb0d3dbc5f555386339f4f74621cda0'
- '0ccdad826d251515b61d4b60da93a7e5'
+md5sums=('56f549854d723d9dcebb77919019df55'
+ 'f88e6b4ce09e6d453f595d46d2a153b2'
'c4fcca138b6abf6d443d48a6f0cd8833'
'7efee4d5b3653711f9e229493316841c'
- '8db636d7bf3c05068d96f88cb84bdf9d'
+ 'dd4f472de8380104af3ac0ef920fae8b'
'fa85e5cce5d723275b14365ba71a8aad')
build() {
Modified: coreutils-6.10-configuration.patch
===================================================================
--- coreutils-6.10-configuration.patch 2010-01-14 14:35:12 UTC (rev 63088)
+++ coreutils-6.10-configuration.patch 2010-01-14 14:58:02 UTC (rev 63089)
@@ -1,37 +1,89 @@
-diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
---- coreutils-7.2-orig/gnulib-tests/gnulib.mk 2009-03-31 14:28:30.000000000 +0200
-+++ coreutils-7.2/gnulib-tests/gnulib.mk 2009-04-01 12:37:00.000000000 +0200
-@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
+diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/gnulib.mk
+--- coreutils-8.4-orig/gnulib-tests/gnulib.mk 2010-01-13 22:01:30.000000000 +0100
++++ coreutils-8.4/gnulib-tests/gnulib.mk 2010-01-14 10:28:17.000000000 +0100
+@@ -256,9 +256,9 @@ EXTRA_DIST += nap.h test-chown.h test-ch
- ## begin gnulib module memchr-tests
+ ## begin gnulib module cloexec-tests
--TESTS += test-memchr
--check_PROGRAMS += test-memchr
--EXTRA_DIST += test-memchr.c zerosize-ptr.h
-+#TESTS += test-memchr
-+#check_PROGRAMS += test-memchr
-+#EXTRA_DIST += test-memchr.c zerosize-ptr.h
+-TESTS += test-cloexec
+-check_PROGRAMS += test-cloexec
+-EXTRA_DIST += test-cloexec.c macros.h
++#TESTS += test-cloexec
++#check_PROGRAMS += test-cloexec
++#EXTRA_DIST += test-cloexec.c macros.h
- ## end gnulib module memchr-tests
+ ## end gnulib module cloexec-tests
-@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
+@@ -332,9 +332,9 @@ EXTRA_DIST += test-dirname.c
- ## begin gnulib module strverscmp-tests
+ ## begin gnulib module dup2-tests
--TESTS += test-strverscmp
--check_PROGRAMS += test-strverscmp
--EXTRA_DIST += test-strverscmp.c
-+#TESTS += test-strverscmp
-+#check_PROGRAMS += test-strverscmp
-+#EXTRA_DIST += test-strverscmp.c
+-TESTS += test-dup2
+-check_PROGRAMS += test-dup2
+-EXTRA_DIST += test-dup2.c signature.h macros.h
++#TESTS += test-dup2
++#check_PROGRAMS += test-dup2
++#EXTRA_DIST += test-dup2.c signature.h macros.h
- ## end gnulib module strverscmp-tests
+ ## end gnulib module dup2-tests
-diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
---- coreutils-6.11-orig/tests/test-lib.sh 2008-04-19 23:34:23.000000000 +0200
-+++ coreutils-6.11/tests/test-lib.sh 2008-04-24 14:18:59.000000000 +0200
-@@ -97,8 +97,8 @@ skip_if_()
+@@ -376,9 +376,9 @@ EXTRA_DIST += test-exclude.c test-exclud
+ ## begin gnulib module fchdir-tests
+
+-TESTS += test-fchdir
+-check_PROGRAMS += test-fchdir
+-EXTRA_DIST += test-fchdir.c signature.h macros.h
++#TESTS += test-fchdir
++#check_PROGRAMS += test-fchdir
++#EXTRA_DIST += test-fchdir.c signature.h macros.h
+
+ ## end gnulib module fchdir-tests
+
+@@ -855,10 +855,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/li
+
+ ## begin gnulib module linkat-tests
+
+-TESTS += test-linkat
+-check_PROGRAMS += test-linkat
+-test_linkat_LDADD = $(LDADD) @LIBINTL@
+-EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
++#TESTS += test-linkat
++#check_PROGRAMS += test-linkat
++#test_linkat_LDADD = $(LDADD) @LIBINTL@
++#EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
+
+ ## end gnulib module linkat-tests
+
+@@ -1532,9 +1532,9 @@ EXTRA_DIST += test-uname.c signature.h m
+
+ ## begin gnulib module unistd-safer-tests
+
+-TESTS += test-dup-safer
+-check_PROGRAMS += test-dup-safer
+-EXTRA_DIST += test-dup-safer.c macros.h
++#TESTS += test-dup-safer
++#check_PROGRAMS += test-dup-safer
++#EXTRA_DIST += test-dup-safer.c macros.h
+
+ ## end gnulib module unistd-safer-tests
+
+diff -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am
+--- coreutils-8.4-orig/tests/Makefile.am 2010-01-03 18:06:20.000000000 +0100
++++ coreutils-8.4/tests/Makefile.am 2010-01-14 10:28:17.000000000 +0100
+@@ -79,7 +79,6 @@ TESTS = \
+ rm/ext3-perf \
+ rm/cycle \
+ cp/link-heap \
+- tail-2/inotify-hash-abuse \
+ tail-2/inotify-hash-abuse2 \
+ tail-2/F-vs-rename \
+ tail-2/inotify-rotate \
+diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh
+--- coreutils-8.4-orig/tests/test-lib.sh 2010-01-03 18:06:20.000000000 +0100
++++ coreutils-8.4/tests/test-lib.sh 2010-01-14 10:28:17.000000000 +0100
+@@ -218,8 +218,8 @@ skip_if_()
+
require_selinux_()
{
- case `ls -Zd .` in
@@ -41,34 +93,9 @@
skip_test_ "this system (or maybe just" \
"the current file system) lacks SELinux support"
;;
-diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
---- coreutils-7.1-orig/src/ls.c 2009-02-25 13:23:59.000000000 +0100
-+++ coreutils-7.1/src/ls.c 2009-02-25 13:25:20.000000000 +0100
-@@ -38,10 +38,6 @@
- #include <config.h>
- #include <sys/types.h>
-
--#ifdef HAVE_CAP
--# include <sys/capability.h>
--#endif
--
- #if HAVE_TERMIOS_H
- # include <termios.h>
- #endif
-@@ -84,6 +80,10 @@
- #include "system.h"
- #include <fnmatch.h>
-
-+#ifdef HAVE_CAP
-+# include <sys/capability.h>
-+#endif
-+
- #include "acl.h"
- #include "argmatch.h"
- #include "dev-ino.h"
-diff -urNp coreutils-8.1-orig/tests/touch/no-dereference coreutils-8.1/tests/touch/no-dereference
---- coreutils-8.1-orig/tests/touch/no-dereference 2009-10-30 12:51:07.000000000 +0100
-+++ coreutils-8.1/tests/touch/no-dereference 2009-11-27 13:31:10.000000000 +0100
+diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference
+--- coreutils-8.4-orig/tests/touch/no-dereference 2010-01-12 15:36:17.000000000 +0100
++++ coreutils-8.4/tests/touch/no-dereference 2010-01-14 10:28:17.000000000 +0100
@@ -46,6 +46,8 @@ test -f nowhere && fail=1
grep '^#define HAVE_UTIMENSAT' "$CONFIG_HEADER" > /dev/null ||
grep '^#define HAVE_LUTIMES' "$CONFIG_HEADER" > /dev/null ||
@@ -77,4 +104,4 @@
+ skip_test_ 'rest of the test disabled due to koji lack of utimensat function'
# Changing time of dangling symlink is okay.
- touch -h dangling || fail=1
+ # Skip the test if this fails, but the error text corresponds to
Modified: coreutils-i18n.patch
===================================================================
--- coreutils-i18n.patch 2010-01-14 14:35:12 UTC (rev 63088)
+++ coreutils-i18n.patch 2010-01-14 14:58:02 UTC (rev 63089)
@@ -14,8 +14,8 @@
struct linebuffer
@@ -28,6 +33,9 @@ struct linebuffer
- size_t size; /* Allocated. */
- size_t length; /* Used. */
+ size_t size; /* Allocated. */
+ size_t length; /* Used. */
char *buffer;
+# if HAVE_WCHAR_H
+ mbstate_t state;
More information about the arch-commits
mailing list