Attachment 119347 Details for Bug 161859 – smartmontools-5.42.patch

[patch] smartmontools-5.42.patch

smartmontools-5.42.patch (text/plain), 3.67 KB, created by Oleksii Samorukov on 2011-10-21 07:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksii Samorukov

Created: 2011-10-21 07:00:26 UTC

Size: 3.67 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/Makefile /root/smartmontools/Makefile
>--- /usr/ports/sysutils/smartmontools/Makefile	2011-09-27 20:59:51.000000000 +0200
>+++ /root/smartmontools/Makefile	2011-10-21 07:46:50.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	smartmontools
>-PORTVERSION=	5.41
>-PORTREVISION=	3
>+PORTVERSION=	5.42
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/distinfo /root/smartmontools/distinfo
>--- /usr/ports/sysutils/smartmontools/distinfo	2011-06-14 20:44:10.000000000 +0200
>+++ /root/smartmontools/distinfo	2011-10-21 07:49:14.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (smartmontools-5.41.tar.gz) = 173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32
>-SIZE (smartmontools-5.41.tar.gz) = 740661
>+SHA256 (smartmontools-5.42.tar.gz) = ee9760064fdd0727a111dc5fef2b748b951ac21df4a09ea513acdb353e9e37b3
>+SIZE (smartmontools-5.42.tar.gz) = 740025
>diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/files/patch-os_freebsd /root/smartmontools/files/patch-os_freebsd
>--- /usr/ports/sysutils/smartmontools/files/patch-os_freebsd	2011-09-27 20:59:51.000000000 +0200
>+++ /root/smartmontools/files/patch-os_freebsd	1970-01-01 01:00:00.000000000 +0100
>@@ -1,74 +0,0 @@
>-$FreeBSD: ports/sysutils/smartmontools/files/patch-os_freebsd,v 1.1 2011/09/27 18:59:51 crees Exp $
>-
>-This patch from upstream address 2 issues:
>-
>-1) SMART health status is always "GOOD" with atacam driver.
>-2) Command "-l scterc" is broken on ata and atacam drivers.
>-
>-See https://sourceforge.net/apps/trac/smartmontools/ticket/198 for more
>-details.
>-
>-NOTE: Path stripped from filename to make make patch work, but otherwise
>-identical to the patch in the ticket.
>-
>-Index: trunk/smartmontools/os_freebsd.cpp
>-===================================================================
>---- os_freebsd.cpp (revision 3407)
>-+++ os_freebsd.cpp (revision 3421)
>-@@ -288,10 +288,10 @@
>-       break;
>-     case ata_cmd_in::data_in:  
>--      request.flags=ATA_CMD_READ;
>-+      request.flags=ATA_CMD_READ | ATA_CMD_CONTROL;
>-       request.data=(char *)in.buffer;
>-       request.count=in.size;
>-       break;
>-     case ata_cmd_in::data_out: 
>--      request.flags=ATA_CMD_WRITE;
>-+      request.flags=ATA_CMD_WRITE | ATA_CMD_CONTROL;
>-       request.data=(char *)in.buffer;
>-       request.count=in.size;
>-@@ -300,6 +300,6 @@
>-       return set_err(ENOSYS);
>-   }
>--                          
>--  clear_err(); 
>-+
>-+  clear_err();
>-   errno = 0;
>-   if (do_cmd(&request, in.in_regs.is_48bit_cmd()))
>-@@ -390,5 +390,5 @@
>-   if (request->count == 0)
>-     camflags = CAM_DIR_NONE;
>--  else if (request->flags == ATA_CMD_READ)
>-+  else if (request->flags & ATA_CMD_READ)
>-     camflags = CAM_DIR_IN;
>-   else
>-@@ -406,9 +406,6 @@
>-                  request->timeout * 1000); // timeout in seconds
>- 
>-+  ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
>-   // ata_28bit_cmd
>--  if (request->flags == ATA_CMD_CONTROL)
>--    ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
>--  else
>--    ccb.ataio.cmd.flags = 0;
>-   ccb.ataio.cmd.command = request->u.ata.command;
>-   ccb.ataio.cmd.features = request->u.ata.feature;
>-@@ -436,5 +433,15 @@
>-   }
>- 
>--  request->u.ata.count = ccb.ataio.res.sector_count;
>-+  request->u.ata.lba =
>-+    ((u_int64_t)(ccb.ataio.res.lba_low)) |
>-+    ((u_int64_t)(ccb.ataio.res.lba_mid) << 8) |
>-+    ((u_int64_t)(ccb.ataio.res.lba_high) << 16) |
>-+    ((u_int64_t)(ccb.ataio.res.lba_low_exp) << 24) |
>-+    ((u_int64_t)(ccb.ataio.res.lba_mid_exp) << 32) |
>-+    ((u_int64_t)(ccb.ataio.res.lba_high_exp) << 40);
>-+
>-+  request->u.ata.count = ccb.ataio.res.sector_count | (ccb.ataio.res.sector_count_exp << 8);
>-+  request->error = ccb.ataio.res.error;
>-+
>-   return 0;
>- }

Actions: View | Diff

Attachments on bug 161859: 119347