fix build failure due to symbols conflicting with stdio(#494213)
This commit is contained in:
Ondrej Vasik
parent
374458f1f2
commit
64def6c44e
92
star-1.5-stdioconflict.patch
Normal file
92
star-1.5-stdioconflict.patch
Normal file
@ -0,0 +1,92 @@
|
||||
diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.h
|
||||
--- star-1.5-orig/include/schily/schily.h 2008-02-16 16:32:01.000000000 +0100
|
||||
+++ star-1.5/include/schily/schily.h 2009-04-08 10:49:17.000000000 +0200
|
||||
@@ -113,7 +113,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 sch_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 *,
|
||||
@@ -243,7 +243,7 @@ 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));
|
||||
-extern int getline __PR((char *, int));
|
||||
+extern int sch_getline __PR((char *, int));
|
||||
extern int getstr __PR((char *, int));
|
||||
extern int breakline __PR((char *, char, char **, int));
|
||||
extern int getallargs __PR((int *, char * const**, const char *, ...));
|
||||
diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c
|
||||
--- star-1.5-orig/lib/fexec.c 2007-07-01 12:04:35.000000000 +0200
|
||||
+++ star-1.5/lib/fexec.c 2009-04-08 10:54:05.000000000 +0200
|
||||
@@ -165,7 +165,7 @@ fexecle(name, in, out, err, va_alist)
|
||||
} while (p != NULL);
|
||||
va_end(args);
|
||||
|
||||
- ret = fexecve(name, in, out, err, av, env);
|
||||
+ ret = sch_fexecve(name, in, out, err, av, env);
|
||||
if (av != xav)
|
||||
free(av);
|
||||
return (ret);
|
||||
@@ -179,11 +179,11 @@ 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 (sch_fexecve(name, in, out, err, av, environ));
|
||||
}
|
||||
|
||||
EXPORT int
|
||||
-fexecve(name, in, out, err, av, env)
|
||||
+sch_fexecve(name, in, out, err, av, env)
|
||||
const char *name;
|
||||
FILE *in, *out, *err;
|
||||
char * const av[], * const env[];
|
||||
diff -urNp star-1.5-orig/lib/libschily-mapvers star-1.5/lib/libschily-mapvers
|
||||
--- star-1.5-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200
|
||||
+++ star-1.5/lib/libschily-mapvers 2009-04-08 10:54:21.000000000 +0200
|
||||
@@ -77,7 +77,7 @@ global:
|
||||
fexecl;
|
||||
fexecle;
|
||||
fexecv;
|
||||
- fexecve;
|
||||
+ sch_fexecve;
|
||||
ffileread;
|
||||
ffilewrite;
|
||||
fgetline;
|
||||
@@ -123,7 +123,7 @@ global:
|
||||
geterrno;
|
||||
getfiles;
|
||||
getfp;
|
||||
- getline;
|
||||
+ sch_getline;
|
||||
getmainfp;
|
||||
#getstr;
|
||||
#handlecond;
|
||||
diff -urNp star-1.5-orig/lib/stdio/fgetline.c star-1.5/lib/stdio/fgetline.c
|
||||
--- star-1.5-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200
|
||||
+++ star-1.5/lib/stdio/fgetline.c 2009-04-08 10:51:39.000000000 +0200
|
||||
@@ -61,7 +61,7 @@ fgetline(f, buf, len)
|
||||
}
|
||||
|
||||
EXPORT int
|
||||
-getline(buf, len)
|
||||
+sch_getline(buf, len)
|
||||
char *buf;
|
||||
int len;
|
||||
{
|
||||
diff -urNp star-1.5-orig/libfind/find.c star-1.5/libfind/find.c
|
||||
--- star-1.5-orig/libfind/find.c 2008-04-10 19:04:54.000000000 +0200
|
||||
+++ star-1.5/libfind/find.c 2009-04-08 10:54:48.000000000 +0200
|
||||
@@ -1730,7 +1730,7 @@ doexec(f, ac, av, state)
|
||||
#endif
|
||||
av[ac] = NULL; /* -exec {} \; is not NULL terminated */
|
||||
|
||||
- fexecve(av[0], state->std[0], state->std[1], state->std[2],
|
||||
+ sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
|
||||
av, state->env);
|
||||
#ifdef PLUS_DEBUG
|
||||
error("argsize %d\n",
|
||||
@ -4,13 +4,14 @@
|
||||
Summary: An archiving tool with ACL support
|
||||
Name: star
|
||||
Version: 1.5
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
URL: http://cdrecord.berlios.de/old/private/star.html
|
||||
Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
|
||||
Patch1: star-1.5-newMake.patch
|
||||
Patch2: star-1.5-selinux.patch
|
||||
Patch3: star-1.5-changewarnSegv.patch
|
||||
Patch4: star-1.5-removenames_c.patch
|
||||
Patch5: star-1.5-stdioconflict.patch
|
||||
License: CDDL
|
||||
Group: Applications/Archiving
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
@ -29,6 +30,7 @@ and can restore individual files from the archive. Star supports ACL.
|
||||
%endif
|
||||
%patch3 -p1 -b .changewarnSegv
|
||||
%patch4 -p1 -b .removenames
|
||||
%patch5 -p1 -b .conflict
|
||||
|
||||
for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
|
||||
for AFILE in gcc cc; do
|
||||
@ -100,6 +102,10 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_mandir}/man1/spax.1*
|
||||
|
||||
%changelog
|
||||
* Wed Apr 08 2009 Ondrej Vasik <ovasik@redhat.com> 1.5-4
|
||||
- fix build failure due to symbols conflicting
|
||||
with stdio(#494213)
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user