From owner-freebsd-ports-bugs Sat Jan 18 8:50:12 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 786C837B405 for ; Sat, 18 Jan 2003 08:50:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2367243F18 for ; Sat, 18 Jan 2003 08:50:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0IGo4NS022774 for ; Sat, 18 Jan 2003 08:50:04 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0IGo4Qp022773; Sat, 18 Jan 2003 08:50:04 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E097C37B401 for ; Sat, 18 Jan 2003 08:45:14 -0800 (PST) Received: from mailout03.sul.t-online.com (mailout03.sul.t-online.com [194.25.134.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C7C143F1E for ; Sat, 18 Jan 2003 08:45:13 -0800 (PST) (envelope-from corecode@corecode.ath.cx) Received: from fwd08.sul.t-online.de by mailout03.sul.t-online.com with smtp id 18Zw5o-0008UC-09; Sat, 18 Jan 2003 17:45:12 +0100 Received: from pride.uni.stoert.net (320050403952-0001@[217.224.174.28]) by fmrl08.sul.t-online.com with esmtp id 18Zw5j-25aQyWC; Sat, 18 Jan 2003 17:45:07 +0100 Received: from terrorfish.uni.stoert.net (terrorfish.uni.stoert.net [10.150.180.178]) by pride.uni.stoert.net (Postfix) with ESMTP id 74F1A133A0D for ; Sat, 18 Jan 2003 17:45:07 +0100 (CET) Received: from terrorfish.uni.stoert.net (localhost [127.0.0.1]) by terrorfish.uni.stoert.net (8.12.6/8.12.6) with ESMTP id h0IGjr75039847 for ; Sat, 18 Jan 2003 17:45:53 +0100 (CET) (envelope-from corecode@terrorfish.uni.stoert.net) Received: (from corecode@localhost) by terrorfish.uni.stoert.net (8.12.6/8.12.6/Submit) id h0IGa3A8026266; Sat, 18 Jan 2003 17:36:03 +0100 (CET) (envelope-from corecode) Message-Id: <200301181636.h0IGa3A8026266@terrorfish.uni.stoert.net> Date: Sat, 18 Jan 2003 17:36:03 +0100 (CET) From: "Simon 'corecode' Schubert" Reply-To: "Simon 'corecode' Schubert" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47190: maintainer-update: audio/cdparanoia Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47190 >Category: ports >Synopsis: maintainer-update: audio/cdparanoia >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 18 08:50:04 PST 2003 >Closed-Date: >Last-Modified: >Originator: Simon 'corecode' Schubert >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD terrorfish.uni.stoert.net 5.0-CURRENT FreeBSD 5.0-CURRENT #40: Tue Jan 14 20:32:36 CET 2003 corecode@terrorfish.uni.stoert.net:/usr/obj/athlon/usr/src/sys/TERRORFISH i386 >Description: o changes prevent log clobber on -STABLE machines with special drives >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/cvs/ports/cdparanoia/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 2003/01/15 03:18:20 1.8 +++ Makefile 2003/01/18 15:46:20 1.9 @@ -7,7 +7,7 @@ PORTNAME= cdparanoia PORTVERSION= 3.9.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio sysutils MASTER_SITES= http://www.xiph.org/paranoia/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/} Index: files/patch-interface-scsi_interface.c =================================================================== RCS file: /home/cvs/ports/cdparanoia/files/patch-interface-scsi_interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- files/patch-interface-scsi_interface.c 2003/01/07 13:30:34 1.3 +++ files/patch-interface-scsi_interface.c 2003/01/18 15:44:39 1.4 @@ -2,10 +2,10 @@ =================================================================== RCS file: /home/cvs/cdparanoia/interface/scsi_interface.c,v retrieving revision 1.1.1.1 -retrieving revision 1.6 -diff -u -r1.1.1.1 -r1.6 +retrieving revision 1.7 +diff -u -r1.1.1.1 -r1.7 --- interface/scsi_interface.c 2003/01/05 09:46:26 1.1.1.1 -+++ interface/scsi_interface.c 2003/01/07 00:49:01 1.6 ++++ interface/scsi_interface.c 2003/01/18 15:42:15 1.7 @@ -3,6 +3,8 @@ * Original interface.c Copyright (C) 1994-1997 * Eissfeldt heiko@colossus.escape.de @@ -83,7 +83,7 @@ static int handle_scsi_cmd(cdrom_drive *d, unsigned int cmd_len, unsigned int in_size, -@@ -284,6 +322,83 @@ +@@ -284,6 +322,84 @@ return(0); } @@ -92,7 +92,6 @@ + unsigned int cmd_len, + unsigned int out_size, + unsigned int in_size, -+ + unsigned char bytefill, + int bytecheck) { + int result; @@ -100,11 +99,14 @@ + bzero(&d->ccb->csio, sizeof(d->ccb->csio)); + + memcpy(d->ccb->csio.cdb_io.cdb_bytes, d->sg_buffer, cmd_len); ++ ++ if (bytecheck && out_size == 0) ++ memset(d->sg_buffer, bytefill, in_size); ++ + cam_fill_csio(&d->ccb->csio, -+ /* retries */ 3, /* XXX */ ++ /* retries */ 0, + /* cbfcnp */ NULL, -+ /* flags */ CAM_PASS_ERR_RECOVER | CAM_DEV_QFRZDIS | -+ (out_size ? CAM_DIR_OUT : CAM_DIR_IN), ++ /* flags */ CAM_DEV_QFRZDIS | (out_size ? CAM_DIR_OUT : CAM_DIR_IN), + /* tag_action */ MSG_SIMPLE_Q_TAG, + /* data_ptr */ out_size ? d->sg_buffer + cmd_len : d->sg_buffer, + /* dxfer_len */ out_size ? out_size : in_size, @@ -112,15 +114,14 @@ + /* cdb_len */ cmd_len, + /* timeout */ 60000); /* XXX */ + -+ if ((result = cam_send_ccb(d->dev, d->ccb)) < 0) ++ if ((result = cam_send_ccb(d->dev, d->ccb)) < 0 || ++ (d->ccb->ccb_h.status & CAM_STATUS_MASK) == 0 /* hack? */) + return TR_EREAD; + -+ if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { -+ fprintf (stderr, "error returned from SCSI command:\n"); -+ if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR) -+ scsi_sense_print (d->dev, &d->ccb->csio, stderr); -+ else -+ fprintf (stderr, "ccb->ccb_h.status == %d\n", d->ccb->ccb_h.status); ++ if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP && ++ (d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR) { ++ fprintf (stderr, "\t\terror returned from SCSI command:\n" ++ "\t\tccb->ccb_h.status == %d\n", d->ccb->ccb_h.status); + errno = EIO; + return TR_UNKNOWN; + } @@ -167,7 +168,7 @@ /* Group 1 (10b) command */ static int mode_sense_atapi(cdrom_drive *d,int size,int page){ -@@ -833,30 +948,33 @@ +@@ -833,30 +949,33 @@ while(1) { if((err=map(d,(p?buffer:NULL),begin,sectors))){ if(d->report_all){ @@ -210,7 +211,7 @@ } if(!d->error_retry)return(-7); -@@ -1307,6 +1425,7 @@ +@@ -1307,6 +1426,7 @@ return; } @@ -218,7 +219,7 @@ static int check_atapi(cdrom_drive *d){ int atapiret=-1; int fd = d->cdda_fd; /* this is the correct fd (not ioctl_fd), as the -@@ -1333,6 +1452,47 @@ +@@ -1333,6 +1453,47 @@ } } @@ -266,7 +267,7 @@ static int check_mmc(cdrom_drive *d){ char *b; cdmessage(d,"\nChecking for MMC style command set...\n"); -@@ -1379,6 +1539,7 @@ +@@ -1379,6 +1540,7 @@ } } @@ -274,7 +275,7 @@ /* request vendor brand and model */ unsigned char *scsi_inquiry(cdrom_drive *d){ memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6); -@@ -1389,6 +1550,7 @@ +@@ -1389,6 +1551,7 @@ } return (d->sg_buffer); } @@ -282,7 +283,7 @@ int scsi_init_drive(cdrom_drive *d){ -@@ -1458,8 +1620,12 @@ +@@ -1458,8 +1621,12 @@ check_fua_bit(d); d->error_retry=1; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message