diff --git a/coreutils.changes b/coreutils.changes index d64d0bd..73048fd 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 20 19:17:21 CEST 2007 - schwab@suse.de + +- Fix compiling with glibc 2.6. + ------------------------------------------------------------------- Sun May 20 10:53:16 CEST 2007 - schwab@suse.de diff --git a/coreutils.spec b/coreutils.spec index f577557..8568e14 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -21,7 +21,7 @@ Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.9 -Release: 14 +Release: 16 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -35,6 +35,7 @@ Patch6: i18n-infloop.diff Patch7: fchownat.diff Patch8: coreutils-sysinfo.diff Patch9: ls-x.diff +Patch10: futimens.diff Patch11: i18n-monthsort.diff Patch16: invalid-ids.diff Patch17: no-no.diff @@ -104,6 +105,7 @@ Authors: %patch8 -p1 %patch9 -p1 chmod +x tests/ls/x-option +%patch10 %patch11 %patch16 -p1 %patch17 @@ -177,6 +179,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun May 20 2007 - schwab@suse.de +- Fix compiling with glibc 2.6. +* Sun May 20 2007 - schwab@suse.de - Fix fchownat test. * Mon Apr 02 2007 - schwab@suse.de - Fix ls -x. diff --git a/futimens.diff b/futimens.diff new file mode 100644 index 0000000..cd1f883 --- /dev/null +++ b/futimens.diff @@ -0,0 +1,49 @@ +--- lib/utimens.c ++++ lib/utimens.c +@@ -75,8 +75,8 @@ + Return 0 on success, -1 (setting errno) on failure. */ + + int +-futimens (int fd ATTRIBUTE_UNUSED, +- char const *file, struct timespec const timespec[2]) ++gl_futimens (int fd ATTRIBUTE_UNUSED, ++ char const *file, struct timespec const timespec[2]) + { + /* Some Linux-based NFS clients are buggy, and mishandle time stamps + of files in NFS file systems in some cases. We have no +@@ -185,5 +185,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gl_futimens (-1, file, timespec); + } +--- lib/utimens.h ++++ lib/utimens.h +@@ -1,3 +1,3 @@ + #include +-int futimens (int, char const *, struct timespec const [2]); ++int gl_futimens (int, char const *, struct timespec const [2]); + int utimens (char const *, struct timespec const [2]); +--- src/copy.c ++++ src/copy.c +@@ -616,7 +616,7 @@ + timespec[0] = get_stat_atime (src_sb); + timespec[1] = get_stat_mtime (src_sb); + +- if (futimens (dest_desc, dst_name, timespec) != 0) ++ if (gl_futimens (dest_desc, dst_name, timespec) != 0) + { + error (0, errno, _("preserving times for %s"), quote (dst_name)); + if (x->require_preserve) +--- src/touch.c ++++ src/touch.c +@@ -182,7 +182,7 @@ + t = timespec; + } + +- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); ++ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); + + if (fd == STDIN_FILENO) + {