rpms/gzip/F-7 gzip-1.3.11-futimens.patch, NONE, 1.1 gzip.spec, 1.36, 1.37

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/gzip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217

Modified Files:
	gzip.spec 
Added Files:
	gzip-1.3.11-futimens.patch 
Log Message:

  Resolves: 245129
  Build of gzip fails
---------------------------------------


gzip-1.3.11-futimens.patch:

--- NEW FILE gzip-1.3.11-futimens.patch ---
--- gzip-1.3.11/lib/utimens.c.pom	2007-01-18 09:33:34.000000000 +0100
+++ gzip-1.3.11/lib/utimens.c	2007-06-27 16:49:55.000000000 +0200
@@ -75,7 +75,7 @@ struct utimbuf
    Return 0 on success, -1 (setting errno) on failure.  */
 
 int
-futimens (int fd ATTRIBUTE_UNUSED,
+futimens_oi (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 futimens_oi (-1, file, timespec);
 }
--- gzip-1.3.11/lib/utimens.h.pom	2004-11-23 21:59:50.000000000 +0100
+++ gzip-1.3.11/lib/utimens.h	2007-06-27 16:50:02.000000000 +0200
@@ -1,3 +1,3 @@
 #include "timespec.h"
-int futimens (int, char const *, struct timespec const [2]);
+int futimens_oi (int, char const *, struct timespec const [2]);
 int utimens (char const *, struct timespec const [2]);
--- gzip-1.3.11/gzip.c.pom	2007-06-27 16:48:12.000000000 +0200
+++ gzip-1.3.11/gzip.c	2007-06-27 16:49:24.000000000 +0200
@@ -1650,7 +1650,7 @@ local void copy_stat(ifstat)
 	}
       }
 
-    if (futimens (ofd, ofname, timespec) != 0)
+    if (futimens_oi (ofd, ofname, timespec) != 0)
       {
 	int e = errno;
 	WARN ((stderr, "%s: ", program_name));


Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/F-7/gzip.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gzip.spec	5 Mar 2007 12:23:09 -0000	1.36
+++ gzip.spec	27 Jun 2007 14:52:19 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch14: gzip-1.3.5-cve-2006-4338.patch
 Patch15: gzip-1.3.9-cve-2006-4337.patch
 Patch16: gzip-1.3.5-cve-2006-4337_len.patch
+Patch17: gzip-1.3.11-futimens.patch
 URL: http://www.gzip.org/
 Requires: /sbin/install-info
 Requires: mktemp less
@@ -44,6 +45,7 @@
 %patch14 -p1 -b .4338
 %patch15 -p1 -b .4337
 %patch16 -p1 -b .4337l
+%patch17 -p1 -b .futimens
 
 %build
 export DEFS="NO_ASM"
@@ -91,6 +93,10 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Wed Jun 27 2007 Ivana Varekova <varekova at redhat.com> - 1.3.11-2
+- Resolves: 245129
+  Build of gzip fails
+
 * Mon Mar  5 2007 Ivana Varekova <varekova at redhat.com> - 1.3.11-1
 - update to 1.3.11
   remove uncompress