Attachment #200702 for bug #234562

Lines 2-9 Link Here

(-)/root/ports/smartmontools/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/sysutils/smartmontools/Makefile 487272 2018-12-12 01:35:33Z gerald $	2	# $FreeBSD: head/sysutils/smartmontools/Makefile 487272 2018-12-12 01:35:33Z gerald $
3		3
4	PORTNAME= smartmontools	4	PORTNAME= smartmontools
5	PORTVERSION= 6.6	5	PORTVERSION= 7.0
6	PORTREVISION= 3
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8

Lines 1-3 Link Here

(-)/root/ports/smartmontools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1509917610	1	TIMESTAMP = 1546416586
2	SHA256 (smartmontools-6.6.tar.gz) = 51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054	2	SHA256 (smartmontools-7.0.tar.gz) = e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c
3	SIZE (smartmontools-6.6.tar.gz) = 903847	3	SIZE (smartmontools-7.0.tar.gz) = 944925

Line 0 Link Here

(-)/root/ports/smartmontools/files/patch-configure (+11 lines)
	1	--- configure.orig 2019-01-02 11:04:33.405401000 +0100
	2	+++ configure 2019-01-02 11:04:52.511236000 +0100
	3	@@ -6891,7 +6891,7 @@
	4	--freebsd\|--dragonfly\|--kfreebsd-gnu)
	5	os_deps='os_freebsd.o cciss.o dev_areca.o'
	6	os_libs='-lcam -lsbuf'
	7	- os_dltools='curl wget lynx fetch svn'
	8	+ os_dltools='fetch curl wget lynx svn'
	9	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_device_desc in -lusb" >&5
	10	$as_echo_n "checking for libusb20_dev_get_device_desc in -lusb... " >&6; }
	11	if ${ac_cv_lib_usb_libusb20_dev_get_device_desc+:} false; then :




--- 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"




--- 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 && __FreeBSD_version < 1200081
+  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))




--- update-smart-drivedb.in.orig	2016-02-26 23:29:24.000000000 +0300
+++ update-smart-drivedb.in	2016-05-12 23:07:17.558810000 +0300
@@ -51,7 +51,8 @@
   -s SMARTCTL     Use SMARTCTL for syntax check ('-s -' to disable)
                   [default: $SMARTCTL]
   -t TOOL         Use TOOL for download: $os_dltools
-                  [default: first one found in PATH]
+                  [default: fetch, which is always available
+                  on FreeBSD.]
   -u LOCATION     Use URL of LOCATION for download:
                     sf (Sourceforge code browser via HTTPS)
                     svn (SVN repository via HTTPS) [default]
@@ -262,14 +263,8 @@
 esac
 
 if [ -z "$tool" ]; then
-  # Find download tool in PATH
-  for t in $os_dltools; do
-    if inpath "$t"; then
-      tool=$t
-      break
-    fi
-  done
-  test -n "$tool" || error "found none of: $os_dltools"
+  # Set to fetch by default
+  tool="fetch"
 fi
 
 test -n "$url" || selecturl "svn"

Return to bug 234562

Lines 1-13 Link Here

(-)/root/ports/smartmontools/files/patch-freebsd__nvme__ioctl.h (-13 lines)
1	--- freebsd_nvme_ioctl.h.orig 2017-09-20 10:34:38.000000000 -0700
2	+++ freebsd_nvme_ioctl.h 2018-02-22 23:04:32.250104000 -0800
3	@@ -148,8 +148,10 @@
4	#include <dev/nvme/nvme.h>
5	#endif
6
7	+#if __FreeBSD_version < 1200058
8	#define nvme_completion_is_error(cpl) \
9	((cpl)->status.sc != 0 \|\| (cpl)->status.sct != 0)
10	+#endif
11
12	#define NVME_CTRLR_PREFIX "/dev/nvme"
13	#define NVME_NS_PREFIX "ns"

Lines 1-58 Link Here

