[packages/cdrtools] - updated to 3.01 - updated config patch, enhanced to cover rscsi - updated make,linking patches - r
qboosh
qboosh at pld-linux.org
Tue Dec 29 21:00:28 CET 2020
commit 9bfb9744f459d93cd0b30f0a163d62cb58b5aab9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Dec 29 20:59:30 2020 +0100
- updated to 3.01
- updated config patch, enhanced to cover rscsi
- updated make,linking patches
- removed no longer applicable rename patch, seems no longer needed
- cdda2wav has been relicensed to CDDL v1.0
cdrtools-config.patch | 89 +++++++++++++++++
cdrtools-linking.patch | 21 ++--
cdrtools-make.patch | 15 +--
cdrtools-rename.patch | 260 -------------------------------------------------
cdrtools.spec | 71 +++++++-------
5 files changed, 143 insertions(+), 313 deletions(-)
---
diff --git a/cdrtools.spec b/cdrtools.spec
index 1ab8b46..2f49af9 100644
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -5,23 +5,24 @@ Summary(pt_BR.UTF-8): Um programa de gravação de CD/DVD/BluRay
Summary(ru.UTF-8): Программа для записи CD/DVD/BluRay, запускаемая из командной строки
Summary(uk.UTF-8): Програма для запису CD/DVD/BluRay, яка запускається з командної стрічки
Name: cdrtools
-Version: 3.00
-Release: 2
+Version: 3.01
+Release: 1
Epoch: 5
-License: GPL v2 (mkisofs), LGPL v2.1 (cdda2wav), CDDL v1.0 (the rest)
+License: GPL v2 (mkisofs), CDDL v1.0 (the rest)
Group: Applications/System
Source0: http://downloads.sourceforge.net/cdrtools/%{name}-%{version}.tar.bz2
-# Source0-md5: f9fbab08fbd458b0d2312976d8c5f558
+# Source0-md5: 7d45c5b7e1f78d85d1583b361aee6e8b
Patch0: %{name}-config.patch
Patch2: %{name}-man.patch
Patch3: %{name}-make.patch
Patch4: %{name}-linking.patch
Patch5: %{name}-revert_sg_io_eperm_failure.patch
-Patch6: %{name}-rename.patch
URL: http://cdrtools.sourceforge.net/
+BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: iconv
+BuildRequires: libcap-devel
Provides: cdrecord
Obsoletes: cdrecord
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -236,10 +237,9 @@ chmod -R u+rw -R .
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
# Remove profiled make files
-rm -v $(find . -name '*_p.mk')
+%{__rm} -v $(find . -name '*_p.mk')
cp -p /usr/share/automake/config.* conf
@@ -257,15 +257,18 @@ cp -p /usr/share/automake/config.* conf
cd autoconf
install -d m4
-mv acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4 m4
-mv aclocal.m4 acinclude.m4
+%{__mv} acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4 m4
+%{__mv} aclocal.m4 acinclude.m4
for a in acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4; do
:> $a
done
# extract only needed functions
-sed -ne '/AC_INCL_CHECK_TYPE/,/dnl ###/p' m4/acgeneral.m4 >> acinclude.m4
+sed -n -e '/AC_TRY_COMPILE2/,/dnl ###/ { s/AC_LANG/_AC_LANG/; p }' \
+ -e '/AC_RCHECK_FUNC/,/dnl ### Checking compiler/ { s/AC_LANG/_AC_LANG/; p }' \
+ -e '/AC_INCL_CHECK_TYPE/,/dnl ###/p' m4/acgeneral.m4 >> acinclude.m4
+sed -n -e '/CONFIG_RMTCALL/,/^])/p' m4/acspecific.m4 >> acinclude.m4
%build
cd autoconf
@@ -298,28 +301,24 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_includedir}/schily/scg}
cp -p libscg/scg/*.h $RPM_BUILD_ROOT%{_includedir}/schily/scg
-cp -p cdrecord/cdrecord.dfl $RPM_BUILD_ROOT%{_sysconfdir}/cdrecord.conf
-
-rm -r $RPM_BUILD_ROOT%{_includedir}/scg
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/scg
%ifarch x32
-rm -r $RPM_BUILD_ROOT%{_includedir}/schily/x32-pld-linux-cc
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/schily/x32-pld-linux-cc
%else
-rm -r $RPM_BUILD_ROOT%{_includedir}/schily/%{_target_platform}-cc
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/schily/%{_target_platform}-cc
%endif
-rm -r $RPM_BUILD_ROOT%{_docdir}/{mkisofs,rscsi,cdrecord,cdda2wav,libparanoia}
-rm $RPM_BUILD_ROOT%{_mandir}/man5/makefiles.5*
-rm $RPM_BUILD_ROOT%{_mandir}/man5/makerules.5*
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{mkisofs,rscsi,cdrecord,cdda2wav,libparanoia}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/makefiles.5*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/makerules.5*
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AN-* doc/cdrecord.ps Changelog README README.mkisofs cdrecord/README.ATAPI cdrecord/README.DiskT at 2
-%doc cdrecord/README.{WORM,audio,cdplus,cdtext,cdrw,clone,copy,multi}
-%doc cdrecord/README.{parallel,raw,rscsi,sony,verify} make_diskt at 2.sh
-%doc cdrecord/cdrecord.dfl cdrecord/LICENSE
+%doc AN-* CDDL.Schily.txt COPYING Changelog README make_diskt at 2.sh cdrecord/README.{ATAPI,DiskT at 2,WORM,audio,cdplus,cdtext,cdrw,clone,copy,multi,parallel,raw,rscsi,sony,verify} cdrecord/{LICENSE,cdrecord.dfl} doc/cdrecord.ps
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cdrecord.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rscsi.conf
%attr(755,root,root) %{_bindir}/cdrecord
%attr(755,root,root) %{_bindir}/scgcheck
%attr(755,root,root) %{_bindir}/scgskeleton
@@ -331,19 +330,27 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libcdrdeflt.a
+%{_libdir}/libdeflt.a
+%{_libdir}/libedc_ecc.a
+%{_libdir}/libedc_ecc_dec.a
+%{_libdir}/libfile.a
+%{_libdir}/libfind.a
+%{_libdir}/libhfs.a
+%{_libdir}/libmdigest.a
+%{_libdir}/libparanoia.a
+%{_libdir}/librscg.a
+%{_libdir}/libscg.a
+%{_libdir}/libscgcmd.a
+%{_libdir}/libsiconv.a
%dir %{_includedir}/schily
-%dir %{_includedir}/schily/scg
%{_includedir}/schily/*.h
+%dir %{_includedir}/schily/scg
%{_includedir}/schily/scg/*.h
%files cdda2wav
%defattr(644,root,root,755)
-%doc cdda2wav/Frontends cdda2wav/HOWTOUSE cdda2wav/OtherProgs
-%doc cdda2wav/README cdda2wav/THANKS cdda2wav/TODO
-%doc cdda2wav/cdda2mp3.new cdda2wav/cdda_links cdda2wav/pitchplay
-%doc cdda2wav/readmult cdda2wav/tracknames.pl cdda2wav/tracknames.txt
-%doc cdda2wav/FAQ
+%doc cdda2wav/{FAQ,Frontends,HOWTOUSE,OtherProgs,README,THANKS,TODO,cdda2mp3.new,cdda_links,pitchplay,readmult,tracknames.pl,tracknames.txt}
%attr(755,root,root) %{_bindir}/cdda2wav
%attr(755,root,root) %{_bindir}/cdda2mp3
%attr(755,root,root) %{_bindir}/cdda2ogg
@@ -371,11 +378,7 @@ rm -rf $RPM_BUILD_ROOT
%files mkisofs
%defattr(644,root,root,755)
-%doc mkisofs/README.compression mkisofs/README.eltorito mkisofs/README
-%doc mkisofs/README.graft_dirs mkisofs/README.hfs_boot mkisofs/README.hfs_magic
-%doc mkisofs/README.hide mkisofs/README.joliet mkisofs/README.mkhybrid
-%doc mkisofs/README.prep_boot mkisofs/README.rootinfo mkisofs/README.session
-%doc mkisofs/README.sort mkisofs/README.sparcboot
+%doc README.mkisofs mkisofs/README mkisofs/README.{compression,eltorito,graft_dirs,hfs_boot,hfs_magic,hide,joliet,mkhybrid,prep_boot,rootinfo,session,sort,sparcboot}
%attr(755,root,root) %{_bindir}/mkisofs
%attr(755,root,root) %{_bindir}/mkhybrid
%{_libdir}/siconv
diff --git a/cdrtools-config.patch b/cdrtools-config.patch
index 1f8b0ee..bfa742c 100644
--- a/cdrtools-config.patch
+++ b/cdrtools-config.patch
@@ -134,3 +134,92 @@
.sp
.B \h'-2m'Autotarget Mode
.br
+--- cdrtools-3.01/cdrecord/Makefile.dfl.orig 2010-05-14 20:14:37.000000000 +0200
++++ cdrtools-3.01/cdrecord/Makefile.dfl 2020-12-29 17:48:56.424679180 +0100
+@@ -8,11 +8,12 @@
+ ###########################################################################
+
+ INSMODE= 0644
+-INSDIR= etc/default
++INSDIR= etc
+ INSBASE= $(INS_RBASE:%/=%)
+ INSFLAGS= -noclobber
+ TARGET= cdrecord
+ AUXSRCEXT= .dfl
++_EXEEXT= .conf
+ #XMK_FILE= Makefile.man
+
+ ###########################################################################
+--- cdrtools-3.01/rscsi/rscsi.1.orig 2009-11-15 20:27:50.000000000 +0100
++++ cdrtools-3.01/rscsi/rscsi.1 2020-12-29 18:41:07.327717623 +0100
+@@ -514,8 +514,11 @@
+ to exit.
+ .SH FILES
+ .TP
+-/etc/default/rscsi
+-Default values can be set for the following options in /etc/default/rscsi.
++/etc/rscsi.conf
++Default values can be set for the following options in /etc/rscsi/conf .
++Note that this path has been changed from standard location in cdrtools
++distribution (/etc/default/rscsi) to be consistent with other packages
++which don't use /etc/default directory in general.
+ For example:
+ .sp
+ .BR DEBUG= /tmp/rscsi.debug
+@@ -583,7 +586,7 @@
+ will compare the
+ .B "host entry
+ from
+-.B /etc/default/rscsi
++.B /etc/rscsi.conf
+ with the following strings:
+ .RS
+ .TP 10
+@@ -644,7 +647,7 @@
+ If you like to debug
+ .B rscsi
+ edit
+-.B /etc/default/rscsi
++.B /etc/rscsi.conf
+ and insert a
+ .B DEBUG
+ entry.
+--- cdrtools-3.01/rscsi/rscsi.dfl.orig 2005-08-09 15:19:20.000000000 +0200
++++ cdrtools-3.01/rscsi/rscsi.dfl 2020-12-29 19:21:24.784621135 +0100
+@@ -1,6 +1,6 @@
+ #ident @(#)rscsi.dfl 1.3 05/08/09 Copyr 2000 J. Schilling
+ #
+-# This file is /etc/default/rscsi
++# This file is /etc/rscsi.conf
+ #
+ # NOTE: If this file is not present, rscsi will reject to work.
+ #
+--- cdrtools-3.01/rscsi/rscsi.c.orig 2010-05-24 11:27:48.000000000 +0200
++++ cdrtools-3.01/rscsi/rscsi.c 2020-12-29 17:51:01.767333474 +0100
+@@ -134,9 +134,9 @@
+ * don't contribute work and don't give support, they are causing extra
+ * work for me and this way slow down the development.
+ */
+- if (defltopen("/etc/default/rscsi") < 0) {
++ if (defltopen("/etc/rscsi.conf") < 0) {
+ rscsierror(geterrno(), errmsgstr(geterrno()),
+- "Remote configuration error: Cannot open /etc/default/rscsi");
++ "Remote configuration error: Cannot open /etc/rscsi.conf");
+ /* rscsirespond(-1, geterrno());*/
+ exit(EX_BAD);
+ }
+--- cdrtools-3.01/rscsi/Makefile.dfl.orig 2010-05-14 20:17:15.000000000 +0200
++++ cdrtools-3.01/rscsi/Makefile.dfl 2020-12-29 19:21:55.414455199 +0100
+@@ -8,10 +8,11 @@
+ ###########################################################################
+
+ INSMODE= 0644
+-INSDIR= etc/default
++INSDIR= etc
+ INSBASE= $(INS_RBASE:%/=%)
+ TARGET= rscsi
+ AUXSRCEXT= .dfl
++_EXEEXT= .conf
+ #XMK_FILE= Makefile.man
+
+ ###########################################################################
diff --git a/cdrtools-linking.patch b/cdrtools-linking.patch
index 8f5c27a..0fe42f0 100644
--- a/cdrtools-linking.patch
+++ b/cdrtools-linking.patch
@@ -1,25 +1,22 @@
-diff -Nur cdrtools-2.01.01.orig/RULES/rules.cmd cdrtools-2.01.01.linking/RULES/rules.cmd
---- cdrtools-2.01.01.orig/RULES/rules.cmd 2006-05-14 13:55:28.000000000 +0200
-+++ cdrtools-2.01.01.linking/RULES/rules.cmd 2006-08-05 19:21:26.000000000 +0200
-@@ -30,7 +30,7 @@
+--- cdrtools-3.01/RULES/rules.cmd.orig 2020-12-28 20:54:28.689106159 +0100
++++ cdrtools-3.01/RULES/rules.cmd 2020-12-28 20:57:24.211488606 +0100
+@@ -42,7 +42,7 @@
all: $(PTARGET)
$(PTARGET): $(OFILES) $(SRCLIBS)
- $(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS)
+ $(LDCC) $(LDFLAGS) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDLIBS)
- # $(CC) -o $@ $(OFILES) $(LDPATH) $(RUNPATH) $(SRCLIBS) $(LIBS)
###########################################################################
-diff -Nur cdrtools-2.01.01.orig/RULES/rules.inc cdrtools-2.01.01.linking/RULES/rules.inc
---- cdrtools-2.01.01.orig/RULES/rules.inc 2006-05-14 13:55:29.000000000 +0200
-+++ cdrtools-2.01.01.linking/RULES/rules.inc 2006-08-05 19:21:41.000000000 +0200
+ include $(SRCROOT)/$(RULESDIR)/sub.htm
+--- cdrtools-3.01/RULES/rules.inc.orig 2020-12-28 20:54:28.689106159 +0100
++++ cdrtools-3.01/RULES/rules.inc 2020-12-28 20:57:57.307975973 +0100
@@ -41,7 +41,7 @@
all: $(PTARGETCX) $(PTARGET)
$(PTARGETCX): $(OFILES) $(SRCLIBS)
- $(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS)
+ $(LDCC) $(LDFLAGS) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDLIBS)
-
- $(PTARGET): $(OINCSDIR) $(PTARGETCX)
- @echo " ==> GENERATING include file \"$@\""; $(PTARGETC)$(_XEXEEXT) > $@
-
+ #
+ # If calling "$(PTARGETC)$(_XEXEEXT)" fails, this may be a cross compilation,
+ # so retry to run the command under control of "$(CONFIG_RMTCALL)".
diff --git a/cdrtools-make.patch b/cdrtools-make.patch
index 73a81ae..7b483b3 100644
--- a/cdrtools-make.patch
+++ b/cdrtools-make.patch
@@ -1,6 +1,6 @@
---- cdrtools-2.01.01/DEFAULTS/Defaults.linux.orig 2009-06-04 23:10:45.000000000 +0200
-+++ cdrtools-2.01.01/DEFAULTS/Defaults.linux 2010-01-05 09:18:52.000000000 +0100
-@@ -40,16 +40,11 @@
+--- cdrtools-3.01/DEFAULTS/Defaults.linux.orig 2020-12-28 19:35:02.348260976 +0100
++++ cdrtools-3.01/DEFAULTS/Defaults.linux 2020-12-28 20:53:15.129504665 +0100
+@@ -40,17 +40,12 @@
# LINUX_SRC_INCLUDE is used in RULES/*-linux-*cc*.rul
#
###########################################################################
@@ -12,6 +12,7 @@
+LINUX_SRC_INCLUDE=
DEFINCDIRS= $(SRCROOT)/include
+ DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
-#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
@@ -20,12 +21,12 @@
###########################################################################
#
---- cdrtools-2.01.01/RULES/rules.cnf.orig 2008-08-01 20:04:08.000000000 +0200
-+++ cdrtools-2.01.01/RULES/rules.cnf 2008-10-06 22:18:00.000000000 +0200
-@@ -61,7 +61,7 @@
+--- cdrtools-3.01/RULES/rules.cnf.orig 2020-12-28 19:35:02.348260976 +0100
++++ cdrtools-3.01/RULES/rules.cnf 2020-12-28 20:53:58.149271607 +0100
+@@ -64,7 +64,7 @@
cd $(OINCSDIR); \
CONFIG_NOFAIL=TRUE CC="$(XCC_COM)" CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(C++FLAGS)" CPPFLAGS="$(OSDEFS)" \
+ CXXFLAGS="$(C++FLAGS)" CPPFLAGS="$(OS_DEFS)" \
- LDFLAGS="$(LDOPTS)" sh ../../autoconf/configure $(CONFFLAGS)
+ LDFLAGS="$(LDFLAGS1) $(LDOPTS)" sh ../../autoconf/configure $(CONFFLAGS)
###########################################################################
diff --git a/cdrtools-rename.patch b/cdrtools-rename.patch
deleted file mode 100644
index b337fec..0000000
--- a/cdrtools-rename.patch
+++ /dev/null
@@ -1,260 +0,0 @@
---- cdrtools-3.00/./autoconf/configure.in~ 2010-05-07 20:00:25.000000000 +0300
-+++ cdrtools-3.00/./autoconf/configure.in 2014-03-24 23:12:01.206179037 +0200
-@@ -370,17 +370,17 @@
- dnl POSIX rules. The new POSIX interfaces in question should be called
- dnl fdexec*() to follow the rules of other similar POSIX functions.
- dnl
--dnl We use AC_RCHECK_FUNCS() because some Linux distros define a
-+dnl We use AC_CHECK_FUNCS() because some Linux distros define a
- dnl fexecve() that returns ENOSYS an AC_CHECK_FUNCS() would return FALSE
- dnl
- echo Checking for POSIX violations by the POSIX.1-2008 standard:
--AC_RCHECK_FUNCS(fexecl fexecle fexecv fexecve)
--AC_RCHECK_FUNCS(fspawnv fspawnl fspawnv_nowait)
-+AC_CHECK_FUNCS(fexecl fexecle fexecv fexecve)
-+AC_CHECK_FUNCS(fspawnv fspawnl fspawnv_nowait)
-
- dnl A similar problem exists with the new POSIX.1-2008 interfaces
- dnl getline() and fgetline(). These interfaces are also incompatible
- dnl with our interfaces defined in 1982.
--AC_RCHECK_FUNCS(getline fgetline)
-+AC_CHECK_FUNCS(getline fgetline)
- echo End of tests for POSIX violations by the POSIX.1-2008 standard.
-
- dnl Check whether a symbol is either defined in an include file or
---- cdrtools-3.00/include/schily/schily.h~ 2009-10-23 00:18:55.000000000 +0300
-+++ cdrtools-3.00/include/schily/schily.h 2014-03-24 23:14:00.498115198 +0200
-@@ -144,7 +144,6 @@
- #define fexecl js_fexecl
- #define fexecle js_fexecle
- #define fexecv js_fexecv
--#define fexecve js_fexecve
- #endif
- #ifdef RENAME_FSPAWN
- #define fspawnv js_fspawnv
-@@ -152,7 +151,6 @@
- #define fspawnl js_fspawnl
- #endif
- #ifdef RENAME_GETLINE
--#define getline js_getline
- #define fgetline js_fgetline
- #endif
-
-@@ -174,7 +172,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 js_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 *, const char *, ...));
-@@ -311,7 +309,7 @@
- extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
- extern int findline __PR((const char *, char, const char *,
- int, char **, int));
--extern int getline __PR((char *, int));
-+extern int js_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 *, ...));
---- cdrtools-3.00/libfind/find.c~ 2010-04-27 21:42:14.000000000 +0300
-+++ cdrtools-3.00/libfind/find.c 2014-03-24 23:15:42.452619081 +0200
-@@ -1878,7 +1878,7 @@
- #endif
- pp[ac] = NULL; /* -exec {} \; is not NULL terminated */
-
-- fexecve(av[0], state->std[0], state->std[1], state->std[2],
-+ js_fexecve(av[0], state->std[0], state->std[1], state->std[2],
- pp, state->env);
- err = geterrno();
- #ifdef PLUS_DEBUG
---- cdrtools-2.01.01/libscg/scsitransp.c.orig 2009-09-07 21:09:48.000000000 +0200
-+++ cdrtools-2.01.01/libscg/scsitransp.c 2010-01-06 08:37:33.000000000 +0100
-@@ -338,7 +338,7 @@
-
- js_printf("%s", msg);
- flush();
-- if (getline(okbuf, sizeof (okbuf)) == EOF)
-+ if (js_getline(okbuf, sizeof (okbuf)) == EOF)
- exit(EX_BAD);
- if (streql(okbuf, "y") || streql(okbuf, "yes") ||
- streql(okbuf, "Y") || streql(okbuf, "YES"))
---- cdrtools-2.01.01/libschily/fexec.c.orig 2009-11-15 15:14:28.000000000 +0100
-+++ cdrtools-2.01.01/libschily/fexec.c 2010-01-06 08:41:20.000000000 +0100
-@@ -135,7 +135,7 @@
- } while (p != NULL);
- va_end(args);
-
-- ret = fexecv(name, in, out, err, ac, av);
-+ ret = js_fexecv(name, in, out, err, ac, av);
- if (av != xav)
- free(av);
- return (ret);
-@@ -143,10 +143,10 @@
-
- #ifdef PROTOTYPES
- EXPORT int
--fexecle(const char *name, FILE *in, FILE *out, FILE *err, const char *arg0, ...)
-+js_fexecle(const char *name, FILE *in, FILE *out, FILE *err, const char *arg0, ...)
- #else
- EXPORT int
--fexecle(name, in, out, err, arg0, va_alist)
-+js_fexecle(name, in, out, err, arg0, va_alist)
- char *name;
- FILE *in;
- FILE *out;
-@@ -198,25 +198,25 @@
- } while (p != NULL);
- va_end(args);
-
-- ret = fexecve(name, in, out, err, av, env);
-+ ret = js_fexecve(name, in, out, err, av, env);
- if (av != xav)
- free(av);
- return (ret);
- }
-
- EXPORT int
--fexecv(name, in, out, err, ac, av)
-+js_fexecv(name, in, out, err, ac, av)
- const char *name;
- FILE *in, *out, *err;
- int ac;
- char *av[];
- {
- av[ac] = NULL; /* force list to be null terminated */
-- return (fexecve(name, in, out, err, av, environ));
-+ return (js_fexecve(name, in, out, err, av, environ));
- }
-
- EXPORT int
--fexecve(name, in, out, err, av, env)
-+js_fexecve(name, in, out, err, av, env)
- const char *name;
- FILE *in, *out, *err;
- char * const av[], * const env[];
---- cdrtools-2.01.01/libschily/spawn.c.orig 2010-01-06 08:45:54.000000000 +0100
-+++ cdrtools-2.01.01/libschily/spawn.c 2010-01-06 08:45:43.000000000 +0100
-@@ -127,10 +127,10 @@
- if (pid != 0)
- return (pid);
- /*
-- * silly: fexecv must set av[ac] = NULL
-+ * silly: js_fexecv must set av[ac] = NULL
- * so we have to cast argv tp (char **)
- */
-- fexecv(name, in, out, err, argc, (char **)argv);
-+ js_fexecv(name, in, out, err, argc, (char **)argv);
- _exit(geterrno());
- /* NOTREACHED */
- #ifndef lint
---- cdrtools-2.01.01/libschily/stdio/fgetline.c.orig 2004-09-25 14:23:36.000000000 +0200
-+++ cdrtools-2.01.01/libschily/stdio/fgetline.c 2010-01-06 08:34:46.000000000 +0100
-@@ -61,7 +61,7 @@
- }
-
- EXPORT int
--getline(buf, len)
-+js_getline(buf, len)
- char *buf;
- int len;
- {
---- cdrtools-2.01.01/readcd/io.c.orig 2010-01-06 08:29:06.000000000 +0100
-+++ cdrtools-2.01.01/readcd/io.c 2010-01-06 08:29:31.000000000 +0100
-@@ -136,7 +136,7 @@
- (*prt)(s, *lp, mini, maxi, dp);
- flush();
- line[0] = '\0';
-- if (getline(line, 80) == EOF)
-+ if (js_getline(line, 80) == EOF)
- exit(EX_BAD);
-
- linep = skipwhite(line);
-@@ -204,7 +204,7 @@
- printf("%r", form, args);
- va_end(args);
- flush();
-- if (getline(okbuf, sizeof (okbuf)) == EOF)
-+ if (js_getline(okbuf, sizeof (okbuf)) == EOF)
- exit(EX_BAD);
- if (okbuf[0] == '?') {
- printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
---- cdrtools-2.01.01/readcd/readcd.c.orig 2010-01-06 08:27:59.000000000 +0100
-+++ cdrtools-2.01.01/readcd/readcd.c 2010-01-06 08:28:36.000000000 +0100
-@@ -2098,7 +2098,7 @@
- error("Copy from SCSI (%d,%d,%d) disk to file\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
- error("Enter filename [%s]: ", defname); flush();
-- (void) getline(filename, sizeof (filename));
-+ (void) js_getline(filename, sizeof (filename));
- }
-
- if (askrange) {
-@@ -2285,7 +2285,7 @@
- error("Copy from file to SCSI (%d,%d,%d) disk\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
- error("Enter filename [%s]: ", defname); flush();
-- (void) getline(filename, sizeof (filename));
-+ (void) js_getline(filename, sizeof (filename));
- error("Notice: reading from file always starts at file offset 0.\n");
-
- getlong("Enter starting sector for copy:", &addr, 0L, end-1);
---- cdrtools-2.01.01/scgcheck/dmaresid.c.orig 2010-01-06 08:24:34.000000000 +0100
-+++ cdrtools-2.01.01/scgcheck/dmaresid.c 2010-01-06 08:25:01.000000000 +0100
-@@ -84,7 +84,7 @@
- printf("Ready to start test for working DMA residual count == DMA count? Enter <CR> to continue: ");
- fprintf(logfile, "**********> Testing for working DMA residual count == DMA count.\n");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) js_getline(abuf, sizeof (abuf));
- passed = TRUE;
- dmacnt = cnt;
- ret = xtinquiry(scgp, 0, dmacnt);
-@@ -118,7 +118,7 @@
-
- printf("Ready to start test for working DMA residual count == 1? Enter <CR> to continue: ");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) js_getline(abuf, sizeof (abuf));
- chkprint("**********> Testing for working DMA residual count == 1.\n");
- passed = TRUE;
- dmacnt = cnt+1;
-@@ -147,7 +147,7 @@
-
- printf("Ready to start test for working DMA overrun detection? Enter <CR> to continue: ");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) js_getline(abuf, sizeof (abuf));
- chkprint("**********> Testing for working DMA overrun detection.\n");
- passed = TRUE;
- dmacnt = cnt-1;
---- cdrtools-2.01.01/scgcheck/scgcheck.c.orig 2010-01-06 08:26:33.000000000 +0100
-+++ cdrtools-2.01.01/scgcheck/scgcheck.c 2010-01-06 08:27:29.000000000 +0100
-@@ -191,7 +191,7 @@
- break;
- error("Enter SCSI device name for bus scanning [%s]: ", device);
- flushit();
-- (void) getline(device, sizeof (device));
-+ (void) js_getline(device, sizeof (device));
- if (device[0] == '\0')
- strcpy(device, "0,6,0");
-
-@@ -616,5 +616,5 @@
- lbuf[0] = '\0';
- return (0);
- }
-- return (getline(lbuf, len));
-+ return (js_getline(lbuf, len));
- }
---- cdrtools-3.00/scgcheck/sense.c~ 2010-05-24 12:19:15.000000000 +0300
-+++ cdrtools-3.00/scgcheck/sense.c 2014-03-24 23:16:55.065826928 +0200
-@@ -116,7 +116,7 @@
-
- printf("Ready to eject tray? Enter <CR> to continue: ");
- flushit();
-- (void) getline(abuf, sizeof (abuf));
-+ (void) js_getline(abuf, sizeof (abuf));
- if (abuf[0] != 'n') {
- scsi_unload(scgp, (cdr_t *)0);
- needload = TRUE;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cdrtools.git/commitdiff/9bfb9744f459d93cd0b30f0a163d62cb58b5aab9
More information about the pld-cvs-commit
mailing list