[arch-commits] CVS update of arch/build/base/coreutils (PKGBUILD futimes.patch)

[Tobias Powalowski]

    Date: Thursday, August 16, 2007 @ 16:22:02
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/coreutils

   Added: futimes.patch (1.1)
Modified: PKGBUILD (1.25 -> 1.26)

'upgpkg: update to new glibc compiling'


---------------+
 PKGBUILD      |   13 +++++++++++--
 futimes.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)


Index: arch/build/base/coreutils/PKGBUILD
diff -u arch/build/base/coreutils/PKGBUILD:1.25 arch/build/base/coreutils/PKGBUILD:1.26
--- arch/build/base/coreutils/PKGBUILD:1.25	Sun Aug  5 12:03:46 2007
+++ arch/build/base/coreutils/PKGBUILD	Thu Aug 16 16:22:01 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.25 2007/08/05 16:03:46 jgc Exp $
+# $Id: PKGBUILD,v 1.26 2007/08/16 20:22:01 tpowa Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=coreutils
 pkgver=6.9
-pkgrel=1
+pkgrel=2
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,7 +15,14 @@
 	coreutils-i18n.patch
 	coreutils-uname.patch
 	coreutils-pam.patch
+	futimes.patch
 	su)
+md5sums=('62032af4d79cd99743e06d5c40c4989c'
+         'ce0239547afd626b06c016e9ada429a9'
+         '18684a4be85074048483d1efef83a6bc'
+         '0b8e18a36125207ecc0b41626c3d36e1'
+         '6ac50183975829e6463ef17abed61ebb'
+         'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -24,6 +31,8 @@
   patch -Np1 -i ../coreutils-i18n.patch || return 1
   # from gentoo portage
   patch -Np1 -i ../coreutils-uname.patch || return 1
+  # fix compiling against new glibc
+  patch -Np1 -i ../futimes.patch || return 1
   # make head and tail recognize the old syntax (eg, tail -10)
   export DEFAULT_POSIX2_VERSION=199209
   ./configure --prefix=/usr --enable-pam ac_cv_func_openat=no 
Index: arch/build/base/coreutils/futimes.patch
diff -u /dev/null arch/build/base/coreutils/futimes.patch:1.1
--- /dev/null	Thu Aug 16 16:22:01 2007
+++ arch/build/base/coreutils/futimes.patch	Thu Aug 16 16:22:01 2007
@@ -0,0 +1,47 @@
+--- coreutils-6.9/lib/utimens.h.futimens	2007-02-23 18:25:21.000000000 +0000
++++ coreutils-6.9/lib/utimens.h	2007-06-13 11:40:37.000000000 +0100
+@@ -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]);
+--- coreutils-6.9/lib/utimens.c.futimens	2007-01-18 08:33:34.000000000 +0000
++++ coreutils-6.9/lib/utimens.c	2007-06-13 11:40:37.000000000 +0100
+@@ -75,7 +75,7 @@ struct utimbuf
+    Return 0 on success, -1 (setting errno) on failure.  */
+ 
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++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
+@@ -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);
+ }
+--- coreutils-6.9/src/copy.c.futimens	2007-06-13 11:56:44.000000000 +0100
++++ coreutils-6.9/src/copy.c	2007-06-13 11:57:00.000000000 +0100
+@@ -547,7 +547,7 @@ copy_reg (char const *src_name, char con
+       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)
+--- coreutils-6.9/src/touch.c.futimens	2007-06-13 11:58:00.000000000 +0100
++++ coreutils-6.9/src/touch.c	2007-06-13 11:58:06.000000000 +0100
+@@ -182,7 +182,7 @@ touch (const char *file)
+       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)
+     {