ports/166302: [MAINTAINER] sysutils/k3b: fixed build on version 9 and later
Muhammad Moinur Rahman
5u623l20 at gmail.com
Wed Mar 21 18:50:13 UTC 2012
>Number: 166302
>Category: ports
>Synopsis: [MAINTAINER] sysutils/k3b: fixed build on version 9 and later
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 21 18:50:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Muhammad Moinur Rahman
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD bofh.telnet.net.bd 9.0-STABLE FreeBSD 9.0-STABLE #0: Fri Mar 2 02:21:51 BDT
>Description:
[DESCRIBE CHANGES]
This version was broken for version 9 and later. I have fixed it up based on a patch of Andriy Gapon which works
in k3b-kde4. This patch is not exactly the same as that; it was modified to suite the dependancy of kde3. While working on the patch
I have found a line on the patch added like :
+ * Copyright (C) 2011 Andriy Gapon <avg at FreeBSD.org>
So I am not yet sure whether if I am allowed to use that codebase. If not feel free to close the PR. However I have checked the patch
and it works for me.
Additionally I am adding some reference for the committers :
https://redports.org/~subzero/20120321143232-24110-16691/k3b-1.0.5_15.log
https://redports.org/~subzero/20120321143232-24110-16692/k3b-1.0.5_15.log
https://redports.org/~subzero/20120321143232-24110-16693/k3b-1.0.5_15.log
https://redports.org/~subzero/20120321143232-24110-16696/k3b-1.0.5_15.log
https://redports.org/~subzero/20120321143232-24110-16697/k3b-1.0.5_15.log
https://redports.org/~subzero/20120321143232-24110-16698/k3b-1.0.5_15.log
Sorry to say that it does not build on 7.4 as one of it's dependency kdelibs3 does not build fully on 7.4.
Added file(s):
- files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp
Generated with FreeBSD Port Tools 0.99_4 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- k3b-1.0.5_15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/k3b/Makefile ./Makefile
--- /usr/ports/sysutils/k3b/Makefile 2012-03-17 11:03:16.000000000 +0600
+++ ./Makefile 2012-03-21 20:31:07.892239000 +0600
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
@@ -58,7 +58,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 900044
-BROKEN= does not compile on FreeBSD 9.X
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp
.endif
PKGMESSAGE= ${PKGDIR}/pkg-message-7
diff -ruN --exclude=CVS /usr/ports/sysutils/k3b/files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp ./files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp
--- /usr/ports/sysutils/k3b/files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp 1970-01-01 06:00:00.000000000 +0600
+++ ./files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp 2012-03-21 20:31:07.936240000 +0600
@@ -0,0 +1,286 @@
+--- libk3bdevice/k3bscsicommand_bsd.cpp.orig 2012-03-22 03:26:44.000000000 +0600
++++ libk3bdevice/k3bscsicommand_bsd.cpp 2012-03-22 03:11:30.000000000 +0600
+@@ -17,6 +17,7 @@
+ #include "k3bdevice.h"
+
+ #include <k3bdebug.h>
++#include <kdebug.h>
+
+ #include <stdio.h>
+ #include <errno.h>
+@@ -24,41 +25,44 @@
+ #include <cam/scsi/scsi_message.h>
+ #include <cam/scsi/scsi_pass.h>
+
+-#define ERRCODE(s) ((((s)[2]&0x0F)<<16)|((s)[12]<<8)|((s)[13]))
+-#define EMEDIUMTYPE EINVAL
+-#define ENOMEDIUM ENODEV
+-#define CREAM_ON_ERRNO(s) do { \
+- switch ((s)[12]) \
+- { case 0x04: errno=EAGAIN; break; \
+- case 0x20: errno=ENODEV; break; \
+- case 0x21: if ((s)[13]==0) errno=ENOSPC; \
+- else errno=EINVAL; \
+- break; \
+- case 0x30: errno=EMEDIUMTYPE; break; \
+- case 0x3A: errno=ENOMEDIUM; break; \
+- } \
+-} while(0)
++namespace /*anonymous*/
++{
++ inline int sense_to_err( const struct scsi_sense_data& s )
++ {
++ int errorCode, senseKey, addSenseCode, addSenseCodeQual;
++ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode,
++ &senseKey, &addSenseCode, &addSenseCodeQual );
++ return (errorCode << 24) | (senseKey << 16) |
++ (addSenseCode << 8) | addSenseCodeQual;
++ }
++}
+
+
+
+ class K3bDevice::ScsiCommand::Private
+ {
++ typedef union ccb CCB;
+ public:
+- union ccb ccb;
++ Private();
++ int transport( const Device* device, TransportDirection dir, void* data, size_t len );
++ unsigned char& operator[]( size_t i );
++ void clear();
++ const CCB& get_ccb() { return ccb; }
++
++ private:
++ CCB ccb;
+ };
+
+
+ void K3bDevice::ScsiCommand::clear()
+ {
+- memset (&d->ccb,0,sizeof(ccb));
++ d->clear();
+ }
+
+
+ unsigned char& K3bDevice::ScsiCommand::operator[]( size_t i )
+ {
+- if( d->ccb.csio.cdb_len < i+1 )
+- d->ccb.csio.cdb_len = i+1;
+- return d->ccb.csio.cdb_io.cdb_bytes[i];
++ return (*d)[i];
+ }
+
+ int K3bDevice::ScsiCommand::transport( TransportDirection dir,
+@@ -79,130 +83,103 @@
+ m_device->usageUnlock();
+ return -1;
+ }
+- d->ccb.ccb_h.path_id = m_device->handle()->path_id;
+- d->ccb.ccb_h.target_id = m_device->handle()->target_id;
+- d->ccb.ccb_h.target_lun = m_device->handle()->target_lun;
+-
+- k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len << endl;
+- int ret=0;
+- int direction = CAM_DEV_QFRZDIS;
+- if (!len)
+- direction |= CAM_DIR_NONE;
+- else
+- direction |= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT;
+- cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000);
+- unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data;
+
+- ret = cam_send_ccb(m_device->handle(), &d->ccb);
++ int ret = d->transport( m_device, dir, data, len );
++ if( ret != 0 ) {
++ const struct scsi_sense_data& s = d->get_ccb().csio.sense_data;
++ int errorCode, senseKey, addSenseCode, addSenseCodeQual;
++ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode, &senseKey,
++ &addSenseCode, &addSenseCodeQual );
++ debugError( d->get_ccb().csio.cdb_io.cdb_bytes[0],
++ errorCode,
++ senseKey,
++ addSenseCode,
++ addSenseCodeQual );
++ }
++
++ if( needToClose )
++ m_device->close();
++ m_device->usageUnlock();
+
+- if (ret < 0) {
+- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed: " << ret << endl;
++ return ret;
++}
+
+- if( needToClose )
+- m_device->close();
++K3bDevice::ScsiCommand::Private::Private()
++ {
++ clear();
++ }
+
+- m_device->usageUnlock();
++void K3bDevice::ScsiCommand::Private::clear()
++ {
++ memset( &ccb, 0, sizeof(ccb) );
++ }
+
+- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
+- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
+- senset->error_code & SSD_ERRCODE,
+- senset->flags & SSD_KEY,
+- senset->add_sense_code,
+- senset->add_sense_code_qual );
+-
+- int result = (((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 |
+- ((senset->flags & SSD_KEY)<<16) & 0x0F00 |
+- (senset->add_sense_code<<8) & 0x00F0 |
+- (senset->add_sense_code_qual) & 0x000F );
++ unsigned char& K3bDevice::ScsiCommand::Private::operator[]( size_t i )
++ {
++ if( ccb.csio.cdb_len < i + 1 )
++ ccb.csio.cdb_len = i + 1;
++ return ccb.csio.cdb_io.cdb_bytes[i];
++ }
+
+- return result ? result : ret;
++ int K3bDevice::ScsiCommand::Private::transport( const Device* device, TransportDirection dir, void* data, size_t len )
++ {
++ ccb.ccb_h.path_id = device->handle()->path_id;
++ ccb.ccb_h.target_id = device->handle()->target_id;
++ ccb.ccb_h.target_lun = device->handle()->target_lun;
++
++ k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << commandString(ccb.csio.cdb_io.cdb_bytes[0])
++ << " (" << QString::number((int)ccb.csio.cdb_io.cdb_bytes[0], 16) << "), length: " << (int)ccb.csio.cdb_len;
++ int direction = CAM_DEV_QFRZDIS;
++ if (!len)
++ direction |= CAM_DIR_NONE;
++ else
++ direction |= (dir & TR_DIR_READ) ? CAM_DIR_IN : CAM_DIR_OUT;
++
++ cam_fill_csio( &(ccb.csio), 1, NULL, direction, MSG_SIMPLE_Q_TAG, (uint8_t*)data, len, sizeof(ccb.csio.sense_data), ccb.csio.cdb_len, 30*1000 );
++ int ret = cam_send_ccb( device->handle(), &ccb );
++ if( ret < 0 ) {
++ kdError() << "(K3bDevice::ScsiCommand) transport cam_send_ccb failed: ret = " << ret
++ << ", errno = " << errno << ", cam_errbuf = " << cam_errbuf;
++ return 1;
+ }
+
+- else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
+- if( needToClose )
+- m_device->close();
+- m_device->usageUnlock();
++ else if( (ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ) {
++ k3bDebug() << "(K3bDevice::ScsiCommand) transport succeeded";
+ return 0;
+ }
+
+- errno = EIO;
+- // FreeBSD 5-CURRENT since 2003-08-24, including 5.2 fails to
+- // pull sense data automatically, at least for ATAPI transport,
+- // so I reach for it myself...
+- if ((d->ccb.csio.scsi_status==SCSI_STATUS_CHECK_COND) &&
+- !(d->ccb.ccb_h.status&CAM_AUTOSNS_VALID))
+- {
+- u_int8_t _sense[18];
+- u_int32_t resid=d->ccb.csio.resid;
+-
+- memset(_sense,0,sizeof(_sense));
+-
+- operator[](0) = 0x03; // REQUEST SENSE
+- d->ccb.csio.cdb_io.cdb_bytes[4] = sizeof(_sense);
+- d->ccb.csio.cdb_len = 6;
+- d->ccb.csio.ccb_h.flags |= CAM_DIR_IN|CAM_DIS_AUTOSENSE;
+- d->ccb.csio.data_ptr = _sense;
+- d->ccb.csio.dxfer_len = sizeof(_sense);
+- d->ccb.csio.sense_len = 0;
+-
+- ret = cam_send_ccb(m_device->handle(), &d->ccb);
++ k3bDebug() << "(K3bDevice::ScsiCommand) transport command failed: scsi_status = " << QString::number(ccb.csio.scsi_status, 16);
+
+- d->ccb.csio.resid = resid;
+- if (ret<0)
++ if( ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND &&
++ !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) &&
++ ccb.csio.cdb_io.cdb_bytes[0] != MMC_REQUEST_SENSE )
++ {
++ k3bDebug() << "(K3bDevice::ScsiCommand) transport requesting sense data";
++
++ struct scsi_sense_data sense;
++ ScsiCommand::Private cmd;
++ cmd[0] = MMC_REQUEST_SENSE;
++ cmd[4] = SSD_MIN_SIZE;
++ cmd[5] = 0; // Necessary to set the proper command length
++
++ memset( &sense, 0, sizeof(sense) );
++ ret = cmd.transport( device, TR_DIR_READ, &sense, SSD_MIN_SIZE );
++ if( ret < 0 )
+ {
+- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (2): " << ret << endl;
+- ret = -1;
+- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
+- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
+- senset->error_code & SSD_ERRCODE,
+- senset->flags & SSD_KEY,
+- senset->add_sense_code,
+- senset->add_sense_code_qual );
+-
+- if( needToClose )
+- m_device->close();
+- m_device->usageUnlock();
+-
+- return -1;
++ kdWarning() << "(K3bDevice::ScsiCommand) transport getting sense data failed: " << ret;
++ return 1;
+ }
+- if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP)
+- {
+- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (3): " << ret << endl;
+- errno=EIO,-1;
+- ret = -1;
+- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
+- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
+- senset->error_code & SSD_ERRCODE,
+- senset->flags & SSD_KEY,
+- senset->add_sense_code,
+- senset->add_sense_code_qual );
+-
+- if( needToClose )
+- m_device->close();
+- m_device->usageUnlock();
+
+- return -1;
+- }
+-
+- memcpy(sense,_sense,sizeof(_sense));
++ ccb.csio.sense_data = sense;
++ ccb.ccb_h.status |= CAM_AUTOSNS_VALID;
+ }
+
+- ret = ERRCODE(sense);
+- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (4): " << ret << endl;
+- if (ret == 0)
+- ret = -1;
+- else
+- CREAM_ON_ERRNO(((unsigned char *)&d->ccb.csio.sense_data));
+- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
+- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
+- senset->error_code & SSD_ERRCODE,
+- senset->flags & SSD_KEY,
+- senset->add_sense_code,
+- senset->add_sense_code_qual );
+-
+- if( needToClose )
+- m_device->close();
+- m_device->usageUnlock();
+-
++ if( !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) )
++ k3bDebug() << "(K3bDevice::ScsiCommand) sense data is not available";
++
++ ret = sense_to_err(ccb.csio.sense_data);
++ if( ret == 0 )
++ ret = 1;
++ k3bDebug() << "(K3bDevice::ScsiCommand) transport failed: " << ret;
+ return ret;
+ }
--- k3b-1.0.5_15.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list