Update cdrtools to 2.01.01.27.

Patch provided by Jukka Salmi in PR 36392.

NEW features of cdrtools-2.01.01a25:

All:

Libschily:

-       __fjmalloc()/__jmalloc() now allow to specify JM_EXIT to exit() instead
        of callinf siglongjmp()

-       New function file_getraise() to get the current file raise value.


Libparanoia (Ported/enhanced by J<F6>rg Schilling, originated by Monty xiphmont@mit.edu):

Libedc (Optimized by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

Libfind:

-       Libfind is now close from the final state

-       Added README file to the directory libfind/ that help to learn how
        to create a complete find(1) command, a "bsh" find builtin and a
        ksh93 find builtin using libfind.

-       Libfind Version is now 1.3

-       libfind has been restructured to allow it to be used as builtin function
        inside shells like e.g. "bsh" and "ksh93".

-       libfind now allows I/O redirection (needed for shell builtins).

-       libfind now may be told to check for abort situations (needed for
        shell builtins in order to check for abort on ^C).

-       New function find_free()

-       Libfind no longer leaks memory if called with a commandline with
        syntax errors.


Libfile:

Libhfs_iso:

Libscg:

-       scg_numbus() function for FreeBSD corrected to make cdrtools work again.
        Thanks to a hint from Joseph Terner <jtsn@jtsn.de>

Rscsi:

Cdrecord:

-       A typo in the man page has been fixed (mkisofs does not have a -q but
        a -quiet option).

-       A debug message in the DVD+ driver hav been updated to make cdrecord
        again compile in -DDEBUG mode.


Cdda2wav (Maintained/enhanced by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

-       Fixed a bug that caused cdda2wav to hang when retrieving the CDDB information.
        This bug has been introduced with cdrtools-2.01.01a21


Readcd:

Scgcheck:

Scgskeleton:

Btcflash:

Mkisofs (By J<F6>rg Schilling and James Pearson j.pearson@ge.ucl.ac.uk):

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.

NEW features of cdrtools-2.01.01a26:

All:

-       Now using cdrecord/version.h for the global version number

-       New autoconf test for struct timeval in sys/time.h

-       New autoconf test for struct timezone in sys/time.h

-       Changed include/schily/time.h to depend on the
        new autoconf #defines HAVE_STRUCT_TIMEVAL and
        HAVE_STRUCT_TIMEZONE

-       The Schily makefile system is now also passing OS
        specific #defines to "configure".

-       New Schily makefile system Target shell allows to
        call "make shell" in order to get a shell with exactly
        the same environment as the compilers will see from
        the makefile system. This helps testing.

-       New autoconf test checks whether we need to call
        "xx.exe" on a plaform. This is needed in order to
        be able to call the Microsoft compiler from the
        SFU (Services for UNIX) environment.

-       It is now possible to call the Microsoft compiler
        from SFU. In order to do this, call "smake CCOM=cl"

        If this does not work, you may need to change the
        file DEFAULTS/vc7-interix-setup

Libschily:


Libparanoia (Ported/enhanced by J<F6>rg Schilling, originated by Monty xiphmont@mit.edu):

-       Fixed a typo in paranoia_init() that gas been introduced with 2.01.01a24
        This bug did cause a core dump.
        Thanks to Robert Grimm <rob@news.robgri.de> for reporting.


Libedc (Optimized by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

Libfind:

-       Fixed a bug in names.c that caused nameinit() to go into an endless
        recursion and dump core if there is no "nobody" in /etc/passwd.
        This bug has been introduced recently.


Libfile:

Libhfs_iso:

Libscg:

Rscsi:

Cdrecord:

-       Trying to work around a Pioneer firmware bug that causes cdrecord to write
        DVDs at lowest speed.

-       Reset SCSI silent mode after cdrecord did use the auto-mode (no dev= parameter)
        to find the drive. This again gives visible error messages.


Cdda2wav (Maintained/enhanced by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

Readcd:

Scgcheck:

Scgskeleton:

Btcflash:

Mkisofs (By J<F6>rg Schilling and James Pearson j.pearson@ge.ucl.ac.uk):

-       added a better error message from Helios in volume.c

-       The timezone bug (first fixed in 2.01.01a24 has now been fixed
        correctly and works even if the timezone is located east to GMT.


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.

NEW features of cdrtools-2.01.01a27:

All:

-       Added forgotten file RULES/x86-interix-cl.rul to the Schily Makefilesystem

-       Trying to better deal with MS winsock2.h oddities in schily/time.h

-       #undef iswalnum ... in schily//wchar.h before defining non wchar fallbacks.

-       config.guess now knows about i386 Darwin (Mac OS X on Intel)

-       Schily makefilesystem enhanced to check for extended
        fields in struct utsname as seen e.g. in MS SFU (Interix).

-       New predefined macro OSVERSION in the makefilesystem is needed
        for SCO OpenServer 6.x support (because this uses a UnixWare
        kernel

-       Trying to support Compilation on SCO OpenServer 6.x

-       New macro $(CC_OUTPUT_FILTER) allows to filter away the
        unwanted file name echo from cl.exe.

-       Interix now uses uname -m instead of uname -p for $(OARCH)

-       Makefile support for pentium-4-unixware-cc.rul and
        pentium-4-unixware-gcc.rul was added.

-       New autoconf test for libiconv

-       The Schily makefilesystem now by default searches in /usr/local/include
        and /usr/local/lib if on FreeBSD. This is needed in order to find
        libintl and libiconv.

-       make html and make htmlx now works even on the top level directory
        and creates html versions of the man pages

-       fixed a typo in the autoconf test for C99 isinf/isnan

Libschily:


Libparanoia (Ported/enhanced by J<F6>rg Schilling, originated by Monty xiphmont@mit.edu):


Libedc (Optimized by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

Libfind:

-       find_list.c now #ifdefs names like S_IFLNK

Libfile:

-       Better portability for strerror() in file.h

Libhfs_iso:

Libscg:

-       Better help message for Mac OS X wich dev=help

Rscsi:

Cdrecord:

-       Cdrecord now correctly reports Copyright ...2007 with -version

-

Cdda2wav (Maintained/enhanced by J<F6>rg Schilling, originated by Heiko Ei<DF>feldt heiko@hexco.de):

-       Let cdda2wav print the -version outout to stdout and in a similar form
        as other cdrtools programs.

Readcd:

Scgcheck:

Scgskeleton:

Btcflash:

-       Make btcflash compile on K&R compilers (like on HP-UX)

Mkisofs (By J<F6>rg Schilling and James Pearson j.pearson@ge.ucl.ac.uk):

-       mkisofs -J no longer implies -l as done incorrectly after
        converting from GNU getopt_long() to getargs()


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.

5 files changed, 17 insertions, 33 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index f078782518a..da5dd4ee60f 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/03/19 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/05/29 15:32:16 obache Exp $
 
-DISTNAME=	cdrtools-2.01.01a24
-PKGNAME=	cdrtools-2.01.01.24
+DISTNAME=	cdrtools-2.01.01a27
+PKGNAME=	cdrtools-2.01.01.27
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index d5d8317418b..0eed2b53700 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.5 2007/03/16 22:04:52 bad Exp $
+$NetBSD: distinfo,v 1.6 2007/05/29 15:32:16 obache Exp $
 
-SHA1 (cdrtools-2.01.01a24.tar.bz2) = cd375751bb1417049df05c342d00d95f6b04f296
-RMD160 (cdrtools-2.01.01a24.tar.bz2) = 95f9d6e82414b92f4d8ad434a66f926754c42101
-Size (cdrtools-2.01.01a24.tar.bz2) = 1588764 bytes
+SHA1 (cdrtools-2.01.01a27.tar.bz2) = fcb9bcdb697e474f2e60889fe64571b06442ffb4
+RMD160 (cdrtools-2.01.01a27.tar.bz2) = c009cf067318da565a66420009406265df12b645
+Size (cdrtools-2.01.01a27.tar.bz2) = 1594145 bytes
 SHA1 (patch-aa) = fca9bcc4d4a7480cea9c9f6011f72afdf691a9ef
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
 SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
-SHA1 (patch-ai) = 0f535ca3dde4c28909697e43136ff60c352cb6b0
+SHA1 (patch-ai) = 9a7b5530ca592e8bedaea6084f2f4e33f4ad5a4e
 SHA1 (patch-aj) = 8f5c57f7b5ebc4ae9188212c9599d0431f0ce785
-SHA1 (patch-ak) = 1ea3e7c76001d41e0a256d510b6e8c58dac7f966
 SHA1 (patch-ba) = 8a1d6b7703e0885fe080e4a71aeabd0bb4302381
 SHA1 (patch-bb) = d9a94fc48430988b86b6a4a08a01e6a7ed95669f
 SHA1 (patch-ca) = b7a2f9a511852cca018a090086e46d299e4e1ce0
 SHA1 (patch-cb) = 39e5ab3ef417d32fa5ef9f9dd1313193ce647162
 SHA1 (patch-cc) = 709590dbb45c37e3a6b07322167f38c95fcb2fdf
-SHA1 (patch-cd) = a97eaa7f3c69ead40c313dae5128a79cc46f50b1
+SHA1 (patch-cd) = 9477e87b3e4a52d18532e276f5507975611dd727
 SHA1 (patch-ce) = a57b73b2edac23903439136c874a1e2d0f895e70
 SHA1 (patch-cf) = 73fc95f53b85f637d4eb81a8b79355863c539ba7
 SHA1 (patch-cg) = d59b660609a2928e872bcde8393ad6eec51798bd
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
index 13c37a647a3..2e24cea7762 100644
--- a/sysutils/cdrtools/patches/patch-ai
+++ b/sysutils/cdrtools/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
 
 --- libscg/scsi-bsd.c.orig	2006-11-26 18:12:57.000000000 +0100
 +++ libscg/scsi-bsd.c
@@ -6,8 +6,8 @@ $NetBSD: patch-ai,v 1.2 2007/03/16 22:04:54 bad Exp $
   *	Choose your name instead of "schily" and make clear that the version
   *	string is related to a modified source.
   */
--LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.43";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.43nb1";	/* The version for this transport*/
+-LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.44";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.44nb1";	/* The version for this transport*/
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
diff --git a/sysutils/cdrtools/patches/patch-ak b/sysutils/cdrtools/patches/patch-ak
deleted file mode 100644
index 327fd0751cc..00000000000
--- a/sysutils/cdrtools/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/03/16 22:04:54 bad Exp $
-
---- cdrecord/drv_dvdplus.c.orig	2007-02-22 21:17:25.000000000 +0100
-+++ cdrecord/drv_dvdplus.c	2007-03-13 15:26:00.000000000 +0100
-@@ -647,8 +647,8 @@
- 	di_to_dstat(dip, dsp);
- 
- #ifdef	DVDPLUS_DEBUG
--error("res2 %d era %d sess stat %d disk stat %d\n",
--dip->res2,
-+error("dtype %d era %d sess stat %d disk stat %d\n",
-+dip->dtype,
- dip->erasable,
- dip->sess_status,
- dip->disk_status);
diff --git a/sysutils/cdrtools/patches/patch-cd b/sysutils/cdrtools/patches/patch-cd
index fd776ace5e9..02eede33933 100644
--- a/sysutils/cdrtools/patches/patch-cd
+++ b/sysutils/cdrtools/patches/patch-cd
@@ -1,13 +1,13 @@
-$NetBSD: patch-cd,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-cd,v 1.3 2007/05/29 15:32:17 obache Exp $
 
---- include/schily/schily.h.orig	2007-02-26 16:17:56.000000000 +0100
-+++ include/schily/schily.h
-@@ -115,7 +115,7 @@ extern	int	fspawnl __PR((FILE *, FILE *,
+--- include/schily/schily.h.orig	2007-04-03 18:41:25.000000000 +0200
++++ include/schily/schily.h	2007-05-28 14:07:47.000000000 +0200
+@@ -116,7 +116,7 @@ extern	int	fspawnl __PR((FILE *, FILE *,
  extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
  					const char *, int, char *const*));
  extern	int	fgetline __PR((FILE *, char *, int));
 -extern	int	fgetstr __PR((FILE *, char *, int));
 +extern	int	schily_fgetstr __PR((FILE *, char *, int));
+ extern	int	file_getraise __PR((FILE *));
  extern	void	file_raise __PR((FILE *, int));
  extern	int	fileclose __PR((FILE *));
- extern	FILE	*fileluopen __PR((int, const char *));