From 62f30a534d0ed1cdb2799d235da140ddff567221 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Sat, 22 Dec 2007 20:05:44 +0000
Subject: Make this build with recent glibc. Patches provided by Yakovetsky
 Vladimir in PR 37384.

---
 archivers/gzip/distinfo         |  5 ++++-
 archivers/gzip/patches/patch-ac | 13 +++++++++++++
 archivers/gzip/patches/patch-ad | 20 ++++++++++++++++++++
 archivers/gzip/patches/patch-ae |  9 +++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 archivers/gzip/patches/patch-ac
 create mode 100644 archivers/gzip/patches/patch-ad
 create mode 100644 archivers/gzip/patches/patch-ae

(limited to 'archivers')

diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo
index bf917173291..5be0a807b6d 100644
--- a/archivers/gzip/distinfo
+++ b/archivers/gzip/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.1 2007/11/08 19:26:52 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/12/22 20:05:44 minskim Exp $
 
 SHA1 (gzip-1.3.12.tar) = 330eb5f1b3dfab13a491352cb00b6573e5b55a5f
 RMD160 (gzip-1.3.12.tar) = 6845dfba2a275f4de488c3fb97e64405838a5005
 Size (gzip-1.3.12.tar) = 1822720 bytes
 SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4
 SHA1 (patch-ab) = 42309926f601998b97051aadc31ad44413716029
+SHA1 (patch-ac) = 8ef4b7105ca9b201079f5cf8799642e12184fda4
+SHA1 (patch-ad) = 082ced7d4a89a49b750525cc71bbf9a9abfc5b9e
+SHA1 (patch-ae) = a1d245c5cf055e9bd35fb7e810d5183a71cbfc74
diff --git a/archivers/gzip/patches/patch-ac b/archivers/gzip/patches/patch-ac
new file mode 100644
index 00000000000..945e5759677
--- /dev/null
+++ b/archivers/gzip/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/12/22 20:05:44 minskim Exp $
+
+--- gzip.c.orig	2007-03-19 22:09:51.000000000 -0700
++++ gzip.c
+@@ -1637,7 +1637,7 @@ local void copy_stat(ifstat)
+ 	}
+       }
+ 
+-    if (futimens (ofd, ofname, timespec) != 0)
++    if (gl_futimens (ofd, ofname, timespec) != 0)
+       {
+ 	int e = errno;
+ 	WARN ((stderr, "%s: ", program_name));
diff --git a/archivers/gzip/patches/patch-ad b/archivers/gzip/patches/patch-ad
new file mode 100644
index 00000000000..2220df16798
--- /dev/null
+++ b/archivers/gzip/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2007/12/22 20:05:44 minskim Exp $
+
+--- lib/utimens.c.orig	2007-01-18 00:33:34.000000000 -0800
++++ lib/utimens.c
+@@ -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);
+ }
diff --git a/archivers/gzip/patches/patch-ae b/archivers/gzip/patches/patch-ae
new file mode 100644
index 00000000000..8dd8051515e
--- /dev/null
+++ b/archivers/gzip/patches/patch-ae
@@ -0,0 +1,9 @@
+$NetBSD: patch-ae,v 1.1 2007/12/22 20:05:44 minskim Exp $
+
+--- lib/utimens.h.orig	2007-02-23 10:25:21.000000000 -0800
++++ lib/utimens.h
+@@ -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]);
-- 
cgit v1.2.3