Subject: pkg/25470: new pkg: sysutils/cdrecord-dvd
To: None <gnats-bugs@gnats.netbsd.org>
From: Rhialto <rhialto@azenomei.knuffel.net>
List: pkgsrc-bugs
Date: 05/05/2004 12:52:12
>Number: 25470
>Category: pkg
>Synopsis: new pkg: sysutils/cdrecord-dvd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed May 05 10:53:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Rhialto
>Release: NetBSD 1.6.2
>Organization:
>Environment:
System: NetBSD azenomei.falu.nl 1.6.2 NetBSD 1.6.2 (AZENOMEI) #0: Wed Apr 7 23:54:43 CEST 2004 rhialto@azenomei.falu.nl:/home/rhialto/NetBSD-1.6.2/usr/src/sys/arch/alpha/compile/AZENOMEI alpha
Architecture: alpha
Machine: alpha
>Description:
I found another patch to write DVD+R(W) disks with my DVD writer
(a Philips DVDRW 416). It seems slightly cleaner than the one
in sysutils/cdrtools-ossdvd, since it doesn't require to specify
driver=mmc_mdvd explicitly. Maybe that is drive-dependent.
Apart from this different patch, this pkg is basically a copy
of cdrtools-ossdvd, except that it is based on a newer (alpha)
version of cdrtools, so I adjusted the patches accordingly.
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# cdrtools-dvd
# cdrtools-dvd/PLIST
# cdrtools-dvd/Makefile
# cdrtools-dvd/MESSAGE.cdrecord.conf
# cdrtools-dvd/MESSAGE.SunOS
# cdrtools-dvd/DESCR
# cdrtools-dvd/distinfo
# cdrtools-dvd/patches
# cdrtools-dvd/patches/patch-cb
# cdrtools-dvd/patches/patch-ca
# cdrtools-dvd/patches/patch-bb
# cdrtools-dvd/patches/patch-ba
# cdrtools-dvd/patches/patch-cc
# cdrtools-dvd/patches/patch-ai
# cdrtools-dvd/patches/patch-ah
# cdrtools-dvd/patches/patch-ac
# cdrtools-dvd/patches/patch-aj
#
echo c - cdrtools-dvd
mkdir -p cdrtools-dvd > /dev/null 2>&1
echo x - cdrtools-dvd/PLIST
sed 's/^X//' >cdrtools-dvd/PLIST << 'END-of-cdrtools-dvd/PLIST'
X@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
Xbin/cdda2wav
Xbin/cdrecord
Xbin/mkisofs
Xbin/readcd
Xbin/devdump
Xbin/isodump
Xbin/isoinfo
Xbin/isovfy
Xman/man1/cdda2wav.1
Xman/man1/cdrecord.1
Xman/man1/readcd.1
Xman/man8/mkisofs.8
Xman/man8/devdump.8
Xman/man8/isodump.8
Xman/man8/isoinfo.8
Xman/man8/isovfy.8
END-of-cdrtools-dvd/PLIST
echo x - cdrtools-dvd/Makefile
sed 's/^X//' >cdrtools-dvd/Makefile << 'END-of-cdrtools-dvd/Makefile'
X# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:57 grant Exp $
X
XDISTNAME= cdrtools-2.01a28
XPKGNAME= cdrtools-dvd-2.01.1.28
XCATEGORIES= sysutils
XMASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
X
XPATCHFILES= cdrtools-2.01a28-dvd.patch.bz2
XPATCH_SITES= http://people.mandrakesoft.com/~warly/files/cdrtools/archives/
XPATCH_DIST_STRIP= -p1
X
XMAINTAINER= lukem@NetBSD.org
XHOMEPAGE= http://people.mandrakesoft.com/~warly/files/cdrtools/
XCOMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs/DVDs
X
XCONFLICTS= mkisofs-[0-9]* cdrecord-* cdrtools-*
X
X.include "../../mk/bsd.prefs.mk"
X
XWRKSRC= ${WRKDIR}/cdrtools-2.01
XUSE_BUILDLINK2= # defined
XUSE_GNU_TOOLS+= make
XTBL?= tbl
X
X.if ${LOCALBASE} != "/opt/schily"
XBUILDLINK_TRANSFORM= r:/opt/schily
XBUILDLINK_TRANSFORM+= r:/opt/schily
X.endif
X
X# avoid picking up a bad ${ARCH} during the build
XMAKE_ENV+= ARCH=""
XMAKE_ENV+= MAKEPROG="gmake"
XMAKE_ENV+= COPTX="${CFLAGS}"
XMAKE_ENV+= LDOPTX="${LDFLAGS}"
X
X# if we're using a gcc which is named gcc, we need to set CCOM=gcc
X# in MAKE_ENV so the make infrastructure picks the right options.
X.if !empty(CC:M*gcc*)
XMAKE_ENV+= CCOM="gcc"
X.endif
X
X# allow us to override the default /etc/default/cdrecord by patching
X# the documentation appropriately. Additionally, we also provide a
X# MESSAGE stating the reasons we do this, as required by the license.
XCDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
X
X.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
XMESSAGE_SRC+= MESSAGE.cdrecord.conf
XMESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
XMESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF}
X.endif
X
XCDRECORD_CONF_FILES= cdrecord/defaults.c cdrecord/cdrecord.1
XCDRECORD_CONF_FILES+= readcd/readcd.1
X
Xpost-patch:
X @cd ${WRKSRC}; for file in ${CDRECORD_CONF_FILES}; do \
X ${MV} ${WRKSRC}/$$file ${WRKSRC}/$${file}.old && \
X ${SED} -e 's|@CDRECORD_CONF@|${CDRECORD_CONF}|' \
X ${WRKSRC}/$${file}.old > ${WRKSRC}/$$file; \
X done
X
Xdo-configure:
X cd ${WRKSRC}/RULES; \
X for suffix in netbsd-cc.rul netbsd-gcc.rul; do \
X if [ ! -f ${MACHINE}-$$suffix ]; then \
X ${LN} -sf i386-$$suffix ${MACHINE}-$$suffix; \
X fi; \
X done
X
Xpost-build:
X cd ${WRKSRC}; \
X for file in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \
X ${TBL} $${file} > $${file}.tmp; \
X ${MV} -f $${file}.tmp $${file}; \
X done
X
Xdo-install:
X cd ${WRKSRC}/cdda2wav; \
X ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin; \
X ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
X cd ${WRKSRC}/cdrecord; \
X ${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin; \
X ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
X cd ${WRKSRC}/mkisofs; \
X ${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin; \
X ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
X cd ${WRKSRC}/mkisofs/diag; \
X for f in devdump isodump isoinfo isovfy; do \
X ${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin; \
X ${INSTALL_MAN} isoinfo.8 ${PREFIX}/man/man8/$$f.8; \
X done
X cd ${WRKSRC}/readcd; \
X ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \
X ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
X
X.include "../../mk/ossaudio.buildlink2.mk"
X.include "../../mk/bsd.pkg.mk"
END-of-cdrtools-dvd/Makefile
echo x - cdrtools-dvd/MESSAGE.cdrecord.conf
sed 's/^X//' >cdrtools-dvd/MESSAGE.cdrecord.conf << 'END-of-cdrtools-dvd/MESSAGE.cdrecord.conf'
X===========================================================================
X$NetBSD: MESSAGE.cdrecord.conf,v 1.2 2004/02/03 05:17:43 reed Exp $
X
XNote: The location of the ${PKGNAME_NOREV} `defaults' file has
Xbeen set to:
X
X ${CDRECORD_CONF}
X
XThis is the pkgsrc standard config file location, NOT the cdrtools
Xstandard location, which is /etc/default/cdrecord.
X
XThe reason for this is that pkgsrc packages should not use configuration
Xfiles outside ${LOCALBASE} unless they are explicitly set by the user.
X
X===========================================================================
END-of-cdrtools-dvd/MESSAGE.cdrecord.conf
echo x - cdrtools-dvd/MESSAGE.SunOS
sed 's/^X//' >cdrtools-dvd/MESSAGE.SunOS << 'END-of-cdrtools-dvd/MESSAGE.SunOS'
X===========================================================================
X$NetBSD: MESSAGE.SunOS,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
XYou will need to stop Solaris volume management before using
X${PKGNAME_NOREV}:
X
X /etc/init.d/volmgt stop
X
X===========================================================================
END-of-cdrtools-dvd/MESSAGE.SunOS
echo x - cdrtools-dvd/DESCR
sed 's/^X//' >cdrtools-dvd/DESCR << 'END-of-cdrtools-dvd/DESCR'
XCdrecord allows you to burn CDs with a CD-R/CD-RW recorder. It
Xworks as a burn engine for several applications. Cdrecord supports
XCD recorders from many different vendors; all SCSI-3/mmc and
XATAPI/mmc compliant drives should also work. Supported features
Xinclude: IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data
XCDs, and mixed CDs; full multi-session support, CD-RWs (rewritable),
XTAO, DAO and human-readable error messages.
X
XThis version is patched (by marly@mandrakesoft.com) to also write DVDs.
END-of-cdrtools-dvd/DESCR
echo x - cdrtools-dvd/distinfo
sed 's/^X//' >cdrtools-dvd/distinfo << 'END-of-cdrtools-dvd/distinfo'
X$NetBSD: distinfo,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
XSHA1 (cdrtools-2.01a28.tar.gz) = e68810c8a2815135aac86e64bc4204d41f5b9461
XSize (cdrtools-2.01a28.tar.gz) = 1695031 bytes
XSHA1 (cdrtools-2.01a28-dvd.patch.bz2) = 30be888ff75b35ac27b808dcc9a13bd53eaadaf9
XSize (cdrtools-2.01a28-dvd.patch.bz2) = 13096 bytes
XSHA1 (patch-ac) = 0d9217924ed353b1c23bac1ffd8b2ee69eda8f47
XSHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
XSHA1 (patch-ai) = 02869ef082eef33b2dbe3cf041eec148a8d262f7
XSHA1 (patch-aj) = 097799f86607bbfe33ba06e68f5cafe98b9d92dc
XSHA1 (patch-ba) = 635f7584d125517309ae00919f5a7808b28ba127
XSHA1 (patch-bb) = 653956259faeb46106e243e543eb17eb25d5a371
XSHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
XSHA1 (patch-cb) = c7060bce4ef117e55169a39eb0850a0b57de56c2
XSHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
END-of-cdrtools-dvd/distinfo
echo c - cdrtools-dvd/patches
mkdir -p cdrtools-dvd/patches > /dev/null 2>&1
echo x - cdrtools-dvd/patches/patch-cb
sed 's/^X//' >cdrtools-dvd/patches/patch-cb << 'END-of-cdrtools-dvd/patches/patch-cb'
X$NetBSD: patch-cb,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
X+++ cdrecord/cdrecord.1
X@@ -1684,8 +1684,8 @@ login shell.
X
X .SH FILES
X .TP
X-/etc/default/cdrecord
X-Default values can be set for the following options in /etc/default/cdrecord.
X+@CDRECORD_CONF@
X+Default values can be set for the following options in @CDRECORD_CONF@.
X For example:
X .SM CDR_FIFOSIZE=8m
X or
X@@ -1694,7 +1694,7 @@ or
X .TP
X CDR_DEVICE
X This may either hold a device identifier that is suitable to the open
X-call of the SCSI transport library or a label in the file /etc/default/cdrecord
X+call of the SCSI transport library or a label in the file @CDRECORD_CONF@
X that allows to identify a specific drive on the system.
X .TP
X CDR_SPEED
END-of-cdrtools-dvd/patches/patch-cb
echo x - cdrtools-dvd/patches/patch-ca
sed 's/^X//' >cdrtools-dvd/patches/patch-ca << 'END-of-cdrtools-dvd/patches/patch-ca'
X$NetBSD: patch-ca,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
X+++ cdrecord/defaults.c
X@@ -53,7 +53,7 @@ open_cdrdefaults()
X * don't contribute work and don't give support, they are causing extra
X * work for me and this way slow down the cdrecord development.
X */
X- return (defltopen("/etc/default/cdrecord"));
X+ return (defltopen("@CDRECORD_CONF@"));
X }
X
X EXPORT void
END-of-cdrtools-dvd/patches/patch-ca
echo x - cdrtools-dvd/patches/patch-bb
sed 's/^X//' >cdrtools-dvd/patches/patch-bb << 'END-of-cdrtools-dvd/patches/patch-bb'
X$NetBSD: patch-bb,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
X
X+++ mkisofs/mkisofs.c
X@@ -2279,11 +2279,11 @@ parse_input_files:
X }
X }
X /* We don't need root privilleges anymore. */
X-#ifdef HAVE_SETREUID
X- if (setreuid(-1, getuid()) < 0)
X-#else
X #ifdef HAVE_SETEUID
X if (seteuid(getuid()) < 0)
X+#else
X+#ifdef HAVE_SETREUID
X+ if (setreuid(-1, getuid()) < 0)
X #else
X if (setuid(getuid()) < 0)
X #endif
END-of-cdrtools-dvd/patches/patch-bb
echo x - cdrtools-dvd/patches/patch-ba
sed 's/^X//' >cdrtools-dvd/patches/patch-ba << 'END-of-cdrtools-dvd/patches/patch-ba'
X$NetBSD: patch-ba,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
X
X+++ readcd/readcd.c
X@@ -385,11 +385,11 @@ main(ac, av)
X /*
X * We don't need root privilleges anymore.
X */
X-#ifdef HAVE_SETREUID
X- if (setreuid(-1, getuid()) < 0)
X-#else
X #ifdef HAVE_SETEUID
X if (seteuid(getuid()) < 0)
X+#else
X+#ifdef HAVE_SETREUID
X+ if (setreuid(-1, getuid()) < 0)
X #else
X if (setuid(getuid()) < 0)
X #endif
END-of-cdrtools-dvd/patches/patch-ba
echo x - cdrtools-dvd/patches/patch-cc
sed 's/^X//' >cdrtools-dvd/patches/patch-cc << 'END-of-cdrtools-dvd/patches/patch-cc'
X$NetBSD: patch-cc,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
X+++ readcd/readcd.1
X@@ -186,7 +186,7 @@ If the argument to the
X .B dev=
X option does not contain the characters ',', '/', '@' or ':',
X it is interpreted as an label name that may be found in the file
X-/etc/default/cdrecord (see FILES section).
X+@CDRECORD_CONF@ (see FILES section).
X .TP
X .BI timeout= #
X Set the default SCSI command timeout value to
END-of-cdrtools-dvd/patches/patch-cc
echo x - cdrtools-dvd/patches/patch-ai
sed 's/^X//' >cdrtools-dvd/patches/patch-ai << 'END-of-cdrtools-dvd/patches/patch-ai'
X$NetBSD$
X
X+++ libscg/scsi-bsd.c Wed May 5 11:36:00 2004
X@@ -48,7 +48,7 @@
X * Choose your name instead of "schily" and make clear that the version
X * string is related to a modified source.
X */
X-LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
X+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42nb1"; /* The version for this transport*/
X
X #define MAX_SCG 16 /* Max # of SCSI controllers */
X #define MAX_TGT 16
X@@ -108,7 +108,7 @@
X * return "schily" for the SCG_AUTHOR request.
X */
X case SCG_AUTHOR:
X- return (_scg_auth_schily);
X+ return ("frueauf");
X case SCG_SCCS_ID:
X return (__sccsid);
X }
X@@ -140,6 +140,15 @@
X register int l;
X register int nopen = 0;
X char devname[64];
X+#if defined(__NetBSD__)
X+ struct scsi_addr mysaddr;
X+#if defined(__i386__)
X+ char slicename[] = "d"; /* i386 is special */
X+#else
X+ char slicename[] = "c"; /* this is what the rest uses */
X+#endif
X+ char *myslicename = slicename;
X+#endif
X
X if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
X errno = EINVAL;
X@@ -166,6 +175,59 @@
X if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
X goto openbydev;
X
X+/*
X+ * I know of no method in NetBSD to probe the scsibus and get the mapping
X+ * busnumber,target,lun --> devicename.
X+ *
X+ * Because of this implement a true bruteforce hack to find
X+ * out what cdroms there are.
X+ *
X+ * Note that this method only finds cd0-cd7. Anything higher
X+ * than this needs additional tweaks.
X+ *
X+ * Feel free to implement this cleanly if you have better knowledge.
X+ * Until then this helps to get -scanbus und thus xcdroast working :-)
X+ *
X+ */
X+#if defined(__NetBSD__)
X+ if (busno >= 0 && tgt >= 0 && tlun >= 0) {
X+ for (l=0; l < MAX_LUN ; l++) {
X+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
X+ f = open(devname, O_RDWR);
X+ if (f >= 0) {
X+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
X+ close(f);
X+ errno = EINVAL;
X+ return (0);
X+ }
X+ if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
X+ scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
X+ return(1);
X+ }
X+ } else goto openbydev;
X+ }
X+ } else for (l=0; l < MAX_LUN ; l++) {
X+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
X+ f = open(devname, O_RDWR);
X+ if (f >= 0) {
X+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
X+ close(f);
X+ errno = EINVAL;
X+ return (0);
X+ }
X+ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr);
X+ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr);
X+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
X+ close(f);
X+ errno = EINVAL;
X+ return (0);
X+ }
X+ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr);
X+ if (scg_setup(scgp, f, busno, tgt, tlun))
X+ nopen++;
X+ }
X+ }
X+#else /* not __NetBSD__ */
X if (busno >= 0 && tgt >= 0 && tlun >= 0) {
X
X js_snprintf(devname, sizeof (devname),
X@@ -202,6 +264,7 @@
X }
X }
X }
X+#endif /* end of not __NetBSD__ */
X /*
X * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
X * We do the apropriate tests and try our best.
END-of-cdrtools-dvd/patches/patch-ai
echo x - cdrtools-dvd/patches/patch-ah
sed 's/^X//' >cdrtools-dvd/patches/patch-ah << 'END-of-cdrtools-dvd/patches/patch-ah'
X$NetBSD: patch-ah,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
X+++ cdda2wav/setuid.c Sat Nov 30 18:17:51 2002
X@@ -92,7 +92,7 @@
X
X if (geteuid() == 0) return; /* nothing to do */
X
X-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
X+#if defined (HAVE_SETEUID)
X if (seteuid(effective_uid)) {
X perror("seteuid in needroot()");
X exit(PERM_ERROR);
X@@ -126,7 +126,7 @@
X return;
X if (geteuid() != 0) return; /* nothing to do */
X
X-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
X+#if defined (HAVE_SETEUID)
X if (seteuid(real_uid)) {
X perror("seteuid in dontneedroot()");
X exit(PERM_ERROR);
X@@ -186,7 +186,7 @@
X
X if (getegid() == effective_gid) return; /* nothing to do */
X
X-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
X+#if defined (HAVE_SETEGID)
X if (setegid(effective_gid)) {
X perror("setegid in needgroup()");
X exit(PERM_ERROR);
X@@ -217,7 +217,7 @@
X exit(INTERNAL_ERROR);
X }
X if (getegid() != effective_gid) return; /* nothing to do */
X-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
X+#if defined (HAVE_SETEGID)
X if (setegid(real_gid)) {
X perror("setegid in dontneedgroup()");
X exit(PERM_ERROR);
END-of-cdrtools-dvd/patches/patch-ah
echo x - cdrtools-dvd/patches/patch-ac
sed 's/^X//' >cdrtools-dvd/patches/patch-ac << 'END-of-cdrtools-dvd/patches/patch-ac'
X$NetBSD: patch-ac,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
X
X+++ include/btorder.h
X@@ -28,6 +28,9 @@
X #include <sys/types.h> /* try to load isa_defs.h on Solaris */
X #define _INCL_SYS_TYPES_H
X #endif
X+#ifdef __NetBSD__
X+#include <machine/endian.h>
X+#endif
X
X #ifndef _MCONFIG_H
X #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
X@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
X # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
X defined(__PPC) || defined(powerpc) || defined(__powerpc__)
X
X-# if defined(__BIG_ENDIAN__)
X+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
X # define _BIT_FIELDS_HTOL
X # else
X # define _BIT_FIELDS_LTOH
END-of-cdrtools-dvd/patches/patch-ac
echo x - cdrtools-dvd/patches/patch-aj
sed 's/^X//' >cdrtools-dvd/patches/patch-aj << 'END-of-cdrtools-dvd/patches/patch-aj'
X$NetBSD$
X
X+++ cdrecord/scsi_cdr.c Wed May 5 11:39:52 2004
X@@ -317,6 +317,12 @@
X request_sense(scgp)
X SCSI *scgp;
X {
X+
X+#ifdef __NetBSD__
X+ /* request sense already done by kernel */
X+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
X+ scgp->scmd->sense_count);
X+#else
X char sensebuf[CCS_SENSE_LEN];
X register struct scg_cmd *scmd = scgp->scmd;
X
X@@ -336,6 +342,7 @@
X if (scg_cmd(scgp) < 0)
X return (-1);
X scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
X+#endif
X return (0);
X }
X
END-of-cdrtools-dvd/patches/patch-aj
exit
>Release-Note:
>Audit-Trail:
>Unformatted: