Date: Fri, 11 Dec 2009 14:51:19 +0200 From: Alex Samorukov <samm@os2.kiev.ua> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marck@FreeBSD.org Subject: ports/141371: [PATCH] sysutils/smartmontools: update to 5.39 Message-ID: <E1NJ4xr-000Dw2-0m@s1.sdv.com.ua> Resent-Message-ID: <200912111340.nBBDe2HZ025811@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141371
>Category: ports
>Synopsis: [PATCH] sysutils/smartmontools: update to 5.39
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 11 13:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alex Samorukov
>Release: FreeBSD 6.3-RELEASE-p13 i386
>Organization:
>Environment:
System: FreeBSD s1.sdv.com.ua 6.3-RELEASE-p13 FreeBSD 6.3-RELEASE-p13 #4: Sat Oct 3 11:02:30 EEST
>Description:
- Update to 5.39 and remove already integrated patches
Removed file(s):
- files/patch-knowndrives.cpp
- files/patch-os__freebsd.cpp
- files/patch-scsiata.cpp
Port maintainer (marck@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- smartmontools-5.39.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/Makefile /root/tmp/smartmontools/Makefile
--- /usr/ports/sysutils/smartmontools/Makefile 2009-12-08 03:27:48.000000000 +0200
+++ /root/tmp/smartmontools/Makefile 2009-12-11 14:33:09.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= smartmontools
-PORTVERSION= 5.38
-PORTREVISION= 8
+PORTVERSION= 5.39
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -17,6 +16,8 @@
CONFLICTS= smartmontools-devel-[0-9]*
USE_GMAKE= yes
+# hack to prevent gmake failure on 6.xx
+GMAKE= make
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --enable-sample
diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/distinfo /root/tmp/smartmontools/distinfo
--- /usr/ports/sysutils/smartmontools/distinfo 2008-03-25 17:39:33.000000000 +0200
+++ /root/tmp/smartmontools/distinfo 2009-12-11 14:32:23.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (smartmontools-5.38.tar.gz) = a282846532ecbd6b4a28072373b3a70b
-SHA256 (smartmontools-5.38.tar.gz) = b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
-SIZE (smartmontools-5.38.tar.gz) = 617326
+MD5 (smartmontools-5.39.tar.gz) = 63c1b5373a9ef91e9c9becb16e147571
+SHA256 (smartmontools-5.39.tar.gz) = e118de37541ef78061a823439425c63106df249e925610d96aabc9bd8239e0d0
+SIZE (smartmontools-5.39.tar.gz) = 658355
diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/files/patch-knowndrives.cpp /root/tmp/smartmontools/files/patch-knowndrives.cpp
--- /usr/ports/sysutils/smartmontools/files/patch-knowndrives.cpp 2008-03-25 17:39:33.000000000 +0200
+++ /root/tmp/smartmontools/files/patch-knowndrives.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- knowndrives.cpp.orig 2008-02-02 19:10:48.000000000 +0100
-+++ knowndrives.cpp 2008-03-14 13:35:59.000000000 +0100
-@@ -1155,7 +1155,7 @@
- NULL, NULL, NULL, NULL
- },
- { "Western Digital Caviar SE Serial ATA family",
-- "^WDC WD((4|8|12|16|20|25|32|40)00(JD|KD))-.*$",
-+ "^WDC WD((4|8|12|16|20|25|32|40)00(JD|KD|PD))-.*$",
- ".*",
- NULL, NULL, NULL, NULL
- },
diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/files/patch-os__freebsd.cpp /root/tmp/smartmontools/files/patch-os__freebsd.cpp
--- /usr/ports/sysutils/smartmontools/files/patch-os__freebsd.cpp 2009-08-31 16:45:57.000000000 +0300
+++ /root/tmp/smartmontools/files/patch-os__freebsd.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,58 +0,0 @@
-
-$FreeBSD: ports/sysutils/smartmontools/files/patch-os__freebsd.cpp,v 1.5 2009/08/31 13:45:57 avl Exp $
-
---- os_freebsd.cpp.orig
-+++ os_freebsd.cpp
-@@ -272,7 +272,6 @@
- }
-
- int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) {
--{
- return -1;
- }
-
-@@ -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 +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";
-+static const char * fbsd_dev_scsi_pass = "pass";
- 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 +969,11 @@
- return CONTROLLER_ATA;
- }
-
-+ // form /dev/pass* or pass*
-+ if (!strncmp(fbsd_dev_scsi_pass, dev_name,
-+ strlen(fbsd_dev_scsi_pass)))
-+ goto handlescsi;
-+
- // form /dev/da* or da*
- if (!strncmp(fbsd_dev_scsi_disk_plus, dev_name,
- strlen(fbsd_dev_scsi_disk_plus)))
diff -ruN --exclude=CVS /usr/ports/sysutils/smartmontools/files/patch-scsiata.cpp /root/tmp/smartmontools/files/patch-scsiata.cpp
--- /usr/ports/sysutils/smartmontools/files/patch-scsiata.cpp 2009-09-11 16:41:59.000000000 +0300
+++ /root/tmp/smartmontools/files/patch-scsiata.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,22 +0,0 @@
---- scsiata.cpp.orig 2007-12-02 19:14:20.000000000 -0700
-+++ scsiata.cpp 2009-09-04 14:27:48.000000000 -0600
-@@ -380,14 +380,14 @@
- return 1, else 0 */
- int has_sat_pass_through(int device, int packet_interface)
- {
-- char data[512];
-+ int ret;
-+ char *data = (char *)malloc(512); // (alignment)
- smart_command_set command;
-
- command = packet_interface ? PIDENTIFY : IDENTIFY;
-- if (0 == sat_command_interface(device, command, 0, data))
-- return 1;
-- else
-- return 0;
-+ ret = ( 0 == sat_command_interface(device, command, 0, data) ? 1 : 0 );
-+ free(data);
-+ return ret;
- }
-
- /* Next two functions are borrowed from sg_lib.c in the sg3_utils
--- smartmontools-5.39.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1NJ4xr-000Dw2-0m>