From 522fea92cc381d6103bde5dd8f06a86c987a8c06 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 15 2015 11:36:36 +0000 Subject: import coreutils-8.22-12.el7_1.2 --- diff --git a/SOURCES/coreutils-8.22-df-filtermountlistupdate.patch b/SOURCES/coreutils-8.22-df-filtermountlistupdate.patch new file mode 100644 index 0000000..208437c --- /dev/null +++ b/SOURCES/coreutils-8.22-df-filtermountlistupdate.patch @@ -0,0 +1,508 @@ +diff -urNp coreutils-8.22-orig/src/df.c coreutils-8.22/src/df.c +--- coreutils-8.22-orig/src/df.c 2015-07-06 15:51:56.218101224 +0200 ++++ coreutils-8.22/src/df.c 2015-07-06 16:07:14.429941697 +0200 +@@ -47,12 +47,12 @@ struct devlist + + /* Filled with device numbers of examined file systems to avoid + duplicities in output. */ +-struct devlist ++static struct devlist + { + dev_t dev_num; + struct mount_entry *me; + struct devlist *next; +-}; ++} *device_list; + + /* If true, show even file systems with zero size or + uninteresting types. */ +@@ -617,7 +617,7 @@ excluded_fstype (const char *fstype) + me_mountdir wins. */ + + static void +-filter_mount_list (void) ++filter_mount_list (bool devices_only) + { + struct mount_entry *me; + +@@ -621,9 +621,6 @@ filter_mount_list (void) + { + struct mount_entry *me; + +- /* Store of already-processed device numbers. */ +- struct devlist *devlist_head = NULL; +- + /* Sort all 'wanted' entries into the list devlist_head. */ + for (me = mount_list; me;) + { +@@ -631,41 +628,66 @@ filter_mount_list (void) + struct devlist *devlist; + struct mount_entry *discard_me = NULL; + +- if (-1 == stat (me->me_mountdir, &buf)) ++ /* Avoid stating remote file systems as that may hang. ++ On Linux we probably have me_dev populated from /proc/self/mountinfo, ++ however we still stat() in case another device was mounted later. */ ++ if ((me->me_remote && show_local_fs) ++ || -1 == stat (me->me_mountdir, &buf)) + { +- /* Stat failed - add ME to be able to complain about it later. */ ++ /* If remote, and showing just local, add ME for filtering later. ++ If stat failed; add ME to be able to complain about it later. */ + buf.st_dev = me->me_dev; + } + else + { +- /* If the device name is a real path name ... */ +- if (strchr (me->me_devname, '/')) +- { +- /* ... try to find its device number in the devlist. */ +- for (devlist = devlist_head; devlist; devlist = devlist->next) +- if (devlist->dev_num == buf.st_dev) +- break; ++ /* If we've already seen this device... */ ++ for (devlist = device_list; devlist; devlist = devlist->next) ++ if (devlist->dev_num == buf.st_dev) ++ break; + +- if (devlist) ++ if (devlist) ++ { ++ if (! print_grand_total && me->me_remote && devlist->me->me_remote ++ && ! STREQ (devlist->me->me_devname, me->me_devname)) + { ++ /* Don't discard remote entries with different locations, ++ as these are more likely to be explicitly mounted. ++ However avoid this when producing a total to give ++ a more accurate value in that case. */ ++ } ++ else if ((strchr (me->me_devname, '/') ++ /* let "real" devices with '/' in the name win. */ ++ && ! strchr (devlist->me->me_devname, '/')) ++ /* let a shorter mountdir win. */ ++ || (strlen (devlist->me->me_mountdir) ++ > strlen (me->me_mountdir)) ++ /* let an entry overmounted on a new device win... */ ++ || (! STREQ (devlist->me->me_devname, me->me_devname) ++ /* ... but only when matching an existing mnt point, ++ to avoid problematic replacement when given ++ inaccurate mount lists, seen with some chroot ++ environments for example. */ ++ && STREQ (me->me_mountdir, ++ devlist->me->me_mountdir))) ++ { ++ /* Discard mount entry for existing device. */ ++ discard_me = devlist->me; ++ devlist->me = me; ++ } ++ else ++ { ++ /* Discard mount entry currently being processed. */ + discard_me = me; +- +- /* Let the shorter mountdir win. */ +- if (! strchr (devlist->me->me_devname, '/') +- || (strlen (devlist->me->me_mountdir) +- > strlen (me->me_mountdir))) +- { +- discard_me = devlist->me; +- devlist->me = me; +- } + } ++ + } + } + + if (discard_me) + { + me = me->me_next; +- free_mount_entry (discard_me); ++ if (! devices_only) ++ free_mount_entry (discard_me); + } + else + { +@@ -673,28 +695,49 @@ filter_mount_list (void) + devlist = xmalloc (sizeof *devlist); + devlist->me = me; + devlist->dev_num = buf.st_dev; +- devlist->next = devlist_head; +- devlist_head = devlist; ++ devlist->next = device_list; ++ device_list = devlist; + + me = me->me_next; + } + } + + /* Finally rebuild the mount_list from the devlist. */ +- mount_list = NULL; +- while (devlist_head) +- { +- /* Add the mount entry. */ +- me = devlist_head->me; +- me->me_next = mount_list; +- mount_list = me; +- /* Free devlist entry and advance. */ +- struct devlist *devlist = devlist_head->next; +- free (devlist_head); +- devlist_head = devlist; +- } ++ if (! devices_only) { ++ mount_list = NULL; ++ while (device_list) ++ { ++ /* Add the mount entry. */ ++ me = device_list->me; ++ me->me_next = mount_list; ++ mount_list = me; ++ /* Free devlist entry and advance. */ ++ struct devlist *devlist = device_list->next; ++ free (device_list); ++ device_list = devlist; ++ } ++ } + } + ++/* Search a mount entry list for device id DEV. ++ Return the corresponding mount entry if found or NULL if not. */ ++ ++static struct mount_entry const * _GL_ATTRIBUTE_PURE ++me_for_dev (dev_t dev) ++{ ++ struct devlist *dl = device_list; ++ ++ while (dl) ++ { ++ if (dl->dev_num == dev) ++ return dl->me; ++ dl = dl->next; ++ } ++ ++ return NULL; ++} ++ ++ + /* Return true if N is a known integer value. On many file systems, + UINTMAX_MAX represents an unknown value; on AIX, UINTMAX_MAX - 1 + represents unknown. Use a rule that works on AIX file systems, and +@@ -887,6 +887,11 @@ get_dev (char const *disk, char const *m + if (!selected_fstype (fstype) || excluded_fstype (fstype)) + return; + ++ /* Ignore relative MOUNT_POINTs, which are present for example ++ in /proc/mounts on Linux with network namespaces. */ ++ if (!force_fsu && mount_point && ! IS_ABSOLUTE_FILE_NAME (mount_point)) ++ return; ++ + /* If MOUNT_POINT is NULL, then the file system is not mounted, and this + program reports on the file system that the special file is on. + It would be better to report on the unmounted file system, +@@ -900,9 +924,43 @@ get_dev (char const *disk, char const *m + fsu = *force_fsu; + else if (get_fs_usage (stat_file, disk, &fsu)) + { +- error (0, errno, "%s", quote (stat_file)); +- exit_status = EXIT_FAILURE; +- return; ++ /* If we can't access a system provided entry due ++ to it not being present (now), or due to permissions, ++ just output placeholder values rather than failing. */ ++ if (process_all && (errno == EACCES || errno == ENOENT)) ++ { ++ if (! show_all_fs) ++ return; ++ ++ fstype = "-"; ++ fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree = ++ fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX; ++ } ++ else ++ { ++ error (0, errno, "%s", quote (stat_file)); ++ exit_status = EXIT_FAILURE; ++ return; ++ } ++ } ++ else if (process_all && show_all_fs) ++ { ++ /* Ensure we don't output incorrect stats for over-mounted directories. ++ Discard stats when the device name doesn't match. Though don't ++ discard when used and current mount entries are both remote due ++ to the possibility of aliased host names or exports. */ ++ struct stat sb; ++ if (stat (stat_file, &sb) == 0) ++ { ++ struct mount_entry const * dev_me = me_for_dev (sb.st_dev); ++ if (dev_me && ! STREQ (dev_me->me_devname, disk) ++ && (! dev_me->me_remote || ! me_remote)) ++ { ++ fstype = "-"; ++ fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree = ++ fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX; ++ } ++ } + } + + if (fsu.fsu_blocks == 0 && !show_all_fs && !show_listed_fs) +@@ -1320,8 +1325,7 @@ get_all_entries (void) + { + struct mount_entry *me; + +- if (!show_all_fs) +- filter_mount_list (); ++ filter_mount_list (show_all_fs); + + for (me = mount_list; me; me = me->me_next) + get_dev (me->me_devname, me->me_mountdir, NULL, NULL, me->me_type, +diff -urNp coreutils-8.22-orig/doc/coreutils.texi coreutils-8.22/doc/coreutils.texi +--- coreutils-8.22-orig/doc/coreutils.texi 2015-07-06 17:44:13.266328267 +0200 ++++ coreutils-8.22/doc/coreutils.texi 2015-07-06 17:48:41.612327379 +0200 +@@ -11149,11 +11149,15 @@ The program accepts the following option + @itemx --all + @opindex -a + @opindex --all +-@cindex automounter file systems + @cindex ignore file systems +-Include in the listing dummy file systems, which +-are omitted by default. Such file systems are typically special-purpose +-pseudo-file-systems, such as automounter entries. ++Include in the listing dummy, duplicate, or inaccessible file systems, which ++are omitted by default. Dummy file systems are typically special purpose ++pseudo file systems such as @samp{/proc}, with no associated storage. ++Duplicate file systems are local or remote file systems that are mounted ++at separate locations in the local file hierarchy, or bind mounted locations. ++Inaccessible file systems are those which are mounted but subsequently ++over-mounted by another file system at that point, or otherwise inaccessible ++due to permissions of the mount point etc. + + @item -B @var{size} + @itemx --block-size=@var{size} +diff -urNp coreutils-8.22-orig/tests/df/skip-duplicates.sh coreutils-8.22/tests/df/skip-duplicates.sh +--- coreutils-8.22-orig/tests/df/skip-duplicates.sh 2013-12-04 15:48:30.000000000 +0100 ++++ coreutils-8.22/tests/df/skip-duplicates.sh 2015-07-06 17:45:47.176027871 +0200 +@@ -2,7 +2,7 @@ + # Test df's behavior when the mount list contains duplicate entries. + # This test is skipped on systems that lack LD_PRELOAD support; that's fine. + +-# Copyright (C) 2012-2013 Free Software Foundation, Inc. ++# Copyright (C) 2012-2015 Free Software Foundation, Inc. + + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,19 +21,73 @@ + print_ver_ df + require_gcc_shared_ + +-df || skip_ "df fails" +- +-# Simulate an mtab file with two entries of the same device number. +-# Also add entries with unstatable mount dirs to ensure that's handled. +-cat > k.c <<'EOF' || framework_failure_ ++# We use --local here so as to not activate ++# potentially very many remote mounts. ++df --local || skip_ 'df fails' ++ ++export CU_NONROOT_FS=$(df --local --output=target 2>&1 | grep /. | head -n1) ++export CU_REMOTE_FS=$(df --local --output=target 2>&1 | grep /. | ++ tail -n+2 | head -n1) ++ ++unique_entries=1 ++test -z "$CU_NONROOT_FS" || unique_entries=$(expr $unique_entries + 1) ++test -z "$CU_REMOTE_FS" || unique_entries=$(expr $unique_entries + 2) ++ ++grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \ ++ || skip_ "no mntent.h available to confirm the interface" ++ ++grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \ ++ || skip_ "getmntent is not used on this system" ++ ++# Simulate an mtab file to test various cases. ++cat > k.c < + #include ++#include + #include ++#include ++#include ++ ++#define STREQ(a, b) (strcmp (a, b) == 0) ++ ++FILE* fopen(const char *path, const char *mode) ++{ ++ static FILE* (*fopen_func)(char const *, char const *); ++ ++ /* get reference to original (libc provided) fopen */ ++ if (!fopen_func) ++ { ++ fopen_func = (FILE*(*)(char const *, char const *)) ++ dlsym(RTLD_NEXT, "fopen"); ++ if (!fopen_func) ++ { ++ fprintf (stderr, "Failed to find fopen()\n"); ++ errno = ESRCH; ++ return NULL; ++ } ++ } ++ ++ /* Returning ENOENT here will get read_file_system_list() ++ to fall back to using getmntent() below. */ ++ if (STREQ (path, "/proc/self/mountinfo")) ++ { ++ errno = ENOENT; ++ return NULL; ++ } ++ else ++ return fopen_func(path, mode); ++} ++ ++#define STREQ(a, b) (strcmp (a, b) == 0) + + struct mntent *getmntent (FILE *fp) + { ++ static char *nonroot_fs; ++ static char *remote_fs; ++ static int done; ++ + /* Prove that LD_PRELOAD works. */ +- static int done = 0; + if (!done) + { + fclose (fopen ("x", "w")); +@@ -41,50 +95,92 @@ struct mntent *getmntent (FILE *fp) + } + + static struct mntent mntents[] = { +- {.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir"}, +- {.mnt_fsname="fsname", .mnt_dir="/",}, +- {.mnt_fsname="/fsname", .mnt_dir="/root"}, +- {.mnt_fsname="/fsname", .mnt_dir="/"}, ++ {.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir", .mnt_opts=""}, ++ {.mnt_fsname="fsname", .mnt_dir="/", .mnt_opts=""}, ++ {.mnt_fsname="/fsname", .mnt_dir="/.", .mnt_opts=""}, ++ {.mnt_fsname="/fsname", .mnt_dir="/", .mnt_opts=""}, ++ {.mnt_fsname="virtfs", .mnt_dir="/NONROOT", .mnt_type="t1", .mnt_opts=""}, ++ {.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="t2", .mnt_opts=""}, ++ {.mnt_fsname="netns", .mnt_dir="net:[1234567]", .mnt_opts=""}, ++ {.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""}, ++ {.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""}, ++ {.mnt_fsname="rem:ote2",.mnt_dir="/REMOTE", .mnt_opts=""}, + }; + +- if (!getenv ("CU_TEST_DUPE_INVALID") && done == 1) ++ if (done == 1) ++ { ++ nonroot_fs = getenv ("CU_NONROOT_FS"); ++ if (!nonroot_fs || !*nonroot_fs) ++ nonroot_fs = "/"; /* merge into / entries. */ ++ ++ remote_fs = getenv ("CU_REMOTE_FS"); ++ } ++ ++ if (done == 1 && !getenv ("CU_TEST_DUPE_INVALID")) + done++; /* skip the first entry. */ + +- while (done++ <= 4) ++ while (done++ <= 10) + { +- mntents[done-2].mnt_type = "-"; ++ if (!mntents[done-2].mnt_type) ++ mntents[done-2].mnt_type = "-"; ++ if (!mntents[done-2].mnt_opts) ++ mntents[done-2].mnt_opts = "-"; ++ if (STREQ (mntents[done-2].mnt_dir, "/NONROOT")) ++ mntents[done-2].mnt_dir = nonroot_fs; ++ if (STREQ (mntents[done-2].mnt_dir, "/REMOTE")) ++ { ++ if (!remote_fs || !*remote_fs) ++ continue; ++ else ++ mntents[done-2].mnt_dir = remote_fs; ++ } + return &mntents[done-2]; + } ++ + return NULL; + } + EOF + + # Then compile/link it: +-gcc --std=gnu99 -shared -fPIC -ldl -O2 k.c -o k.so \ ++gcc_shared_ k.c k.so \ + || framework_failure_ 'failed to build shared library' + + # Test if LD_PRELOAD works: +-LD_PRELOAD=./k.so df ++LD_PRELOAD=$LD_PRELOAD:./k.so df + test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" + + # The fake mtab file should only contain entries + # having the same device number; thus the output should +-# consist of a header and one entry. +-LD_PRELOAD=./k.so df >out || fail=1 +-test $(wc -l out && fail=1 +-test $(wc -l out || fail=1 ++test $(wc -l out || fail=1 ++test "$CU_REMOTE_FS" && elide_remote=1 || elide_remote=0 ++test $(wc -l out || fail=1 ++test $(wc -l out || fail=1 +-test $(wc -l out || fail=1 ++total_fs=6; test "$CU_REMOTE_FS" && total_fs=$(expr $total_fs + 3) ++test $(wc -l me_next) ++ { ++ if (STREQ (me->me_mountdir, mount)) ++ le = me; ++ } ++ ++ if (le) ++ { ++ char *devname = le->me_devname; ++ char *canon_dev = canonicalize_file_name (devname); ++ if (canon_dev && IS_ABSOLUTE_FILE_NAME (canon_dev)) ++ return canon_dev; ++ free (canon_dev); ++ return xstrdup (le->me_devname); ++ } ++ else ++ return NULL; ++} ++ + /* If DISK corresponds to a mount point, show its usage + and return true. Otherwise, return false. */ + static bool +@@ -1064,27 +1091,57 @@ get_disk (char const *disk) + { + struct mount_entry const *me; + struct mount_entry const *best_match = NULL; ++ bool best_match_accessible = false; ++ bool eclipsed_device = false; + char const *file = disk; + + char *resolved = canonicalize_file_name (disk); +- if (resolved && resolved[0] == '/') ++ if (resolved && IS_ABSOLUTE_FILE_NAME (resolved)) + disk = resolved; + + size_t best_match_len = SIZE_MAX; + for (me = mount_list; me; me = me->me_next) + { +- if (STREQ (disk, me->me_devname)) ++ /* TODO: Should cache canon_dev in the mount_entry struct. */ ++ char *devname = me->me_devname; ++ char *canon_dev = canonicalize_file_name (me->me_devname); ++ if (canon_dev && IS_ABSOLUTE_FILE_NAME (canon_dev)) ++ devname = canon_dev; ++ ++ if (STREQ (disk, devname)) + { ++ char *last_device = last_device_for_mount (me->me_mountdir); ++ eclipsed_device = last_device && ! STREQ (last_device, devname); + size_t len = strlen (me->me_mountdir); +- if (len < best_match_len) ++ ++ if (! eclipsed_device ++ && (! best_match_accessible || len < best_match_len)) + { +- best_match = me; +- if (len == 1) /* Traditional root. */ +- break; +- else +- best_match_len = len; ++ struct stat disk_stats; ++ bool this_match_accessible = false; ++ ++ if (stat (me->me_mountdir, &disk_stats) == 0) ++ best_match_accessible = this_match_accessible = true; ++ ++ if (this_match_accessible ++ || (! best_match_accessible && len < best_match_len)) ++ { ++ best_match = me; ++ if (len == 1) /* Traditional root. */ ++ { ++ free (last_device); ++ free (canon_dev); ++ break; ++ } ++ else ++ best_match_len = len; ++ } + } ++ ++ free (last_device); + } ++ ++ free (canon_dev); + } + + free (resolved); +@@ -1096,6 +1153,13 @@ get_disk (char const *disk) + best_match->me_remote, NULL, false); + return true; + } ++ else if (eclipsed_device) ++ { ++ error (0, 0, _("cannot access %s: over-mounted by another device"), ++ quote (file)); ++ exit_status = EXIT_FAILURE; ++ return true; ++ } + + return false; + } diff --git a/SOURCES/coreutils-8.22-ppc64le.patch b/SOURCES/coreutils-8.22-ppc64le.patch new file mode 100644 index 0000000..f8634ed --- /dev/null +++ b/SOURCES/coreutils-8.22-ppc64le.patch @@ -0,0 +1,39 @@ +diff -up coreutils-8.22/gnulib-tests/test-isnanl.h.ppc coreutils-8.22/gnulib-tests/test-isnanl.h +--- coreutils-8.22/gnulib-tests/test-isnanl.h.ppc 2014-06-23 14:01:05.925541920 +0200 ++++ coreutils-8.22/gnulib-tests/test-isnanl.h 2014-06-23 14:01:39.437617584 +0200 +@@ -51,6 +51,15 @@ main () + /* A bit pattern that is different from a Quiet NaN. With a bit of luck, + it's a Signalling NaN. */ + { ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = NaNl (); + # if LDBL_EXPBIT0_BIT > 0 +diff -up coreutils-8.22/gnulib-tests/test-signbit.c.ppc coreutils-8.22/gnulib-tests/test-signbit.c +--- coreutils-8.22/gnulib-tests/test-signbit.c.ppc 2013-12-04 15:53:33.000000000 +0100 ++++ coreutils-8.22/gnulib-tests/test-signbit.c 2014-06-23 13:59:20.378307385 +0200 +@@ -151,6 +151,16 @@ test_signbitl () + #define NWORDS \ + ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) + typedef union { long double value; unsigned int word[NWORDS]; } memory_long_double; ++ ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = zerol / zerol; + # if LDBL_EXPBIT0_BIT > 0 diff --git a/SOURCES/coreutils-8.22-xfs-tests.patch b/SOURCES/coreutils-8.22-xfs-tests.patch new file mode 100644 index 0000000..dedff30 --- /dev/null +++ b/SOURCES/coreutils-8.22-xfs-tests.patch @@ -0,0 +1,29 @@ +From: Pádraig Brady + +Avoid false failure due to speculative preallocation on XFS +Avoid false failure due to delayed allocation on BTRFS + +diff -Naur coreutils-8.22.orig/tests/dd/sparse.sh coreutils-8.22/tests/dd/sparse.sh +--- coreutils-8.22.orig/tests/dd/sparse.sh 2013-12-04 14:48:30.000000000 +0000 ++++ coreutils-8.22/tests/dd/sparse.sh 2015-05-19 21:24:55.139941789 +0000 +@@ -58,11 +58,18 @@ + + # Ensure NUL blocks smaller than the block size are not made sparse. + # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole. +- dd if=file.in of=file.out bs=2M conv=sparse ++ dd if=file.in of=file.out bs=2M conv=sparse,fsync + test 2500 -lt $(kb_alloc file.out) || fail=1 + ++ # Note we recreate a sparse file first to avoid ++ # speculative preallocation seen in XFS, where a write() that ++ # extends a file can preallocate some extra space that ++ # a subsequent seek will not convert to a hole. ++ rm -f file.out ++ truncate --size=3M file.out ++ + # Ensure that this 1MiB string of NULs *is* converted to a hole. +- dd if=file.in of=file.out bs=1M conv=sparse ++ dd if=file.in of=file.out bs=1M conv=sparse,notrunc,fsync + test $(kb_alloc file.out) -lt 2500 || fail=1 + + fi diff --git a/SPECS/coreutils.spec b/SPECS/coreutils.spec index 5cbcc89..71d280d 100644 --- a/SPECS/coreutils.spec +++ b/SPECS/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.22 -Release: 11%{?dist} +Release: 12%{?dist}.2 License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -14,6 +14,13 @@ Source106: coreutils-colorls.csh # From upstream Patch1: coreutils-8.22-cp-selinux.patch +#Use new version of getdisk function in df (better results) +Patch2: coreutils-8.22-df-getdisk.patch +#Use new version of find_mount_list function +Patch3: coreutils-8.22-df-filtermountlistupdate.patch +#fix dd sparse test false test failure on xfs and btrfs +Patch4: coreutils-8.22-xfs-tests.patch + # Our patches #general patch to workaround koji build system issues @@ -28,6 +35,8 @@ Patch103: coreutils-8.2-uname-processortype.patch Patch104: coreutils-df-direct.patch #add note about mkdir --mode behaviour into info documentation(#610559) Patch107: coreutils-8.4-mkdir-modenote.patch +#fix gnulib tests on ppc64le +Patch108: coreutils-8.22-ppc64le.patch # sh-utils #add info about TZ envvar to date manpage @@ -128,6 +137,9 @@ the old GNU fileutils, sh-utils, and textutils packages. # From upstream %patch1 -p1 -b .nullcontext +%patch2 -p1 -b .getdisk +%patch3 -p1 -b .filtermnt +%patch4 -p1 -b .xfsfail # Our patches %patch100 -p1 -b .configure @@ -136,6 +148,7 @@ the old GNU fileutils, sh-utils, and textutils packages. %patch103 -p1 -b .sysinfo %patch104 -p1 -b .dfdirect %patch107 -p1 -b .mkdirmode +%patch108 -p1 -b .ppc64le # sh-utils %patch703 -p1 -b .dateman @@ -374,6 +387,13 @@ fi %{_sbindir}/chroot %changelog +* Mon Jul 27 2015 Ondrej Vasik - 8.22-12.2 +- df: improve filtering of NFS mounts and bind mounts + (#1247128) + +* Tue Aug 05 2014 Ondrej Vasik - 8.22-12 +- fix test failure on ppc64le (#1112687) + * Fri Jan 24 2014 Daniel Mach - 8.22-11 - Mass rebuild 2014-01-24