Fix from upstream gnulib for futimens handling with newer glibc #180764.

(Portage version: 2.1.3_rc6)

3 files changed, 48 insertions, 2 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index d829d6d50a81..000999889022 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.213 2007/07/02 15:27:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.214 2007/07/07 01:25:30 vapier Exp $
+
+  07 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/gnulib-futimens-rename.patch, coreutils-6.9-r1.ebuild:
+  Fix from upstream gnulib for futimens handling with newer glibc #180764.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> coreutils-6.4.ebuild,
   coreutils-6.7.ebuild, coreutils-6.7-r1.ebuild, coreutils-6.9.ebuild,
diff --git a/sys-apps/coreutils/coreutils-6.9-r1.ebuild b/sys-apps/coreutils/coreutils-6.9-r1.ebuild
index 6c1aca41d967..c491897245e8 100644
--- a/sys-apps/coreutils/coreutils-6.9-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.9-r1.ebuild,v 1.14 2007/07/02 15:27:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.9-r1.ebuild,v 1.15 2007/07/07 01:25:30 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -46,6 +46,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/gnulib-futimens-rename.patch #180764
+	sed -i 's:\<futimens\>:gl_futimens:' src/{copy,touch}.c
+
 	PATCHDIR="${WORKDIR}/patch"
 	rm -f "${PATCHDIR}"/generic/001_*progress*
 
diff --git a/sys-apps/coreutils/files/gnulib-futimens-rename.patch b/sys-apps/coreutils/files/gnulib-futimens-rename.patch
new file mode 100644
index 000000000000..dfb5023b4b3c
--- /dev/null
+++ b/sys-apps/coreutils/files/gnulib-futimens-rename.patch
@@ -0,0 +1,39 @@
+http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
+
+2007-05-19  Jim Meyering  <jim@meyering.net>
+
+	* lib/utimens.c (gl_futimens): Rename from futimens,
+	now that glibc-2.6 declares futimens.
+	* lib/utimens.h: Likewise.
+
+diff --git a/lib/utimens.c b/lib/utimens.c
+index 71bc510..7e3175a 100644
+--- a/lib/utimens.c
++++ b/lib/utimens.c
+@@ -75,8 +75,8 @@ struct utimbuf
+    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 @@ futimens (int fd ATTRIBUTE_UNUSED,
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return gl_futimens (-1, file, timespec);
+ }
+diff --git a/lib/utimens.h b/lib/utimens.h
+index 0097aaa..169521d 100644
+--- a/lib/utimens.h
++++ b/lib/utimens.h
+@@ -1,3 +1,3 @@
+ #include <time.h>
+-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]);