>Number:         19073
>Category:       pkg
>Synopsis:       sysutils/cdrecord-devel update (cdrtools-1.11a39)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 16 02:30:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 1.6K
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD nforce.naobsd.org 1.6K NetBSD 1.6K (NFORCE) #0: Fri Nov 15 11:27:16 JST 2002 fun@nforce.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/NFORCE i386
Architecture: i386
Machine: i386
>Description:
	Latest cdrtools is version 1.11a39
>How-To-Repeat:
	See:
	  ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
>Fix:
	I can write CD-RW disk with new cdrecord. Other commands were
	not tested.

	I didn't review that patches/patch-* are suitable for new ver.
	This patch is easy fix, change offset # and regen sha1 hashes.

Index: sysutils/cdrecord-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/cdrecord-devel/Makefile	2002/10/03 05:04:29	1.4
+++ sysutils/cdrecord-devel/Makefile	2002/11/15 07:59:45
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2002/10/03 05:04:29 lukem Exp $
 
-DISTNAME=	cdrtools-1.11a34
-PKGNAME=	cdrecord-1.10.34
-PKGREVISION=	1
+DISTNAME=	cdrtools-1.11a39
+PKGNAME=	cdrecord-1.10.39
+EXTRACT_SUFX=	.tar.bz2
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
Index: sysutils/cdrecord-devel/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- sysutils/cdrecord-devel/distinfo	2002/09/29 08:04:10	1.1.1.1
+++ sysutils/cdrecord-devel/distinfo	2002/11/15 07:59:45
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.1.1.1 2002/09/29 08:04:10 lukem Exp $
 
-SHA1 (cdrtools-1.11a34.tar.gz) = 13fba1355b834785f847ec697d6912f648a4a02c
-Size (cdrtools-1.11a34.tar.gz) = 1512523 bytes
-SHA1 (patch-ac) = 52622d8fc4170a9c0310c810badc74bb3b9c9df8
-SHA1 (patch-ah) = cb1ee6bc32602735b81e339345194b49f225e94c
-SHA1 (patch-ai) = 3dd98fc56a3304b980797f9a898bec2bd3dd484c
-SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
-SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
-SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
+SHA1 (cdrtools-1.11a39.tar.bz2) = 5a1a48e23d370fabf7273f8bcabf5b43d0646f51
+Size (cdrtools-1.11a39.tar.bz2) = 1301661 bytes
+SHA1 (patch-ac) = a5a807e6bc9ebca3d962803fc2af4e873213dcea
+SHA1 (patch-ah) = b630dcb8cb38d4601ab16c5fa9e99f10fec00883
+SHA1 (patch-ai) = 5b3a73d0a07959073703442703524892f1165728
+SHA1 (patch-aj) = cdab048e6c92e20992ae8b78ef3bc650acf0cc09
+SHA1 (patch-ba) = a441c905487a4589e60a325a5f5753238ecfc3cf
+SHA1 (patch-bb) = adbc37b816c2fd4efae24e1477f4cf11c9c978bb
Index: sysutils/cdrecord-devel/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- sysutils/cdrecord-devel/patches/patch-ac	2002/09/29 07:59:09	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-ac	2002/11/15 07:59:45
@@ -1,7 +1,7 @@
 $NetBSD: patch-ac,v 1.1.1.1 2002/09/29 07:59:09 lukem Exp $
 
---- include/btorder.h.orig	Mon Dec 10 10:54:27 2001
-+++ include/btorder.h
+--- include/btorder.h.orig	Mon Dec 10 08:54:27 2001
++++ include/btorder.h	Fri Nov 15 16:23:19 2002
 @@ -28,6 +28,7 @@
  #include <sys/types.h>			/* try to load isa_defs.h on Solaris */
  #define	_INCL_SYS_TYPES_H
@@ -10,7 +10,7 @@
  
  #ifndef _MCONFIG_H
  #include <mconfig.h>			/* load bit/byte-oder from xmconfig.h*/
-@@ -108,7 +109,7 @@ error  Only one of _BIT_FIELDS_LTOH or _
+@@ -108,7 +109,7 @@
  #	if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
  	   defined(__PPC) || defined(powerpc) || defined(__powerpc__)
  
Index: sysutils/cdrecord-devel/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-ah,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ah
--- sysutils/cdrecord-devel/patches/patch-ah	2002/09/29 08:01:02	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-ah	2002/11/15 07:59:45
@@ -1,8 +1,8 @@
 $NetBSD: patch-ah,v 1.1.1.1 2002/09/29 08:01:02 lukem Exp $
 
---- cdda2wav/setuid.c.orig	Thu Mar 21 08:29:21 2002
-+++ cdda2wav/setuid.c
-@@ -91,7 +91,7 @@ void needroot(necessary)
+--- cdda2wav/setuid.c.orig	Thu Mar 21 06:29:21 2002
++++ cdda2wav/setuid.c	Fri Nov 15 16:23:19 2002
+@@ -91,7 +91,7 @@
  
      if (geteuid() == 0) return; /* nothing to do */
  
