Hello community, here is the log from the commit of package cdrtools for openSUSE:Factory checked in at 2014-03-14 15:12:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-01-29 07:12:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cdrtools.new/cdrtools.changes 2014-03-14 15:13:00.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 5 02:47:25 UTC 2014 - jeng...@inai.de + +- Update to new upstream release 3.01~a23 +* Cdrecord now prints timediffs also in hours:minutes:seconds. +* Cdda2wav no longer includes "c2check" in the "proof" paranoia + option to avoid a firmware bug in a TSSTcorp drive. +* Mkisofs has slightly-reduced CPU time requirements. +* A problem in isoinfo has been fixed; it did not always print + timestamps in `-find -ls` mode. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cdrtools/schily-libs.changes 2014-01-29 07:12:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cdrtools.new/schily-libs.changes 2014-03-14 15:13:00.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 5 02:47:25 UTC 2014 - jeng...@inai.de + +- Update to new upstream release 3.01~a23 +* Cdrecord now prints timediffs also in hours:minutes:seconds. +* Cdda2wav no longer includes "c2check" in the "proof" paranoia + option to avoid a firmware bug in a TSSTcorp drive. +* Mkisofs has slightly-reduced CPU time requirements. +* A problem in isoinfo has been fixed; it did not always print + timestamps in `-find -ls` mode. + +------------------------------------------------------------------- @@ -12,0 +24 @@ +- Drop ppc64le.patch (merged upstream) Old: ---- cdrtools-3.01a22.tar.bz2 New: ---- cdrtools-3.01a23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdrtools.spec ++++++ --- /var/tmp/diff_new_pack.WMNNzq/_old 2014-03-14 15:13:01.000000000 +0100 +++ /var/tmp/diff_new_pack.WMNNzq/_new 2014-03-14 15:13:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: cdrtools -Version: 3.01~a22 +Version: 3.01~a23 Release: 0 # ^This really is a prerelease and thus sorts before 3.01 %define sversion 3.01 @@ -28,7 +28,7 @@ #Freecode-URL: http://freecode.com/projects/cdrtools #DL-URL: ftp://ftp.berlios.de/pub/cdrecord/ -Source: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a22.tar.bz2 +Source: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a23.tar.bz2 Source1: cdrecord.easy Source2: cdrecord.secure Source3: cdrecord.paranoid ++++++ schily-libs.spec ++++++ --- /var/tmp/diff_new_pack.WMNNzq/_old 2014-03-14 15:13:01.000000000 +0100 +++ /var/tmp/diff_new_pack.WMNNzq/_new 2014-03-14 15:13:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: schily-libs -Version: 3.01~a22 +Version: 3.01~a23 Release: 0 %define sversion 3.01 Summary: A collection of libraries to support cdrtools @@ -27,7 +27,7 @@ #Freecode-URL: http://freecode.com/projects/schily #DL-URL: ftp://ftp.berlios.de/pub/schily/ -Source: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a22.tar.bz2 +Source: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a23.tar.bz2 Source7: pre_checkin.sh Patch1: gcc48wa.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ cdrtools-3.01a22.tar.bz2 -> cdrtools-3.01a23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/AN-3.01a23 new/cdrtools-3.01/AN-3.01a23 --- old/cdrtools-3.01/AN-3.01a23 1970-01-01 01:00:00.000000000 +0100 +++ new/cdrtools-3.01/AN-3.01a23 2014-03-04 11:27:02.000000000 +0100 @@ -0,0 +1,163 @@ +Please have a look at the German open Source Center BerliOS at www.berlios.de +BerliOS will continue to support free hosting of cryptography projects even +when US laws change and don't allow to host cryptography projects in the USA. +Also look at sourcewell.berlios.de, the first Open Source announcement service +that itself is implemented as Open Source project. + +***************** Important news **************************** + +For the 'Slottable Source Plugin Module' SSPM Features read README.SSPM + +***************** Please Test ********************************* + +NEW features of cdrtools-3.01a23: + +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. + +All: + +- Typo fix in README.compile for the mail address. + Thanks to Dennis Clarke for the catch! + + +Libschily: + +- libschily/sleep.c and libschily/usleep.c have been modified to work + with MinGW. + + +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: + +- The timediff function now in addition prints the time diff in + hours : minutes : seconds . thausands of a second. + + Thanks to a hint from Donald R Laster Jr from Slackware. + + +Cdda2wav (Maintained/enhanced by J�rg Schilling, originated by Heiko Ei�feldt he...@hexco.de): + +- Cdda2wav no longer includes the new paranoia mode "c2check" in the macro + "proof". This has been done because of a report from G�raud Meyer <gr...@gmx.com> + that gives hints that the drive: + Type: ROM, Vendor 'TSSTcorp' Model 'CDDVDW SH-222AB ' Revision 'SB00' MMC+CDDA + does not handle hidden tracks when "c2check" is active. + +Readcd: + +Scgcheck: + +Scgskeleton: + +Btcflash: + +Mkisofs (Maintained/enhanced by J�rg Schilling since 1997, originated by Eric Youngdale): + +- mkisofs was slightly modified to reduce CPU time requirements. + It now reads/writes in 64kBytes chunks instead of stdio buffer + size which is typically 8 kB. + +- Fixed a typo in the mkisofs man page. + Thanks to a hint from Donald R Laster Jr from Slackware. + +- Mkisofs now in addition prints "-iso-level 3 or more required" + in case that a large file was skipped because of the current mkisofs settings. + + Thanks to a hint from Donald R Laster Jr from Slackware. + +- A problem in isoinfo has been fixed. + This problem caused "isoinfo -R -find -ls" to print Jan 1 1970 timestamps + in case that Rock Ridge was not present. + + + 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: + +ftp://ftp.berlios.de/pub/cdrecord/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 + ftp://ftp.berlios.de/pub/star/ + +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' old/cdrtools-3.01/BUILD new/cdrtools-3.01/BUILD --- old/cdrtools-3.01/BUILD 2013-05-15 23:29:40.000000000 +0200 +++ new/cdrtools-3.01/BUILD 2014-02-11 21:57:01.000000000 +0100 @@ -603,6 +603,6 @@ Germany Email: jo...@schily.isdn.cs.tu-berlin.de, j...@cs.tu-berlin.de - joerg.schill...@fokus.fraunhufer.de + joerg.schill...@fokus.fraunhofer.de Please mail bugs and suggestions to me. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/COMPILE new/cdrtools-3.01/COMPILE --- old/cdrtools-3.01/COMPILE 2013-05-15 23:29:40.000000000 +0200 +++ new/cdrtools-3.01/COMPILE 2014-02-11 21:57:01.000000000 +0100 @@ -603,6 +603,6 @@ Germany Email: jo...@schily.isdn.cs.tu-berlin.de, j...@cs.tu-berlin.de - joerg.schill...@fokus.fraunhufer.de + joerg.schill...@fokus.fraunhofer.de Please mail bugs and suggestions to me. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/INSTALL new/cdrtools-3.01/INSTALL --- old/cdrtools-3.01/INSTALL 2013-05-15 23:29:40.000000000 +0200 +++ new/cdrtools-3.01/INSTALL 2014-02-11 21:57:01.000000000 +0100 @@ -603,6 +603,6 @@ Germany Email: jo...@schily.isdn.cs.tu-berlin.de, j...@cs.tu-berlin.de - joerg.schill...@fokus.fraunhufer.de + joerg.schill...@fokus.fraunhofer.de Please mail bugs and suggestions to me. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/README.compile new/cdrtools-3.01/README.compile --- old/cdrtools-3.01/README.compile 2013-05-15 23:29:40.000000000 +0200 +++ new/cdrtools-3.01/README.compile 2014-02-11 21:57:01.000000000 +0100 @@ -603,6 +603,6 @@ Germany Email: jo...@schily.isdn.cs.tu-berlin.de, j...@cs.tu-berlin.de - joerg.schill...@fokus.fraunhufer.de + joerg.schill...@fokus.fraunhofer.de Please mail bugs and suggestions to me. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/cdda2wav/cdda2wav.1 new/cdrtools-3.01/cdda2wav/cdda2wav.1 --- old/cdrtools-3.01/cdda2wav/cdda2wav.1 2013-12-24 14:30:05.000000000 +0100 +++ new/cdrtools-3.01/cdda2wav/cdda2wav.1 2014-03-03 23:57:08.000000000 +0100 @@ -1,5 +1,5 @@ '\" t -.\" @(#)cdda2wav.1 1.58 13/12/24 Copyright 1998,1999,2000 Heiko Eissfeldt, Copyright 2004-2013 J. Schilling +.\" @(#)cdda2wav.1 1.59 14/03/03 Copyright 1998,1999,2000 Heiko Eissfeldt, Copyright 2004-2013 J. Schilling .if t .ds a \v'-0.55m'\h'0.00n'\z.\h'0.40n'\z.\v'0.55m'\h'-0.40n'a .if t .ds o \v'-0.55m'\h'0.00n'\z.\h'0.45n'\z.\v'0.55m'\h'-0.45n'o .if t .ds u \v'-0.55m'\h'0.00n'\z.\h'0.40n'\z.\v'0.55m'\h'-0.40n'u @@ -609,6 +609,17 @@ .B c2check Turn on C2 error checking. For now, this just results in printing C2 error statistics. +.sp +Warning: some drives have been reported to fail reading hidden tracks when +the +.B c2check +mode is in effect. +When you plan to use +.B c2check +while extracting hidden tracks, first verify that your drive will report +hidden tracks the same with and without the +.B c2check +option. .br .ne 5 .TP @@ -620,7 +631,7 @@ .sp .B " paraopts=minoverlap=\fIsectors\-per\-request\fP-1,\e .br -.B " retries=200,readahead=600,c2check +.B " retries=200,readahead=600 .sp If .I sectors\-per\-request\f\-1 @@ -637,6 +648,13 @@ and .B readahead= to get the best results for a specific platform. +.sp +Note that previous versions did include +.B c2check +with the +.B proof +macro, but this has been reported to fail on some drives. + .RE .br .TP @@ -1681,7 +1699,7 @@ Germany .fi .SH DATE -2013/12/24 +2014/03/03 .br .ne 7 .SH "INTERFACE STABILITY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/cdda2wav/cdda2wav.c new/cdrtools-3.01/cdda2wav/cdda2wav.c --- old/cdrtools-3.01/cdda2wav/cdda2wav.c 2014-01-03 18:15:33.000000000 +0100 +++ new/cdrtools-3.01/cdda2wav/cdda2wav.c 2014-03-03 23:57:08.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)cdda2wav.c 1.153 14/01/03 Copyright 1993-2004 Heiko Eissfeldt, Copyright 2004-2014 J. Schilling */ +/* @(#)cdda2wav.c 1.154 14/03/03 Copyright 1993-2004 Heiko Eissfeldt, Copyright 2004-2014 J. Schilling */ #include "config.h" #ifndef lint static UConst char sccsid[] = -"@(#)cdda2wav.c 1.153 14/01/03 Copyright 1993-2004 Heiko Eissfeldt, Copyright 2004-2014 J. Schilling"; +"@(#)cdda2wav.c 1.154 14/03/03 Copyright 1993-2004 Heiko Eissfeldt, Copyright 2004-2014 J. Schilling"; #endif #undef DEBUG_BUFFER_ADDRESSES @@ -2716,7 +2716,7 @@ minoverlap=amt set the min. number of sectors used for dynamic overlap.\n\ maxoverlap=amt set the max. number of sectors used for dynamic overlap.\n\ c2check check C2 pointers from drive to rate quality.\n\ - proof shortcut for minoverlap=20,retries=200,readahead=600,c2check.\n\ + proof shortcut for minoverlap=20,retries=200,readahead=600.\n\ "), stderr); /* END CSTYLED */ @@ -2884,7 +2884,13 @@ global.paranoia_parms.mindynoverlap = -1; global.paranoia_parms.retries = 200; global.paranoia_parms.readahead = 600; +#ifdef __should_we__ + /* + * c2check may cause some drives to become unable + * to read hidden tracks. + */ global.paranoia_parms.enable_c2_check = 1; +#endif } else { errmsgno(EX_BAD, _("Unknown option '%s'.\n"), optstr); paranoia_usage(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/cdrecord/misc.c new/cdrtools-3.01/cdrecord/misc.c --- old/cdrtools-3.01/cdrecord/misc.c 2009-07-10 21:44:45.000000000 +0200 +++ new/cdrtools-3.01/cdrecord/misc.c 2014-02-17 23:57:38.000000000 +0100 @@ -1,13 +1,13 @@ -/* @(#)misc.c 1.8 09/07/10 Copyright 1998, 2001-2009 J. Schilling */ +/* @(#)misc.c 1.9 14/02/17 Copyright 1998, 2001-2014 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)misc.c 1.8 09/07/10 Copyright 1998, 2001-2009 J. Schilling"; + "@(#)misc.c 1.9 14/02/17 Copyright 1998, 2001-2014 J. Schilling"; #endif /* * Misc support functions * - * Copyright (c) 1998, 2001-2009 J. Schilling + * Copyright (c) 1998, 2001-2014 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -16,6 +16,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. @@ -74,6 +76,11 @@ * We need to cast timeval->* to long because * of the broken sys/time.h in Linux. */ - printf("%s%4ld.%03lds\n", fmt, (long)tv.tv_sec, (long)tv.tv_usec/1000); + printf("%s%4ld.%03lds (%2.2ld:%2.2ld:%2.2ld.%3.3ld)\n", + fmt, + (long)tv.tv_sec, (long)tv.tv_usec/1000, + (long)tv.tv_sec/3600, + (long)(tv.tv_sec/60)%60, + (long)tv.tv_sec%60, (long)tv.tv_usec/1000); flush(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/cdrecord/version.h new/cdrtools-3.01/cdrecord/version.h --- old/cdrtools-3.01/cdrecord/version.h 2014-01-19 20:24:25.000000000 +0100 +++ new/cdrtools-3.01/cdrecord/version.h 2014-03-04 11:27:47.000000000 +0100 @@ -1,6 +1,6 @@ -/* @(#)version.h 1.76 14/01/19 Copyright 2007-2014 J. Schilling */ +/* @(#)version.h 1.77 14/03/04 Copyright 2007-2014 J. Schilling */ /* * The version for cdrtools programs */ -#define VERSION "3.01a22" +#define VERSION "3.01a23" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/libschily/sleep.c new/cdrtools-3.01/libschily/sleep.c --- old/cdrtools-3.01/libschily/sleep.c 2011-08-02 20:07:23.000000000 +0200 +++ new/cdrtools-3.01/libschily/sleep.c 2014-03-03 23:42:42.000000000 +0100 @@ -1,13 +1,13 @@ -/* @(#)sleep.c 1.5 11/08/02 Copyright 2007-2011 J. Schilling */ +/* @(#)sleep.c 1.6 14/03/03 Copyright 2007-2014 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)sleep.c 1.5 11/08/02 Copyright 2007-2011 J. Schilling"; + "@(#)sleep.c 1.6 14/03/03 Copyright 2007-2014 J. Schilling"; #endif /* * Emulate sleep where it does not exist * - * Copyright (c) 2007-2011 J. Schilling + * Copyright (c) 2007-2014 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -16,12 +16,14 @@ * 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. */ -#if !defined(HAVE_SLEEP) && defined(_MSC_VER) +#if !defined(HAVE_SLEEP) && (defined(_MSC_VER) || defined(__MINGW32__)) #include <schily/windows.h> #include <schily/standard.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/libschily/usleep.c new/cdrtools-3.01/libschily/usleep.c --- old/cdrtools-3.01/libschily/usleep.c 2011-08-02 20:06:59.000000000 +0200 +++ new/cdrtools-3.01/libschily/usleep.c 2014-03-03 23:42:42.000000000 +0100 @@ -1,11 +1,11 @@ -/* @(#)usleep.c 1.23 11/08/02 Copyright 1995-2011 J. Schilling */ +/* @(#)usleep.c 1.24 14/03/03 Copyright 1995-2014 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)usleep.c 1.23 11/08/02 Copyright 1995-20011 J. Schilling"; + "@(#)usleep.c 1.24 14/03/03 Copyright 1995-20014 J. Schilling"; #endif /* - * Copyright (c) 1995-2011 J. Schilling + * Copyright (c) 1995-2014 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -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. @@ -57,7 +59,7 @@ #undef HAVE_USLEEP #endif -#if !defined(HAVE_USLEEP) && !defined(_MSC_VER) +#if !defined(HAVE_USLEEP) EXPORT int usleep(usec) @@ -118,6 +120,10 @@ nanosleep(&ts, 0); #endif +#if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(HAVE_USLEEP) +#define HAVE_USLEEP + Sleep(usec/1000); +#endif #if !defined(HAVE_USLEEP) #define HAVE_USLEEP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/mkisofs/diag/isoinfo.c new/cdrtools-3.01/mkisofs/diag/isoinfo.c --- old/cdrtools-3.01/mkisofs/diag/isoinfo.c 2013-04-28 15:52:45.000000000 +0200 +++ new/cdrtools-3.01/mkisofs/diag/isoinfo.c 2014-03-03 23:39:36.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)isoinfo.c 1.88 13/04/28 joerg */ +/* @(#)isoinfo.c 1.89 14/03/03 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)isoinfo.c 1.88 13/04/28 joerg"; + "@(#)isoinfo.c 1.89 14/03/03 joerg"; #endif /* * File isodump.c - dump iso9660 directory information. @@ -11,7 +11,7 @@ * Written by Eric Youngdale (1993). * * Copyright 1993 Yggdrasil Computing, Incorporated - * Copyright (c) 1999-2013 J. Schilling + * Copyright (c) 1999-2014 J. Schilling * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -480,9 +480,6 @@ unsigned char *p = &pnt[5]; flag2 |= RR_FLAG_TF; /* Time stamp */ - fstat_buf.st_atime = - fstat_buf.st_mtime = - fstat_buf.st_ctime = iso9660_time(date_buf, FALSE); longfmt = (pnt[4] & 0x80) != 0; if (longfmt) size = 17; @@ -927,6 +924,17 @@ } } memcpy(date_buf, idr->date, 9); + /* + * Always first set up time stamps and file modes from + * ISO-9660. This is used as a fallback in case that + * there is no related Rock Ridge based data. + */ + fstat_buf.st_atime = + fstat_buf.st_mtime = + fstat_buf.st_ctime = iso9660_time(date_buf, FALSE); + fstat_buf.st_mode |= S_IRUSR|S_IXUSR | + S_IRGRP|S_IXGRP | + S_IROTH|S_IXOTH; if (use_rock) dump_rr(idr); if ((idr->flags[0] & 2) != 0 && @@ -1101,7 +1109,7 @@ if (help) usage(0); if (prvers) { - printf(_("isoinfo %s (%s-%s-%s) Copyright (C) 1993-1999 %s (C) 1999-2013 %s\n"), + printf(_("isoinfo %s (%s-%s-%s) Copyright (C) 1993-1999 %s (C) 1999-2014 %s\n"), VERSION, HOST_CPU, HOST_VENDOR, HOST_OS, _("Eric Youngdale"), @@ -1875,12 +1883,6 @@ if (name_buf[0] == '.' && name_buf[1] == '\0') n[rlen] = '\0'; - if (!use_rock) { - fstat_buf.st_mtime = iso9660_time(date_buf, FALSE); - fstat_buf.st_mode |= S_IRUSR|S_IXUSR | - S_IRGRP|S_IXGRP | - S_IROTH|S_IXOTH; - } #ifdef HAVE_ST_BLKSIZE fstat_buf.st_blksize = 0; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/mkisofs/mkisofs.8 new/cdrtools-3.01/mkisofs/mkisofs.8 --- old/cdrtools-3.01/mkisofs/mkisofs.8 2014-01-19 18:26:48.000000000 +0100 +++ new/cdrtools-3.01/mkisofs/mkisofs.8 2014-02-17 23:49:17.000000000 +0100 @@ -1,21 +1,8 @@ '\" t .\" To print, first run through tbl .\" -*- nroff -*- -.\" @(#)mkisofs.8 1.150 14/01/19 Copyright 1997-2014 J. Schilling -.\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License version 2 -.\" as published by the Free Software Foundation. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License along with -.\" this program; see the file COPYING. If not, write to the Free Software -.\" Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -.\" +.\" @(#)mkisofs.8 1.152 14/02/17 Copyright 1997-2014 J. Schilling +.\"@@C@@ .\" .if t .ds a \v'-0.55m'\h'0.00n'\z.\h'0.40n'\z.\v'0.55m'\h'-0.40n'a .if t .ds o \v'-0.55m'\h'0.00n'\z.\h'0.45n'\z.\v'0.55m'\h'-0.45n'o @@ -29,7 +16,7 @@ .if n .ds o oe .if n .ds u ue .if n .ds s sz -.TH MKISOFS 8 "2014/01/19" "Version 3.0" +.TH MKISOFS 8 "2014/02/17" "Version 3.0" .SH NAME mkisofs \- create an hybrid ISO-9660/JOLIET/HFS/UDF filesystem-image with optional Rock Ridge attributes. .SH SYNOPSIS @@ -62,7 +49,7 @@ ISO-9660/JOLIET/UDF filesystems are limited to a maximum size of 8\ TB. The maximum size of a single file is 8\ TB (single files in UDF are currently limited to aprox. 200\ GB). -If yo like to have files +If you like to have files larger than 2 \GB, you need to specify .B \-iso\-level 3 or above. @@ -3562,6 +3549,7 @@ .SH "SEE ALSO .BR cdrecord (1), .BR mkzftree (1), +.BR sfind (1), .BR magic (5), .BR apple_driver (8). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/mkisofs/mkisofs.c new/cdrtools-3.01/mkisofs/mkisofs.c --- old/cdrtools-3.01/mkisofs/mkisofs.c 2014-01-19 17:43:37.000000000 +0100 +++ new/cdrtools-3.01/mkisofs/mkisofs.c 2014-02-11 23:38:45.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)mkisofs.c 1.271 14/01/19 joerg */ +/* @(#)mkisofs.c 1.272 14/02/11 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)mkisofs.c 1.271 14/01/19 joerg"; + "@(#)mkisofs.c 1.272 14/02/11 joerg"; #endif /* * Program mkisofs.c - generate iso9660 filesystem based upon directory @@ -3244,6 +3244,9 @@ discimage = stdout; setmode(fileno(stdout), O_BINARY); } +#ifdef HAVE_SETVBUF + setvbuf(discimage, NULL, _IOFBF, 64*1024); +#endif /* Now assign addresses on the disc for the path table. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/mkisofs/tree.c new/cdrtools-3.01/mkisofs/tree.c --- old/cdrtools-3.01/mkisofs/tree.c 2013-04-24 22:45:18.000000000 +0200 +++ new/cdrtools-3.01/mkisofs/tree.c 2014-02-17 23:50:01.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)tree.c 1.129 13/04/24 joerg */ +/* @(#)tree.c 1.130 14/02/17 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)tree.c 1.129 13/04/24 joerg"; + "@(#)tree.c 1.130 14/02/17 joerg"; #endif /* * File tree.c - scan directory tree and build memory structures for iso9660 @@ -1641,7 +1641,7 @@ #else errno = EFBIG; #endif - errmsg(_("File %s is too large for current mkisofs settings - ignoring\n"), + errmsg(_("File %s is too large for current mkisofs settings (-iso-level 3 or more required) - ignoring\n"), whole_path); return (0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cdrtools-3.01/mkisofs/write.c new/cdrtools-3.01/mkisofs/write.c --- old/cdrtools-3.01/mkisofs/write.c 2012-12-02 14:38:54.000000000 +0100 +++ new/cdrtools-3.01/mkisofs/write.c 2014-02-11 23:36:59.000000000 +0100 @@ -1,8 +1,8 @@ -/* @(#)write.c 1.137 12/12/02 joerg */ +/* @(#)write.c 1.138 14/02/11 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)write.c 1.137 12/12/02 joerg"; + "@(#)write.c 1.138 14/02/11 joerg"; #endif /* * Program write.c - dump memory structures to file for iso9660 filesystem. @@ -10,7 +10,7 @@ * Written by Eric Youngdale (1993). * * Copyright 1993 Yggdrasil Computing, Incorporated - * Copyright (c) 1999-2012 J. Schilling + * Copyright (c) 1999-2014 J. Schilling * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ #define SIZEOF_UDF_EXT_ATTRIBUTE_COMMON 50 /* Max number of sectors we will write at one time */ -#define NSECT 16 +#define NSECT 32 #define INSERTMACRESFORK 1 @@ -374,7 +374,11 @@ * As we do not need to call write_one_file() recursively * we make buffer static. */ +#ifdef __BEOS__ static char buffer[SECTOR_SIZE * NSECT]; +#else + char buffer[SECTOR_SIZE * NSECT]; +#endif FILE *infile; off_t remain; int use; @@ -419,10 +423,15 @@ /* boundary */ memset(buffer, 0, use); seterrno(0); - if (infile) + if (infile) { +#ifdef VMS amt = fread(buffer, 1, use, infile); - else +#else + amt = ffileread(infile, buffer, use); +#endif + } else { amt = use; + } if (amt < use && amt != remain) { /* * Note that mkisofs is not star and no 100% archiver. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
