rpms/cpio/devel cpio-2.10-utimens.patch,NONE,1.1 cpio.spec,1.68,1.69

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/cpio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16848

Modified Files:
	cpio.spec 
Added Files:
	cpio-2.10-utimens.patch 
Log Message:
do not fail with new POSIX 2008 utimens() glibc call (#552320)

cpio-2.10-utimens.patch:
 utimens.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE cpio-2.10-utimens.patch ---
diff -urNp cpio-2.10-orig/gnu/utimens.c cpio-2.10/gnu/utimens.c
--- cpio-2.10-orig/gnu/utimens.c	2009-02-14 19:18:01.000000000 +0100
+++ cpio-2.10/gnu/utimens.c	2010-01-06 14:43:29.000000000 +0100
@@ -122,16 +122,17 @@ gl_futimens (int fd ATTRIBUTE_UNUSED,
     }
 #endif
 #if HAVE_FUTIMENS
-  {
-    int result = futimens (fd, timespec);
+  if (0 <= fd)
+    {
+      int result = futimens (fd, timespec);
 # ifdef __linux__
-    /* Work around the same bug as above.  */
-    if (0 < result)
-      errno = ENOSYS;
+      /* Work around the same bug as above.  */
+      if (0 < result)
+        errno = ENOSYS;
 # endif
-    if (result == 0 || errno != ENOSYS)
-      return result;
-  }
+      if (result == 0 || errno != ENOSYS)
+        return result;
+    }
 #endif
 
   /* The platform lacks an interface to set file timestamps with


Index: cpio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- cpio.spec	6 Aug 2009 13:10:57 -0000	1.68
+++ cpio.spec	6 Jan 2010 13:54:29 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -17,6 +17,7 @@ Patch5: cpio-2.9-dir_perm.patch
 Patch6: cpio-2.9-dev_number.patch
 Patch7: cpio-2.9-sys_umask.patch
 Patch8: cpio-2.9.90-defaultremoteshell.patch
+Patch9: cpio-2.10-utimens.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: texinfo, autoconf, gettext, rmt
@@ -46,6 +47,7 @@ Install cpio if you need a program to ma
 %patch6  -p1 -b .dev_number
 %patch7  -p1 -b .sys_umask
 %patch8  -p1 -b .defaultremote
+%patch9  -p1 -b .utimens
 
 autoheader
 
@@ -90,6 +92,10 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Wed Jan 06 2010 Ondrej Vasik <ovasik at redhat.com> 2.10-4
+- do not fail with new POSIX 2008 utimens() glibc call
+  (#552320)
+
 * Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> 2.10-3
 - do process install-info only without --excludedocs(#515924)