Imported Debian patch 1.3.12-3.1

diff --git a/debian/changelog b/debian/changelog
index 660c64457610dc9034f5789776fb4e9b79d02249..3964b55d7d0bfcd417dd9fc112f823cd25f40391 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <schepler@debian.org>  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 --git a/gzip.c b/gzip.c
index bddab9824cf7a0a6080c70d159a9db7fbc268582..affde9eb386166150d410354e554b715c9520bc7 100644 (file)
--- a/gzip.c
+++ b/gzip.c
@@ -1642,7 +1642,7 @@ local void copy_stat(ifstat)
        }
       }
 
-    if (futimens (ofd, ofname, timespec) != 0)
+    if (gz_futimens (ofd, ofname, timespec) != 0)
       {
        int e = errno;
        WARN ((stderr, "%s: ", program_name));

diff --git a/lib/utimens.c b/lib/utimens.c
index 71bc510d86bb57db59203877a55fdd25d45ab694..e5e98f7dabd2c9eb5bad599c554187853b12b970 100644 (file)
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -75,7 +75,7 @@ struct utimbuf
    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 @@ futimens (int fd ATTRIBUTE_UNUSED,
 int
 utimens (char const *file, struct timespec const timespec[2])
 {
-  return futimens (-1, file, timespec);
+  return gz_futimens (-1, file, timespec);
 }

diff --git a/lib/utimens.h b/lib/utimens.h
index 0097aaaf7524d00906674963c7c1a7905e457a08..77f30d333987354b716d732c601a7ababafa4065 100644 (file)
--- 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 gz_futimens (int, char const *, struct timespec const [2]);
 int utimens (char const *, struct timespec const [2]);