Hello community, here is the log from the commit of package cdrtools for openSUSE:Factory checked in at 2015-03-30 19:10:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdrtools (Old) and /work/SRC/openSUSE:Factory/.cdrtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdrtools" Changes: -------- --- /work/SRC/openSUSE:Factory/cdrtools/cdrtools.changes 2015-02-23 13:24:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cdrtools.new/cdrtools.changes 2015-03-30 19:10:19.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 25 11:24:07 UTC 2015 - jeng...@inai.de + +- Update to new upstream release 3.01~a28 +* Build system changes only: manpages are installed just once + +------------------------------------------------------------------- schily-libs.changes: same change Old: ---- cdrtools-3.01a27.tar.bz2 New: ---- cdrtools-3.01a28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdrtools.spec ++++++ --- /var/tmp/diff_new_pack.vCSbnb/_old 2015-03-30 19:10:20.000000000 +0200 +++ /var/tmp/diff_new_pack.vCSbnb/_new 2015-03-30 19:10:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cdrtools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: cdrtools -Version: 3.01~a27 +Version: 3.01~a28 Release: 0 -# Upstream confirms that 3.01a27 is intended to sort before 3.01 +# Upstream confirms that 3.01aNN is intended to sort before 3.01 %define sversion 3.01 Summary: Tools for recording CD/DVD/BluRay media License: CDDL-1.0 and GPL-2.0 and GPL-2.0+ and BSD-2-Clause and BSD-3-Clause and HPND and ISC Group: Productivity/Multimedia/CD/Record Url: http://cdrtools.sourceforge.net/private/cdrecord.html -Source: http://downloads.sf.net/cdrtools/cdrtools-3.01a27.tar.bz2 +Source: http://downloads.sf.net/cdrtools/cdrtools-3.01a28.tar.bz2 Source1: cdrecord.easy Source2: cdrecord.secure Source3: cdrecord.paranoid @@ -148,8 +148,9 @@ %install b="%buildroot" +# D'oh… not parallel safe gmake GMAKE_NOWARN=true RUNPATH="" \ - DESTDIR="$b" INS_BASE="%_prefix" install %{?_smp_mflags} + DESTDIR="$b" INS_BASE="%_prefix" install -j1 # Devel files not used and/or already provided by libschily-devel, libscg-devel rm -Rf "$b/%_includedir" "$b/%_prefix/lib"/*.a "$b/%_prefix/lib/profiled" \ ++++++ schily-libs.spec ++++++ --- /var/tmp/diff_new_pack.vCSbnb/_old 2015-03-30 19:10:20.000000000 +0200 +++ /var/tmp/diff_new_pack.vCSbnb/_new 2015-03-30 19:10:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package schily-libs # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: schily-libs -Version: 3.01~a27 +Version: 3.01~a28 Release: 0 %define sversion 3.01 Summary: A collection of libraries to support cdrtools @@ -25,7 +25,7 @@ Group: Development/Libraries/C and C++ Url: http://cdrtools.sourceforge.net/private/cdrecord.html -Source: http://downloads.sf.net/cdrtools/cdrtools-3.01a27.tar.bz2 +Source: http://downloads.sf.net/cdrtools/cdrtools-3.01a28.tar.bz2 Source7: pre_checkin.sh Patch1: gcc48wa.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -109,11 +109,12 @@ b="%buildroot" for i in %targets; do pushd "$i" + # D'oh… not parallel safe gmake GMAKE_NOWARN=true LINKMODE=dynamic RUNPATH="" \ CCCC=cc LDCC=cc DYNLD=cc \ -Ldoptx='$(_mapvers:%=-Wl,--version-script=%)' \ + Ldoptx='$(_mapvers:%=-Wl,--version-script=%)' \ DESTDIR="$b" INS_BASE="%_prefix" \ - install %{?_smp_mflags} + install -j1 popd done if [ "%_lib" != "lib" ]; then ++++++ cdrtools-3.01a27.tar.bz2 -> cdrtools-3.01a28.tar.bz2 ++++++ ++++ 11838 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/AN-3.01a28 new/cdrtools-3.01/AN-3.01a28 --- old/cdrtools-3.01/AN-3.01a28 1970-01-01 01:00:00.000000000 +0100 +++ new/cdrtools-3.01/AN-3.01a28 2015-03-24 18:56:42.000000000 +0100 @@ -0,0 +1,183 @@ +***************** Important news **************************** + +For the 'Slottable Source Plugin Module' SSPM Features read README.SSPM + +***************** Please Test ********************************* + +NEW features of cdrtools-3.01a28: + +This is the first localization step for cdrtools. All programs now (hopefully) +call gettext() for all strings that need localization. + +- The next step will include dgettext() calls for the libraries. + +- The following step will include the extracted strings + +- The last step will include German translations and install support + for the resulting binary message object files. + +----------> Please test and report compilation problems! <--------- + +***** NOTE: As mentioned since 2004, frontends to cdrtools should ***** +***** call all programs from cdrtools in the "C" locale ***** +***** by e.g. calling: LC_ALL=C cdrecord .... ***** +***** unless these frontends support localized strings ***** +***** used by the cdrtools with NLS support. ***** + +This version compiles on Win-DOS using the Microsoft compiler cl.exe but +warning: due to missing POSIX compliance with basic features (e.g. stat() +does not return inode numbers), there are many problems with the resulting +code and thus it is recommended to better use a POSIX layer on top of +WIN-DOS. + + *** WARNING *** + *** Need new smake *** + + *** Due to the fact that schily-2014-04-03 introduced to use new macro + *** expansions and a related bug fix in smake, you need a new smake + *** to compile this source. To ensure this, get a recent "schily" + *** tarball from http://sourceforge.net/projects/schilytools/files/ + *** and call: + + cd ./psmake + ./MAKE-all + cd .. + psmake/smake + psmake/smake install + + The new smake version mentioned above is smake-1.2.4. + + Now you have a new smake that is able to compile this source. + + Note that the major makefile restructuring introduced in + schily-2014-04-03 is now more than am month ago and thus seems + to work without problems. + + WARNING: the new version of the isoinfo program makes use of the + *at() series of functions that have been introduced by Sun + in August 2001 and added to POSIX.1-2008. For older platforms, + libschily now includes emulations for these functions but + these emulations have not yet been tested thouroughly. + Please report problems! + + +All: + +- The makefile rules for installing man pages have been changed so that + OBJ/<archdir>/man/ is no longer a direct dependency of the man page. + This results in repeated "make install" calls not to reinstall + up-to-date man pages again. + +- The makefile rules for installing localized sripts have been changed so + hat OBJ/<archdir>/ is no longer a direct dependency of the man page. + This results in repeated "make install" calls not to reinstall + up-to-date scripts again. + +- New autoconf test checks whether printf() supports %z + +- Some documentation now mentions sourceforge instead of BerliOS + +- README.compile now mentions how to use instrumented compilers with + the Schily Makefilesystem. + + +Libschily: + +- strlcatl() wcslcatl(): new functions + +- libschily::linkat.c now manually null-terminates the result from + resolvepath() as the Solaris syscall implementation does not + null-terminate it in all cases. + +- libschily::resolvepath.c comment added to remind on the fact that + in contrary to out implementation the Solaris resolvepath() syscall + does not null-terminate the buffer. + +Libparanoia (Ported/enhanced by J�rg Schilling, originated by Monty xiphm...@mit.edu): + +Libedc (Optimized by J�rg Schilling, originated by Heiko Ei�feldt he...@hexco.de): + + +Libcdrdeflt: + +Libdeflt: + +Libfind: + +Libfile: + +Libhfs_iso: + + +Libmdigest: + +Libsiconv: + + +Libscg: + + +Libscgcmd: + +Libmdigest: + +Rscsi: + +Cdrecord: + +Cdda2wav (Maintained/enhanced by J�rg Schilling, originated by Heiko Ei�feldt he...@hexco.de): + +Readcd: + +Scgcheck: + +Scgskeleton: + +Btcflash: + +Mkisofs (Maintained/enhanced by J�rg Schilling since 1997, originated by Eric Youngdale): + +- mkisofs: isodump did not compile on non c99 compilers. + + + HELIOS TODO: + + - Add the HELIOS UNICODE mapping code. This needs to be done + at UCS-2 level for Joliet and UDF (instead of UTF-8) and only + for Rock Ridge (in case of a UTF-8 based target locale) using + UTF-8 based translations. + + - Make the Apple extensions work again with "mkisofs -find" + +TODO: + + - read Joliet filenames with multi-session if no TRANS.TBL + or RR is present. I am looking for a volunteer for this task! + + Note that this can never be 100% correct as there is no relation + between the names on the master (UNIX) filesystem, the ISO-9660 + names and the Joliet names. Only the Rock Ridge names are + untranslated with respect to the original files on the + master (UNIX) filesystem. + + - add libecc/edc for CDI and similar. + + +CYGWIN NT-4.0 NOTES: + +To compile on Cygwin32, get Cygwin and install it. +For more information read README.win32 + +The files are located on: + +http://sourceforge.net/projects/cdrtools/files/alpha/ ... + +NOTE: These tar archives are 100% POSIX compatible. GNU tar may get some + minor trouble. If you like a 100% POSIX compliant tar, get star from + http://sourceforge.net/projects/s-tar/files/ of from the schily-* + tarball at: http://sourceforge.net/projects/schilytools/files/ + +WARNING: Do not use 'winzip' to extract the tar file! + Winzip cannot extract symbolic links correctly. + +Joerg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/BUILD new/cdrtools-3.01/BUILD --- old/cdrtools-3.01/BUILD 2014-12-03 20:11:38.000000000 +0100 +++ new/cdrtools-3.01/BUILD 2015-02-25 23:00:41.000000000 +0100 @@ -336,6 +336,18 @@ lines like: "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)" as well as the related #endif. +Using a different compiler binary name: + + Call: + + make CC=/opt/instrumented/bin/cc + + Note that all knowledge about the options of a compiler are derived + from the CCOM= variable, so if you like to use an instrumented gcc + variant, you may like to call: + + make CCOM=gcc CC=fluffy-gcc + Getting help from make: @@ -571,6 +583,7 @@ OSREL= # 5.11 OSVERSION= # snv_130 CCOM= # generic compiler name (e.g. "gcc") + CC= # compiler to call (name for binary) CC_COM= # compiler to call (name + basic args) ARCH= overwrites M_ARCH and P_ARCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/COMPILE new/cdrtools-3.01/COMPILE --- old/cdrtools-3.01/COMPILE 2014-12-03 20:11:38.000000000 +0100 +++ new/cdrtools-3.01/COMPILE 2015-02-25 23:00:41.000000000 +0100 @@ -336,6 +336,18 @@ lines like: "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)" as well as the related #endif. +Using a different compiler binary name: + + Call: + + make CC=/opt/instrumented/bin/cc + + Note that all knowledge about the options of a compiler are derived + from the CCOM= variable, so if you like to use an instrumented gcc + variant, you may like to call: + + make CCOM=gcc CC=fluffy-gcc + Getting help from make: @@ -571,6 +583,7 @@ OSREL= # 5.11 OSVERSION= # snv_130 CCOM= # generic compiler name (e.g. "gcc") + CC= # compiler to call (name for binary) CC_COM= # compiler to call (name + basic args) ARCH= overwrites M_ARCH and P_ARCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/INSTALL new/cdrtools-3.01/INSTALL --- old/cdrtools-3.01/INSTALL 2014-12-03 20:11:38.000000000 +0100 +++ new/cdrtools-3.01/INSTALL 2015-02-25 23:00:41.000000000 +0100 @@ -336,6 +336,18 @@ lines like: "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)" as well as the related #endif. +Using a different compiler binary name: + + Call: + + make CC=/opt/instrumented/bin/cc + + Note that all knowledge about the options of a compiler are derived + from the CCOM= variable, so if you like to use an instrumented gcc + variant, you may like to call: + + make CCOM=gcc CC=fluffy-gcc + Getting help from make: @@ -571,6 +583,7 @@ OSREL= # 5.11 OSVERSION= # snv_130 CCOM= # generic compiler name (e.g. "gcc") + CC= # compiler to call (name for binary) CC_COM= # compiler to call (name + basic args) ARCH= overwrites M_ARCH and P_ARCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/README.compile new/cdrtools-3.01/README.compile --- old/cdrtools-3.01/README.compile 2014-12-03 20:11:38.000000000 +0100 +++ new/cdrtools-3.01/README.compile 2015-02-25 23:00:41.000000000 +0100 @@ -336,6 +336,18 @@ lines like: "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)" as well as the related #endif. +Using a different compiler binary name: + + Call: + + make CC=/opt/instrumented/bin/cc + + Note that all knowledge about the options of a compiler are derived + from the CCOM= variable, so if you like to use an instrumented gcc + variant, you may like to call: + + make CCOM=gcc CC=fluffy-gcc + Getting help from make: @@ -571,6 +583,7 @@ OSREL= # 5.11 OSVERSION= # snv_130 CCOM= # generic compiler name (e.g. "gcc") + CC= # compiler to call (name for binary) CC_COM= # compiler to call (name + basic args) ARCH= overwrites M_ARCH and P_ARCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/RULES/rules.loc new/cdrtools-3.01/RULES/rules.loc --- old/cdrtools-3.01/RULES/rules.loc 2012-01-22 16:51:52.000000000 +0100 +++ new/cdrtools-3.01/RULES/rules.loc 2015-01-31 16:41:23.000000000 +0100 @@ -1,4 +1,4 @@ -#ident "@(#)rules.loc 1.8 12/01/22 " +#ident "@(#)rules.loc 1.9 15/01/31 " ########################################################################### # Written 1997 by J. Schilling ########################################################################### @@ -14,6 +14,8 @@ # with the License. # # See the file CDDL.Schily.txt in this distribution for details. +# A copy of the CDDL is also available via the Internet at +# http://www.opensource.org/licenses/cddl1.txt # # When distributing Covered Code, include this CDDL HEADER in each # file and include the License file CDDL.Schily.txt from this distribution. @@ -31,7 +33,9 @@ all: $(ARCHDIR) $(PTARGET) -$(PTARGET): $(ARCHDIR) $(SRCFILE) +install: $(ARCHDIR) + +$(PTARGET): $(SRCFILE) $(LOCALIZE) $(SRCFILE) $@ $(ARCHDIR): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/RULES/rules.man new/cdrtools-3.01/RULES/rules.man --- old/cdrtools-3.01/RULES/rules.man 2012-01-23 22:41:41.000000000 +0100 +++ new/cdrtools-3.01/RULES/rules.man 2015-01-31 16:41:23.000000000 +0100 @@ -1,4 +1,4 @@ -#ident "@(#)rules.man 1.6 12/01/23 " +#ident "@(#)rules.man 1.7 15/01/31 " ########################################################################### # Written 1997 by J. Schilling ########################################################################### @@ -14,6 +14,8 @@ # with the License. # # See the file CDDL.Schily.txt in this distribution for details. +# A copy of the CDDL is also available via the Internet at +# http://www.opensource.org/licenses/cddl1.txt # # When distributing Covered Code, include this CDDL HEADER in each # file and include the License file CDDL.Schily.txt from this distribution. @@ -46,7 +48,9 @@ all: $(ARCHDIR) $(PTARGET) -$(PTARGET): $(ARCHDIR) $(SRCFILE) +install: $(ARCHDIR) + +$(PTARGET): $(SRCFILE) $(LOCALIZE) $(SRCFILE) $@ $(ARCHDIR): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/autoconf/configure.in new/cdrtools-3.01/autoconf/configure.in --- old/cdrtools-3.01/autoconf/configure.in 2014-04-02 17:38:12.000000000 +0200 +++ new/cdrtools-3.01/autoconf/configure.in 2015-03-02 20:06:32.000000000 +0100 @@ -1,6 +1,6 @@ -dnl @(#)configure.in 1.257 14/04/02 Copyright 1998-2014 J. Schilling +dnl @(#)configure.in 1.258 15/03/02 Copyright 1998-2014 J. Schilling dnl Process this file with autoconf to produce a configure script. -AC_REVISION(1.257)dnl +AC_REVISION(1.258)dnl dnl AC_INIT(xconfig.h.in) AC_INIT(config.guess) @@ -439,6 +439,7 @@ AC_FUNC_SIGSETJMP AC_FUNC_SIGLONGJMP AC_FUNC_PRINTF_J +AC_FUNC_PRINTF_Z AC_FUNC_PRINTF_LL AC_FUNC_REALLOC_NULL AC_CHECK_FUNCS(access eaccess euidaccess) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/autoconf/xconfig.h.in new/cdrtools-3.01/autoconf/xconfig.h.in --- old/cdrtools-3.01/autoconf/xconfig.h.in 2014-05-15 21:04:57.000000000 +0200 +++ new/cdrtools-3.01/autoconf/xconfig.h.in 2015-03-02 20:06:32.000000000 +0100 @@ -1,4 +1,4 @@ -/* @(#)xconfig.h.in 1.244 14/05/15 Copyright 1998-2014 J. Schilling */ +/* @(#)xconfig.h.in 1.245 15/03/02 Copyright 1998-2014 J. Schilling */ /* * Dynamic autoconf C-include code. * Do not edit, this file has been created automatically. @@ -655,6 +655,7 @@ #undef HAVE_WCRTOMB /* wcrtomb() is present in libc */ #undef HAVE_PRINTF_J /* *printf() in libc supports %jd */ +#undef HAVE_PRINTF_Z /* *printf() in libc supports %zd */ #undef HAVE_PRINTF_LL /* *printf() in libc supports %lld */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/cdrecord/version.h new/cdrtools-3.01/cdrecord/version.h --- old/cdrtools-3.01/cdrecord/version.h 2015-01-27 20:41:51.000000000 +0100 +++ new/cdrtools-3.01/cdrecord/version.h 2015-03-24 23:46:30.000000000 +0100 @@ -1,6 +1,6 @@ -/* @(#)version.h 1.81 15/01/27 Copyright 2007-2015 J. Schilling */ +/* @(#)version.h 1.82 15/03/24 Copyright 2007-2015 J. Schilling */ /* * The version for cdrtools programs */ -#define VERSION "3.01a27" +#define VERSION "3.01a28" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/conf/post.html new/cdrtools-3.01/conf/post.html --- old/cdrtools-3.01/conf/post.html 2014-12-03 22:23:08.000000000 +0100 +++ new/cdrtools-3.01/conf/post.html 2015-01-18 15:44:44.000000000 +0100 @@ -1,8 +1,7 @@ <p><hr> <a href="http://www.fraunhofer.de/";><IMG SRC="fhglogr.gif" ALT="FhG " BORDER=0></a> -<a href="http://www.fokus.fraunhofer.de/home/";><IMG SRC="fhlogo.gif" ALT="FhG FOKUS " BORDER=0></a> -<a href="http://cdrecord.org/private/index.html";> -<IMG SRC="schilling.gif" ALT="Schily " BORDER=0 WIDTH=41 HEIGHT=54></a> +<!--<a href="http://cdrecord.org/private/index.html";> +<IMG SRC="schilling.gif" ALT="Schily " BORDER=0 WIDTH=41 HEIGHT=54></a>--> <a href="http://cdrecord.org/private/index.html";>Schily's Home</a> <a href="https://sourceforge.net/projects/ved/files/";><IMG SRC="vedpowered.gif" ALT="VED powered " BORDER=0 ></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/include/schily/schily.h new/cdrtools-3.01/include/schily/schily.h --- old/cdrtools-3.01/include/schily/schily.h 2014-01-02 15:49:06.000000000 +0100 +++ new/cdrtools-3.01/include/schily/schily.h 2015-03-03 20:54:11.000000000 +0100 @@ -1,4 +1,4 @@ -/* @(#)schily.h 1.113 14/01/02 Copyright 1985-2014 J. Schilling */ +/* @(#)schily.h 1.114 15/03/03 Copyright 1985-2014 J. Schilling */ /* * Definitions for libschily * @@ -449,9 +449,15 @@ extern int sprintf __PR((char *, const char *, ...)); #endif extern char *strcatl __PR((char *, ...)); +#ifdef FOUND_SIZE_T +extern size_t strlcatl __PR((char *, size_t, ...)); +#endif extern int streql __PR((const char *, const char *)); #ifdef _SCHILY_WCHAR_H extern wchar_t *wcscatl __PR((wchar_t *, ...)); +#ifdef FOUND_SIZE_T +extern size_t wcslcatl __PR((wchar_t *, size_t, ...)); +#endif extern int wcseql __PR((const wchar_t *, const wchar_t *)); #endif #ifdef va_arg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/libschily/Targets new/cdrtools-3.01/libschily/Targets --- old/cdrtools-3.01/libschily/Targets 2014-06-03 20:34:47.000000000 +0200 +++ new/cdrtools-3.01/libschily/Targets 2015-03-03 20:54:11.000000000 +0100 @@ -1,4 +1,4 @@ -# @(#)Targets 1.48 14/06/03 Copyright 1995-2014 J. Schilling +# @(#)Targets 1.49 15/03/03 Copyright 1995-2014 J. Schilling CFILES_STDIO= cvmod.c dat.c fcons.c fdown.c fdup.c \ ffileread.c ffilewrite.c \ @@ -62,14 +62,14 @@ spawn.c \ strcasecmp.c strncasecmp.c strcasemap.c \ strcat.c strcatl.c strchr.c strcmp.c strcpy.c strcspn.c \ - strdup.c streql.c strlen.c strlcat.c strlcpy.c strncat.c strncmp.c \ + strdup.c streql.c strlen.c strlcat.c strlcatl.c strlcpy.c strncat.c strncmp.c \ strncpy.c strndup.c strnlen.c strrchr.c strspn.c strstr.c \ swabbytes.c \ symlinkat.c \ timegm.c \ uid.c unlinkat.c uname.c usleep.c utimens.c utimensat.c \ wcscat.c wcscatl.c wcschr.c wcscmp.c wcscpy.c wcscspn.c \ - wcsdup.c wcseql.c wcslen.c wcslcat.c wcslcpy.c wcsncat.c wcsncmp.c \ + wcsdup.c wcseql.c wcslen.c wcslcat.c wcslcatl.c wcslcpy.c wcsncat.c wcsncmp.c \ wcsncpy.c wcsndup.c wcsnlen.c wcsrchr.c wcsspn.c wcsstr.c \ wdabort.c \ zerobytes.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/libschily/linkat.c new/cdrtools-3.01/libschily/linkat.c --- old/cdrtools-3.01/libschily/linkat.c 2013-10-30 23:54:18.000000000 +0100 +++ new/cdrtools-3.01/libschily/linkat.c 2015-03-03 20:53:14.000000000 +0100 @@ -1,4 +1,4 @@ -/* @(#)linkat.c 1.2 13/10/30 Copyright 2011-2013 J. Schilling */ +/* @(#)linkat.c 1.3 15/03/03 Copyright 2011-2015 J. Schilling */ /* * Emulate the behavior of linkat(int fd1, const char *name1, int fd2, * const char *name2, int flag) @@ -12,7 +12,7 @@ * to know that we do more than a simple open() here and that the * working directory may be changed by us. * - * Copyright (c) 2013 J. Schilling + * Copyright (c) 2011-2015 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -39,6 +39,10 @@ #ifndef HAVE_LINKAT +#ifndef ENAMETOOLONG +#define ENAMETOOLONG EINVAL +#endif + EXPORT int linkfollow __PR((const char *old, const char *new)); EXPORT int linkfollow(old, new) @@ -46,10 +50,17 @@ const char *new; { char buf[max(8192, PATH_MAX+1)]; + int blen; buf[0] = '\0'; - if (resolvepath(old, buf, sizeof (buf)) < 0) + if ((blen = resolvepath(old, buf, sizeof (buf))) < 0) { return (-1); + } else if (blen >= sizeof (buf)) { + seterrno(ENAMETOOLONG); + return (-1); /* Path too long */ + } else { + buf[blen] = '\0'; /* Solaris syscall does not null-terminate */ + } return (link(buf, new)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/libschily/resolvepath.c new/cdrtools-3.01/libschily/resolvepath.c --- old/cdrtools-3.01/libschily/resolvepath.c 2013-10-29 23:17:57.000000000 +0100 +++ new/cdrtools-3.01/libschily/resolvepath.c 2015-03-03 20:52:11.000000000 +0100 @@ -1,9 +1,9 @@ -/* @(#)resolvepath.c 1.4 13/10/29 Copyright 2011-2013 J. Schilling */ +/* @(#)resolvepath.c 1.5 15/03/03 Copyright 2011-2015 J. Schilling */ /* * resolvepath() removes "./" and non-leading "/.." path components. * It tries to do the same as the Solaris syscall with the same name. * - * Copyright (c) 2011-2013 J. Schilling + * Copyright (c) 2011-2015 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -39,6 +39,13 @@ LOCAL int shorten __PR((char *path)); #ifndef HAVE_RESOLVEPATH +/* + * Warning: The Solaris system call "resolvepath()" does not null-terminate + * the result in "buf". Code that used resolvepath() should manually + * null-terminate the buffer. + * + * Note: Path needs to exist. + */ EXPORT int resolvepath(path, buf, bufsiz) register const char *path; @@ -49,6 +56,9 @@ } #endif +/* + * Path may not exist. + */ EXPORT int resolvenpath(path, buf, bufsiz) register const char *path; @@ -59,7 +69,10 @@ } /* - * The behavior may be controlled via flags. + * The behavior may be controlled via flags: + * + * RSPF_EXIST All path components must exist + * RSPF_NOFOLLOW_LAST Do not follow link in last path component */ EXPORT int resolvefpath(path, buf, bufsiz, flags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/libschily/strlcatl.c new/cdrtools-3.01/libschily/strlcatl.c --- old/cdrtools-3.01/libschily/strlcatl.c 1970-01-01 01:00:00.000000000 +0100 +++ new/cdrtools-3.01/libschily/strlcatl.c 2015-03-03 20:50:42.000000000 +0100 @@ -0,0 +1,84 @@ +/* @(#)strlcatl.c 1.1 15/03/03 Copyright 2015 J. Schilling */ +/* + * list version of strlcat() + * + * concatenates all past first parameter until a NULL pointer is reached + * + * WARNING: a NULL constant is not a NULL pointer, so a caller must + * cast a NULL constant to a pointer: (char *)NULL + * + * returns number of bytes needed to fit all + * + * Copyright (c) 2015 J. Schilling + */ +/* + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * See the file CDDL.Schily.txt in this distribution for details. + * A copy of the CDDL is also available via the Internet at + * http://www.opensource.org/licenses/cddl1.txt + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file CDDL.Schily.txt from this distribution. + */ + +#include <schily/mconfig.h> +#include <schily/varargs.h> +#include <schily/standard.h> +#include <schily/string.h> +#include <schily/schily.h> + +/* VARARGS3 */ +#ifdef PROTOTYPES +EXPORT size_t +strlcatl(char *to, size_t len, ...) +#else +EXPORT size_t +strlcatl(to, len va_alist) + char *to; + size_t len; + va_dcl +#endif +{ + va_list args; + register char *p; + register char *tor = to; + size_t olen = len; + +#ifdef PROTOTYPES + va_start(args, len); +#else + va_start(args); +#endif + if (len > 0) { + while (--len > 0 && *tor++ != '\0') + ; + + if (len == 0) + goto toolong; + + while ((p = va_arg(args, char *)) != NULL) { + tor--; + len++; + while (--len > 0 && (*tor++ = *p++) != '\0') + ; + if (len == 0) { + *tor = '\0'; + olen = tor - to + strlen(p); + goto toolong; + } + } + olen = --tor - to; + } + va_end(args); + return (olen); +toolong: + while ((p = va_arg(args, char *)) != NULL) { + olen += strlen(p); + } + va_end(args); + return (olen); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/libschily/wcslcatl.c new/cdrtools-3.01/libschily/wcslcatl.c --- old/cdrtools-3.01/libschily/wcslcatl.c 1970-01-01 01:00:00.000000000 +0100 +++ new/cdrtools-3.01/libschily/wcslcatl.c 2015-03-03 20:50:42.000000000 +0100 @@ -0,0 +1,85 @@ +/* @(#)wcslcatl.c 1.1 15/03/03 Copyright 2015 J. Schilling */ +/* + * list version of strlcat() + * + * concatenates all past first parameter until a NULL pointer is reached + * + * WARNING: a NULL constant is not a NULL pointer, so a caller must + * cast a NULL constant to a pointer: (wchar_t *)NULL + * + * returns number of bytes needed to fit all + * + * Copyright (c) 2015 J. Schilling + */ +/* + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * See the file CDDL.Schily.txt in this distribution for details. + * A copy of the CDDL is also available via the Internet at + * http://www.opensource.org/licenses/cddl1.txt + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file CDDL.Schily.txt from this distribution. + */ + +#include <schily/mconfig.h> +#include <schily/varargs.h> +#include <schily/standard.h> +#include <schily/wchar.h> +#include <schily/string.h> +#include <schily/schily.h> + +/* VARARGS3 */ +#ifdef PROTOTYPES +EXPORT size_t +wcslcatl(wchar_t *to, size_t len, ...) +#else +EXPORT size_t +wcslcatl(to, len va_alist) + wchar_t *to; + size_t len; + va_dcl +#endif +{ + va_list args; + register wchar_t *p; + register wchar_t *tor = to; + size_t olen = len; + +#ifdef PROTOTYPES + va_start(args, len); +#else + va_start(args); +#endif + if (len > 0) { + while (--len > 0 && *tor++ != '\0') + ; + + if (len == 0) + goto toolong; + + while ((p = va_arg(args, wchar_t *)) != NULL) { + tor--; + len++; + while (--len > 0 && (*tor++ = *p++) != '\0') + ; + if (len == 0) { + *tor = '\0'; + olen = tor - to + wcslen(p); + goto toolong; + } + } + olen = --tor - to; + } + va_end(args); + return (olen); +toolong: + while ((p = va_arg(args, wchar_t *)) != NULL) { + olen += wcslen(p); + } + va_end(args); + return (olen); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cdrtools-3.01/mkisofs/diag/isodump.c new/cdrtools-3.01/mkisofs/diag/isodump.c --- old/cdrtools-3.01/mkisofs/diag/isodump.c 2015-01-27 23:06:40.000000000 +0100 +++ new/cdrtools-3.01/mkisofs/diag/isodump.c 2015-02-25 20:22:34.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)isodump.c 1.48 15/01/27 joerg */ +/* @(#)isodump.c 1.49 15/02/25 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)isodump.c 1.48 15/01/27 joerg"; + "@(#)isodump.c 1.49 15/02/25 joerg"; #endif /* * File isodump.c - dump iso9660 directory information. @@ -300,11 +300,11 @@ } if (strncmp((char *)pnt, "ER", 2) == 0) { /* ER */ - flag2 |= RR_FLAG_ER; /* ER record */ int lid = pnt[4] & 0xFF; /* Len ID */ int ldes = pnt[5] & 0xFF; /* Len des */ int lsrc = pnt[6] & 0xFF; /* Len src */ int xver = pnt[7] & 0xFF; /* X vers */ + flag2 |= RR_FLAG_ER; /* ER record */ rr_version = xver; printf(_("=[len_id=%d,len_des=%d,len_src=%d,ext_ver=%d,id=\"%.*s\"]"),
