Rename custom function "fexecve", which conflicts with glibc's fexecve(3),

to schily_fexecve.

Also <linux/fs.h> must be included before <linux/ext2_fs.h>.

5 files changed, 77 insertions, 5 deletions

diff --git a/archivers/star/distinfo b/archivers/star/distinfo
index 0140c8e2d51..0ade0e20933 100644
--- a/archivers/star/distinfo
+++ b/archivers/star/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/01/15 17:46:01 tron Exp $
+$NetBSD: distinfo,v 1.12 2012/01/30 03:43:58 sbd Exp $
 
 SHA1 (star-1.4.3.tar.gz) = c59b68d97edba77a9ac6000be04d457ded1eefe9
 RMD160 (star-1.4.3.tar.gz) = f7ec71bfab1723c994e5eed7e6818394a41d44d9
@@ -7,5 +7,8 @@ SHA1 (patch-aa) = 4fe4af396adf23eb7ac071b02a7bf726ab1e4318
 SHA1 (patch-ab) = aea3af88d3bedf2ce7a7744c90062ba4e57bb79f
 SHA1 (patch-ac) = 81e6361db3903e5b04fae4e70ad3a37f9a2f4fa7
 SHA1 (patch-ad) = 2be98feac17350b37c242a6f84f539e81330ee14
-SHA1 (patch-ae) = 34786fc3c51ef14ca2ae9250d8d12d12788abdc5
+SHA1 (patch-ae) = 9f08ee4a8f1f150d08d8c4688e0c5061ad2db52e
 SHA1 (patch-af) = b28ca20dd8cd5326a9d9836880f09740abca7525
+SHA1 (patch-lib_fexec.c) = 5a40df04d84c0e44037cdcc723325cce741e2e0f
+SHA1 (patch-star_fflags.c) = 66fb755de21734eed5c18c896c7aa2ed13696d99
+SHA1 (patch-star_star__unix.c) = 3c478f3cd166f8ee03477a3cb00ef8609be53f4b
diff --git a/archivers/star/patches/patch-ae b/archivers/star/patches/patch-ae
index 4b778078494..df55a24690f 100644
--- a/archivers/star/patches/patch-ae
+++ b/archivers/star/patches/patch-ae
@@ -1,11 +1,23 @@
-$NetBSD: patch-ae,v 1.1 2011/01/15 17:46:01 tron Exp $
+$NetBSD: patch-ae,v 1.2 2012/01/30 03:43:58 sbd Exp $
 
 Remove unused custom function "getline" which conflicts with getline(3)
 which is part of the POSIX standard.
 
+Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
+to schily_fexecve.
+
 --- include/schily.h.orig	2002-12-24 18:28:01.000000000 +0000
-+++ include/schily.h	2011-01-15 17:41:23.000000000 +0000
-@@ -183,7 +183,6 @@
++++ include/schily.h
+@@ -107,7 +107,7 @@ extern	int	fexecle __PR((const char *, F
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ 							char **));
+-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
++extern	int	schily_fexecve __PR((const char *, FILE *, FILE *, FILE *,
+ 					char * const *, char * const *));
+ extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
+@@ -183,7 +183,6 @@ extern	char	*fillbytes __PR((void *, int
  extern	char	*findbytes __PR((const void *, int, char));
  extern	int	findline __PR((const char *, char, const char *,
  							int, char **, int));
diff --git a/archivers/star/patches/patch-lib_fexec.c b/archivers/star/patches/patch-lib_fexec.c
new file mode 100644
index 00000000000..1252c97a70a
--- /dev/null
+++ b/archivers/star/patches/patch-lib_fexec.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-lib_fexec.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
+
+Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
+to schily_fexecve.
+
+--- lib/fexec.c.orig	2002-06-08 16:45:11.000000000 +0000
++++ lib/fexec.c
+@@ -161,7 +161,7 @@ int fexecle(name, in, out, err, va_alist
+ 	} while (p != NULL);
+ 	va_end(args);
+ 
+-	ret = fexecve(name, in, out, err, av, env);
++	ret = schily_fexecve(name, in, out, err, av, env);
+ 	if (av != xav)
+ 		free(av);
+ 	return (ret);
+@@ -174,10 +174,10 @@ int fexecv(name, in, out, err, ac, av)
+ 	char *av[];
+ {
+ 	av[ac] = NULL;			/*  force list to be null terminated */
+-	return fexecve (name, in, out, err, av, environ);
++	return schily_fexecve (name, in, out, err, av, environ);
+ }
+ 
+-int fexecve(name, in, out, err, av, env)
++int schily_fexecve(name, in, out, err, av, env)
+ 	const char *name;
+ 	FILE *in, *out, *err;
+ 	char * const av[], * const env[];
diff --git a/archivers/star/patches/patch-star_fflags.c b/archivers/star/patches/patch-star_fflags.c
new file mode 100644
index 00000000000..bb5016f40df
--- /dev/null
+++ b/archivers/star/patches/patch-star_fflags.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-star_fflags.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
+
+<linux/fs.h> must be included before <linux/ext2_fs.h>
+
+--- star/fflags.c.orig	2002-01-27 22:48:12.000000000 +0000
++++ star/fflags.c
+@@ -41,6 +41,7 @@ static	char sccsid[] =
+ #include "starsubs.h"
+ #ifdef	__linux__
+ #include <fctldefs.h>
++#include <linux/fs.h>
+ #include <linux/ext2_fs.h>
+ #include <sys/ioctl.h>
+ #endif
diff --git a/archivers/star/patches/patch-star_star__unix.c b/archivers/star/patches/patch-star_star__unix.c
new file mode 100644
index 00000000000..d5447355f46
--- /dev/null
+++ b/archivers/star/patches/patch-star_star__unix.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-star_star__unix.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
+
+<linux/fs.h> must be included before <linux/ext2_fs.h>
+
+--- star/star_unix.c.orig	2002-08-15 23:22:32.000000000 +0000
++++ star/star_unix.c
+@@ -44,6 +44,7 @@ static	char sccsid[] =
+ #include "xutimes.h"
+ #ifdef	__linux__
+ #include <fctldefs.h>
++#include <linux/fs.h>
+ #include <linux/ext2_fs.h>
+ #include <sys/ioctl.h>
+ #endif