[arch-commits] Commit in coreutils/trunk (3 files)
Date: Thursday, May 14, 2015 @ 17:06:04
Author: seblu
Revision: 239347
upgpkg: coreutils 8.23-2
- fix FS#44404
- fix build on btrfs
Added:
coreutils/trunk/01-btrfs-alloc.patch
Modified:
coreutils/trunk/PKGBUILD
Deleted:
coreutils/trunk/0001-cp-don-t-reserve-a-device-number.patch
-+
0001-cp-don-t-reserve-a-device-number.patch | 77
01-btrfs-alloc.patch| 96 ++
PKGBUILD| 23 --
3 files changed, 111 insertions(+), 85 deletions(-)
Deleted: 0001-cp-don-t-reserve-a-device-number.patch
===
--- 0001-cp-don-t-reserve-a-device-number.patch 2015-05-14 13:32:09 UTC (rev
239346)
+++ 0001-cp-don-t-reserve-a-device-number.patch 2015-05-14 15:06:04 UTC (rev
239347)
@@ -1,77 +0,0 @@
-From d0294ff3b90430750a631556277c75f1a555dd44 Mon Sep 17 00:00:00 2001
-From: Paul Eggert egg...@cs.ucla.edu
-Date: Thu, 3 Apr 2014 09:48:22 -0700
-Subject: [PATCH] cp: don't reserve a device number
-
-* src/copy.c (copy_internal): Replace dev_t arg DEVICE with struct
-stat pointer arg PARENT. All callers changed. This removes an
-unwarranted assumption that dev_t values of 0 cannot occur in file
-systems. See: http://bugs.gnu.org/17179
- src/copy.c | 15 +++
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/copy.c b/src/copy.c
-index 781cc1e..d471a77 100644
a/src/copy.c
-+++ b/src/copy.c
-@@ -117,7 +117,7 @@ struct dir_list
- #define DEST_INFO_INITIAL_CAPACITY 61
-
- static bool copy_internal (char const *src_name, char const *dst_name,
-- bool new_dst, dev_t device,
-+ bool new_dst, struct stat const *parent,
-struct dir_list *ancestors,
-const struct cp_options *x,
-bool command_line_arg,
-@@ -621,7 +621,7 @@ copy_dir (char const *src_name_in, char const
*dst_name_in, bool new_dst,
- char *dst_name = file_name_concat (dst_name_in, namep, NULL);
- bool first_dir_created = *first_dir_created_per_command_line_arg;
-
-- ok = copy_internal (src_name, dst_name, new_dst, src_sb-st_dev,
-+ ok = copy_internal (src_name, dst_name, new_dst, src_sb,
-ancestors, non_command_line_options, false,
-first_dir_created,
-local_copy_into_self, NULL);
-@@ -1725,9 +1725,8 @@ should_dereference (const struct cp_options *x, bool
command_line_arg)
- /* Copy the file SRC_NAME to the file DST_NAME. The files may be of
-any type. NEW_DST should be true if the file DST_NAME cannot
-exist because its parent directory was just created; NEW_DST should
-- be false if DST_NAME might already exist. DEVICE is the device
-- number of the parent directory, or 0 if the parent of this file is
-- not known. ANCESTORS points to a linked, null terminated list of
-+ be false if DST_NAME might already exist. A nonnull PARENT describes the
-+ parent directory. ANCESTORS points to a linked, null terminated list of
-devices and inodes of parent directories of SRC_NAME. COMMAND_LINE_ARG
-is true iff SRC_NAME was specified on the command line.
-FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output.
-@@ -1737,7 +1736,7 @@ should_dereference (const struct cp_options *x, bool
command_line_arg)
- static bool
- copy_internal (char const *src_name, char const *dst_name,
-bool new_dst,
-- dev_t device,
-+ struct stat const *parent,
-struct dir_list *ancestors,
-const struct cp_options *x,
-bool command_line_arg,
-@@ -2434,7 +2433,7 @@ copy_internal (char const *src_name, char const
*dst_name,
- }
-
- /* Decide whether to copy the contents of the directory. */
-- if (x-one_file_system device != 0 device != src_sb.st_dev)
-+ if (x-one_file_system parent parent-st_dev != src_sb.st_dev)
- {
- /* Here, we are crossing a file system boundary and cp's -x option
- is in effect: so don't copy the contents of this directory. */
-@@ -2827,7 +2826,7 @@ copy (char const *src_name, char const *dst_name,
- top_level_dst_name = dst_name;
-
- bool first_dir_created_per_command_line_arg = false;
-- return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL,
-+ return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL,
- options, true,
- first_dir_created_per_command_line_arg,
- copy_into_self, rename_succeeded);
---
-1.9.1
-
Added: 01-btrfs-alloc.patch
===
--- 01-btrfs-alloc.patch(rev 0)
+++
[arch-commits] Commit in coreutils/trunk (3 files)
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
===
--- PKGBUILD2010-01-14 14:35:12 UTC (rev 63088)
+++ PKGBUILD2010-01-14 14:58:02 UTC (rev 63089)
@@ -3,7 +3,7 @@
# Contributor: judd jvi...@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.0
+0200
-+++ coreutils-7.2/gnulib-tests/gnulib.mk 2009-04-01 12:37:00.0
+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.0
+0100
coreutils-8.4/gnulib-tests/gnulib.mk 2010-01-14 10:28:17.0
+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.0
+0200
-+++ coreutils-6.11/tests/test-lib.sh 2008-04-24 14:18:59.0 +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
