[Midnightbsd-cvs] mports [23666] trunk/sysutils/smartmontools: update to 6.6.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jul 24 08:26:10 EDT 2018
Revision: 23666
http://svnweb.midnightbsd.org/mports/?rev=23666
Author: laffer1
Date: 2018-07-24 08:26:10 -0400 (Tue, 24 Jul 2018)
Log Message:
-----------
update to 6.6.
Modified Paths:
--------------
trunk/sysutils/smartmontools/Makefile
trunk/sysutils/smartmontools/distinfo
Added Paths:
-----------
trunk/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h
trunk/sysutils/smartmontools/files/patch-os__freebsd.cpp
Removed Paths:
-------------
trunk/sysutils/smartmontools/files/patch-atacmds.h
trunk/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h
Modified: trunk/sysutils/smartmontools/Makefile
===================================================================
--- trunk/sysutils/smartmontools/Makefile 2018-07-23 21:53:34 UTC (rev 23665)
+++ trunk/sysutils/smartmontools/Makefile 2018-07-24 12:26:10 UTC (rev 23666)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= smartmontools
-PORTVERSION= 6.5
+PORTVERSION= 6.6
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -14,10 +14,11 @@
OPTIONS_DEFINE= DOCS
-USES= alias gmake
+USES= compiler:c++11-lib gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-dependency-tracking \
--enable-sample \
+ --with-nvme-devicescan=yes \
--with-initscriptdir=${PREFIX}/etc/rc.d
SUB_FILES= pkg-message smart
Modified: trunk/sysutils/smartmontools/distinfo
===================================================================
--- trunk/sysutils/smartmontools/distinfo 2018-07-23 21:53:34 UTC (rev 23665)
+++ trunk/sysutils/smartmontools/distinfo 2018-07-24 12:26:10 UTC (rev 23666)
@@ -1,2 +1,3 @@
-SHA256 (smartmontools-6.5.tar.gz) = 89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc
-SIZE (smartmontools-6.5.tar.gz) = 855642
+TIMESTAMP = 1532434512
+SHA256 (smartmontools-6.6.tar.gz) = 51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054
+SIZE (smartmontools-6.6.tar.gz) = 903847
Deleted: trunk/sysutils/smartmontools/files/patch-atacmds.h
===================================================================
--- trunk/sysutils/smartmontools/files/patch-atacmds.h 2018-07-23 21:53:34 UTC (rev 23665)
+++ trunk/sysutils/smartmontools/files/patch-atacmds.h 2018-07-24 12:26:10 UTC (rev 23666)
@@ -1,12 +0,0 @@
---- atacmds.h.orig 2015-10-31 09:36:16.000000000 -0700
-+++ atacmds.h 2016-06-15 19:39:43.425233000 -0700
-@@ -74,7 +74,9 @@
- #define ATA_IDLE 0xe3
- #define ATA_SMART_CMD 0xb0
- #define ATA_SECURITY_FREEZE_LOCK 0xf5
-+#ifndef ATA_SET_FEATURES
- #define ATA_SET_FEATURES 0xef
-+#endif
- #define ATA_STANDBY_IMMEDIATE 0xe0
-
- // SET_FEATURES subcommands
Added: trunk/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h
===================================================================
--- trunk/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h (rev 0)
+++ trunk/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h 2018-07-24 12:26:10 UTC (rev 23666)
@@ -0,0 +1,13 @@
+--- freebsd_nvme_ioctl.h.orig 2017-09-20 10:34:38.000000000 -0700
++++ freebsd_nvme_ioctl.h 2018-02-22 23:04:32.250104000 -0800
+@@ -148,8 +148,10 @@
+ #include <dev/nvme/nvme.h>
+ #endif
+
++#if __FreeBSD_version < 1200058
+ #define nvme_completion_is_error(cpl) \
+ ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
++#endif
+
+ #define NVME_CTRLR_PREFIX "/dev/nvme"
+ #define NVME_NS_PREFIX "ns"
Property changes on: trunk/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h
===================================================================
--- trunk/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h 2018-07-23 21:53:34 UTC (rev 23665)
+++ trunk/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h 2018-07-24 12:26:10 UTC (rev 23666)
@@ -1,20 +0,0 @@
---- freebsd_nvme_ioctl.h.orig 2016-03-28 16:25:56 UTC
-+++ freebsd_nvme_ioctl.h
-@@ -31,6 +31,7 @@
-
- #define NVME_PASSTHROUGH_CMD _IOWR('n', 0, struct nvme_pt_command)
-
-+#if __FreeBSD_version < 1100110
- struct nvme_command
- {
- /* dword 0 */
-@@ -143,6 +144,9 @@ struct nvme_pt_command {
- */
- struct mtx * driver_lock;
- };
-+#else
-+#include <dev/nvme/nvme.h>
-+#endif
-
- #define nvme_completion_is_error(cpl) \
- ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
Added: trunk/sysutils/smartmontools/files/patch-os__freebsd.cpp
===================================================================
--- trunk/sysutils/smartmontools/files/patch-os__freebsd.cpp (rev 0)
+++ trunk/sysutils/smartmontools/files/patch-os__freebsd.cpp 2018-07-24 12:26:10 UTC (rev 23666)
@@ -0,0 +1,58 @@
+--- os_freebsd.cpp.orig 2017-04-24 09:34:16.000000000 -0700
++++ os_freebsd.cpp 2018-02-27 19:15:54.338861000 +0000
+@@ -16,6 +16,8 @@
+ */
+
+ #include <stdio.h>
++#include <sys/endian.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+@@ -484,7 +486,7 @@
+ }
+ nsid = 0xFFFFFFFF; // broadcast id
+ }
+- else if (sscanf(dev, NVME_CTRLR_PREFIX"%d"NVME_NS_PREFIX"%d%c",
++ else if (sscanf(dev, NVME_CTRLR_PREFIX"%d" NVME_NS_PREFIX "%d%c",
+ &ctrlid, &nsid, &tmp) == 2)
+ {
+ if(ctrlid < 0 || nsid < 0) {
+@@ -521,16 +523,20 @@
+ struct nvme_pt_command pt;
+ memset(&pt, 0, sizeof(pt));
+
++#if __FreeBSD_version >= 1200058
++ pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode);
++#else
+ pt.cmd.opc = in.opcode;
++#endif
+- pt.cmd.nsid = in.nsid;
++ pt.cmd.nsid = htole32(in.nsid);
+ pt.buf = in.buffer;
+ pt.len = in.size;
+- pt.cmd.cdw10 = in.cdw10;
+- pt.cmd.cdw11 = in.cdw11;
+- pt.cmd.cdw12 = in.cdw12;
+- pt.cmd.cdw13 = in.cdw13;
+- pt.cmd.cdw14 = in.cdw14;
+- pt.cmd.cdw15 = in.cdw15;
++ pt.cmd.cdw10 = htole32(in.cdw10);
++ pt.cmd.cdw11 = htole32(in.cdw11);
++ pt.cmd.cdw12 = htole32(in.cdw12);
++ pt.cmd.cdw13 = htole32(in.cdw13);
++ pt.cmd.cdw14 = htole32(in.cdw14);
++ pt.cmd.cdw15 = htole32(in.cdw15);
+ pt.is_read = 1; // should we use in.direction()?
+
+ int status = ioctl(get_fd(), NVME_PASSTHROUGH_CMD, &pt);
+@@ -538,6 +544,9 @@
+ if (status < 0)
+ return set_err(errno, "NVME_PASSTHROUGH_CMD: %s", strerror(errno));
+
++#if __FreeBSD_version >= 1200058
++ nvme_completion_swapbytes(&pt.cpl);
++#endif
+ out.result=pt.cpl.cdw0; // Command specific result (DW0)
+
+ if (nvme_completion_is_error(&pt.cpl))
Property changes on: trunk/sysutils/smartmontools/files/patch-os__freebsd.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list