FreeBSD Bugzilla – Attachment 200702 Details for
Bug 234562
sysutils/smartmontools: Update to 7.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update to 7.0
smart.diff (text/plain), 6.08 KB, created by
Oleksii Samorukov
on 2019-01-02 10:42:28 UTC
(
hide
)
Description:
update to 7.0
Filename:
MIME Type:
Creator:
Oleksii Samorukov
Created:
2019-01-02 10:42:28 UTC
Size:
6.08 KB
patch
obsolete
>diff -urN /usr/ports/sysutils/smartmontools/Makefile /root/ports/smartmontools/Makefile >--- /usr/ports/sysutils/smartmontools/Makefile 2018-12-12 02:35:33.000000000 +0100 >+++ /root/ports/smartmontools/Makefile 2019-01-02 11:41:16.237648000 +0100 >@@ -2,8 +2,7 @@ > # $FreeBSD: head/sysutils/smartmontools/Makefile 487272 2018-12-12 01:35:33Z gerald $ > > PORTNAME= smartmontools >-PORTVERSION= 6.6 >-PORTREVISION= 3 >+PORTVERSION= 7.0 > CATEGORIES= sysutils > MASTER_SITES= SF > >diff -urN /usr/ports/sysutils/smartmontools/distinfo /root/ports/smartmontools/distinfo >--- /usr/ports/sysutils/smartmontools/distinfo 2017-11-06 20:39:05.000000000 +0100 >+++ /root/ports/smartmontools/distinfo 2019-01-02 09:09:46.322991000 +0100 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1509917610 >-SHA256 (smartmontools-6.6.tar.gz) = 51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054 >-SIZE (smartmontools-6.6.tar.gz) = 903847 >+TIMESTAMP = 1546416586 >+SHA256 (smartmontools-7.0.tar.gz) = e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c >+SIZE (smartmontools-7.0.tar.gz) = 944925 >diff -urN /usr/ports/sysutils/smartmontools/files/patch-configure /root/ports/smartmontools/files/patch-configure >--- /usr/ports/sysutils/smartmontools/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 >+++ /root/ports/smartmontools/files/patch-configure 2019-01-02 11:10:08.855231000 +0100 >@@ -0,0 +1,11 @@ >+--- configure.orig 2019-01-02 11:04:33.405401000 +0100 >++++ configure 2019-01-02 11:04:52.511236000 +0100 >+@@ -6891,7 +6891,7 @@ >+ *-*-freebsd*|*-*-dragonfly*|*-*-kfreebsd*-gnu*) >+ os_deps='os_freebsd.o cciss.o dev_areca.o' >+ os_libs='-lcam -lsbuf' >+- os_dltools='curl wget lynx fetch svn' >++ os_dltools='fetch curl wget lynx svn' >+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_device_desc in -lusb" >&5 >+ $as_echo_n "checking for libusb20_dev_get_device_desc in -lusb... " >&6; } >+ if ${ac_cv_lib_usb_libusb20_dev_get_device_desc+:} false; then : >diff -urN /usr/ports/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h /root/ports/smartmontools/files/patch-freebsd__nvme__ioctl.h >--- /usr/ports/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h 2018-02-26 21:19:51.000000000 +0100 >+++ /root/ports/smartmontools/files/patch-freebsd__nvme__ioctl.h 1970-01-01 01:00:00.000000000 +0100 >@@ -1,13 +0,0 @@ >---- 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" >diff -urN /usr/ports/sysutils/smartmontools/files/patch-os__freebsd.cpp /root/ports/smartmontools/files/patch-os__freebsd.cpp >--- /usr/ports/sysutils/smartmontools/files/patch-os__freebsd.cpp 2018-09-07 17:45:14.000000000 +0200 >+++ /root/ports/smartmontools/files/patch-os__freebsd.cpp 1970-01-01 01:00:00.000000000 +0100 >@@ -1,58 +0,0 @@ >---- 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)) >diff -urN /usr/ports/sysutils/smartmontools/files/patch-update-smart-drivedb.in /root/ports/smartmontools/files/patch-update-smart-drivedb.in >--- /usr/ports/sysutils/smartmontools/files/patch-update-smart-drivedb.in 2016-05-13 21:33:43.000000000 +0200 >+++ /root/ports/smartmontools/files/patch-update-smart-drivedb.in 1970-01-01 01:00:00.000000000 +0100 >@@ -1,29 +0,0 @@ >---- 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"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
samm
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 234562
:
200700
|
200702
|
201461