From 8d751c4bfebfeff8ad772855d36494fa0a32bd93 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 18 Mar 2016 13:47:37 +0300 Subject: [PATCH] coreutils: Update to 8.25 --- ...c.patch => 001-coreutils-8.25-2.src.patch} | 255 ++++++++++-------- coreutils/008-msys2-src.patch | 52 ++-- coreutils/PKGBUILD | 12 +- 3 files changed, 171 insertions(+), 148 deletions(-) rename coreutils/{001-coreutils-8.24-3.src.patch => 001-coreutils-8.25-2.src.patch} (82%) diff --git a/coreutils/001-coreutils-8.24-3.src.patch b/coreutils/001-coreutils-8.25-2.src.patch similarity index 82% rename from coreutils/001-coreutils-8.24-3.src.patch rename to coreutils/001-coreutils-8.25-2.src.patch index 26d2ebe3..814aed81 100644 --- a/coreutils/001-coreutils-8.24-3.src.patch +++ b/coreutils/001-coreutils-8.25-2.src.patch @@ -1,6 +1,11 @@ ---- origsrc/coreutils-8.24/ChangeLog 2015-07-03 15:23:13.000000000 -0600 -+++ src/coreutils-8.24/ChangeLog 2015-08-26 17:59:44.745654800 -0600 -@@ -1,3 +1,230 @@ +--- origsrc/coreutils-8.25/ChangeLog 2016-01-20 03:55:17.000000000 -0700 ++++ src/coreutils-8.25/ChangeLog 2016-03-08 20:22:07.177797100 -0700 +@@ -1,3 +1,235 @@ ++2016-03-08 Eric Blake ++ ++ Cygwin release 8.25-1. ++ * lib/set-permissions.c (set_acls_from_mode): Fix missing return. ++ +2015-08-26 Eric Blake + + Cygwin release 8.24-3. @@ -228,12 +233,12 @@ + * src/install.c (strip): Check for .exe here since strip doesn't. + + - 2015-07-03 Pádraig Brady + 2016-01-20 Pádraig Brady - version 8.24 ---- origsrc/coreutils-8.24/configure.ac 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/configure.ac 2015-08-26 17:59:36.443068800 -0600 -@@ -462,7 +462,8 @@ gl_WARN_ADD([-Werror], [CFLAGS]) + version 8.25 +--- origsrc/coreutils-8.25/configure.ac 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/configure.ac 2016-03-08 20:19:00.297070400 -0700 +@@ -468,7 +468,8 @@ gl_WARN_ADD([-Werror], [CFLAGS]) gl_WARN_ADD([-errwarn], [CFLAGS]) # Put this message here, after gl_WARN_ADD's chatter. AC_MSG_CHECKING([whether this system supports stdbuf]) @@ -243,7 +248,7 @@ LDFLAGS="-shared $LDFLAGS" stdbuf_supported=no # Note we only LINK here rather than RUN to support cross compilation -@@ -479,7 +480,7 @@ AC_LINK_IFELSE( +@@ -486,7 +487,7 @@ AC_LINK_IFELSE( ], [stdbuf_supported=yes]) AC_MSG_RESULT([$stdbuf_supported]) @@ -252,9 +257,9 @@ gl_ADD_PROG([optional_bin_progs], [stdbuf]) fi CFLAGS=$ac_save_CFLAGS ---- origsrc/coreutils-8.24/doc/coreutils.texi 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/doc/coreutils.texi 2015-08-26 17:59:36.443068800 -0600 -@@ -7569,6 +7569,14 @@ These options change how file names them +--- origsrc/coreutils-8.25/doc/coreutils.texi 2016-01-13 04:16:39.000000000 -0700 ++++ src/coreutils-8.25/doc/coreutils.texi 2016-03-08 20:19:00.297070400 -0700 +@@ -7665,6 +7665,14 @@ These options change how file names them @table @samp @@ -269,7 +274,7 @@ @item -b @itemx --escape @itemx --quoting-style=escape -@@ -11567,6 +11575,14 @@ With this option, @command{stat} acts on +@@ -11679,6 +11687,14 @@ With this option, @command{stat} acts on by each symbolic link argument. Without it, @command{stat} acts on any symbolic link argument directly. @@ -284,8 +289,8 @@ @item -f @itemx --file-system @opindex -f ---- origsrc/coreutils-8.24/lib/cygwin.c 1969-12-31 17:00:00.000000000 -0700 -+++ src/coreutils-8.24/lib/cygwin.c 2015-08-26 17:59:36.443068800 -0600 +--- origsrc/coreutils-8.25/lib/cygwin.c 1969-12-31 17:00:00.000000000 -0700 ++++ src/coreutils-8.25/lib/cygwin.c 2016-03-08 20:19:00.297070400 -0700 @@ -0,0 +1,73 @@ +/* cygwin.c - helper functions unique to Cygwin + @@ -360,8 +365,8 @@ + errno = saved_errno; + return result; +} ---- origsrc/coreutils-8.24/lib/cygwin.h 1969-12-31 17:00:00.000000000 -0700 -+++ src/coreutils-8.24/lib/cygwin.h 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/cygwin.h 1969-12-31 17:00:00.000000000 -0700 ++++ src/coreutils-8.25/lib/cygwin.h 2016-03-08 20:19:00.297070400 -0700 @@ -0,0 +1,38 @@ +/* cygwin.h - helper functions unique to Cygwin + @@ -401,8 +406,8 @@ + __name_orig), ".exe") + +#endif /* CYGWIN_H */ ---- origsrc/coreutils-8.24/lib/hash-pjw.c 2015-06-15 23:00:37.000000000 -0600 -+++ src/coreutils-8.24/lib/hash-pjw.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/hash-pjw.c 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/hash-pjw.c 2016-03-08 20:19:00.297070400 -0700 @@ -19,6 +19,7 @@ #include "hash-pjw.h" @@ -428,15 +433,15 @@ + + return h % tablesize; +} ---- origsrc/coreutils-8.24/lib/hash-pjw.h 2015-06-15 23:00:37.000000000 -0600 -+++ src/coreutils-8.24/lib/hash-pjw.h 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/hash-pjw.h 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/hash-pjw.h 2016-03-08 20:19:00.297070400 -0700 @@ -21,3 +21,4 @@ The result is platform dependent: it depends on the size of the 'size_t' type and on the signedness of the 'char' type. */ extern size_t hash_pjw (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; +extern size_t hash_pjw_case (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; ---- origsrc/coreutils-8.24/lib/hash-triple.c 2015-06-15 23:00:37.000000000 -0600 -+++ src/coreutils-8.24/lib/hash-triple.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/hash-triple.c 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/hash-triple.c 2016-03-08 20:19:00.297070400 -0700 @@ -34,7 +34,13 @@ size_t triple_hash (void const *x, size_t table_size) { @@ -451,8 +456,8 @@ /* Ignoring the device number here should be fine. */ return (tmp ^ p->st_ino) % table_size; ---- origsrc/coreutils-8.24/lib/local.mk 2012-11-13 06:51:53.000000000 -0700 -+++ src/coreutils-8.24/lib/local.mk 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/local.mk 2012-11-13 06:51:53.000000000 -0700 ++++ src/coreutils-8.25/lib/local.mk 2016-03-08 20:19:00.297070400 -0700 @@ -3,3 +3,6 @@ include lib/gnulib.mk # Allow "make distdir" to succeed before "make all" has run. dist-hook: $(noinst_LIBRARIES) @@ -460,8 +465,8 @@ + +# Hook in cygwin helper +lib_libcoreutils_a_SOURCES += lib/cygwin.c lib/cygwin.h ---- origsrc/coreutils-8.24/lib/root-dev-ino.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/lib/root-dev-ino.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/root-dev-ino.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/lib/root-dev-ino.c 2016-03-08 20:19:00.312670600 -0700 @@ -25,13 +25,17 @@ /* Call lstat to get the device and inode numbers for '/'. Upon failure, return NULL. Otherwise, set the members of @@ -484,8 +489,8 @@ + root_d_i->double_slash.st_dev = statbuf.st_dev; return root_d_i; } ---- origsrc/coreutils-8.24/lib/root-dev-ino.h 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/lib/root-dev-ino.h 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/root-dev-ino.h 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/lib/root-dev-ino.h 2016-03-08 20:19:00.312670600 -0700 @@ -21,19 +21,26 @@ # include "dev-ino.h" # include "same-inode.h" @@ -515,10 +520,10 @@ - if (STREQ (Dirname, "/")) \ + if (STREQ (Dirname, "/") || STREQ (Dirname, "//")) \ error (0, 0, _("it is dangerous to operate recursively on %s"), \ - quote (Dirname)); \ + quoteaf (Dirname)); \ else \ ---- origsrc/coreutils-8.24/lib/same.c 2015-06-15 23:00:37.000000000 -0600 -+++ src/coreutils-8.24/lib/same.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/same.c 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/same.c 2016-03-08 20:19:00.312670600 -0700 @@ -40,6 +40,13 @@ #include "error.h" #include "same-inode.h" @@ -579,8 +584,27 @@ bool same = false; #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX ---- origsrc/coreutils-8.24/lib/xfreopen.c 2015-06-15 23:00:37.000000000 -0600 -+++ src/coreutils-8.24/lib/xfreopen.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/lib/set-permissions.c 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/set-permissions.c 2016-03-08 20:19:00.312670600 -0700 +@@ -269,6 +269,7 @@ set_acls_from_mode (const char *name, in + } + return -1; + } ++ return 0; + } + } + +@@ -494,7 +495,7 @@ set_acls (struct permission_context *ctx + + # ifndef HAVE_ACL_FROM_TEXT + # error Must have acl_from_text (see POSIX 1003.1e draft 17). +-# endif ++ # endif + # ifndef HAVE_ACL_DELETE_DEF_FILE + # error Must have acl_delete_def_file (see POSIX 1003.1e draft 17). + # endif +--- origsrc/coreutils-8.25/lib/xfreopen.c 2016-01-01 06:45:55.000000000 -0700 ++++ src/coreutils-8.25/lib/xfreopen.c 2016-03-08 20:19:00.312670600 -0700 @@ -18,6 +18,7 @@ #include "xfreopen.h" @@ -607,9 +631,9 @@ if (!freopen (filename, mode, fp)) { char const *f = (filename ? filename ---- origsrc/coreutils-8.24/src/chcon.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/chcon.c 2015-08-26 17:59:36.458650200 -0600 -@@ -48,7 +48,7 @@ static bool verbose; +--- origsrc/coreutils-8.25/src/chcon.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chcon.c 2016-03-08 20:19:00.312670600 -0700 +@@ -47,7 +47,7 @@ static bool verbose; /* Pointer to the device and inode numbers of '/', when --recursive. Otherwise NULL. */ @@ -627,9 +651,9 @@ root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), ---- origsrc/coreutils-8.24/src/chgrp.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/chgrp.c 2015-08-26 17:59:36.458650200 -0600 -@@ -299,7 +299,7 @@ main (int argc, char **argv) +--- origsrc/coreutils-8.25/src/chgrp.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chgrp.c 2016-03-08 20:19:00.312670600 -0700 +@@ -300,7 +300,7 @@ main (int argc, char **argv) if (chopt.recurse && preserve_root) { @@ -638,9 +662,9 @@ chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (chopt.root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), ---- origsrc/coreutils-8.24/src/chmod.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/chmod.c 2015-08-26 17:59:36.458650200 -0600 -@@ -81,7 +81,7 @@ static enum Verbosity verbosity = V_off; +--- origsrc/coreutils-8.25/src/chmod.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chmod.c 2016-03-08 20:19:00.312670600 -0700 +@@ -80,7 +80,7 @@ static enum Verbosity verbosity = V_off; /* Pointer to the device and inode numbers of '/', when --recursive. Otherwise NULL. */ @@ -649,7 +673,7 @@ /* For long options that have no equivalent short option, use a non-character as a pseudo short option, starting with CHAR_MAX + 1. */ -@@ -552,7 +552,7 @@ main (int argc, char **argv) +@@ -551,7 +551,7 @@ main (int argc, char **argv) if (recurse && preserve_root) { @@ -658,8 +682,8 @@ root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), ---- origsrc/coreutils-8.24/src/chown-core.h 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/chown-core.h 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/src/chown-core.h 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chown-core.h 2016-03-08 20:19:00.312670600 -0700 @@ -50,7 +50,7 @@ struct Chown_option /* Pointer to the device and inode numbers of '/', when --recursive. @@ -669,8 +693,8 @@ /* This corresponds to the --dereference (opposite of -h) option. */ bool affect_symlink_referent; ---- origsrc/coreutils-8.24/src/chown.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/chown.c 2015-08-26 17:59:36.458650200 -0600 +--- origsrc/coreutils-8.25/src/chown.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chown.c 2016-03-08 20:19:00.312670600 -0700 @@ -312,7 +312,7 @@ main (int argc, char **argv) if (chopt.recurse && preserve_root) @@ -680,8 +704,8 @@ chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (chopt.root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), ---- origsrc/coreutils-8.24/src/chroot.c 2015-06-26 12:15:58.000000000 -0600 -+++ src/coreutils-8.24/src/chroot.c 2015-08-26 17:59:36.474268300 -0600 +--- origsrc/coreutils-8.25/src/chroot.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/chroot.c 2016-03-08 20:19:00.312670600 -0700 @@ -170,7 +170,8 @@ static bool is_root (const char* dir) { @@ -692,8 +716,8 @@ free (resolved); return is_res_root; } ---- origsrc/coreutils-8.24/src/cksum.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/cksum.c 2015-08-26 17:59:36.474268300 -0600 +--- origsrc/coreutils-8.25/src/cksum.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/cksum.c 2016-03-08 20:19:00.312670600 -0700 @@ -301,6 +301,9 @@ main (int argc, char **argv) have_read_stdin = false; @@ -704,8 +728,8 @@ if (optind == argc) ok = cksum ("-", false); else ---- origsrc/coreutils-8.24/src/copy.c 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/src/copy.c 2015-08-26 17:59:36.474268300 -0600 +--- origsrc/coreutils-8.25/src/copy.c 2016-01-16 12:09:33.000000000 -0700 ++++ src/coreutils-8.25/src/copy.c 2016-03-08 20:19:00.312670600 -0700 @@ -74,6 +74,10 @@ # include #endif @@ -717,7 +741,7 @@ #ifndef HAVE_FCHOWN # define HAVE_FCHOWN false # define fchown(fd, uid, gid) (-1) -@@ -1411,7 +1415,11 @@ close_src_desc: +@@ -1416,7 +1420,11 @@ close_src_desc: static bool same_file_ok (char const *src_name, struct stat const *src_sb, char const *dst_name, struct stat const *dst_sb, @@ -730,7 +754,7 @@ { const struct stat *src_sb_link; const struct stat *dst_sb_link; -@@ -1555,6 +1563,18 @@ same_file_ok (char const *src_name, stru +@@ -1560,6 +1568,18 @@ same_file_ok (char const *src_name, stru if (S_ISLNK (dst_sb_link->st_mode)) return true; @@ -749,7 +773,7 @@ /* It's not ok if they're distinct hard links to the same file as this causes a race condition and we may lose data in this case. */ if (same_link -@@ -1902,10 +1922,20 @@ copy_internal (char const *src_name, cha +@@ -1907,10 +1927,20 @@ copy_internal (char const *src_name, cha && ! (x->move_mode || x->symbolic_link || x->hard_link || x->backup_type != no_backups || x->unlink_dest_before_opening)); @@ -774,7 +798,7 @@ { if (errno != ENOENT) { -@@ -1921,10 +1951,17 @@ copy_internal (char const *src_name, cha +@@ -1926,10 +1956,17 @@ copy_internal (char const *src_name, cha { /* Here, we know that dst_name exists, at least to the point that it is stat'able or lstat'able. */ bool return_now; @@ -792,8 +816,8 @@ + )) { error (0, 0, _("%s and %s are the same file"), - quote_n (0, src_name), quote_n (1, dst_name)); -@@ -1983,6 +2020,9 @@ copy_internal (char const *src_name, cha + quoteaf_n (0, src_name), quoteaf_n (1, dst_name)); +@@ -1988,6 +2025,9 @@ copy_internal (char const *src_name, cha cp and mv treat -i and -f differently. */ if (x->move_mode) { @@ -803,7 +827,7 @@ if (abandon_move (x, dst_name, &dst_sb)) { /* Pretend the rename succeeded, so the caller (mv) -@@ -2138,7 +2178,11 @@ copy_internal (char const *src_name, cha +@@ -2144,7 +2184,11 @@ copy_internal (char const *src_name, cha /* Never unlink dst_name when in move mode. */ && ! x->move_mode && (x->unlink_dest_before_opening @@ -816,7 +840,7 @@ || (x->dereference == DEREF_NEVER && ! S_ISREG (src_sb.st_mode)) )) -@@ -2909,6 +2953,21 @@ copy (char const *src_name, char const * +@@ -2920,6 +2964,21 @@ copy (char const *src_name, char const * { assert (valid_options (options)); @@ -838,7 +862,7 @@ /* Record the file names: they're used in case of error, when copying a directory into itself. I don't like to make these tools do *any* extra work in the common case when that work is solely to handle -@@ -2920,10 +2979,15 @@ copy (char const *src_name, char const * +@@ -2931,10 +2990,15 @@ copy (char const *src_name, char const * top_level_dst_name = dst_name; bool first_dir_created_per_command_line_arg = false; @@ -855,9 +879,9 @@ } /* Set *X to the default options for a value of type struct cp_options. */ ---- origsrc/coreutils-8.24/src/dd.c 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/src/dd.c 2015-08-26 17:59:36.474268300 -0600 -@@ -38,6 +38,10 @@ +--- origsrc/coreutils-8.25/src/dd.c 2016-01-13 04:16:39.000000000 -0700 ++++ src/coreutils-8.25/src/dd.c 2016-03-08 20:19:00.312670600 -0700 +@@ -36,6 +36,10 @@ #include "xstrtol.h" #include "xtime.h" @@ -868,7 +892,7 @@ /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "dd" -@@ -1965,6 +1969,13 @@ copy_with_unblock (char const *buf, size +@@ -1984,6 +1988,13 @@ copy_with_unblock (char const *buf, size static void set_fd_flags (int fd, int add_flags, char const *name) { @@ -882,16 +906,16 @@ /* Ignore file creation flags that are no-ops on file descriptors. */ add_flags &= ~ (O_NOCTTY | O_NOFOLLOW); -@@ -2358,6 +2369,8 @@ main (int argc, char **argv) +@@ -2374,6 +2385,8 @@ main (int argc, char **argv) } else { + if ((input_flags & (O_BINARY | O_TEXT)) == 0) + input_flags |= O_BINARY; if (ifd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) - error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); - } -@@ -2380,6 +2393,8 @@ main (int argc, char **argv) + error (EXIT_FAILURE, errno, _("failed to open %s"), + quoteaf (input_file)); +@@ -2397,6 +2410,8 @@ main (int argc, char **argv) | (conversions_mask & C_NOCREAT ? 0 : O_CREAT) | (conversions_mask & C_EXCL ? O_EXCL : 0) | (seek_records || (conversions_mask & C_NOTRUNC) ? 0 : O_TRUNC)); @@ -900,9 +924,9 @@ /* Open the output file with *read* access only if we might need to read to satisfy a 'seek=' request. If we can't read ---- origsrc/coreutils-8.24/src/dircolors.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/dircolors.c 2015-08-26 17:59:36.474268300 -0600 -@@ -494,8 +494,12 @@ main (int argc, char **argv) +--- origsrc/coreutils-8.25/src/dircolors.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/dircolors.c 2016-03-08 20:19:00.312670600 -0700 +@@ -495,8 +495,12 @@ main (int argc, char **argv) } else { @@ -916,9 +940,9 @@ } fputs (prefix, stdout); fwrite (s, 1, len, stdout); ---- origsrc/coreutils-8.24/src/install.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/install.c 2015-08-26 17:59:36.474268300 -0600 -@@ -44,6 +44,10 @@ +--- origsrc/coreutils-8.25/src/install.c 2016-01-03 05:59:44.000000000 -0700 ++++ src/coreutils-8.25/src/install.c 2016-03-08 20:19:00.312670600 -0700 +@@ -43,6 +43,10 @@ #include "utimens.h" #include "xstrtol.h" @@ -944,11 +968,11 @@ + } +#endif /* __CYGWIN__ */ execlp (strip_program, strip_program, name, NULL); - error (EXIT_FAILURE, errno, _("cannot run %s"), strip_program); + error (EXIT_FAILURE, errno, _("cannot run %s"), quoteaf (strip_program)); break; ---- origsrc/coreutils-8.24/src/ls.c 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/src/ls.c 2015-08-26 17:59:36.474268300 -0600 -@@ -118,6 +118,10 @@ +--- origsrc/coreutils-8.25/src/ls.c 2016-01-14 05:16:23.000000000 -0700 ++++ src/coreutils-8.25/src/ls.c 2016-03-08 20:19:00.328288400 -0700 +@@ -117,6 +117,10 @@ # include #endif @@ -959,7 +983,7 @@ #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) -@@ -750,6 +754,11 @@ static char const *long_time_format[2] = +@@ -753,6 +757,11 @@ static char const *long_time_format[2] = N_("%b %e %H:%M") }; @@ -971,7 +995,7 @@ /* The set of signals that are caught. */ static sigset_t caught_signals; -@@ -785,6 +794,9 @@ enum +@@ -788,6 +797,9 @@ enum enum { AUTHOR_OPTION = CHAR_MAX + 1, @@ -981,7 +1005,7 @@ BLOCK_SIZE_OPTION, COLOR_OPTION, DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION, -@@ -846,6 +858,9 @@ static struct option const long_options[ +@@ -849,6 +861,9 @@ static struct option const long_options[ {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, {"context", no_argument, 0, 'Z'}, {"author", no_argument, NULL, AUTHOR_OPTION}, @@ -991,7 +1015,7 @@ {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} -@@ -1932,6 +1947,12 @@ decode_switches (int argc, char **argv) +@@ -1953,6 +1968,12 @@ decode_switches (int argc, char **argv) print_scontext = true; break; @@ -1004,7 +1028,7 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); -@@ -2918,6 +2939,12 @@ gobble_file (char const *name, enum file +@@ -2943,6 +2964,12 @@ gobble_file (char const *name, enum file uintmax_t blocks = 0; struct fileinfo *f; @@ -1017,7 +1041,7 @@ /* An inode value prior to gobble_file necessarily came from readdir, which is not used for command line arguments. */ assert (! command_line_arg || inode == NOT_AN_INODE_NUMBER); -@@ -3028,11 +3055,19 @@ gobble_file (char const *name, enum file +@@ -3053,11 +3080,19 @@ gobble_file (char const *name, enum file file_failure (command_line_arg, _("cannot access %s"), absolute_name); if (command_line_arg) @@ -1038,7 +1062,7 @@ return 0; } -@@ -3216,6 +3251,9 @@ gobble_file (char const *name, enum file +@@ -3241,6 +3276,9 @@ gobble_file (char const *name, enum file f->name = xstrdup (name); cwd_n_used++; @@ -1048,7 +1072,7 @@ return blocks; } -@@ -4920,6 +4958,11 @@ Sort entries alphabetically if none of - +@@ -4961,6 +4999,11 @@ Sort entries alphabetically if none of - -1 list one file per line. Avoid '\\n' with -q or -b\ \n\ "), stdout); @@ -1060,9 +1084,9 @@ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_size_note (); ---- origsrc/coreutils-8.24/src/md5sum.c 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/src/md5sum.c 2015-08-26 17:59:36.474268300 -0600 -@@ -816,6 +816,9 @@ main (int argc, char **argv) +--- origsrc/coreutils-8.25/src/md5sum.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/md5sum.c 2016-03-08 20:19:00.328288400 -0700 +@@ -867,6 +867,9 @@ main (int argc, char **argv) if (optind == argc) argv[argc++] = bad_cast ("-"); @@ -1072,9 +1096,9 @@ for (; optind < argc; ++optind) { char *file = argv[optind]; ---- origsrc/coreutils-8.24/src/mv.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/mv.c 2015-08-26 17:59:36.474268300 -0600 -@@ -92,7 +92,7 @@ rm_option_init (struct rm_options *x) +--- origsrc/coreutils-8.25/src/mv.c 2016-01-12 04:41:44.000000000 -0700 ++++ src/coreutils-8.25/src/mv.c 2016-03-08 20:19:00.328288400 -0700 +@@ -91,7 +91,7 @@ rm_option_init (struct rm_options *x) x->require_restore_cwd = true; { @@ -1083,7 +1107,7 @@ x->root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (x->root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), -@@ -467,6 +467,16 @@ main (int argc, char **argv) +@@ -466,6 +466,16 @@ main (int argc, char **argv) else if (!target_directory) { assert (2 <= n_files); @@ -1100,8 +1124,8 @@ if (target_directory_operand (file[n_files - 1])) target_directory = file[--n_files]; else if (2 < n_files) ---- origsrc/coreutils-8.24/src/pwd.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/pwd.c 2015-08-26 17:59:36.489854600 -0600 +--- origsrc/coreutils-8.25/src/pwd.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/pwd.c 2016-03-08 20:19:00.328288400 -0700 @@ -268,8 +268,8 @@ static void robust_getcwd (struct file_name *file_name) { @@ -1132,8 +1156,8 @@ } ---- origsrc/coreutils-8.24/src/remove.h 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/remove.h 2015-08-26 17:59:36.489854600 -0600 +--- origsrc/coreutils-8.25/src/remove.h 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/remove.h 2016-03-08 20:19:00.328288400 -0700 @@ -54,7 +54,7 @@ struct rm_options /* Pointer to the device and inode numbers of '/', when --recursive @@ -1143,9 +1167,9 @@ /* If nonzero, stdin is a tty. */ bool stdin_tty; ---- origsrc/coreutils-8.24/src/rm.c 2015-06-26 11:04:19.000000000 -0600 -+++ src/coreutils-8.24/src/rm.c 2015-08-26 17:59:36.489854600 -0600 -@@ -325,7 +325,7 @@ main (int argc, char **argv) +--- origsrc/coreutils-8.25/src/rm.c 2016-01-01 06:48:50.000000000 -0700 ++++ src/coreutils-8.25/src/rm.c 2016-03-08 20:19:00.328288400 -0700 +@@ -323,7 +323,7 @@ main (int argc, char **argv) if (x.recursive && preserve_root) { @@ -1154,9 +1178,9 @@ x.root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (x.root_dev_ino == NULL) error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), ---- origsrc/coreutils-8.24/src/stat.c 2015-06-26 11:05:22.000000000 -0600 -+++ src/coreutils-8.24/src/stat.c 2015-08-26 17:59:36.489854600 -0600 -@@ -73,6 +73,13 @@ +--- origsrc/coreutils-8.25/src/stat.c 2016-01-13 04:16:39.000000000 -0700 ++++ src/coreutils-8.25/src/stat.c 2016-03-08 20:19:00.328288400 -0700 +@@ -72,6 +72,13 @@ #include "find-mount-point.h" #include "xvasprintf.h" @@ -1170,7 +1194,7 @@ #if USE_STATVFS # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER # define HAVE_STRUCT_STATXFS_F_TYPE HAVE_STRUCT_STATVFS_F_TYPE -@@ -190,6 +197,9 @@ static struct option const long_options[ +@@ -189,6 +196,9 @@ static struct option const long_options[ {"format", required_argument, NULL, 'c'}, {"printf", required_argument, NULL, PRINTF_OPTION}, {"terse", no_argument, NULL, 't'}, @@ -1180,7 +1204,7 @@ {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} -@@ -1267,14 +1277,26 @@ do_statfs (char const *filename, char co +@@ -1284,14 +1294,26 @@ do_statfs (char const *filename, char co return false; } @@ -1193,7 +1217,7 @@ if (STATFS (filename, &statfsbuf) != 0) { error (0, errno, _("cannot read file system information for %s"), - quote (filename)); + quoteaf (filename)); +#if __CYGWIN__ + freea (name_alt); +#endif /* __CYGWIN__ */ @@ -1207,7 +1231,7 @@ return ! fail; } -@@ -1285,6 +1307,7 @@ do_stat (char const *filename, char cons +@@ -1302,6 +1324,7 @@ do_stat (char const *filename, char cons { int fd = STREQ (filename, "-") ? 0 : -1; struct stat statbuf; @@ -1215,7 +1239,7 @@ if (0 <= fd) { -@@ -1297,18 +1320,29 @@ do_stat (char const *filename, char cons +@@ -1314,18 +1337,28 @@ do_stat (char const *filename, char cons /* We can't use the shorter (follow_links?stat:lstat) (filename, &statbug) since stat might be a function-like macro. */ @@ -1224,16 +1248,15 @@ - : lstat (filename, &statbuf)) != 0) + else { -- error (0, errno, _("cannot stat %s"), quote (filename)); +- error (0, errno, _("cannot stat %s"), quoteaf (filename)); - return false; + if ((follow_links + ? stat (filename, &statbuf) + : lstat (filename, &statbuf)) != 0) + { -+ error (0, errno, _("cannot stat %s"), quote (filename)); ++ error (0, errno, _("cannot stat %s"), quoteaf (filename)); + return false; + } -+ +#if __CYGWIN__ + if (append_exe && 0 < cygwin_spelling (filename)) + CYGWIN_APPEND_EXE (name_alt, filename); @@ -1250,7 +1273,7 @@ return ! fail; } -@@ -1430,6 +1464,11 @@ Display file or file system status.\n\ +@@ -1447,6 +1480,11 @@ Display file or file system status.\n\ if you want a newline, include \\n in FORMAT\n\ -t, --terse print the information in terse form\n\ "), stdout); @@ -1262,7 +1285,7 @@ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); -@@ -1550,6 +1589,12 @@ main (int argc, char *argv[]) +@@ -1567,6 +1605,12 @@ main (int argc, char *argv[]) terse = true; break; diff --git a/coreutils/008-msys2-src.patch b/coreutils/008-msys2-src.patch index 16734c21..68ee1e4c 100644 --- a/coreutils/008-msys2-src.patch +++ b/coreutils/008-msys2-src.patch @@ -1,33 +1,33 @@ diff -Naur a/Makefile.in b/Makefile.in --- a/Makefile.in 2014-07-20 20:19:48.636200000 +0400 +++ b/Makefile.in 2014-07-20 20:19:51.771800000 +0400 -@@ -622,7 +622,7 @@ - lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \ - lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \ - lib/base64.c lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ -- lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ -+ lib/buffer-lcm.h lib/cygwin.c lib/cygwin.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ - lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \ - lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \ - lib/careadlinkat.c lib/cloexec.c lib/close-stream.c \ -@@ -710,7 +710,7 @@ - lib/areadlinkat.$(OBJEXT) lib/argmatch.$(OBJEXT) \ +@@ -627,7 +627,7 @@ + lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base32.h \ + lib/base32.c lib/base64.h lib/base64.c lib/bitrotate.h \ + lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \ +- lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \ ++ lib/cygwin.c lib/cygwin.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \ + lib/c-strncasecmp.c lib/c-strtod.c lib/c-strtold.c \ + lib/canon-host.c lib/canonicalize.c lib/careadlinkat.c \ + lib/cloexec.c lib/close-stream.c lib/closein.c lib/closeout.c \ +@@ -709,7 +709,7 @@ lib/argv-iter.$(OBJEXT) lib/backupfile.$(OBJEXT) \ - lib/base64.$(OBJEXT) lib/bitrotate.$(OBJEXT) \ -- lib/buffer-lcm.$(OBJEXT) lib/c-ctype.$(OBJEXT) \ -+ lib/buffer-lcm.$(OBJEXT) lib/cygwin.$(OBJEXT) lib/c-ctype.$(OBJEXT) \ - lib/c-strcasecmp.$(OBJEXT) lib/c-strncasecmp.$(OBJEXT) \ - lib/c-strtod.$(OBJEXT) lib/c-strtold.$(OBJEXT) \ - lib/canon-host.$(OBJEXT) lib/canonicalize.$(OBJEXT) \ -@@ -4203,7 +4203,7 @@ - lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \ - lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \ - lib/base64.c lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ -- lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ -+ lib/buffer-lcm.h lib/cygwin.c lib/cygwin.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ - lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \ - lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \ - lib/careadlinkat.c lib/cloexec.c lib/close-stream.c \ + lib/base32.$(OBJEXT) lib/base64.$(OBJEXT) \ + lib/bitrotate.$(OBJEXT) lib/buffer-lcm.$(OBJEXT) \ +- lib/c-ctype.$(OBJEXT) lib/c-strcasecmp.$(OBJEXT) \ ++ lib/cygwin.$(OBJEXT) lib/c-ctype.$(OBJEXT) lib/c-strcasecmp.$(OBJEXT) \ + lib/c-strncasecmp.$(OBJEXT) lib/c-strtod.$(OBJEXT) \ + lib/c-strtold.$(OBJEXT) lib/canon-host.$(OBJEXT) \ + lib/canonicalize.$(OBJEXT) lib/careadlinkat.$(OBJEXT) \ +@@ -4223,7 +4223,7 @@ + lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base32.h \ + lib/base32.c lib/base64.h lib/base64.c lib/bitrotate.h \ + lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \ +- lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \ ++ lib/cygwin.c lib/cygwin.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \ + lib/c-strncasecmp.c lib/c-strtod.c lib/c-strtold.c \ + lib/canon-host.c lib/canonicalize.c lib/careadlinkat.c \ + lib/cloexec.c lib/close-stream.c lib/closein.c lib/closeout.c \ @@ -5849,6 +5849,8 @@ lib/$(DEPDIR)/$(am__dirstamp) lib/buffer-lcm.$(OBJEXT): lib/$(am__dirstamp) \ diff --git a/coreutils/PKGBUILD b/coreutils/PKGBUILD index 61e43c65..dfd955c9 100644 --- a/coreutils/PKGBUILD +++ b/coreutils/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=coreutils -pkgver=8.24 +pkgver=8.25 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') @@ -12,23 +12,23 @@ depends=('gmp' 'libiconv' 'libintl') makedepends=('gmp-devel' 'libiconv-devel' 'gettext-devel' 'help2man') install=${pkgname}.install source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - 001-coreutils-8.24-3.src.patch + 001-coreutils-8.25-2.src.patch 005-manifest.patch 006-msys1-0x0d.patch 008-msys2-src.patch 009-msysize.patch) -sha256sums=('a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170' +sha256sums=('31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87' 'SKIP' - '24665f20701d2466e8ed9841d0ac73106817051b0024c96cd749fcb0470a9f0b' + '0ab1b027cad824473919f37b2d396b85b226c3acc2805221ad9fa0d246bf71f2' '22e73cf22f784657fae6161cc9538b2f0cd4043800df56c9f6b9aec4ec0a69ce' 'dc501c52267f99cfd81bc00aa31b624183b189638feb43b54b326b62e52fc62a' - '981e95abae66488bcf6b4376c55ed691ab9a4467533b998b90fed2aad7d22ca5' + '3b43e9bc495a8a4308c7ff6574654d14a895f6fda425c59f81bf0e9cb9707da4' '46d30e057c86ff6448fee4b1664a9d8914d56d7efbfd97276212490a03926704') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p2 -i $srcdir/001-coreutils-8.24-3.src.patch + patch -p2 -i $srcdir/001-coreutils-8.25-2.src.patch patch -p1 -i $srcdir/005-manifest.patch patch -p1 -i $srcdir/006-msys1-0x0d.patch patch -p1 -i $srcdir/008-msys2-src.patch