Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (2715e9e3576e6111ecd5643925eb80b04d5e923b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (2715e9e3576e6111ecd5643925eb80b04d5e923b)
  • Date: Sat, 15 Sep 2007 13:40:05 -0500

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

archive/gzip/HISTORY | 5 +++++
archive/gzip/PRE_BUILD | 3 +++
archive/gzip/gzip-futimens.patch | 39
+++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)

New commits:
commit 2715e9e3576e6111ecd5643925eb80b04d5e923b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gzip should have been the gzip patch not the cpio one

commit 146fb2e0d4f7e650b583041b68c9adaeec70ba22
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gzip added internalization of futimens patch for glibc 2.6.1
compatability to gzip

diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 020a22b..91253f1 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,8 @@
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added futimens patch
+ * cpio-futimens.patch: makes it so the futimens patch is internal
+ rather than conflicting with glibc 2.6.1 futimens correct patch
+
2007-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: trigger man recast independent of gzip version always
if the path to gunzip in man.conf is wrong
diff --git a/archive/gzip/PRE_BUILD b/archive/gzip/PRE_BUILD
new file mode 100755
index 0000000..68eefbe
--- /dev/null
+++ b/archive/gzip/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gzip-futimens.patch
diff --git a/archive/gzip/gzip-futimens.patch
b/archive/gzip/gzip-futimens.patch
new file mode 100644
index 0000000..1a8353e
--- /dev/null
+++ b/archive/gzip/gzip-futimens.patch
@@ -0,0 +1,39 @@
+diff -Nur gzip-1.3.12.orig/gzip.c gzip-1.3.12.futimens/gzip.c
+--- gzip-1.3.12.orig/gzip.c 2007-05-18 20:33:26.000000000 +0300
++++ gzip-1.3.12.futimens/gzip.c 2007-05-18 20:33:26.000000000 +0300
+@@ -1643,7 +1643,7 @@
+ }
+ }
+
+- if (futimens (ofd, ofname, timespec) != 0)
++ if (gz_futimens (ofd, ofname, timespec) != 0)
+ {
+ int e = errno;
+ WARN ((stderr, &quot;%s: &quot;, program_name));
+diff -Nur gzip-1.3.12.orig/lib/utimens.c gzip-1.3.12.futimens/lib/utimens.c
+--- gzip-1.3.12.orig/lib/utimens.c 2007-01-18 10:33:34.000000000 +0200
++++ gzip-1.3.12.futimens/lib/utimens.c 2007-05-18 20:33:26.000000000 +0300
+@@ -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 -Nur gzip-1.3.12.orig/lib/utimens.h gzip-1.3.12.futimens/lib/utimens.h
+--- gzip-1.3.12.orig/lib/utimens.h 2007-02-23 20:25:21.000000000 +0200
++++ gzip-1.3.12.futimens/lib/utimens.h 2007-05-18 20:33:26.000000000 +0300
+@@ -1,3 +1,3 @@
+ #include &lt;time.h&gt;
+-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]);



  • [SM-Commit] GIT changes to master grimoire by David Brown (2715e9e3576e6111ecd5643925eb80b04d5e923b), David Brown, 09/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page