(-)/root/ports/smartmontools/files/patch-os__freebsd.cpp (-58 lines)
1	--- os_freebsd.cpp.orig 2017-04-24 09:34:16.000000000 -0700
2	+++ os_freebsd.cpp 2018-02-27 19:15:54.338861000 +0000
3	@@ -16,6 +16,8 @@
4	*/
5
6	#include <stdio.h>
7	+#include <sys/endian.h>
8	+#include <sys/param.h>
9	#include <sys/types.h>
10	#include <dirent.h>
11	#include <fcntl.h>
12	@@ -484,7 +486,7 @@
13	}
14	nsid = 0xFFFFFFFF; // broadcast id
15	}
16	- else if (sscanf(dev, NVME_CTRLR_PREFIX"%d"NVME_NS_PREFIX"%d%c",
17	+ else if (sscanf(dev, NVME_CTRLR_PREFIX"%d" NVME_NS_PREFIX "%d%c",
18	&ctrlid, &nsid, &tmp) == 2)
19	{
20	if(ctrlid < 0 \|\| nsid < 0) {
21	@@ -521,16 +523,20 @@
22	struct nvme_pt_command pt;
23	memset(&pt, 0, sizeof(pt));
24
25	+#if __FreeBSD_version >= 1200058 && __FreeBSD_version < 1200081
26	+ pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode);
27	+#else
28	pt.cmd.opc = in.opcode;
29	+#endif
30	- pt.cmd.nsid = in.nsid;
31	+ pt.cmd.nsid = htole32(in.nsid);
32	pt.buf = in.buffer;
33	pt.len = in.size;
34	- pt.cmd.cdw10 = in.cdw10;
35	- pt.cmd.cdw11 = in.cdw11;
36	- pt.cmd.cdw12 = in.cdw12;
37	- pt.cmd.cdw13 = in.cdw13;
38	- pt.cmd.cdw14 = in.cdw14;
39	- pt.cmd.cdw15 = in.cdw15;
40	+ pt.cmd.cdw10 = htole32(in.cdw10);
41	+ pt.cmd.cdw11 = htole32(in.cdw11);
42	+ pt.cmd.cdw12 = htole32(in.cdw12);
43	+ pt.cmd.cdw13 = htole32(in.cdw13);
44	+ pt.cmd.cdw14 = htole32(in.cdw14);
45	+ pt.cmd.cdw15 = htole32(in.cdw15);
46	pt.is_read = 1; // should we use in.direction()?
47
48	int status = ioctl(get_fd(), NVME_PASSTHROUGH_CMD, &pt);
49	@@ -538,6 +544,9 @@
50	if (status < 0)
51	return set_err(errno, "NVME_PASSTHROUGH_CMD: %s", strerror(errno));
52
53	+#if __FreeBSD_version >= 1200058
54	+ nvme_completion_swapbytes(&pt.cpl);
55	+#endif
56	out.result=pt.cpl.cdw0; // Command specific result (DW0)
57
58	if (nvme_completion_is_error(&pt.cpl))

Lines 1-29 Link Here

(-)/root/ports/smartmontools/files/patch-update-smart-drivedb.in (-29 lines)
1	--- update-smart-drivedb.in.orig 2016-02-26 23:29:24.000000000 +0300
2	+++ update-smart-drivedb.in 2016-05-12 23:07:17.558810000 +0300
3	@@ -51,7 +51,8 @@
4	-s SMARTCTL Use SMARTCTL for syntax check ('-s -' to disable)
5	[default: $SMARTCTL]
6	-t TOOL Use TOOL for download: $os_dltools
7	- [default: first one found in PATH]
8	+ [default: fetch, which is always available
9	+ on FreeBSD.]
10	-u LOCATION Use URL of LOCATION for download:
11	sf (Sourceforge code browser via HTTPS)
12	svn (SVN repository via HTTPS) [default]
13	@@ -262,14 +263,8 @@
14	esac
15
16	if [ -z "$tool" ]; then
17	- # Find download tool in PATH
18	- for t in $os_dltools; do
19	- if inpath "$t"; then
20	- tool=$t
21	- break
22	- fi
23	- done
24	- test -n "$tool" \|\| error "found none of: $os_dltools"
25	+ # Set to fetch by default
26	+ tool="fetch"
27	fi
28
29	test -n "$url" \|\| selecturl "svn"