hfsutils: sync from svk

3 files changed, 79 insertions, 0 deletions

diff --git a/disk/hfsutils/HISTORY b/disk/hfsutils/HISTORY
index 0c6aec8d12..6db5ee2f4e 100644
--- a/disk/hfsutils/HISTORY
+++ b/disk/hfsutils/HISTORY
@@ -1,3 +1,7 @@
+2006-04-24 Flavien Bridault <vlaaad@sourcemage.org>
+	* glibc.patch: fix compiling with newest glibc (bug #11254)
+	* PRE_BUILD: apply this patch
+
 2005-11-29 Seth Woolley <seth@tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/disk/hfsutils/PRE_BUILD b/disk/hfsutils/PRE_BUILD
new file mode 100755
index 0000000000..50222e65b9
--- /dev/null
+++ b/disk/hfsutils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
+patch -p1 < $SPELL_DIRECTORY/glibc.patch
diff --git a/disk/hfsutils/glibc.patch b/disk/hfsutils/glibc.patch
new file mode 100644
index 0000000000..f3f39508f3
--- /dev/null
+++ b/disk/hfsutils/glibc.patch
@@ -0,0 +1,72 @@
+diff -uNr hfsutils-3.2.6.old/binhex.c hfsutils-3.2.6/binhex.c
+--- hfsutils-3.2.6.old/binhex.c	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/binhex.c	2006-04-24 17:38:08.000000000 +0200
+@@ -38,8 +38,6 @@
+ 
+ const char *bh_error = "no error";
+ 
+-extern int errno;
+-
+ # define ERROR(code, str)	(bh_error = (str), errno = (code))
+ 
+ static FILE *file;			/* input/output file */
+diff -uNr hfsutils-3.2.6.old/copyin.c hfsutils-3.2.6/copyin.c
+--- hfsutils-3.2.6.old/copyin.c	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/copyin.c	2006-04-24 17:38:30.000000000 +0200
+@@ -48,8 +48,6 @@
+ 
+ const char *cpi_error = "no error";
+ 
+-extern int errno;
+-
+ # define ERROR(code, str)	(cpi_error = (str), errno = (code))
+ 
+ # define MACB_BLOCKSZ	128
+diff -uNr hfsutils-3.2.6.old/copyout.c hfsutils-3.2.6/copyout.c
+--- hfsutils-3.2.6.old/copyout.c	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/copyout.c	2006-04-24 17:38:44.000000000 +0200
+@@ -49,8 +49,6 @@
+ 
+ const char *cpo_error = "no error";
+ 
+-extern int errno;
+-
+ # define ERROR(code, str)	(cpo_error = (str), errno = (code))
+ 
+ # define MACB_BLOCKSZ	128
+diff -uNr hfsutils-3.2.6.old/hcwd.c hfsutils-3.2.6/hcwd.c
+--- hfsutils-3.2.6.old/hcwd.c	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/hcwd.c	2006-04-24 17:39:00.000000000 +0200
+@@ -43,8 +43,6 @@
+ static int mtabsz = 0, nmounts = 0;
+ static int curvol = -1, dirty = 0;
+ 
+-extern int errno;
+-
+ /*
+  * NAME:	addent()
+  * DESCRIPTION:	insert mount entry into table
+diff -uNr hfsutils-3.2.6.old/hfsutil.h hfsutils-3.2.6/hfsutil.h
+--- hfsutils-3.2.6.old/hfsutil.h	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/hfsutil.h	2006-04-24 17:40:17.000000000 +0200
+@@ -19,7 +19,7 @@
+  * $Id: hfsutil.h,v 1.8 1998/04/11 08:26:57 rob Exp $
+  */
+ 
+-extern int errno;
++# include <errno.h>
+ 
+ # define ERROR(code, str)	(hfs_error = (str), errno = (code))
+ 
+diff -uNr hfsutils-3.2.6.old/tclhfs.c hfsutils-3.2.6/tclhfs.c
+--- hfsutils-3.2.6.old/tclhfs.c	2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/tclhfs.c	2006-04-24 17:40:07.000000000 +0200
+@@ -44,7 +44,7 @@
+ # include "suid.h"
+ # include "version.h"
+ 
+-extern int errno;
++# include <errno.h>
+ 
+ # define ERROR(code, str)	(hfs_error = (str), errno = (code))
+