diff options
| author | hubertf <hubertf@pkgsrc.org> | 1998-10-22 07:01:47 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1998-10-22 07:01:47 +0000 |
| commit | d7566d69066fd8d45ae6274de4583188623a6cac (patch) | |
| tree | 0babbf923a51205db92f482cfb1e5ef1af37bc24 | |
| parent | b3c55662130d86eb465d12ef2bda25455176ff4c (diff) | |
| download | pkgsrc-d7566d69066fd8d45ae6274de4583188623a6cac.tar.gz | |
update to 1.6.1
| -rw-r--r-- | sysutils/cdrecord/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/cdrecord/files/md5 | 4 | ||||
| -rw-r--r-- | sysutils/cdrecord/patches/patch-ac | 81 |
3 files changed, 25 insertions, 64 deletions
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index f1e41ad7124..422bd136b85 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 1998/08/20 15:17:26 tsarna Exp $ +# $NetBSD: Makefile,v 1.19 1998/10/22 07:01:47 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp # -DISTNAME= cdrecord-1.6 +DISTNAME= cdrecord-1.6.1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ diff --git a/sysutils/cdrecord/files/md5 b/sysutils/cdrecord/files/md5 index 6f0830b1926..485e684274a 100644 --- a/sysutils/cdrecord/files/md5 +++ b/sysutils/cdrecord/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1998/08/11 12:20:56 agc Exp $ +$NetBSD: md5,v 1.4 1998/10/22 07:01:48 hubertf Exp $ -MD5 (cdrecord-1.6.tar.gz) = 6eb5b65991fd0a632dbce0a082a591c1 +MD5 (cdrecord-1.6.1.tar.gz) = c0abc4741f1477515c2e8286686e0fc9 diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac index 58ce1b1a921..82bdc3df8a1 100644 --- a/sysutils/cdrecord/patches/patch-ac +++ b/sysutils/cdrecord/patches/patch-ac @@ -1,60 +1,21 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:14:03 agc Exp $ - -*** cdrecord/scsi-bsd.c.orig Wed Nov 12 23:41:37 1997 ---- cdrecord/scsi-bsd.c Wed Nov 12 23:46:55 1997 -*************** -*** 42,47 **** ---- 42,62 ---- - /*#define MAX_DMA_BSD (32*1024)*/ - #define MAX_DMA_BSD (64*1024) /* Check if this is not too big */ - -+ #if defined(__NetBSD__) && defined(TYPE_ATAPI) -+ /* -+ * NetBSD 1.3 has a merged SCSI/ATAPI system, so this structure -+ * is slightly different. -+ */ -+ #define ADDR_ISSCSI(a) ((a).type == TYPE_SCSI) -+ #define ADDR_SCBUS(a) (a).addr.scsi.scbus -+ #define ADDR_TARGET(a) (a).addr.scsi.target -+ #define ADDR_LUN(a) (a).addr.scsi.lun -+ #else -+ #define ADDR_ISSCSI(a) (1) -+ #define ADDR_SCBUS(a) (a).addr.scbus -+ #define ADDR_TARGET(a) (a).addr.target -+ #define ADDR_LUN(a) (a).addr.lun -+ #endif /* __NetBSD__ && TYPE_ATAPI */ - - LOCAL int scsi_send __PR((int f, struct scg_cmd *sp)); - LOCAL int scsi_setup __PR((int f)); -*************** -*** 127,139 **** - errmsg("Cannot get SCSI addr.\n"); - return (-1); - } -- if (debug) -- printf("Bus: %d Target: %d Lun: %d\n", -- saddr.scbus, saddr.target, saddr.lun); - -! Bus = saddr.scbus; -! Target = saddr.target; -! Lun = saddr.lun; - - if (Bus >= MAX_SCG || Target >= 8 || Lun >= 8) - return (-1); ---- 142,157 ---- - errmsg("Cannot get SCSI addr.\n"); - return (-1); - } - -! if (ADDR_ISSCSI(saddr) == 0) -! return (-1); -! -! Bus = ADDR_SCBUS(saddr); -! Target = ADDR_TARGET(saddr); -! Lun = ADDR_LUN(saddr); -! -! if (debug) -! printf("Bus: %d Target: %d Lun: %d\n", Bus, Target, Lun); - - if (Bus >= MAX_SCG || Target >= 8 || Lun >= 8) - return (-1); +--- cdrecord/scsi-bsd.c.BAK Thu Oct 22 08:27:33 1998 ++++ cdrecord/scsi-bsd.c Thu Oct 22 08:30:41 1998 +@@ -175,6 +175,18 @@ + close(f); + return (FALSE); + } ++ ++ /* ++ * I'm not sure if the following is still needed, comment out ++ * until J. Schilling / J. Thorphe answer: ++ * ++ * if (ADDR_ISSCSI(saddr) == 0) ++ * return (-1); ++ * ++ * ++ * - Hubert ++ */ ++ + Bus = SADDR_BUS(saddr); + Target = SADDR_TARGET(saddr); + Lun = SADDR_LUN(saddr); |