commit star for openSUSE:Factory
Hello community, here is the log from the commit of package star for openSUSE:Factory checked in at Mon Jun 8 01:51:04 CEST 2009. -------- --- star/star.changes 2009-03-10 17:35:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/star/star.changes 2009-06-08 00:38:47.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jun 8 00:16:00 CEST 2009 - ro@suse.de + +- rename getline to my_getline to avoid collision with function + from glibc +- rename fexecve to my_fexecve to avoid collision with function + from glibc + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- star-fexecve.diff star-getline.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ star.spec ++++++ --- /var/tmp/diff_new_pack.A25921/_old 2009-06-08 01:50:58.000000000 +0200 +++ /var/tmp/diff_new_pack.A25921/_new 2009-06-08 01:50:58.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Provides: rmt Version: 1.5final -Release: 37 +Release: 38 %define upver 1.5 Source: ftp://ftp.berlios.de/pub/star/alpha/star-%{upver}.tar.bz2 Source1: README-FIRST @@ -35,6 +35,8 @@ Patch5: rmt-move.diff Patch6: star-selinux.patch Patch7: star-lock.diff +Patch8: star-getline.diff +Patch9: star-fexecve.diff Url: http://cdrecord.berlios.de/old/private/star.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: POSIX.1-2001-Compliant Tar Implementation @@ -76,6 +78,8 @@ %patch5 -p1 %patch6 %patch7 +%patch8 +%patch9 %build # bugzilla#134113: incompatible license and unused: SKH: removed @@ -166,6 +170,11 @@ /usr/share/man/man1/tartest.1.gz %changelog +* Mon Jun 08 2009 ro@suse.de +- rename getline to my_getline to avoid collision with function + from glibc +- rename fexecve to my_fexecve to avoid collision with function + from glibc * Tue Mar 10 2009 werner@suse.de - Set read lock before using the semaphore wait on a pipe fd to avoid deadlock (bnc#414251) @@ -284,7 +293,7 @@ that declarations for fexecve and getline don't clash. * Tue May 28 2002 sf@suse.de - %%_lib fixes -* Mon May 27 2002 ro@suse.de +* Tue May 28 2002 ro@suse.de - fixed typo in specfile * Mon May 27 2002 pthomas@suse.de - Initial package creation. ++++++ star-fexecve.diff ++++++ --- include/schily/schily.h +++ include/schily/schily.h @@ -113,7 +113,7 @@ /* 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 my_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 *, --- lib/fexec.c +++ lib/fexec.c @@ -164,7 +164,7 @@ } while (p != NULL); va_end(args); - ret = fexecve(name, in, out, err, av, env); + ret = my_fexecve(name, in, out, err, av, env); if (av != xav) free(av); return (ret); @@ -178,11 +178,11 @@ char *av[]; { av[ac] = NULL; /* force list to be null terminated */ - return (fexecve(name, in, out, err, av, environ)); + return (my_fexecve(name, in, out, err, av, environ)); } EXPORT int -fexecve(name, in, out, err, av, env) +my_fexecve(name, in, out, err, av, env) const char *name; FILE *in, *out, *err; char * const av[], * const env[]; --- lib/libschily-mapvers +++ lib/libschily-mapvers @@ -77,7 +77,7 @@ fexecl; fexecle; fexecv; - fexecve; + my_fexecve; ffileread; ffilewrite; fgetline; --- libfind/find.c +++ libfind/find.c @@ -1730,7 +1730,7 @@ #endif av[ac] = NULL; /* -exec {} \; is not NULL terminated */ - fexecve(av[0], state->std[0], state->std[1], state->std[2], + my_fexecve(av[0], state->std[0], state->std[1], state->std[2], av, state->env); #ifdef PLUS_DEBUG error("argsize %d\n", ++++++ star-getline.diff ++++++ --- include/schily/schily.h +++ include/schily/schily.h @@ -243,7 +243,7 @@ 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 my_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 *, ...)); --- lib/libschily-mapvers +++ lib/libschily-mapvers @@ -123,7 +123,7 @@ geterrno; getfiles; getfp; - getline; + my_getline; getmainfp; #getstr; #handlecond; --- lib/stdio/fgetline.c +++ lib/stdio/fgetline.c @@ -61,7 +61,7 @@ } EXPORT int -getline(buf, len) +my_getline(buf, len) char *buf; int len; { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de