Bug#438675: gzip: Diff for NMU of gzip 1.3.12-3.1

[Daniel Schepler]

Package: gzip
Version: 1.3.12-3
Severity: normal

I've prepared an NMU of gzip to fix the FTBFS bug, #433845, which I'll upload 
tomorrow unless I hear otherwise from you.  I've attached the diff for the 
NMU.
-- 
Daniel Schepler

diff -urN gzip-1.3.12.old/debian/changelog gzip-1.3.12/debian/changelog
--- gzip-1.3.12.old/debian/changelog	2007-08-18 17:03:50.000000000 -0400
+++ gzip-1.3.12/debian/changelog	2007-08-18 17:11:52.000000000 -0400
@@ -1,3 +1,12 @@
+gzip (1.3.12-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename futimens to gz_futimens, since glibc now defines an futimens
+    function with a different prototype.  Closes: #433845.
+  * Urgency medium for the RC bug fix.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]>  Sat, 18 Aug 2007 17:11:52 -0400
+
 gzip (1.3.12-3) unstable; urgency=low
 
   * fix bindir so gunzip, et al, work again, closes: #429462
diff -urN gzip-1.3.12.old/gzip.c gzip-1.3.12/gzip.c
--- gzip-1.3.12.old/gzip.c	2007-08-18 17:03:50.000000000 -0400
+++ gzip-1.3.12/gzip.c	2007-08-18 17:07:25.000000000 -0400
@@ -1642,7 +1642,7 @@
 	}
       }
 
-    if (futimens (ofd, ofname, timespec) != 0)
+    if (gz_futimens (ofd, ofname, timespec) != 0)
       {
 	int e = errno;
 	WARN ((stderr, "%s: ", program_name));
diff -urN gzip-1.3.12.old/lib/utimens.c gzip-1.3.12/lib/utimens.c
--- gzip-1.3.12.old/lib/utimens.c	2007-01-18 03:33:34.000000000 -0500
+++ gzip-1.3.12/lib/utimens.c	2007-08-18 17:06:55.000000000 -0400
@@ -75,7 +75,7 @@
    Return 0 on success, -1 (setting errno) on failure.  */
 
 int
-futimens (int fd ATTRIBUTE_UNUSED,
+gz_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 @@
 int
 utimens (char const *file, struct timespec const timespec[2])
 {
-  return futimens (-1, file, timespec);
+  return gz_futimens (-1, file, timespec);
 }
diff -urN gzip-1.3.12.old/lib/utimens.h gzip-1.3.12/lib/utimens.h
--- gzip-1.3.12.old/lib/utimens.h	2007-02-23 13:25:21.000000000 -0500
+++ gzip-1.3.12/lib/utimens.h	2007-08-18 17:06:44.000000000 -0400
@@ -1,3 +1,3 @@
 #include <time.h>
-int futimens (int, char const *, struct timespec const [2]);
+int gz_futimens (int, char const *, struct timespec const [2]);
 int utimens (char const *, struct timespec const [2]);