diff --git a/coreutils/PKGBUILD b/coreutils/PKGBUILD index 94202901..231e7b4b 100644 --- a/coreutils/PKGBUILD +++ b/coreutils/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=coreutils -pkgver=8.21 +pkgver=8.22 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') @@ -9,72 +9,69 @@ license=('GPL3') url="http://www.gnu.org/software/coreutils" groups=('base') depends=('gmp' 'libiconv' 'libintl') -makedepends=('gmp-devel' 'libiconv-devel' 'gettext-devel') +makedepends=('gmp-devel' 'libiconv-devel' 'gettext-devel' 'help2man') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-8.21-cygwin.patch - coreutils-8.21-msys2.patch - coreutils-8.21-msys2-src.patch - coreutils-8.21-manifest.patch - coreutils-8.21-msys1-0x0d.patch - coreutils-8.21-msys2-add-to-gnulib.patch - coreutils-8.21-msys2-hasmntopt.patch - coreutils-8.21-fix-libstdbuf-link.patch - coreutils-8.21-fpending.patch - coreutils-8.21-fix-man.patch) -md5sums=('065ba41828644eca5dd8163446de5d64' + coreutils-8.15-3.src.patch + coreutils-8.15-fix-dummy-man-invocation.patch + coreutils-8.15-fix-libstdbuf-link.patch + coreutils-8.15-fix-man-deps.patch + coreutils-8.15-fix-manpages.patch + coreutils-8.15-manifest.patch + coreutils-8.15-msys1-0x0d.patch + coreutils-8.15-msys2-add-to-gnulib.patch + coreutils-8.15-msys2-src.patch + coreutils-8.15-msys2.patch) +md5sums=('8fb0ae2267aa6e728958adc38f8163a2' 'SKIP' - '4ab2ad21f209c1c0f009ab039c6d71cd' - 'ca54684c00a17e9d4a8afcc2edb4d9e6' - 'eda2d867321c21fb448101676ea223d1' - 'f3baf52a50dbf4242cff4abcfc4e1182' + '2a2144d1ae5fb05dc0557677c906c22f' + 'c921582989dbfe87fdcc795c1795430e' + 'a8eef34fce0a141652c18aa8e5fb63aa' + '52572688bd1039204aa4a06f4aa88547' + 'cef81924146c101a1fbcdb7d42c09c1c' + 'ac866880965af865040e543e768476d5' '9113031fae1116be3359fceadb15c6b7' 'f5c8937709481a814de66728dd596883' - 'e47212e297fd6a1c95cd00cd4d99ea14' - 'a8eef34fce0a141652c18aa8e5fb63aa' - '3dc4d70c3bf03575c4f9f7faa54e7d8c' - '2ab8dce025b4c6096769ec7aca0f69ea') + '675153737e2a819f69a6f57a7ad9c839' + '3eb55deabe4e3fe60caf3143912ce059') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -p1 -i $srcdir/coreutils-8.21-cygwin.patch - patch -p1 -i $srcdir/coreutils-8.21-msys2.patch - patch -p1 -i $srcdir/coreutils-8.21-msys2-src.patch - patch -p2 -i $srcdir/coreutils-8.21-manifest.patch - patch -p2 -i $srcdir/coreutils-8.21-msys1-0x0d.patch - patch -p2 -i $srcdir/coreutils-8.21-msys2-add-to-gnulib.patch - patch -p2 -i $srcdir/coreutils-8.21-msys2-hasmntopt.patch - patch -p2 -i $srcdir/coreutils-8.21-fix-libstdbuf-link.patch - patch -p1 -i $srcdir/coreutils-8.21-fpending.patch - patch -p1 -i $srcdir/coreutils-8.21-fix-man.patch + cd ${srcdir}/${pkgname}-${pkgver} + + patch -p2 -i $srcdir/coreutils-8.15-3.src.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-dummy-man-invocation.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-libstdbuf-link.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-man-deps.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-manpages.patch + patch -p2 -i $srcdir/coreutils-8.15-manifest.patch + patch -p2 -i $srcdir/coreutils-8.15-msys1-0x0d.patch + patch -p2 -i $srcdir/coreutils-8.15-msys2-add-to-gnulib.patch + patch -p1 -i $srcdir/coreutils-8.15-msys2-src.patch + patch -p1 -i $srcdir/coreutils-8.15-msys2.patch } build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --build=${CHOST} \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --program-transform-name=s/kill/gkill/ \ - --without-libintl-prefix \ - --without-libiconv-prefix \ - --enable-install-program=arch,hostname \ - --enable-no-install-program=uptime \ - ac_cv_header_spawn_h=no + [[ -d $srcdir/build-${CHOST} ]] && rm -rf $srcdir/build-${CHOST} + mkdir -p $srcdir/build-${CHOST} && cd $srcdir/build-${CHOST} + + #cd ${srcdir}/${pkgname}-${pkgver} + ../${pkgname}-${pkgver}/configure --build=${CHOST} \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --program-transform-name=s/kill/gkill/ \ + --without-libintl-prefix \ + --without-libiconv-prefix \ + --enable-install-program=arch,hostname \ + --enable-no-install-program=uptime - make -j1 + make -j1 } -#check() { -# cd ${srcdir}/${pkgname}-${pkgver} -# make RUN_EXPENSIVE_TESTS=yes check -#} - package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - mkdir -p ${pkgdir}/usr/etc - install -m644 src/dircolors.hin ${pkgdir}/usr/etc/DIR_COLORS + cd $srcdir/build-${CHOST} + make DESTDIR=${pkgdir} install + + mkdir -p ${pkgdir}/usr/etc + install -m644 ${srcdir}/${pkgname}-${pkgver}/src/dircolors.hin ${pkgdir}/usr/etc/DIR_COLORS } diff --git a/coreutils/coreutils-8.21-cygwin.patch b/coreutils/coreutils-8.15-3.src.patch similarity index 64% rename from coreutils/coreutils-8.21-cygwin.patch rename to coreutils/coreutils-8.15-3.src.patch index f4c3799f..41120e9d 100644 --- a/coreutils/coreutils-8.21-cygwin.patch +++ b/coreutils/coreutils-8.15-3.src.patch @@ -1,6 +1,224 @@ -diff -Naur coreutils-8.21-orig/lib/cygwin.c coreutils-8.21-cygwin/lib/cygwin.c ---- coreutils-8.21-orig/lib/cygwin.c 1970-01-01 00:00:00.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/cygwin.c 2013-05-17 09:48:23.539062500 +0000 +--- origsrc/coreutils-8.15/ChangeLog 2012-01-06 18:28:25.000000000 +0100 ++++ src/coreutils-8.15/ChangeLog 2013-04-10 09:55:33.665726500 +0200 +@@ -1,3 +1,184 @@ ++2012-02-04 Eric Blake ++ ++ Cygwin release 8.15-1. ++ * lib/fts.c: Early gnulib fix is now upstream. ++ * lib/canonicalize.c: Backport gnulib fix for /// -> /. ++ * src/realpath.c: Backport gnulib fix for --relative-to. ++ ++2011-10-27 Eric Blake ++ ++ Cygwin release 8.14-1. ++ * lib/ftc.c: Backport gnulib fix to make rm close before rmdir. ++ * lib/cygwin.c (cygwin_spelling): Fix logic when 'f' and 'f.exe' ++ exist but are different files. ++ * src/stat.c: Fix --append-exe. ++ ++2011-02-04 Eric Blake ++ ++ Cygwin release 8.10-1. ++ ++2010-12-24 Eric Blake ++ ++ Cygwin release 8.8-1. ++ * lib/mountlist.c (ME_REMOTE): Restore previous cygwin hack to ++ determine remote drives, lost since 6.11-1. ++ ++2010-04-29 Eric Blake ++ ++ Cygwin release 8.5-1. ++ ++2010-03-11 Eric Blake ++ ++ Cygwin release 8.4-1. ++ * lib/xfreopen.c (xfreopen): Consolidate workaround for broken ++ freopen usage into one place. ++ * src/copy.c (copy): Reinstate .exe magic handling when copying ++ files with implicit .exe. ++ ++2008-12-13 Eric Blake ++ ++ Cygwin release 7.0-1. ++ ++2008-06-02 Eric Blake ++ ++ Cygwin release 6.12-1. ++ ++2008-05-12 Eric Blake ++ ++ Cygwin release 6.11-1, requires cygwin 1.7.0. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Accomodate new PATH_MAX. ++ * lib/cygwin.c (cygwin_spelling): Accomodate new trailing ++ `.' semantics. ++ * lib/same.c (same_name): Accomodate new PATH_MAX. ++ ++2008-01-24 Eric Blake ++ ++ Cygwin release 6.10-1. ++ * lib/hash-triple.c (triple_hash): Hash case-insensitively. ++ * lib/hash-pjw.h (hash_pjw_case): New interface. ++ * lib/hash-pjw.c (hash_pjw_case): New function. ++ * src/chcon.c (main): Support my root_dev_ino tweaks. ++ ++2007-08-21 Eric Blake ++ ++ Cygwin release 6.9-5. ++ * same.c (same_name): Detect same file differing only by case. ++ * src/copy.c (same_file_ok): Add parameter to detect when case ++ change is being attempted. ++ (triple_hash): Hash names case-insensitively. ++ (copy_internal): Accommodate case-change attempts. ++ * src/mv.c (do_move): Allow 'mv foo/ Foo/' as shorthand for ++ 'mv -T foo/ Foo/'. ++ ++2007-07-23 Eric Blake ++ ++ Cygwin release 6.9-4. ++ * src/dd.c (main): Fix typo in earlier cygwin patch. ++ ++2007-05-29 Eric Blake ++ ++ Cygwin release 6.9-3. ++ * src/cksum.c (main): Don't lose append mode. ++ * src/md5sum.c (main): Likewise. ++ * src/cat.c (main): Likewise. ++ * src/head.c (main): Likewise. ++ * src/tac.c (main): Likewise. ++ * src/tail.c (main): Likewise. ++ * src/tee.c (main): Likewise. ++ * src/tr.c (main): Likewise. ++ ++2006-11-24 Eric Blake ++ ++ Cygwin release 6.6-2. ++ * lib/cygwin.c (cygwin_spelling): Work even with old-style ++ symlinks, which lacked .lnk suffix. ++ ++2006-04-14 Eric Blake ++ ++ Cygwin release 5.94-5. Experimental only, depends on cygwin ++ snapshot 20060329 or later. ++ * src/dd.c (main): Default to binary mode. ++ * src/system.h (rpl_freopen): Remove this hack, now that cygwin ++ freopen(NULL) works. ++ * lib/quotearg.c (quote_eight_bit): New variable, so I can... ++ (quotearg_buffer_restyled): treat 8-bit characters as printable ++ when outputting to a terminal. ++ * lib/quote.c (quote_n): Use it. ++ ++2006-02-28 Eric Blake ++ ++ Cygwin release 5.94-4. Experimental only, depends on cygwin ++ snapshot 20060227 or later. ++ * lib/root-dev-ino.h (struct root_dev_ino): New struct. ++ (ROOT_DEV_INO_CHECK, ROOT_DEV_INO_WARN): Also track //. ++ * lib/root-dev-ino.c (get_root_dev_ino): Also track //. ++ * src/chmod.c (root_dev_ino): Use new type. ++ (main): Ditto. ++ * src/chown-core.h (struct Chown_option): Ditto. ++ * src/chown.c (main): Ditto. ++ * src/remove.h (struct rm_options): Ditto. ++ * src/rm.c (main): Ditto. ++ * src/pwd.c (robust_getcwd): Ditto. Also fix bug when in / or //. ++ ++2006-01-24 Eric Blake ++ ++ Cygwin release 5.93-3, depends on cygwin-1.5.19-1 or later. ++ * src/cksum.c (main): Always output binary files. ++ * src/md5sum.c (main): Likewise. ++ * src/su.c (correct_password): On NT machines, attempt ++ passwordless login first, and give better error message if ++ password check fails. I still don't know how to distinguish ++ between insufficient privileges vs. incorrect password. ++ * src/dircolors.c (main): Silence warning from tcsh 6.14.00. ++ ++2005-10-15 Eric Blake ++ ++ Cygwin release 5.90-3, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * doc/coreutils.texi (ls invocation, stat invocation): Document ++ --append-exe. ++ * src/ls.c (usage): Ditto. ++ (gobble_file): Append .exe as needed when requested. ++ * src/stat.c (usage): Document --append-exe. ++ (do_stat, do_statfs): Append .exe as needed when requested. ++ ++2005-10-08 Eric Blake ++ ++ Cygwin release 5.90-2, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * lib/mkdir-p.c (make_dir_parents): Fix bug in last patch. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Factor into common macro. ++ * src/copy.c (copy): Use new macro. ++ * src/install.c (strip): Ditto. ++ * src/ln.c (do_link): Ditto. ++ ++2005-07-13 Eric Blake ++ ++ * doc/coreutils.texi (ln invocation): Document --disable-exe-magic. ++ * src/ln.c (usage): Likewise. ++ (do_link): Skip .exe magic when requested. ++ ++2005-07-12 Eric Blake ++ ++ * lib/cygwin.c (cygwin_spelling): Don't append .exe to directories. ++ Make sure .exe exists before returning 1, because otherwise ++ virtual directories such as /cygdrive have problems. ++ ++2005-07-07 Eric Blake ++ ++ * lib/cygwin.h: New file, defining cygwin_spelling. ++ * lib/cygwin.c: New file. ++ * lib/Makefile.am: Compile it. ++ * src/copy.c (copy_internal, copy): Use new cygwin_spelling() to ++ undo .exe magic. ++ * src/link.c (do_link): Likewise. ++ * src/install.c (strip): Likewise. ++ ++2005-01-03 Corinna Vinschen ++ ++ * src/install.c (strip): Check for .exe here since strip doesn't. ++ ++ + 2013-12-13 Pádraig Brady + + version 8.22 +--- origsrc/coreutils-8.15/doc/coreutils.texi 2012-01-03 16:48:48.000000000 +0100 ++++ src/coreutils-8.15/doc/coreutils.texi 2013-03-23 14:46:43.503216200 +0100 +@@ -7328,6 +7328,14 @@ These options change how file names them + + @table @samp + ++@itemx --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs @samp{.exe} magic, where a ++command line argument typed without an .exe extension transparently ++refers to the existing file with an extension. Specifying this option ++will make the .exe show if cygwin magic was involved. ++ + @item -b + @itemx --escape + @itemx --quoting-style=escape +@@ -10963,6 +10971,14 @@ With this option, @command{stat} acts on + by each symbolic link argument. + Without it, @command{stat} acts on any symbolic link argument directly. + ++@itemx --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs .exe magic, where a command line ++argument typed without an .exe extension transparently refers to the ++existing file with an extension. Specifying this option will make ++the .exe show if cygwin magic was involved. ++ + @item -f + @itemx --file-system + @opindex -f +--- origsrc/coreutils-8.15/lib/cygwin.c 1970-01-01 01:00:00.000000000 +0100 ++++ src/coreutils-8.15/lib/cygwin.c 2013-03-23 14:46:43.519038000 +0100 @@ -0,0 +1,73 @@ +/* cygwin.c - helper functions unique to Cygwin + @@ -75,9 +293,8 @@ diff -Naur coreutils-8.21-orig/lib/cygwin.c coreutils-8.21-cygwin/lib/cygwin.c + errno = saved_errno; + return result; +} -diff -Naur coreutils-8.21-orig/lib/cygwin.h coreutils-8.21-cygwin/lib/cygwin.h ---- coreutils-8.21-orig/lib/cygwin.h 1970-01-01 00:00:00.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/cygwin.h 2013-05-17 09:48:23.539062500 +0000 +--- origsrc/coreutils-8.15/lib/cygwin.h 1970-01-01 01:00:00.000000000 +0100 ++++ src/coreutils-8.15/lib/cygwin.h 2013-03-23 14:46:43.519038000 +0100 @@ -0,0 +1,38 @@ +/* cygwin.h - helper functions unique to Cygwin + @@ -117,9 +334,29 @@ diff -Naur coreutils-8.21-orig/lib/cygwin.h coreutils-8.21-cygwin/lib/cygwin.h + __name_orig), ".exe") + +#endif /* CYGWIN_H */ -diff -Naur coreutils-8.21-orig/lib/hash-pjw.c coreutils-8.21-cygwin/lib/hash-pjw.c ---- coreutils-8.21-orig/lib/hash-pjw.c 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/hash-pjw.c 2013-05-17 09:48:23.570312500 +0000 +--- origsrc/coreutils-8.15/lib/file-has-acl.c 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/file-has-acl.c 2013-03-23 14:46:43.519038000 +0100 +@@ -624,15 +624,12 @@ + ; + else + { +- /* Don't use MIN_ACL_ENTRIES: It's set to 4 on Cygwin, but Cygwin ++ /* Use MIN_ACL_ENTRIES: It's set to 4 on Cygwin, but Cygwin + returns only 3 entries for files with no ACL. But this is safe: + If there are more than 4 entries, there cannot be only the + "user::", "group::", "other:", and "mask:" entries. */ +- if (count > 4) +- { +- free (malloced); +- return 1; +- } ++ free (malloced); ++ return (count > 4); + + if (acl_nontrivial (count, entries)) + { +--- origsrc/coreutils-8.15/lib/hash-pjw.c 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/hash-pjw.c 2013-03-23 14:46:43.534469200 +0100 @@ -19,6 +19,7 @@ #include "hash-pjw.h" @@ -128,7 +365,7 @@ diff -Naur coreutils-8.21-orig/lib/hash-pjw.c coreutils-8.21-cygwin/lib/hash-pjw #include #define SIZE_BITS (sizeof (size_t) * CHAR_BIT) -@@ -38,3 +39,16 @@ +@@ -38,3 +39,16 @@ hash_pjw (const void *x, size_t tablesiz return h % tablesize; } @@ -145,18 +382,16 @@ diff -Naur coreutils-8.21-orig/lib/hash-pjw.c coreutils-8.21-cygwin/lib/hash-pjw + + return h % tablesize; +} -diff -Naur coreutils-8.21-orig/lib/hash-pjw.h coreutils-8.21-cygwin/lib/hash-pjw.h ---- coreutils-8.21-orig/lib/hash-pjw.h 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/hash-pjw.h 2013-05-17 09:48:23.585937500 +0000 +--- origsrc/coreutils-8.15/lib/hash-pjw.h 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/hash-pjw.h 2013-03-23 14:46:43.534469200 +0100 @@ -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; -diff -Naur coreutils-8.21-orig/lib/hash-triple.c coreutils-8.21-cygwin/lib/hash-triple.c ---- coreutils-8.21-orig/lib/hash-triple.c 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/hash-triple.c 2013-05-17 09:48:23.601562500 +0000 -@@ -34,7 +34,14 @@ +--- origsrc/coreutils-8.15/lib/hash-triple.c 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/hash-triple.c 2013-03-23 14:46:43.534469200 +0100 +@@ -34,7 +34,14 @@ size_t triple_hash (void const *x, size_t table_size) { struct F_triple const *p = x; @@ -171,11 +406,10 @@ diff -Naur coreutils-8.21-orig/lib/hash-triple.c coreutils-8.21-cygwin/lib/hash- /* Ignoring the device number here should be fine. */ return (tmp ^ p->st_ino) % table_size; -diff -Naur coreutils-8.21-orig/lib/root-dev-ino.c coreutils-8.21-cygwin/lib/root-dev-ino.c ---- coreutils-8.21-orig/lib/root-dev-ino.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/root-dev-ino.c 2013-05-17 09:48:23.617187500 +0000 +--- origsrc/coreutils-8.15/lib/root-dev-ino.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/lib/root-dev-ino.c 2013-03-23 14:46:43.534469200 +0100 @@ -25,13 +25,17 @@ - /* Call lstat to get the device and inode numbers for '/'. + /* Call lstat to get the device and inode numbers for `/'. Upon failure, return NULL. Otherwise, set the members of *ROOT_D_I accordingly and return ROOT_D_I. */ -struct dev_ino * @@ -196,9 +430,8 @@ diff -Naur coreutils-8.21-orig/lib/root-dev-ino.c coreutils-8.21-cygwin/lib/root + root_d_i->double_slash.st_dev = statbuf.st_dev; return root_d_i; } -diff -Naur coreutils-8.21-orig/lib/root-dev-ino.h coreutils-8.21-cygwin/lib/root-dev-ino.h ---- coreutils-8.21-orig/lib/root-dev-ino.h 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/root-dev-ino.h 2013-05-17 09:48:23.632812500 +0000 +--- origsrc/coreutils-8.15/lib/root-dev-ino.h 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/lib/root-dev-ino.h 2013-03-23 14:46:43.534469200 +0100 @@ -21,19 +21,26 @@ # include "dev-ino.h" # include "same-inode.h" @@ -230,9 +463,8 @@ diff -Naur coreutils-8.21-orig/lib/root-dev-ino.h coreutils-8.21-cygwin/lib/root error (0, 0, _("it is dangerous to operate recursively on %s"), \ quote (Dirname)); \ else \ -diff -Naur coreutils-8.21-orig/lib/same.c coreutils-8.21-cygwin/lib/same.c ---- coreutils-8.21-orig/lib/same.c 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/same.c 2013-05-17 09:48:23.648437500 +0000 +--- origsrc/coreutils-8.15/lib/same.c 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/same.c 2013-03-23 14:46:43.534469200 +0100 @@ -40,6 +40,12 @@ #include "error.h" #include "same-inode.h" @@ -246,7 +478,7 @@ diff -Naur coreutils-8.21-orig/lib/same.c coreutils-8.21-cygwin/lib/same.c #ifndef MIN # define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif -@@ -58,6 +64,30 @@ +@@ -58,6 +64,30 @@ same_name (const char *source, const cha bool identical_basenames = (source_baselen == dest_baselen && memcmp (source_basename, dest_basename, dest_baselen) == 0); @@ -277,9 +509,8 @@ diff -Naur coreutils-8.21-orig/lib/same.c coreutils-8.21-cygwin/lib/same.c bool compare_dirs = identical_basenames; bool same = false; -diff -Naur coreutils-8.21-orig/lib/xfreopen.c coreutils-8.21-cygwin/lib/xfreopen.c ---- coreutils-8.21-orig/lib/xfreopen.c 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-cygwin/lib/xfreopen.c 2013-05-17 09:48:23.679687500 +0000 +--- origsrc/coreutils-8.15/lib/xfreopen.c 2012-01-06 08:20:50.000000000 +0100 ++++ src/coreutils-8.15/lib/xfreopen.c 2013-03-23 14:46:43.550071000 +0100 @@ -18,6 +18,8 @@ #include "xfreopen.h" @@ -307,32 +538,18 @@ diff -Naur coreutils-8.21-orig/lib/xfreopen.c coreutils-8.21-cygwin/lib/xfreopen if (!freopen (filename, mode, fp)) { char const *f = (filename ? filename -diff -Naur coreutils-8.21-orig/Makefile.in coreutils-8.21-cygwin/Makefile.in ---- coreutils-8.21-orig/Makefile.in 2013-02-14 16:22:58.000000000 +0000 -+++ coreutils-8.21-cygwin/Makefile.in 2013-05-17 10:18:44.589843800 +0000 -@@ -396,7 +396,8 @@ - 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 lib/md5.c \ -+ lib/close-stream.c lib/closein.c lib/closeout.c \ -+ lib/cygwin.h lib/cygwin.c lib/md5.c \ - lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c \ - lib/di-set.c lib/di-set.h lib/diacrit.h lib/diacrit.c \ - lib/opendir-safer.c lib/dirname.c lib/basename.c \ -diff -Naur coreutils-8.21-orig/src/chcon.c coreutils-8.21-cygwin/src/chcon.c ---- coreutils-8.21-orig/src/chcon.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/chcon.c 2013-05-17 09:48:29.460937500 +0000 -@@ -48,7 +48,7 @@ +--- origsrc/coreutils-8.15/src/chcon.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/chcon.c 2013-03-23 14:46:43.550071000 +0100 +@@ -48,7 +48,7 @@ static bool verbose; - /* Pointer to the device and inode numbers of '/', when --recursive. + /* Pointer to the device and inode numbers of `/', when --recursive. Otherwise NULL. */ -static struct dev_ino *root_dev_ino; +static struct root_dev_ino *root_dev_ino; /* The name of the context file is being given. */ static char const *specified_context; -@@ -572,7 +572,7 @@ +@@ -567,7 +567,7 @@ main (int argc, char **argv) if (recurse && preserve_root) { @@ -341,10 +558,9 @@ diff -Naur coreutils-8.21-orig/src/chcon.c coreutils-8.21-cygwin/src/chcon.c 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"), -diff -Naur coreutils-8.21-orig/src/chgrp.c coreutils-8.21-cygwin/src/chgrp.c ---- coreutils-8.21-orig/src/chgrp.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/chgrp.c 2013-05-17 09:48:29.492187500 +0000 -@@ -299,7 +299,7 @@ +--- origsrc/coreutils-8.15/src/chgrp.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/chgrp.c 2013-03-23 14:46:43.550071000 +0100 +@@ -300,7 +300,7 @@ main (int argc, char **argv) if (chopt.recurse && preserve_root) { @@ -353,19 +569,18 @@ diff -Naur coreutils-8.21-orig/src/chgrp.c coreutils-8.21-cygwin/src/chgrp.c 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"), -diff -Naur coreutils-8.21-orig/src/chmod.c coreutils-8.21-cygwin/src/chmod.c ---- coreutils-8.21-orig/src/chmod.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/chmod.c 2013-05-17 09:48:29.507812500 +0000 -@@ -81,7 +81,7 @@ +--- origsrc/coreutils-8.15/src/chmod.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/chmod.c 2013-03-23 14:46:43.565723600 +0100 +@@ -81,7 +81,7 @@ static enum Verbosity verbosity = V_off; - /* Pointer to the device and inode numbers of '/', when --recursive. + /* Pointer to the device and inode numbers of `/', when --recursive. Otherwise NULL. */ -static struct dev_ino *root_dev_ino; +static struct root_dev_ino *root_dev_ino; /* For long options that have no equivalent short option, use a non-character as a pseudo short option, starting with CHAR_MAX + 1. */ -@@ -549,7 +549,7 @@ +@@ -547,7 +547,7 @@ main (int argc, char **argv) if (recurse && preserve_root) { @@ -374,10 +589,20 @@ diff -Naur coreutils-8.21-orig/src/chmod.c coreutils-8.21-cygwin/src/chmod.c 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"), -diff -Naur coreutils-8.21-orig/src/chown.c coreutils-8.21-cygwin/src/chown.c ---- coreutils-8.21-orig/src/chown.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/chown.c 2013-05-17 09:48:29.539062500 +0000 -@@ -313,7 +313,7 @@ +--- origsrc/coreutils-8.15/src/chown-core.h 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/chown-core.h 2013-03-23 14:46:43.565723600 +0100 +@@ -50,7 +50,7 @@ struct Chown_option + + /* Pointer to the device and inode numbers of `/', when --recursive. + Need not be freed. Otherwise NULL. */ +- struct dev_ino *root_dev_ino; ++ struct root_dev_ino *root_dev_ino; + + /* This corresponds to the --dereference (opposite of -h) option. */ + bool affect_symlink_referent; +--- origsrc/coreutils-8.15/src/chown.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/chown.c 2013-03-23 14:46:43.565723600 +0100 +@@ -314,7 +314,7 @@ main (int argc, char **argv) if (chopt.recurse && preserve_root) { @@ -386,22 +611,9 @@ diff -Naur coreutils-8.21-orig/src/chown.c coreutils-8.21-cygwin/src/chown.c 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"), -diff -Naur coreutils-8.21-orig/src/chown-core.h coreutils-8.21-cygwin/src/chown-core.h ---- coreutils-8.21-orig/src/chown-core.h 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/chown-core.h 2013-05-17 09:48:29.523437500 +0000 -@@ -50,7 +50,7 @@ - - /* Pointer to the device and inode numbers of '/', when --recursive. - Need not be freed. Otherwise NULL. */ -- struct dev_ino *root_dev_ino; -+ struct root_dev_ino *root_dev_ino; - - /* This corresponds to the --dereference (opposite of -h) option. */ - bool affect_symlink_referent; -diff -Naur coreutils-8.21-orig/src/cksum.c coreutils-8.21-cygwin/src/cksum.c ---- coreutils-8.21-orig/src/cksum.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/cksum.c 2013-05-17 09:48:29.554687500 +0000 -@@ -301,6 +301,9 @@ +--- origsrc/coreutils-8.15/src/cksum.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/cksum.c 2013-03-23 14:46:43.581243900 +0100 +@@ -298,6 +298,9 @@ main (int argc, char **argv) have_read_stdin = false; @@ -411,10 +623,9 @@ diff -Naur coreutils-8.21-orig/src/cksum.c coreutils-8.21-cygwin/src/cksum.c if (optind == argc) ok = cksum ("-", false); else -diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c ---- coreutils-8.21-orig/src/copy.c 2013-02-07 09:37:05.000000000 +0000 -+++ coreutils-8.21-cygwin/src/copy.c 2013-05-17 09:48:29.570312500 +0000 -@@ -68,6 +68,10 @@ +--- origsrc/coreutils-8.15/src/copy.c 2012-01-05 15:24:19.000000000 +0100 ++++ src/coreutils-8.15/src/copy.c 2013-03-23 14:46:43.596990500 +0100 +@@ -66,6 +66,10 @@ # include "verror.h" #endif @@ -425,7 +636,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c #ifndef HAVE_FCHOWN # define HAVE_FCHOWN false # define fchown(fd, uid, gid) (-1) -@@ -1207,7 +1211,11 @@ +@@ -1196,7 +1200,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, @@ -438,7 +649,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c { const struct stat *src_sb_link; const struct stat *dst_sb_link; -@@ -1355,6 +1363,18 @@ +@@ -1321,6 +1329,18 @@ same_file_ok (char const *src_name, stru if (S_ISLNK (dst_sb_link->st_mode)) return true; @@ -457,7 +668,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c if (same_link && 1 < dst_sb_link->st_nlink && ! same_name (src_name, dst_name)) -@@ -1684,10 +1704,20 @@ +@@ -1617,10 +1637,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)); @@ -482,7 +693,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c { if (errno != ENOENT) { -@@ -1704,10 +1734,17 @@ +@@ -1637,10 +1667,17 @@ copy_internal (char const *src_name, cha that it is stat'able or lstat'able. */ bool return_now; bool unlink_src; @@ -501,7 +712,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c { error (0, 0, _("%s and %s are the same file"), quote_n (0, src_name), quote_n (1, dst_name)); -@@ -1766,6 +1803,9 @@ +@@ -1699,6 +1736,9 @@ copy_internal (char const *src_name, cha cp and mv treat -i and -f differently. */ if (x->move_mode) { @@ -511,7 +722,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c if (abandon_move (x, dst_name, &dst_sb) || (unlink_src && unlink (src_name) == 0)) { -@@ -1930,7 +1970,11 @@ +@@ -1859,7 +1899,11 @@ copy_internal (char const *src_name, cha /* Never unlink dst_name when in move mode. */ && ! x->move_mode && (x->unlink_dest_before_opening @@ -524,7 +735,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c || (x->dereference == DEREF_NEVER && ! S_ISREG (src_sb.st_mode)) )) -@@ -2682,6 +2726,21 @@ +@@ -2601,6 +2645,21 @@ copy (char const *src_name, char const * { assert (valid_options (options)); @@ -546,7 +757,7 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c /* 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 -@@ -2693,10 +2752,15 @@ +@@ -2612,10 +2671,15 @@ copy (char const *src_name, char const * top_level_dst_name = dst_name; bool first_dir_created_per_command_line_arg = false; @@ -563,10 +774,9 @@ diff -Naur coreutils-8.21-orig/src/copy.c coreutils-8.21-cygwin/src/copy.c } /* Set *X to the default options for a value of type struct cp_options. */ -diff -Naur coreutils-8.21-orig/src/dd.c coreutils-8.21-cygwin/src/dd.c ---- coreutils-8.21-orig/src/dd.c 2013-02-07 09:37:05.000000000 +0000 -+++ coreutils-8.21-cygwin/src/dd.c 2013-05-17 10:02:22.528320300 +0000 -@@ -37,6 +37,10 @@ +--- origsrc/coreutils-8.15/src/dd.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/dd.c 2013-03-23 14:46:43.596990500 +0100 +@@ -36,6 +36,10 @@ #include "xstrtol.h" #include "xtime.h" @@ -577,7 +787,7 @@ diff -Naur coreutils-8.21-orig/src/dd.c coreutils-8.21-cygwin/src/dd.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "dd" -@@ -1781,6 +1785,13 @@ +@@ -1663,6 +1667,13 @@ copy_with_unblock (char const *buf, size static void set_fd_flags (int fd, int add_flags, char const *name) { @@ -591,16 +801,16 @@ diff -Naur coreutils-8.21-orig/src/dd.c coreutils-8.21-cygwin/src/dd.c /* Ignore file creation flags that are no-ops on file descriptors. */ add_flags &= ~ (O_NOCTTY | O_NOFOLLOW); -@@ -2203,6 +2214,8 @@ +@@ -2039,6 +2050,8 @@ main (int argc, char **argv) } else { + if ((input_flags & (O_BINARY | O_TEXT)) == 0) + input_flags |= O_BINARY; if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) - error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); + error (EXIT_FAILURE, errno, _("opening %s"), quote (input_file)); } -@@ -2225,6 +2238,8 @@ +@@ -2061,6 +2074,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)); @@ -608,11 +818,10 @@ diff -Naur coreutils-8.21-orig/src/dd.c coreutils-8.21-cygwin/src/dd.c + opts |= O_BINARY; /* Open the output file with *read* access only if we might - need to read to satisfy a 'seek=' request. If we can't read -diff -Naur coreutils-8.21-orig/src/dircolors.c coreutils-8.21-cygwin/src/dircolors.c ---- coreutils-8.21-orig/src/dircolors.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/dircolors.c 2013-05-17 09:48:29.632812500 +0000 -@@ -494,8 +494,12 @@ + need to read to satisfy a `seek=' request. If we can't read +--- origsrc/coreutils-8.15/src/dircolors.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/dircolors.c 2013-03-23 14:46:43.596990500 +0100 +@@ -495,8 +495,12 @@ to select a shell syntax are mutually ex } else { @@ -626,9 +835,8 @@ diff -Naur coreutils-8.21-orig/src/dircolors.c coreutils-8.21-cygwin/src/dircolo } fputs (prefix, stdout); fwrite (s, 1, len, stdout); -diff -Naur coreutils-8.21-orig/src/install.c coreutils-8.21-cygwin/src/install.c ---- coreutils-8.21-orig/src/install.c 2013-02-07 09:37:05.000000000 +0000 -+++ coreutils-8.21-cygwin/src/install.c 2013-05-17 10:03:20.325195300 +0000 +--- origsrc/coreutils-8.15/src/install.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/install.c 2013-03-23 14:46:43.612484400 +0100 @@ -44,6 +44,10 @@ #include "utimens.h" #include "xstrtol.h" @@ -640,7 +848,7 @@ diff -Naur coreutils-8.21-orig/src/install.c coreutils-8.21-cygwin/src/install.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "install" -@@ -527,6 +531,16 @@ +@@ -526,6 +530,16 @@ strip (char const *name) error (EXIT_FAILURE, errno, _("fork system call failed")); break; case 0: /* Child. */ @@ -657,10 +865,9 @@ diff -Naur coreutils-8.21-orig/src/install.c coreutils-8.21-cygwin/src/install.c execlp (strip_program, strip_program, name, NULL); error (EXIT_FAILURE, errno, _("cannot run %s"), strip_program); break; -diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c ---- coreutils-8.21-orig/src/ls.c 2013-02-03 03:24:02.000000000 +0000 -+++ coreutils-8.21-cygwin/src/ls.c 2013-05-17 09:48:29.679687500 +0000 -@@ -115,6 +115,10 @@ +--- origsrc/coreutils-8.15/src/ls.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/ls.c 2013-03-23 14:46:43.612484400 +0100 +@@ -116,6 +116,10 @@ # include #endif @@ -671,7 +878,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) -@@ -745,6 +749,11 @@ +@@ -746,6 +750,11 @@ static char const *long_time_format[2] = N_("%b %e %H:%M") }; @@ -683,7 +890,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c /* The set of signals that are caught. */ static sigset_t caught_signals; -@@ -780,6 +789,9 @@ +@@ -781,6 +790,9 @@ enum enum { AUTHOR_OPTION = CHAR_MAX + 1, @@ -693,7 +900,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c BLOCK_SIZE_OPTION, COLOR_OPTION, DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION, -@@ -841,6 +853,9 @@ +@@ -842,6 +854,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}, @@ -703,7 +910,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} -@@ -1944,6 +1959,12 @@ +@@ -1945,6 +1960,12 @@ decode_switches (int argc, char **argv) print_scontext = true; break; @@ -716,7 +923,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); -@@ -2869,6 +2890,12 @@ +@@ -2789,6 +2810,12 @@ gobble_file (char const *name, enum file uintmax_t blocks = 0; struct fileinfo *f; @@ -729,7 +936,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c /* 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); -@@ -2980,11 +3007,19 @@ +@@ -2900,11 +2927,19 @@ gobble_file (char const *name, enum file file_failure (command_line_arg, _("cannot access %s"), absolute_name); if (command_line_arg) @@ -750,7 +957,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c return 0; } -@@ -3163,6 +3198,9 @@ +@@ -3092,6 +3127,9 @@ gobble_file (char const *name, enum file f->name = xstrdup (name); cwd_n_used++; @@ -760,7 +967,7 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c return blocks; } -@@ -4859,6 +4897,11 @@ +@@ -4789,6 +4827,11 @@ Mandatory arguments to long options are -Z, --context print any SELinux security context of each file\n\ -1 list one file per line\n\ "), stdout); @@ -772,10 +979,9 @@ diff -Naur coreutils-8.21-orig/src/ls.c coreutils-8.21-cygwin/src/ls.c fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_size_note (); -diff -Naur coreutils-8.21-orig/src/md5sum.c coreutils-8.21-cygwin/src/md5sum.c ---- coreutils-8.21-orig/src/md5sum.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/md5sum.c 2013-05-17 09:48:29.695312500 +0000 -@@ -809,6 +809,9 @@ +--- origsrc/coreutils-8.15/src/md5sum.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/md5sum.c 2013-03-23 14:46:43.628044600 +0100 +@@ -741,6 +741,9 @@ main (int argc, char **argv) if (optind == argc) argv[argc++] = bad_cast ("-"); @@ -785,10 +991,9 @@ diff -Naur coreutils-8.21-orig/src/md5sum.c coreutils-8.21-cygwin/src/md5sum.c for (; optind < argc; ++optind) { char *file = argv[optind]; -diff -Naur coreutils-8.21-orig/src/mv.c coreutils-8.21-cygwin/src/mv.c ---- coreutils-8.21-orig/src/mv.c 2013-02-07 09:37:05.000000000 +0000 -+++ coreutils-8.21-cygwin/src/mv.c 2013-05-17 09:48:29.726562500 +0000 -@@ -91,7 +91,7 @@ +--- origsrc/coreutils-8.15/src/mv.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/mv.c 2013-03-23 14:46:43.628044600 +0100 +@@ -90,7 +90,7 @@ rm_option_init (struct rm_options *x) x->require_restore_cwd = true; { @@ -797,7 +1002,7 @@ diff -Naur coreutils-8.21-orig/src/mv.c coreutils-8.21-cygwin/src/mv.c 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"), -@@ -453,6 +453,16 @@ +@@ -452,6 +452,16 @@ main (int argc, char **argv) else if (!target_directory) { assert (2 <= n_files); @@ -814,10 +1019,9 @@ diff -Naur coreutils-8.21-orig/src/mv.c coreutils-8.21-cygwin/src/mv.c if (target_directory_operand (file[n_files - 1])) target_directory = file[--n_files]; else if (2 < n_files) -diff -Naur coreutils-8.21-orig/src/pwd.c coreutils-8.21-cygwin/src/pwd.c ---- coreutils-8.21-orig/src/pwd.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/pwd.c 2013-05-17 09:48:29.757812500 +0000 -@@ -265,8 +265,8 @@ +--- origsrc/coreutils-8.15/src/pwd.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/pwd.c 2013-03-23 14:46:43.643781900 +0100 +@@ -266,8 +266,8 @@ static void robust_getcwd (struct file_name *file_name) { size_t height = 1; @@ -828,7 +1032,7 @@ diff -Naur coreutils-8.21-orig/src/pwd.c coreutils-8.21-cygwin/src/pwd.c struct stat dot_sb; if (root_dev_ino == NULL) -@@ -279,7 +279,7 @@ +@@ -280,7 +280,7 @@ robust_getcwd (struct file_name *file_na while (1) { /* If we've reached the root, we're done. */ @@ -837,7 +1041,7 @@ diff -Naur coreutils-8.21-orig/src/pwd.c coreutils-8.21-cygwin/src/pwd.c break; find_dir_entry (&dot_sb, file_name, height++); -@@ -288,6 +288,9 @@ +@@ -289,6 +289,9 @@ robust_getcwd (struct file_name *file_na /* See if a leading slash is needed; file_name_prepend adds one. */ if (file_name->start[0] == '\0') file_name_prepend (file_name, "", 0); @@ -847,10 +1051,9 @@ diff -Naur coreutils-8.21-orig/src/pwd.c coreutils-8.21-cygwin/src/pwd.c } -diff -Naur coreutils-8.21-orig/src/remove.h coreutils-8.21-cygwin/src/remove.h ---- coreutils-8.21-orig/src/remove.h 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/remove.h 2013-05-17 10:12:44.856445300 +0000 -@@ -54,7 +54,7 @@ +--- origsrc/coreutils-8.15/src/remove.h 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/remove.h 2013-03-23 14:46:43.659322900 +0100 +@@ -51,7 +51,7 @@ struct rm_options /* Pointer to the device and inode numbers of '/', when --recursive and preserving '/'. Otherwise NULL. */ @@ -859,10 +1062,9 @@ diff -Naur coreutils-8.21-orig/src/remove.h coreutils-8.21-cygwin/src/remove.h /* If nonzero, stdin is a tty. */ bool stdin_tty; -diff -Naur coreutils-8.21-orig/src/rm.c coreutils-8.21-cygwin/src/rm.c ---- coreutils-8.21-orig/src/rm.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/rm.c 2013-05-17 09:48:31.476562500 +0000 -@@ -325,7 +325,7 @@ +--- origsrc/coreutils-8.15/src/rm.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/rm.c 2013-03-23 14:46:43.659322900 +0100 +@@ -319,7 +319,7 @@ main (int argc, char **argv) if (x.recursive && preserve_root) { @@ -871,9 +1073,8 @@ diff -Naur coreutils-8.21-orig/src/rm.c coreutils-8.21-cygwin/src/rm.c 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"), -diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c ---- coreutils-8.21-orig/src/stat.c 2013-01-31 00:46:24.000000000 +0000 -+++ coreutils-8.21-cygwin/src/stat.c 2013-05-17 09:48:31.507812500 +0000 +--- origsrc/coreutils-8.15/src/stat.c 2012-01-01 10:04:06.000000000 +0100 ++++ src/coreutils-8.15/src/stat.c 2013-03-23 14:46:43.675018700 +0100 @@ -73,6 +73,13 @@ #include "find-mount-point.h" #include "xvasprintf.h" @@ -888,7 +1089,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c #if USE_STATVFS # define STRUCT_STATVFS struct statvfs # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER -@@ -185,6 +192,9 @@ +@@ -181,6 +188,9 @@ static struct option const long_options[ {"format", required_argument, NULL, 'c'}, {"printf", required_argument, NULL, PRINTF_OPTION}, {"terse", no_argument, NULL, 't'}, @@ -898,7 +1099,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} -@@ -1203,14 +1213,26 @@ +@@ -1178,14 +1188,26 @@ do_statfs (char const *filename, char co return false; } @@ -925,7 +1126,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c return ! fail; } -@@ -1220,6 +1242,7 @@ +@@ -1195,6 +1217,7 @@ do_stat (char const *filename, char cons char const *format2) { struct stat statbuf; @@ -933,7 +1134,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c if (STREQ (filename, "-")) { -@@ -1232,18 +1255,29 @@ +@@ -1207,18 +1230,29 @@ 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. */ @@ -968,7 +1169,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c return ! fail; } -@@ -1365,6 +1399,11 @@ +@@ -1342,6 +1376,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); @@ -980,7 +1181,7 @@ diff -Naur coreutils-8.21-orig/src/stat.c coreutils-8.21-cygwin/src/stat.c fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); -@@ -1485,6 +1524,12 @@ +@@ -1462,6 +1501,12 @@ main (int argc, char *argv[]) terse = true; break; diff --git a/coreutils/coreutils-8.15-fix-dummy-man-invocation.patch b/coreutils/coreutils-8.15-fix-dummy-man-invocation.patch new file mode 100644 index 00000000..04b279a3 --- /dev/null +++ b/coreutils/coreutils-8.15-fix-dummy-man-invocation.patch @@ -0,0 +1,12 @@ +--- src/coreutils-8.22/Makefile.in.orig 2014-01-30 11:49:05.090504600 +0400 ++++ src/coreutils-8.22/Makefile.in 2014-01-30 12:04:56.602188428 +0400 +@@ -9980,8 +9980,8 @@ + && $(run_help2man) \ + --source='$(PACKAGE_STRING)' \ + --include=$(srcdir)/man/$$name.x \ +- --output=$$t/$$name.1 $$t/$$name \ + --info-page='coreutils \(aq'$$name' invocation\(aq' \ ++ --output=$$t/$$name.1 $$t/$$name \ + && sed \ + -e 's|$*\.td/||g' \ + -e '/For complete documentation/d' \ diff --git a/coreutils/coreutils-8.21-fix-libstdbuf-link.patch b/coreutils/coreutils-8.15-fix-libstdbuf-link.patch similarity index 100% rename from coreutils/coreutils-8.21-fix-libstdbuf-link.patch rename to coreutils/coreutils-8.15-fix-libstdbuf-link.patch diff --git a/coreutils/coreutils-8.15-fix-man-deps.patch b/coreutils/coreutils-8.15-fix-man-deps.patch new file mode 100644 index 00000000..52991210 --- /dev/null +++ b/coreutils/coreutils-8.15-fix-man-deps.patch @@ -0,0 +1,219 @@ +--- src/coreutils-8.22/Makefile.in.orig 2014-01-29 21:35:05.585325500 +0400 ++++ src/coreutils-8.22/Makefile.in 2014-01-29 21:41:07.978677438 +0400 +@@ -9856,111 +9855,111 @@ + # Most prog.1 man pages depend on src/prog. List the exceptions: + # Note that dir and vdir are exceptions only if you consider the name + # of the .c file upon which they depend: ls.c. +-man/arch.1: src/uname +-man/dir.1: src/dir +-man/install.1: src/ginstall +-man/vdir.1: src/vdir +- +-man/base64.1: src/base64 +-man/basename.1: src/basename +-man/cat.1: src/cat +-man/chcon.1: src/chcon +-man/chgrp.1: src/chgrp +-man/chmod.1: src/chmod +-man/chown.1: src/chown +-man/chroot.1: src/chroot +-man/cksum.1: src/cksum +-man/comm.1: src/comm +-man/cp.1: src/cp +-man/csplit.1: src/csplit +-man/cut.1: src/cut +-man/date.1: src/date +-man/dd.1: src/dd +-man/df.1: src/df +-man/dircolors.1: src/dircolors +-man/dirname.1: src/dirname +-man/du.1: src/du +-man/echo.1: src/echo +-man/env.1: src/env +-man/expand.1: src/expand +-man/expr.1: src/expr +-man/factor.1: src/factor +-man/false.1: src/false +-man/fmt.1: src/fmt +-man/fold.1: src/fold +-man/groups.1: src/groups +-man/head.1: src/head +-man/hostid.1: src/hostid +-man/hostname.1: src/hostname +-man/id.1: src/id +-man/join.1: src/join +-man/kill.1: src/kill +-man/link.1: src/link +-man/ln.1: src/ln +-man/logname.1: src/logname +-man/ls.1: src/ls +-man/md5sum.1: src/md5sum +-man/mkdir.1: src/mkdir +-man/mkfifo.1: src/mkfifo +-man/mknod.1: src/mknod +-man/mktemp.1: src/mktemp +-man/mv.1: src/mv +-man/nice.1: src/nice +-man/nl.1: src/nl +-man/nohup.1: src/nohup +-man/nproc.1: src/nproc +-man/numfmt.1: src/numfmt +-man/od.1: src/od +-man/paste.1: src/paste +-man/pathchk.1: src/pathchk +-man/pinky.1: src/pinky +-man/pr.1: src/pr +-man/printenv.1: src/printenv +-man/printf.1: src/printf +-man/ptx.1: src/ptx +-man/pwd.1: src/pwd +-man/readlink.1: src/readlink +-man/realpath.1: src/realpath +-man/rm.1: src/rm +-man/rmdir.1: src/rmdir +-man/runcon.1: src/runcon +-man/seq.1: src/seq +-man/sha1sum.1: src/sha1sum +-man/sha224sum.1: src/sha224sum +-man/sha256sum.1: src/sha256sum +-man/sha384sum.1: src/sha384sum +-man/sha512sum.1: src/sha512sum +-man/shred.1: src/shred +-man/shuf.1: src/shuf +-man/sleep.1: src/sleep +-man/sort.1: src/sort +-man/split.1: src/split +-man/stat.1: src/stat +-man/stdbuf.1: src/stdbuf +-man/stty.1: src/stty +-man/sum.1: src/sum +-man/sync.1: src/sync +-man/tac.1: src/tac +-man/tail.1: src/tail +-man/tee.1: src/tee +-man/test.1: src/test +-man/timeout.1: src/timeout +-man/touch.1: src/touch +-man/tr.1: src/tr +-man/true.1: src/true +-man/truncate.1: src/truncate +-man/tsort.1: src/tsort +-man/tty.1: src/tty +-man/uname.1: src/uname +-man/unexpand.1: src/unexpand +-man/uniq.1: src/uniq +-man/unlink.1: src/unlink +-man/uptime.1: src/uptime +-man/users.1: src/users +-man/wc.1: src/wc +-man/who.1: src/who +-man/whoami.1: src/whoami +-man/yes.1: src/yes ++man/arch.1: src/uname$(EXEEXT) ++man/dir.1: src/dir$(EXEEXT) ++man/install.1: src/ginstall$(EXEEXT) ++man/vdir.1: src/vdir$(EXEEXT) ++ ++man/base64.1: src/base64$(EXEEXT) ++man/basename.1: src/basename$(EXEEXT) ++man/cat.1: src/cat$(EXEEXT) ++man/chcon.1: src/chcon$(EXEEXT) ++man/chgrp.1: src/chgrp$(EXEEXT) ++man/chmod.1: src/chmod$(EXEEXT) ++man/chown.1: src/chown$(EXEEXT) ++man/chroot.1: src/chroot$(EXEEXT) ++man/cksum.1: src/cksum$(EXEEXT) ++man/comm.1: src/comm$(EXEEXT) ++man/cp.1: src/cp$(EXEEXT) ++man/csplit.1: src/csplit$(EXEEXT) ++man/cut.1: src/cut$(EXEEXT) ++man/date.1: src/date$(EXEEXT) ++man/dd.1: src/dd$(EXEEXT) ++man/df.1: src/df$(EXEEXT) ++man/dircolors.1: src/dircolors$(EXEEXT) ++man/dirname.1: src/dirname$(EXEEXT) ++man/du.1: src/du$(EXEEXT) ++man/echo.1: src/echo$(EXEEXT) ++man/env.1: src/env$(EXEEXT) ++man/expand.1: src/expand$(EXEEXT) ++man/expr.1: src/expr$(EXEEXT) ++man/factor.1: src/factor$(EXEEXT) ++man/false.1: src/false$(EXEEXT) ++man/fmt.1: src/fmt$(EXEEXT) ++man/fold.1: src/fold$(EXEEXT) ++man/groups.1: src/groups$(EXEEXT) ++man/head.1: src/head$(EXEEXT) ++man/hostid.1: src/hostid$(EXEEXT) ++man/hostname.1: src/hostname$(EXEEXT) ++man/id.1: src/id$(EXEEXT) ++man/join.1: src/join$(EXEEXT) ++man/kill.1: src/kill$(EXEEXT) ++man/link.1: src/link$(EXEEXT) ++man/ln.1: src/ln$(EXEEXT) ++man/logname.1: src/logname$(EXEEXT) ++man/ls.1: src/ls$(EXEEXT) ++man/md5sum.1: src/md5sum$(EXEEXT) ++man/mkdir.1: src/mkdir$(EXEEXT) ++man/mkfifo.1: src/mkfifo$(EXEEXT) ++man/mknod.1: src/mknod$(EXEEXT) ++man/mktemp.1: src/mktemp$(EXEEXT) ++man/mv.1: src/mv$(EXEEXT) ++man/nice.1: src/nice$(EXEEXT) ++man/nl.1: src/nl$(EXEEXT) ++man/nohup.1: src/nohup$(EXEEXT) ++man/nproc.1: src/nproc$(EXEEXT) ++man/numfmt.1: src/numfmt$(EXEEXT) ++man/od.1: src/od$(EXEEXT) ++man/paste.1: src/paste$(EXEEXT) ++man/pathchk.1: src/pathchk$(EXEEXT) ++man/pinky.1: src/pinky$(EXEEXT) ++man/pr.1: src/pr$(EXEEXT) ++man/printenv.1: src/printenv$(EXEEXT) ++man/printf.1: src/printf$(EXEEXT) ++man/ptx.1: src/ptx$(EXEEXT) ++man/pwd.1: src/pwd$(EXEEXT) ++man/readlink.1: src/readlink$(EXEEXT) ++man/realpath.1: src/realpath$(EXEEXT) ++man/rm.1: src/rm$(EXEEXT) ++man/rmdir.1: src/rmdir$(EXEEXT) ++man/runcon.1: src/runcon$(EXEEXT) ++man/seq.1: src/seq$(EXEEXT) ++man/sha1sum.1: src/sha1sum$(EXEEXT) ++man/sha224sum.1: src/sha224sum$(EXEEXT) ++man/sha256sum.1: src/sha256sum$(EXEEXT) ++man/sha384sum.1: src/sha384sum$(EXEEXT) ++man/sha512sum.1: src/sha512sum$(EXEEXT) ++man/shred.1: src/shred$(EXEEXT) ++man/shuf.1: src/shuf$(EXEEXT) ++man/sleep.1: src/sleep$(EXEEXT) ++man/sort.1: src/sort$(EXEEXT) ++man/split.1: src/split$(EXEEXT) ++man/stat.1: src/stat$(EXEEXT) ++man/stdbuf.1: src/stdbuf$(EXEEXT) ++man/stty.1: src/stty$(EXEEXT) ++man/sum.1: src/sum$(EXEEXT) ++man/sync.1: src/sync$(EXEEXT) ++man/tac.1: src/tac$(EXEEXT) ++man/tail.1: src/tail$(EXEEXT) ++man/tee.1: src/tee$(EXEEXT) ++man/test.1: src/test$(EXEEXT) ++man/timeout.1: src/timeout$(EXEEXT) ++man/touch.1: src/touch$(EXEEXT) ++man/tr.1: src/tr$(EXEEXT) ++man/true.1: src/true$(EXEEXT) ++man/truncate.1: src/truncate$(EXEEXT) ++man/tsort.1: src/tsort$(EXEEXT) ++man/tty.1: src/tty$(EXEEXT) ++man/uname.1: src/uname$(EXEEXT) ++man/unexpand.1: src/unexpand$(EXEEXT) ++man/uniq.1: src/uniq$(EXEEXT) ++man/unlink.1: src/unlink$(EXEEXT) ++man/uptime.1: src/uptime$(EXEEXT) ++man/users.1: src/users$(EXEEXT) ++man/wc.1: src/wc$(EXEEXT) ++man/who.1: src/who$(EXEEXT) ++man/whoami.1: src/whoami$(EXEEXT) ++man/yes.1: src/yes$(EXEEXT) + + .x.1: + $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ diff --git a/coreutils/coreutils-8.15-fix-manpages.patch b/coreutils/coreutils-8.15-fix-manpages.patch new file mode 100644 index 00000000..0efcd2e6 --- /dev/null +++ b/coreutils/coreutils-8.15-fix-manpages.patch @@ -0,0 +1,20 @@ +--- src/coreutils-8.22/doc/coreutils.texi.orig 2014-01-29 21:58:10.272848900 +0400 ++++ src/coreutils-8.22/doc/coreutils.texi 2014-01-29 22:02:14.012272296 +0400 +@@ -7790,7 +7790,7 @@ + + @table @samp + +-@itemx --append-exe ++@item --append-exe + @opindex --append-exe + @cindex appending exe on cygwin + Cygwin only: Cygwin normally performs @samp{.exe} magic, where a +@@ -11727,7 +11727,7 @@ + by each symbolic link argument. + Without it, @command{stat} acts on any symbolic link argument directly. + +-@itemx --append-exe ++@item --append-exe + @opindex --append-exe + @cindex appending exe on cygwin + Cygwin only: Cygwin normally performs .exe magic, where a command line diff --git a/coreutils/coreutils-8.21-manifest.patch b/coreutils/coreutils-8.15-manifest.patch similarity index 96% rename from coreutils/coreutils-8.21-manifest.patch rename to coreutils/coreutils-8.15-manifest.patch index da5a9439..720b650f 100644 --- a/coreutils/coreutils-8.21-manifest.patch +++ b/coreutils/coreutils-8.15-manifest.patch @@ -9,9 +9,9 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -5247,9 +5248,9 @@ + src/src_ginstall-selinux.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) - src/src_ginstall-extent-scan.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) + -src/ginstall$(EXEEXT): $(src_ginstall_OBJECTS) $(src_ginstall_DEPENDENCIES) $(EXTRA_src_ginstall_DEPENDENCIES) src/$(am__dirstamp) +src/ginstall$(EXEEXT): $(src_ginstall_OBJECTS) src/src_ginstall-manifest.res $(src_ginstall_DEPENDENCIES) $(EXTRA_src_ginstall_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/ginstall$(EXEEXT) diff --git a/coreutils/coreutils-8.21-msys1-0x0d.patch b/coreutils/coreutils-8.15-msys1-0x0d.patch similarity index 100% rename from coreutils/coreutils-8.21-msys1-0x0d.patch rename to coreutils/coreutils-8.15-msys1-0x0d.patch diff --git a/coreutils/coreutils-8.21-msys2-add-to-gnulib.patch b/coreutils/coreutils-8.15-msys2-add-to-gnulib.patch similarity index 100% rename from coreutils/coreutils-8.21-msys2-add-to-gnulib.patch rename to coreutils/coreutils-8.15-msys2-add-to-gnulib.patch diff --git a/coreutils/coreutils-8.15-msys2-src.patch b/coreutils/coreutils-8.15-msys2-src.patch new file mode 100644 index 00000000..ba0d81c9 --- /dev/null +++ b/coreutils/coreutils-8.15-msys2-src.patch @@ -0,0 +1,42 @@ +diff -Naur coreutils-8.15/lib/Makefile.in coreutils-8.15-msys/lib/Makefile.in +--- coreutils-8.15/Makefile.in 2013-05-01 08:22:57.715820300 +0000 ++++ coreutils-8.15-msys/Makefile.in 2013-03-04 08:25:50.146484300 +0000 +@@ -392,7 +392,7 @@ + lib/binary-io.h lib/binary-io.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/c-strncasecmp.c lib/c-strtod.c lib/c-strtold.c \ ++ lib/c-strncasecmp.c lib/cygwin.c lib/cygwin.h 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 \ + lib/md5.c lib/sha1.c lib/sha256.c lib/sha512.c \ +@@ -475,7 +475,7 @@ + lib/areadlinkat.$(OBJEXT) lib/argmatch.$(OBJEXT) \ + lib/argv-iter.$(OBJEXT) lib/backupfile.$(OBJEXT) \ + lib/base64.$(OBJEXT) lib/binary-io.$(OBJEXT) \ +- lib/bitrotate.$(OBJEXT) lib/buffer-lcm.$(OBJEXT) \ ++ lib/bitrotate.$(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) \ +@@ -2888,7 +2888,7 @@ + lib/areadlinkat.c lib/argmatch.c lib/argv-iter.c \ + lib/argv-iter.h lib/backupfile.c lib/base64.h lib/base64.c \ + lib/binary-io.h lib/binary-io.c lib/bitrotate.h \ +- lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \ ++ lib/bitrotate.c lib/buffer-lcm.c lib/cygwin.c lib/cygwin.h lib/buffer-lcm.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 \ +diff -Naur coreutils-8.15/src/install.c coreutils-8.15-msys/src/install.c +--- coreutils-8.15/src/install.c 2013-05-01 05:36:30.586914000 +0000 ++++ coreutils-8.15-msys/src/install.c 2013-03-04 10:35:28.122070300 +0000 +@@ -44,7 +44,7 @@ + #include "utimens.h" + #include "xstrtol.h" + +-#if __CYGWIN__ ++#ifdef __CYGWIN__ + # include "cygwin.h" + #endif + diff --git a/coreutils/coreutils-8.15-msys2.patch b/coreutils/coreutils-8.15-msys2.patch new file mode 100644 index 00000000..f222090f --- /dev/null +++ b/coreutils/coreutils-8.15-msys2.patch @@ -0,0 +1,278 @@ +diff -Naur coreutils-8.15/build-aux/compile coreutils-8.15-msys/build-aux/compile +--- coreutils-8.15/build-aux/compile 2011-11-24 18:46:06.000000000 +0000 ++++ coreutils-8.15-msys/build-aux/compile 2013-02-22 18:14:50.759765600 +0000 +@@ -54,7 +54,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN* | MSYS*) + file_conv=cygwin + ;; + *) +@@ -68,7 +68,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/* | msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur coreutils-8.15/build-aux/config.guess coreutils-8.15-msys/build-aux/config.guess +--- coreutils-8.15/build-aux/config.guess 2012-01-06 07:20:50.000000000 +0000 ++++ coreutils-8.15-msys/build-aux/config.guess 2013-02-22 18:15:41.291015600 +0000 +@@ -803,6 +803,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -846,6 +849,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur coreutils-8.15/build-aux/config.rpath coreutils-8.15-msys/build-aux/config.rpath +--- coreutils-8.15/build-aux/config.rpath 2012-01-06 07:20:50.000000000 +0000 ++++ coreutils-8.15-msys/build-aux/config.rpath 2013-02-22 18:16:25.619140600 +0000 +@@ -57,7 +57,7 @@ + aix*) + wl='-Wl,' + ;; +- mingw* | cygwin* | pw32* | os2* | cegcc*) ++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' +@@ -149,7 +149,7 @@ + hardcode_minus_L=no + + case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -198,7 +198,7 @@ + ld_shlibs=no + fi + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -348,7 +348,7 @@ + ;; + bsdi[45]*) + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -537,7 +537,7 @@ + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; +diff -Naur coreutils-8.15/configure coreutils-8.15-msys/configure +--- coreutils-8.15/configure 2012-01-06 17:06:35.000000000 +0000 ++++ coreutils-8.15-msys/configure 2013-02-22 18:46:00.589843800 +0000 +@@ -7055,7 +7046,7 @@ + else + case "$host_os" in + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +@@ -8906,7 +8897,7 @@ + # special semantics and is distinct from /, please report it to + # . + case $host in +- *-cygwin | i370-ibm-openedition) ++ *-cygwin | *-msys | i370-ibm-openedition) + gl_cv_double_slash_root=yes ;; + *) + # Be optimistic and assume that / and // are the same when we +@@ -12620,7 +12611,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_getcwd_null="guessing yes";; + # Guess yes on Cygwin. +- cygwin*) gl_cv_func_getcwd_null="guessing yes";; ++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_getcwd_null="guessing no";; + esac +@@ -22716,7 +22707,7 @@ + openbsd*) gl_cv_func_printf_directive_ls="guessing no";; + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; +- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; ++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + *) gl_cv_func_printf_directive_ls="guessing yes";; + esac +@@ -22800,7 +22791,7 @@ + if test "$cross_compiling" = yes; then : + + case "$host_os" in +- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; ++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; + *) gl_cv_func_printf_flag_grouping="guessing yes";; +@@ -24370,7 +24361,7 @@ + + case "$host_os" in + # Guess no on Cygwin. +- cygwin*) gl_cv_func_btowc_nul="guessing no" ;; ++ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_nul="guessing yes" ;; + esac +@@ -25619,7 +25610,7 @@ + # special semantics and is distinct from /, please report it to + # . + case $host in +- *-cygwin | i370-ibm-openedition) ++ *-cygwin | *-msys | i370-ibm-openedition) + gl_cv_double_slash_root=yes ;; + *) + # Be optimistic and assume that / and // are the same when we +@@ -25711,7 +25702,7 @@ + case "$host_os" in + mingw*) # on this platform, dup2 always returns 0 for success + gl_cv_func_dup2_works="guessing no" ;; +- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 ++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 + gl_cv_func_dup2_works="guessing no" ;; + linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a + # closed fd may yield -EBADF instead of -1 / errno=EBADF. +@@ -55444,7 +55435,7 @@ + + case "$host_os" in + mingw*) REPLACE_SETLOCALE=1 ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.5.*) REPLACE_SETLOCALE=1 ;; + esac +@@ -56490,7 +56481,7 @@ + gnu[0-9]* | \ + linux-* | linux | \ + freebsd2.2* | freebsd[3-9]* | freebsd[1-9][0-9]* | \ +- cygwin | \ ++ cygwin | msys | \ + mingw*) + + $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h +@@ -57148,7 +57139,7 @@ + *) gl_cv_func_wctob_works="guessing yes" ;; + esac + case "$host_os" in +- cygwin*) ++ cygwin* | msys*) + if test "$cross_compiling" = yes; then : + : + else +diff -Naur coreutils-8.15/gnulib-tests/test-copy-acl.sh coreutils-8.15-msys/gnulib-tests/test-copy-acl.sh +--- coreutils-8.15/gnulib-tests/test-copy-acl.sh 2012-01-06 07:20:50.000000000 +0000 ++++ coreutils-8.15-msys/gnulib-tests/test-copy-acl.sh 2013-02-22 18:17:44.608398400 +0000 +@@ -128,7 +128,7 @@ + # the programs. + # func_test_same_acls file1 file2 + case $acl_flavor in +- linux | cygwin | freebsd | solaris) ++ linux | cygwin | msys | freebsd | solaris) + func_test_same_acls () + { + getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1 +@@ -302,7 +302,7 @@ + + ;; + +- cygwin) ++ cygwin | msys) + + # Set an ACL for a group. + setfacl -m group:0:1 tmpfile0 +diff -Naur coreutils-8.15/gnulib-tests/test-file-has-acl.sh coreutils-8.15-msys/gnulib-tests/test-file-has-acl.sh +--- coreutils-8.15/gnulib-tests/test-file-has-acl.sh 2012-01-06 07:20:50.000000000 +0000 ++++ coreutils-8.15-msys/gnulib-tests/test-file-has-acl.sh 2013-02-22 18:18:27.936523400 +0000 +@@ -247,7 +247,7 @@ + fi + ;; + +- cygwin) ++ cygwin | msys) + + # Set an ACL for a group. + if setfacl -m group:0:1 tmpfile0; then +diff -Naur coreutils-8.15/gnulib-tests/test-set-mode-acl.sh coreutils-8.15-msys/gnulib-tests/test-set-mode-acl.sh +--- coreutils-8.15/gnulib-tests/test-set-mode-acl.sh 2012-01-06 07:20:50.000000000 +0000 ++++ coreutils-8.15-msys/gnulib-tests/test-set-mode-acl.sh 2013-02-22 18:19:28.030273400 +0000 +@@ -177,7 +177,7 @@ + linux | freebsd | solaris) + setfacl -m user:$auid:1 tmpfile0 + ;; +- cygwin) ++ cygwin | msys) + setfacl -m group:0:1 tmpfile0 + ;; + hpux) +diff -Naur coreutils-8.15/install.exe.manifest coreutils-8.15-msys/install.exe.manifest +--- coreutils-8.15/install.exe.manifest 1970-01-01 00:00:00.000000000 +0000 ++++ coreutils-8.15-msys/install.exe.manifest 2013-03-04 05:40:53.179687500 +0000 +@@ -0,0 +1,11 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -Naur coreutils-8.15/lib/gnulib.mk coreutils-8.15-msys/lib/gnulib.mk +--- coreutils-8.15/lib/gnulib.mk 2012-01-06 07:22:27.000000000 +0000 ++++ coreutils-8.15-msys/lib/gnulib.mk 2013-02-22 18:21:02.490234300 +0000 +@@ -1807,7 +1807,7 @@ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +diff -Naur coreutils-8.15/Makefile.in coreutils-8.15-msys/lib/Makefile.in +--- coreutils-8.15/Makefile.in 2012-01-06 15:49:23.000000000 +0000 ++++ coreutils-8.15-msys/Makefile.in 2013-03-04 08:25:50.146484300 +0000 +@@ -2970,7 +3005,7 @@ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ diff --git a/coreutils/coreutils-8.21-fix-man.patch b/coreutils/coreutils-8.21-fix-man.patch deleted file mode 100644 index d353d422..00000000 --- a/coreutils/coreutils-8.21-fix-man.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- coreutils-8.21/man/local.mk.orig 2013-02-05 18:01:21.000000000 +0400 -+++ coreutils-8.21/man/local.mk 2013-10-31 23:15:34.058400000 +0400 -@@ -192,5 +192,5 @@ - --output=$$t/$$name.1 $$t/$$name \ - && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t \ - && rm -rf $$t \ -- && chmod -w $@-t \ -+ && chmod a-w $@-t \ - && mv $@-t $@ diff --git a/coreutils/coreutils-8.21-fpending.patch b/coreutils/coreutils-8.21-fpending.patch deleted file mode 100644 index 52fe068f..00000000 --- a/coreutils/coreutils-8.21-fpending.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur coreutils-8.21-fpending/lib/config.hin coreutils-8.21/lib/config.hin ---- coreutils-8.21-fpending/lib/config.hin 2013-10-20 10:11:10.369000000 +0400 -+++ coreutils-8.21/lib/config.hin 2013-10-20 10:24:12.124800000 +0400 -@@ -1298,10 +1298,6 @@ - don't. */ - #undef HAVE_DECL__SYS_SIGLIST - --/* Define to 1 if you have the declaration of `__fpending', and to 0 if you -- don't. */ --#undef HAVE_DECL___FPENDING -- - /* Define to 1 if you have the declaration of `__fsetlocking', and to 0 if you - don't. */ - #undef HAVE_DECL___FSETLOCKING -@@ -2519,9 +2515,6 @@ - member named physmem. */ - #undef HAVE__SYSTEM_CONFIGURATION - --/* Define to 1 if you have the `__fpending' function. */ --#undef HAVE___FPENDING -- - /* Define to 1 if you have the `__fpurge' function. */ - #undef HAVE___FPURGE - -diff -Naur coreutils-8.21-fpending/lib/fpending.h coreutils-8.21/lib/fpending.h ---- coreutils-8.21-fpending/lib/fpending.h 2013-09-22 19:25:57.000000000 +0400 -+++ coreutils-8.21/lib/fpending.h 2013-10-20 10:26:22.710600000 +0400 -@@ -20,11 +20,10 @@ - - #include - #include -+#if HAVE_STDIO_EXT_H -+# include -+#endif - --#if HAVE_DECL___FPENDING --# if HAVE_STDIO_EXT_H --# include --# endif --#else -+#ifndef __fpending - size_t __fpending (FILE *); - #endif -diff -Naur coreutils-8.21-fpending/m4/fpending.m4 coreutils-8.21/m4/fpending.m4 ---- coreutils-8.21-fpending/m4/fpending.m4 2013-09-22 19:25:57.000000000 +0400 -+++ coreutils-8.21/m4/fpending.m4 2013-10-20 10:27:26.603600000 +0400 -@@ -16,14 +16,19 @@ - AC_DEFUN([gl_FUNC_FPENDING], - [ - AC_CHECK_HEADERS_ONCE([stdio_ext.h]) -- AC_CHECK_FUNCS_ONCE([__fpending]) -- fp_headers=' --# include --# if HAVE_STDIO_EXT_H --# include --# endif --' -- AC_CHECK_DECLS([__fpending], , , $fp_headers) -+ AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], -+ [ -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ #if HAVE_STDIO_EXT_H -+ # include -+ #endif -+ ]], -+ [[return ! __fpending (stdin);]])], -+ [gl_cv_func___fpending=yes], -+ [gl_cv_func___fpending=no]) -+ ]) - ]) - - AC_DEFUN([gl_PREREQ_FPENDING], -diff -Naur coreutils-8.21-fpending/m4/gnulib-comp.m4 coreutils-8.21/m4/gnulib-comp.m4 ---- coreutils-8.21-fpending/m4/gnulib-comp.m4 2013-09-22 19:29:16.000000000 +0400 -+++ coreutils-8.21/m4/gnulib-comp.m4 2013-10-20 10:28:16.554800000 +0400 -@@ -679,7 +679,7 @@ - gl_STDIO_MODULE_INDICATOR([fopen]) - gl_MODULE_INDICATOR([fopen-safer]) - gl_FUNC_FPENDING -- if test $ac_cv_func___fpending = no; then -+ if test $gl_cv_func___fpending = no; then - AC_LIBOBJ([fpending]) - gl_PREREQ_FPENDING - fi diff --git a/coreutils/coreutils-8.21-msys2-hasmntopt.patch b/coreutils/coreutils-8.21-msys2-hasmntopt.patch deleted file mode 100644 index de1da608..00000000 --- a/coreutils/coreutils-8.21-msys2-hasmntopt.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/coreutils-8.21/lib/mountlist.c.orig 2013-02-07 20:44:47.000000000 +0400 -+++ src/coreutils-8.21/lib/mountlist.c 2013-06-29 22:19:56.000000000 +0400 -@@ -167,15 +167,48 @@ - /* for Irix 6.5 */ \ - || strcmp (Fs_type, "ignore") == 0) - -+/* Search MNT->mnt_opts for an option matching OPT. -+ Returns the address of the substring, or null if none found. */ -+char * -+hasmntopt (const struct mntent *mnt, const char *opt) -+{ -+ const size_t optlen = strlen (opt); -+ char *rest = mnt->mnt_opts, *p; -+ -+ while ((p = strstr (rest, opt)) != NULL) -+ { -+ if (p == rest -+ || (p[-1] == ',' -+ && (p[optlen] == '\0' || -+ p[optlen] == '=' || -+ p[optlen] == ','))) -+ return p; -+ -+ rest = strchr (rest, ','); -+ if (rest == NULL) -+ break; -+ ++rest; -+ } -+ -+ return NULL; -+} -+#define HAVE_HASMNTOPT -+ - /* Historically, we have marked as "dummy" any file system of type "none", - but now that programs like du need to know about bind-mounted directories, - we grant an exception to any with "bind" in its list of mount options. - I.e., those are *not* dummy entries. */ --#ifdef MOUNTED_GETMNTENT1 --# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \ -- (ME_DUMMY_0 (Fs_name, Fs_type) \ -- || (strcmp (Fs_type, "none") == 0 \ -- && !hasmntopt (Fs_ent, "bind"))) -+#if defined MOUNTED_GETMNTENT1 && defined HAVE_HASMNTOPT -+# if defined HAVE_HASMNTOPT -+# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \ -+ (ME_DUMMY_0 (Fs_name, Fs_type) \ -+ || (strcmp (Fs_type, "none") == 0 \ -+ && !hasmntopt (Fs_ent, "bind"))) -+# else -+# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \ -+ (ME_DUMMY_0 (Fs_name, Fs_type) \ -+ || (strcmp (Fs_type, "none") == 0)) -+# endif - #else - # define ME_DUMMY(Fs_name, Fs_type) \ - (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0) diff --git a/coreutils/coreutils-8.21-msys2-src.patch b/coreutils/coreutils-8.21-msys2-src.patch deleted file mode 100644 index 21b53d8b..00000000 --- a/coreutils/coreutils-8.21-msys2-src.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur coreutils-8.21/lib/Makefile.in coreutils-8.21-msys/lib/Makefile.in ---- coreutils-8.21/Makefile.in 2013-05-01 08:22:57.715820300 +0000 -+++ coreutils-8.21-msys/Makefile.in 2013-03-04 08:25:50.146484300 +0000 -@@ -392,13 +392,13 @@ - lib/argmatch.c lib/argv-iter.c lib/argv-iter.h \ - lib/backupfile.c lib/base64.h lib/base64.c lib/binary-io.h \ - lib/binary-io.c lib/bitrotate.h lib/bitrotate.c \ -- lib/buffer-lcm.c lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c \ -+ lib/buffer-lcm.c 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/closein.c lib/closeout.c \ - lib/cygwin.h lib/cygwin.c lib/md5.c \ -- lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c \ -+ lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c lib/cygwin.c \ - lib/di-set.c lib/di-set.h lib/diacrit.h lib/diacrit.c \ - lib/opendir-safer.c lib/dirname.c lib/basename.c \ - lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \ -@@ -476,7 +476,7 @@ - lib/argmatch.$(OBJEXT) lib/argv-iter.$(OBJEXT) \ - lib/backupfile.$(OBJEXT) lib/base64.$(OBJEXT) \ - lib/binary-io.$(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) \ -@@ -484,7 +484,7 @@ - lib/close-stream.$(OBJEXT) lib/closein.$(OBJEXT) \ - lib/closeout.$(OBJEXT) lib/md5.$(OBJEXT) lib/sha1.$(OBJEXT) \ - lib/sha256.$(OBJEXT) lib/sha512.$(OBJEXT) \ -- lib/cycle-check.$(OBJEXT) lib/di-set.$(OBJEXT) \ -+ lib/cycle-check.$(OBJEXT) lib/cygwin.$(OBJEXT) lib/di-set.$(OBJEXT) \ - lib/diacrit.$(OBJEXT) lib/opendir-safer.$(OBJEXT) \ - lib/dirname.$(OBJEXT) lib/basename.$(OBJEXT) \ - lib/dirname-lgpl.$(OBJEXT) lib/basename-lgpl.$(OBJEXT) \ -@@ -2889,13 +2889,13 @@ - 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/binary-io.h lib/binary-io.c lib/bitrotate.h \ -- lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \ -+ lib/bitrotate.c lib/buffer-lcm.c lib/cygwin.c lib/cygwin.h lib/buffer-lcm.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 \ - lib/md5.c lib/sha1.c lib/sha256.c lib/sha512.c \ -- lib/cycle-check.c lib/di-set.c lib/di-set.h lib/diacrit.h \ -+ lib/cycle-check.c lib/cygwin.c lib/di-set.c lib/di-set.h lib/diacrit.h \ - lib/diacrit.c lib/opendir-safer.c lib/dirname.c lib/basename.c \ - lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \ - lib/dtoastr.c lib/dtotimespec.c lib/exclude.c lib/exitfail.c \ -diff -Naur coreutils-8.15/src/install.c coreutils-8.15-msys/src/install.c ---- coreutils-8.21/src/install.c 2013-05-01 05:36:30.586914000 +0000 -+++ coreutils-8.21-msys/src/install.c 2013-03-04 10:35:28.122070300 +0000 -@@ -44,7 +44,7 @@ - #include "utimens.h" - #include "xstrtol.h" - --#if __CYGWIN__ -+#ifdef __CYGWIN__ - # include "cygwin.h" - #endif - diff --git a/coreutils/coreutils-8.21-msys2.patch b/coreutils/coreutils-8.21-msys2.patch deleted file mode 100644 index 29206234..00000000 --- a/coreutils/coreutils-8.21-msys2.patch +++ /dev/null @@ -1,451 +0,0 @@ -diff -Naur coreutils-8.21-cygwin/build-aux/compile coreutils-8.21-msys/build-aux/compile ---- coreutils-8.21-cygwin/build-aux/compile 2013-02-14 14:58:02.000000000 +0000 -+++ coreutils-8.21-msys/build-aux/compile 2013-05-17 10:27:58.446289100 +0000 -@@ -54,7 +54,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN* | MSYS*) - file_conv=cygwin - ;; - *) -@@ -68,7 +68,7 @@ - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) -diff -Naur coreutils-8.21-cygwin/build-aux/config.guess coreutils-8.21-msys/build-aux/config.guess ---- coreutils-8.21-cygwin/build-aux/config.guess 2013-02-07 16:44:47.000000000 +0000 -+++ coreutils-8.21-msys/build-aux/config.guess 2013-05-17 10:31:55.508789100 +0000 -@@ -845,6 +845,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -diff -Naur coreutils-8.21-cygwin/build-aux/config.rpath coreutils-8.21-msys/build-aux/config.rpath ---- coreutils-8.21-cygwin/build-aux/config.rpath 2013-01-02 12:34:45.000000000 +0000 -+++ coreutils-8.21-msys/build-aux/config.rpath 2013-05-17 10:27:58.446289100 +0000 -@@ -57,7 +57,7 @@ - aix*) - wl='-Wl,' - ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' -@@ -149,7 +149,7 @@ - hardcode_minus_L=no - - case "$host_os" in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -198,7 +198,7 @@ - ld_shlibs=no - fi - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -@@ -348,7 +348,7 @@ - ;; - bsdi[45]*) - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -537,7 +537,7 @@ - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; -diff -Naur coreutils-8.21-cygwin/configure coreutils-8.21-msys/configure ---- coreutils-8.21-cygwin/configure 2013-02-14 15:54:18.000000000 +0000 -+++ coreutils-8.21-msys/configure 2013-05-17 10:33:57.739257800 +0000 -@@ -7171,7 +7171,7 @@ - else - case "$host_os" in - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -@@ -9051,7 +9051,7 @@ - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -@@ -13066,7 +13066,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -@@ -23531,7 +23531,7 @@ - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - *) gl_cv_func_printf_directive_ls="guessing yes";; - esac -@@ -23615,7 +23615,7 @@ - if test "$cross_compiling" = yes; then : - - case "$host_os" in -- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; - *) gl_cv_func_printf_flag_grouping="guessing yes";; -@@ -25145,7 +25145,7 @@ - - case "$host_os" in - # Guess no on Cygwin. -- cygwin*) gl_cv_func_btowc_nul="guessing no" ;; -+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; - esac -@@ -26321,7 +26321,7 @@ - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -@@ -26411,7 +26411,7 @@ - case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; -- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 -+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. -@@ -36608,7 +36608,7 @@ - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -@@ -43008,7 +43008,7 @@ - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;; -@@ -57682,7 +57682,7 @@ - - case "$host_os" in - mingw*) REPLACE_SETLOCALE=1 ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; - esac -@@ -58733,7 +58733,7 @@ - gnu[0-9]* | \ - linux-* | linux | \ - freebsd2.2* | freebsd[3-9]* | freebsd[1-9][0-9]* | \ -- cygwin | \ -+ cygwin | msys | \ - mingw*) - - $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h -@@ -59396,13 +59396,13 @@ - - case "$host_os" in - # Guess no on Solaris <= 9 and Cygwin. -- solaris2.[1-9] | solaris2.[1-9].* | cygwin*) -+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*) - gl_cv_func_wctob_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_wctob_works="guessing yes" ;; - esac - case "$host_os" in -- cygwin*) -+ cygwin* | msys*) - if test "$cross_compiling" = yes; then : - : - else -diff -Naur coreutils-8.21-cygwin/gnulib-tests/test-copy-acl.sh coreutils-8.21-msys/gnulib-tests/test-copy-acl.sh ---- coreutils-8.21-cygwin/gnulib-tests/test-copy-acl.sh 2012-07-12 13:49:26.000000000 +0000 -+++ coreutils-8.21-msys/gnulib-tests/test-copy-acl.sh 2013-05-17 10:27:58.524414100 +0000 -@@ -128,7 +128,7 @@ - # the programs. - # func_test_same_acls file1 file2 - case $acl_flavor in -- linux | cygwin | freebsd | solaris) -+ linux | cygwin | msys | freebsd | solaris) - func_test_same_acls () - { - getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1 -@@ -302,7 +302,7 @@ - - ;; - -- cygwin) -+ cygwin | msys) - - # Set an ACL for a group. - setfacl -m group:0:1 tmpfile0 -diff -Naur coreutils-8.21-cygwin/gnulib-tests/test-file-has-acl.sh coreutils-8.21-msys/gnulib-tests/test-file-has-acl.sh ---- coreutils-8.21-cygwin/gnulib-tests/test-file-has-acl.sh 2012-07-12 13:49:26.000000000 +0000 -+++ coreutils-8.21-msys/gnulib-tests/test-file-has-acl.sh 2013-05-17 10:27:58.540039100 +0000 -@@ -247,7 +247,7 @@ - fi - ;; - -- cygwin) -+ cygwin | msys) - - # Set an ACL for a group. - if setfacl -m group:0:1 tmpfile0; then -diff -Naur coreutils-8.21-cygwin/gnulib-tests/test-set-mode-acl.sh coreutils-8.21-msys/gnulib-tests/test-set-mode-acl.sh ---- coreutils-8.21-cygwin/gnulib-tests/test-set-mode-acl.sh 2012-07-12 13:49:26.000000000 +0000 -+++ coreutils-8.21-msys/gnulib-tests/test-set-mode-acl.sh 2013-05-17 10:27:58.540039100 +0000 -@@ -177,7 +177,7 @@ - linux | freebsd | solaris) - setfacl -m user:$auid:1 tmpfile0 - ;; -- cygwin) -+ cygwin | msys) - setfacl -m group:0:1 tmpfile0 - ;; - hpux) -diff -Naur coreutils-8.21-cygwin/install.exe.manifest coreutils-8.21-msys/install.exe.manifest ---- coreutils-8.21-cygwin/install.exe.manifest 1970-01-01 00:00:00.000000000 +0000 -+++ coreutils-8.21-msys/install.exe.manifest 2013-05-17 10:27:58.540039100 +0000 -@@ -0,0 +1,11 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -Naur coreutils-8.21-cygwin/lib/gnulib.mk coreutils-8.21-msys/lib/gnulib.mk ---- coreutils-8.21-cygwin/lib/gnulib.mk 2013-02-14 14:57:23.000000000 +0000 -+++ coreutils-8.21-msys/lib/gnulib.mk 2013-05-17 10:27:58.540039100 +0000 -@@ -1887,7 +1887,7 @@ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ -diff -Naur coreutils-8.21-cygwin/m4/btowc.m4 coreutils-8.21-msys/m4/btowc.m4 ---- coreutils-8.21-cygwin/m4/btowc.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/btowc.m4 2013-05-17 10:28:02.352539100 +0000 -@@ -49,7 +49,7 @@ - changequote(,)dnl - case "$host_os" in - # Guess no on Cygwin. -- cygwin*) gl_cv_func_btowc_nul="guessing no" ;; -+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; - esac -diff -Naur coreutils-8.21-cygwin/m4/double-slash-root.m4 coreutils-8.21-msys/m4/double-slash-root.m4 ---- coreutils-8.21-cygwin/m4/double-slash-root.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/double-slash-root.m4 2013-05-17 10:28:02.368164100 +0000 -@@ -16,7 +16,7 @@ - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -diff -Naur coreutils-8.21-cygwin/m4/dup2.m4 coreutils-8.21-msys/m4/dup2.m4 ---- coreutils-8.21-cygwin/m4/dup2.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/dup2.m4 2013-05-17 10:38:24.763671900 +0000 -@@ -49,7 +49,7 @@ - [case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; -- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 -+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. -diff -Naur coreutils-8.21-cygwin/m4/getcwd.m4 coreutils-8.21-msys/m4/getcwd.m4 ---- coreutils-8.21-cygwin/m4/getcwd.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/getcwd.m4 2013-05-17 10:38:59.138671900 +0000 -@@ -49,7 +49,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -diff -Naur coreutils-8.21-cygwin/m4/malloc.m4 coreutils-8.21-msys/m4/malloc.m4 ---- coreutils-8.21-cygwin/m4/malloc.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/malloc.m4 2013-05-17 10:39:37.419921900 +0000 -@@ -30,7 +30,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -diff -Naur coreutils-8.21-cygwin/m4/printf.m4 coreutils-8.21-msys/m4/printf.m4 ---- coreutils-8.21-cygwin/m4/printf.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/printf.m4 2013-05-17 10:28:02.383789100 +0000 -@@ -735,7 +735,7 @@ - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - *) gl_cv_func_printf_directive_ls="guessing yes";; - esac -@@ -812,7 +812,7 @@ - [ - changequote(,)dnl - case "$host_os" in -- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; - *) gl_cv_func_printf_flag_grouping="guessing yes";; -@@ -1464,7 +1464,7 @@ - darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. - solaris2.[0-5] | solaris2.[0-5].*) - gl_cv_func_vsnprintf_zerosize_c99="guessing no";; -diff -Naur coreutils-8.21-cygwin/m4/realloc.m4 coreutils-8.21-msys/m4/realloc.m4 ---- coreutils-8.21-cygwin/m4/realloc.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/realloc.m4 2013-05-17 10:40:41.154296900 +0000 -@@ -30,7 +30,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;; -diff -Naur coreutils-8.21-cygwin/m4/setlocale.m4 coreutils-8.21-msys/m4/setlocale.m4 ---- coreutils-8.21-cygwin/m4/setlocale.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/setlocale.m4 2013-05-17 10:28:02.383789100 +0000 -@@ -14,7 +14,7 @@ - mingw*) REPLACE_SETLOCALE=1 ;; - dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL) - dnl is then still "C". -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; - esac -diff -Naur coreutils-8.21-cygwin/m4/threadlib.m4 coreutils-8.21-msys/m4/threadlib.m4 ---- coreutils-8.21-cygwin/m4/threadlib.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/threadlib.m4 2013-05-17 10:28:02.383789100 +0000 -@@ -68,7 +68,7 @@ - dnl bugs that lead to endless loops or crashes. See - dnl . - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -diff -Naur coreutils-8.21-cygwin/m4/unlinkdir.m4 coreutils-8.21-msys/m4/unlinkdir.m4 ---- coreutils-8.21-cygwin/m4/unlinkdir.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/unlinkdir.m4 2013-05-17 10:28:02.383789100 +0000 -@@ -24,7 +24,7 @@ - gnu[[0-9]]* | \ - linux-* | linux | \ - freebsd2.2* | freebsd[[3-9]]* | freebsd[[1-9]][[0-9]]* | \ -- cygwin | \ -+ cygwin | msys | \ - mingw*) - AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1], - [Define to 1 if unlink (dir) cannot possibly succeed.]);; -diff -Naur coreutils-8.21-cygwin/m4/wctob.m4 coreutils-8.21-msys/m4/wctob.m4 ---- coreutils-8.21-cygwin/m4/wctob.m4 2013-01-02 12:34:46.000000000 +0000 -+++ coreutils-8.21-msys/m4/wctob.m4 2013-05-17 10:41:41.685546900 +0000 -@@ -29,14 +29,14 @@ - changequote(,)dnl - case "$host_os" in - # Guess no on Solaris <= 9 and Cygwin. -- solaris2.[1-9] | solaris2.[1-9].* | cygwin*) -+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*) - gl_cv_func_wctob_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_wctob_works="guessing yes" ;; - esac - changequote([,])dnl - case "$host_os" in -- cygwin*) -+ cygwin* | msys*) - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ - #include -diff -Naur coreutils-8.21-cygwin/Makefile.in coreutils-8.21-msys/Makefile.in ---- coreutils-8.21-cygwin/Makefile.in 2013-05-17 10:18:44.589843800 +0000 -+++ coreutils-8.21-msys/Makefile.in 2013-05-17 10:36:31.981445300 +0000 -@@ -8230,7 +8230,7 @@ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \