diff options
| author | Alexander Logvinov <avl@FreeBSD.org> | 2009-08-31 13:45:57 +0000 |
|---|---|---|
| committer | Alexander Logvinov <avl@FreeBSD.org> | 2009-08-31 13:45:57 +0000 |
| commit | 32a0ad1ce21999173009e1ee26da5c3a0df2f757 (patch) | |
| tree | f357678900a072cd833ca9d8114456f8eb58627a /sysutils/smartmontools | |
| parent | e98e984805ced8b67434700f7857b3afe64c160f (diff) | |
Notes
Diffstat (limited to 'sysutils/smartmontools')
| -rw-r--r-- | sysutils/smartmontools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/patch-os__freebsd.cpp | 31 |
2 files changed, 26 insertions, 7 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 205767eee7e3..b3eb776eff85 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/sysutils/smartmontools/files/patch-os__freebsd.cpp b/sysutils/smartmontools/files/patch-os__freebsd.cpp index 053421ead0cf..c752a93a8547 100644 --- a/sysutils/smartmontools/files/patch-os__freebsd.cpp +++ b/sysutils/smartmontools/files/patch-os__freebsd.cpp @@ -1,5 +1,8 @@ ---- os_freebsd.cpp.orig 2008-03-04 23:09:47.000000000 +0100 -+++ os_freebsd.cpp 2008-03-14 13:52:37.000000000 +0100 + +$FreeBSD$ + +--- os_freebsd.cpp.orig ++++ os_freebsd.cpp @@ -272,7 +272,6 @@ } @@ -8,16 +11,32 @@ return -1; } -@@ -525,7 +524,7 @@ +@@ -341,6 +340,15 @@ + request.count=512; + copydata=1; + break; ++ case WRITE_LOG: ++ memcpy(buff, data, 512); ++ request.u.ata.feature=ATA_SMART_WRITE_LOG_SECTOR; ++ request.u.ata.lba=select|(0xc24f<<8); ++ request.u.ata.count=1; ++ request.flags=ATA_CMD_WRITE; ++ request.data=(char *)buff; ++ request.count=512; ++ break; + case IDENTIFY: + request.u.ata.command=ATA_IDENTIFY_DEVICE; + request.flags=ATA_CMD_READ; +@@ -525,7 +533,7 @@ return -1; } - + - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) { #if __FreeBSD_version > 500000 cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); #endif -@@ -924,6 +923,7 @@ +@@ -924,6 +932,7 @@ static const char * fbsd_dev_prefix = "/dev/"; static const char * fbsd_dev_ata_disk_prefix = "ad"; static const char * fbsd_dev_scsi_disk_plus = "da"; @@ -25,7 +44,7 @@ static const char * fbsd_dev_scsi_tape1 = "sa"; static const char * fbsd_dev_scsi_tape2 = "nsa"; static const char * fbsd_dev_scsi_tape3 = "esa"; -@@ -960,6 +960,11 @@ +@@ -960,6 +969,11 @@ return CONTROLLER_ATA; } |