>Number:         36392
>Category:       pkg
>Synopsis:       update sysutils/cdrtools to the latest version (patch provided)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 28 15:30:01 +0000 2007
>Originator:     Jukka Salmi
>Release:        pkgsrc HEAD
>Environment:
System: NetBSD moray.salmi.ch 4.99.18 NetBSD 4.99.18 (MORAY.APM) #0: Thu Apr 26 01:13:24 CEST 2007 build@moray.salmi.ch:/b/build/nbsd/c/i386/sys/arch/i386/compile/MORAY.APM i386
Architecture: i386
Machine: i386
>Description:
The cdrtools version currently used in pkgsrc contains some bugs which
are fixed in the latest version.
>How-To-Repeat:
e.g. http://lists.berlios.de/pipermail/cdrecord-support/2007-May/002320.html
>Fix:
Remove sysutils/cdrtools/patches/patch-ak and apply the following patch
which is also available from
http://salmi.ch/~jukka/patches/pkgsrc/sysutils/cdrtools/2.01.01a24-27.diff

Index: sysutils/cdrtools/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrtools/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- sysutils/cdrtools/Makefile	19 Mar 2007 14:58:20 -0000	1.13
+++ sysutils/cdrtools/Makefile	28 May 2007 12:17:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.13 2007/03/19 14:58:20 joerg 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
Index: sysutils/cdrtools/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrtools/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- sysutils/cdrtools/distinfo	16 Mar 2007 22:04:52 -0000	1.5
+++ sysutils/cdrtools/distinfo	28 May 2007 12:17:15 -0000
@@ -1,20 +1,19 @@
 $NetBSD: distinfo,v 1.5 2007/03/16 22:04:52 bad 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
Index: sysutils/cdrtools/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrtools/patches/patch-ai,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ai
--- sysutils/cdrtools/patches/patch-ai	16 Mar 2007 22:04:54 -0000	1.2
+++ sysutils/cdrtools/patches/patch-ai	28 May 2007 12:17:15 -0000
@@ -6,8 +6,8 @@ $NetBSD: patch-ai,v 1.2 2007/03/16 22:04
   *	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
Index: sysutils/cdrtools/patches/patch-cd
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrtools/patches/patch-cd,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cd
--- sysutils/cdrtools/patches/patch-cd	16 Mar 2007 22:04:54 -0000	1.2
+++ sysutils/cdrtools/patches/patch-cd	28 May 2007 12:17:15 -0000
@@ -1,13 +1,13 @@
 $NetBSD: patch-cd,v 1.2 2007/03/16 22:04:54 bad 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 *));