@@ -11,7 +11,7 @@
      if (seteuid(effective_uid)) {
  	perror("seteuid in needroot()");
  	exit(1);
-@@ -125,7 +125,7 @@ void dontneedroot()
+@@ -125,7 +125,7 @@
  	return;
      if (geteuid() != 0) return; /* nothing to do */
  
@@ -20,7 +20,7 @@
      if (seteuid(real_uid)) {
  	perror("seteuid in dontneedroot()");
  	exit(1);
-@@ -185,7 +185,7 @@ void needgroup(necessary)
+@@ -185,7 +185,7 @@
  
      if (getegid() == effective_gid) return; /* nothing to do */
  
@@ -29,7 +29,7 @@
      if (setegid(effective_gid)) {
  	perror("setegid in needgroup()");
  	exit(1);
-@@ -216,7 +216,7 @@ void dontneedgroup()
+@@ -216,7 +216,7 @@
  	exit(1);
      }
      if (getegid() != effective_gid) return; /* nothing to do */
Index: sysutils/cdrecord-devel/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-ai,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ai
--- sysutils/cdrecord-devel/patches/patch-ai	2001/08/09 08:16:43	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-ai	2002/11/15 07:59:45
@@ -6,14 +6,14 @@
 
 Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
 
---- libscg/scsi-bsd.c.orig	Sun Mar 18 15:10:21 2001
-+++ libscg/scsi-bsd.c	Mon Aug  6 14:55:09 2001
+--- libscg/scsi-bsd.c.orig	Mon Oct 21 22:57:07 2002
++++ libscg/scsi-bsd.c	Fri Nov 15 16:24:45 2002
 @@ -48,7 +48,7 @@
   *	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.40";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.40nb1";	/* The version for this transport*/
+-LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.41";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.41nb1";	/* The version for this transport*/
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
@@ -26,7 +26,7 @@
  		case SCG_SCCS_ID:
  			return (__sccsid);
  		}
-@@ -130,6 +130,15 @@
+@@ -140,6 +140,15 @@
  	register int	l;
  	register int	nopen = 0;
  	char		devname[64];
@@ -42,7 +42,7 @@
  
  	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
  		errno = EINVAL;
-@@ -156,6 +165,60 @@
+@@ -166,6 +175,60 @@
  	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
  		goto openbydev;
  
@@ -103,7 +103,7 @@
  	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
  
  		js_snprintf(devname, sizeof(devname),
-@@ -192,6 +255,7 @@
+@@ -202,6 +265,7 @@
  			}
  		}
  	}
Index: sysutils/cdrecord-devel/patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-aj,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aj
--- sysutils/cdrecord-devel/patches/patch-aj	2002/09/29 08:02:17	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-aj	2002/11/15 07:59:45
@@ -1,8 +1,8 @@
 $NetBSD: patch-aj,v 1.1.1.1 2002/09/29 08:02:17 lukem Exp $
 
---- cdrecord/scsi_cdr.c.orig	Thu Sep 12 22:39:35 2002
-+++ cdrecord/scsi_cdr.c
-@@ -282,6 +282,12 @@ EXPORT int
+--- cdrecord/scsi_cdr.c.orig	Sun Oct 27 05:13:50 2002
++++ cdrecord/scsi_cdr.c	Fri Nov 15 16:23:19 2002
+@@ -283,6 +283,12 @@
  request_sense(scgp)
  	SCSI	*scgp;
  {
@@ -15,7 +15,7 @@
  		 char	sensebuf[CCS_SENSE_LEN];
  	register struct	scg_cmd	*scmd = scgp->scmd;
  
-@@ -301,6 +307,7 @@ request_sense(scgp)
+@@ -302,6 +308,7 @@
  	if (scg_cmd(scgp) < 0)
  		return (-1);
  	scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
Index: sysutils/cdrecord-devel/patches/patch-ba
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-ba,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ba
--- sysutils/cdrecord-devel/patches/patch-ba	2002/09/29 08:04:00	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-ba	2002/11/15 07:59:45
@@ -1,8 +1,8 @@
 $NetBSD: patch-ba,v 1.1.1.1 2002/09/29 08:04:00 lukem Exp $
 
---- readcd/readcd.c.orig	Fri Sep 20 09:00:12 2002
-+++ readcd/readcd.c
-@@ -341,11 +341,11 @@ main(ac, av)
+--- readcd/readcd.c.orig	Thu Oct 24 04:49:35 2002
++++ readcd/readcd.c	Fri Nov 15 16:23:19 2002
+@@ -354,11 +354,11 @@
  	/*
  	 * We don't need root privilleges anymore.
  	 */
Index: sysutils/cdrecord-devel/patches/patch-bb
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cdrecord-devel/patches/patch-bb,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-bb
--- sysutils/cdrecord-devel/patches/patch-bb	2001/08/07 11:23:57	1.1.1.1
+++ sysutils/cdrecord-devel/patches/patch-bb	2002/11/15 07:59:45
@@ -1,8 +1,8 @@
 $NetBSD: patch-bb,v 1.1.1.1 2001/08/07 11:23:57 lukem Exp $
 
---- mkisofs/mkisofs.c.orig	Fri Apr 20 17:45:50 2001
-+++ mkisofs/mkisofs.c	Mon Aug  6 10:46:21 2001
-@@ -2072,11 +2072,11 @@
+--- mkisofs/mkisofs.c.orig	Thu Oct 24 04:29:21 2002
++++ mkisofs/mkisofs.c	Fri Nov 15 16:23:19 2002
+@@ -2200,11 +2200,11 @@
  		}
  	}
  	/* We don't need root privilleges anymore. */
>Release-Note:
>Audit-Trail:
>Unformatted: