[crux-commits] ports/core (2.4): gzip: added fix for glibc 2.6

crux at crux.nu crux at crux.nu
Thu Aug 30 08:17:26 UTC 2007


commit 0c4e5daf0e51a5c551e23896e2f16ebed315f9c7
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Aug 30 10:10:13 2007 +0200

    gzip: added fix for glibc 2.6

diff --git a/gzip/.md5sum b/gzip/.md5sum
index ad4e4be..45929df 100644
--- a/gzip/.md5sum
+++ b/gzip/.md5sum
@@ -1 +1,2 @@
 b5bac2d21840ae077e0217bc5e4845b1  gzip-1.3.12.tar.gz
+fdd026d969653f6c1574ffa0d0968231  gzip-futimens.patch
diff --git a/gzip/Pkgfile b/gzip/Pkgfile
index f5f74fa..37f9503 100644
--- a/gzip/Pkgfile
+++ b/gzip/Pkgfile
@@ -4,11 +4,13 @@
 
 name=gzip
 version=1.3.12
-release=2
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+release=3
+source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \
+        $name-futimens.patch)
 
 build() {
     cd $name-$version
+    patch -p1 -i $SRC/$name-futimens.patch
     ./configure --prefix=/usr --mandir=/usr/man
     make
     make DESTDIR=$PKG install
diff --git a/gzip/gzip-futimens.patch b/gzip/gzip-futimens.patch
new file mode 100644
index 0000000..f8ef8d9
--- /dev/null
+++ b/gzip/gzip-futimens.patch
@@ -0,0 +1,41 @@
+diff -Nru gzip-1.3.12.orig/gzip.c gzip-1.3.12/gzip.c
+--- gzip-1.3.12.orig/gzip.c	2007-08-16 11:50:42.747692170 +0200
++++ gzip-1.3.12/gzip.c	2007-08-16 11:51:38.754599471 +0200
+@@ -1637,7 +1637,7 @@
+ 	}
+       }
+ 
+-    if (futimens (ofd, ofname, timespec) != 0)
++    if (gl_futimens (ofd, ofname, timespec) != 0)
+       {
+ 	int e = errno;
+ 	WARN ((stderr, "%s: ", program_name));
+diff -Nru gzip-1.3.12.orig/lib/utimens.c gzip-1.3.12/lib/utimens.c
+--- gzip-1.3.12.orig/lib/utimens.c	2007-08-16 11:50:42.757691618 +0200
++++ gzip-1.3.12/lib/utimens.c	2007-08-16 11:50:56.646924655 +0200
+@@ -75,8 +75,8 @@
+    Return 0 on success, -1 (setting errno) on failure.  */
+ 
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+-	  char const *file, struct timespec const timespec[2])
++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
+      of files in NFS file systems in some cases.  We have no
+@@ -185,5 +185,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return gl_futimens (-1, file, timespec);
+ }
+diff -Nru gzip-1.3.12.orig/lib/utimens.h gzip-1.3.12/lib/utimens.h
+--- gzip-1.3.12.orig/lib/utimens.h	2007-08-16 11:50:42.767691065 +0200
++++ gzip-1.3.12/lib/utimens.h	2007-08-16 11:56:49.997243976 +0200
+@@ -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]);



More information about the crux-commits mailing list