mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-02 11:09:29 +00:00
- Update to 5.26
- Delete patches integrated into upstream PR: 59809 Submitted by: Robin Breathe <robin@isometry.net> Approved by: maintainer
This commit is contained in:
Sergei Kolobov
parent
3642518e98
commit
fab0d8e4e6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=95127
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= smartmontools
|
||||
PORTVERSION= 5.22
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 5.26
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (smartmontools-5.22.tar.gz) = 9a6dfaff993f88f20af1b9a16cd3fd21
|
||||
MD5 (smartmontools-5.26.tar.gz) = fc2cb32e926b25afa24f450f9a48fbb1
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- knowndrives.c.orig Sat Nov 1 02:33:08 2003
|
||||
+++ knowndrives.c Sat Nov 1 02:33:20 2003
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <regex.h>
|
||||
#include "atacmds.h"
|
||||
@ -1,50 +0,0 @@
|
||||
--- os_freebsd.c.orig Sat Nov 1 02:34:37 2003
|
||||
+++ os_freebsd.c Sat Nov 1 02:40:19 2003
|
||||
@@ -402,13 +402,17 @@
|
||||
|
||||
if (cam_send_ccb(cam_dev,ccb) < 0) {
|
||||
warn("error sending SCSI ccb");
|
||||
+ #if __FreeBSD_version > 500000
|
||||
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
+ #endif
|
||||
cam_freeccb(ccb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
|
||||
+ #if __FreeBSD_version > 500000
|
||||
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
+ #endif
|
||||
cam_freeccb(ccb);
|
||||
return -1;
|
||||
}
|
||||
@@ -426,8 +430,10 @@
|
||||
cam_close_device(cam_dev);
|
||||
|
||||
if (report > 0) {
|
||||
+ int trunc;
|
||||
+
|
||||
pout(" status=0\n");
|
||||
- int trunc = (iop->dxfer_len > 256) ? 1 : 0;
|
||||
+ trunc = (iop->dxfer_len > 256) ? 1 : 0;
|
||||
|
||||
pout(" Incoming data, len=%d%s:\n", (int)iop->dxfer_len,
|
||||
(trunc ? " [only first 256 bytes shown]" : ""));
|
||||
@@ -444,6 +450,9 @@
|
||||
|
||||
|
||||
static int get_ata_channel_unit ( const char* name, int* unit, int* dev) {
|
||||
+#ifndef ATAREQUEST
|
||||
+ return -1;
|
||||
+#else
|
||||
// there is no direct correlation between name 'ad0, ad1, ...' and
|
||||
// channel/unit number. So we need to iterate through the possible
|
||||
// channels and check each unit to see if we match names
|
||||
@@ -483,6 +492,7 @@
|
||||
return -1;
|
||||
else
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@ -10,5 +10,5 @@ A sample configuration file has been installed as ${PREFIX}/etc/smartd.conf.samp
|
||||
Copy this file to ${PREFIX}/etc/smartd.conf and edit appropriately
|
||||
|
||||
To have smartd start at boot
|
||||
cp ${PREFIX}/etc/rc.d/smartd.sample ${PREFIX}/etc/rc.d/smartd.sh
|
||||
cp ${PREFIX}/etc/rc.d/smartd.sh.sample ${PREFIX}/etc/rc.d/smartd.sh
|
||||
chmod 555 ${PREFIX}/etc/rc.d/smartd.sh
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= smartmontools
|
||||
PORTVERSION= 5.22
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 5.26
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (smartmontools-5.22.tar.gz) = 9a6dfaff993f88f20af1b9a16cd3fd21
|
||||
MD5 (smartmontools-5.26.tar.gz) = fc2cb32e926b25afa24f450f9a48fbb1
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- knowndrives.c.orig Sat Nov 1 02:33:08 2003
|
||||
+++ knowndrives.c Sat Nov 1 02:33:20 2003
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <regex.h>
|
||||
#include "atacmds.h"
|
||||
@ -1,50 +0,0 @@
|
||||
--- os_freebsd.c.orig Sat Nov 1 02:34:37 2003
|
||||
+++ os_freebsd.c Sat Nov 1 02:40:19 2003
|
||||
@@ -402,13 +402,17 @@
|
||||
|
||||
if (cam_send_ccb(cam_dev,ccb) < 0) {
|
||||
warn("error sending SCSI ccb");
|
||||
+ #if __FreeBSD_version > 500000
|
||||
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
+ #endif
|
||||
cam_freeccb(ccb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
|
||||
+ #if __FreeBSD_version > 500000
|
||||
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
+ #endif
|
||||
cam_freeccb(ccb);
|
||||
return -1;
|
||||
}
|
||||
@@ -426,8 +430,10 @@
|
||||
cam_close_device(cam_dev);
|
||||
|
||||
if (report > 0) {
|
||||
+ int trunc;
|
||||
+
|
||||
pout(" status=0\n");
|
||||
- int trunc = (iop->dxfer_len > 256) ? 1 : 0;
|
||||
+ trunc = (iop->dxfer_len > 256) ? 1 : 0;
|
||||
|
||||
pout(" Incoming data, len=%d%s:\n", (int)iop->dxfer_len,
|
||||
(trunc ? " [only first 256 bytes shown]" : ""));
|
||||
@@ -444,6 +450,9 @@
|
||||
|
||||
|
||||
static int get_ata_channel_unit ( const char* name, int* unit, int* dev) {
|
||||
+#ifndef ATAREQUEST
|
||||
+ return -1;
|
||||
+#else
|
||||
// there is no direct correlation between name 'ad0, ad1, ...' and
|
||||
// channel/unit number. So we need to iterate through the possible
|
||||
// channels and check each unit to see if we match names
|
||||
@@ -483,6 +492,7 @@
|
||||
return -1;
|
||||
else
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@ -10,5 +10,5 @@ A sample configuration file has been installed as ${PREFIX}/etc/smartd.conf.samp
|
||||
Copy this file to ${PREFIX}/etc/smartd.conf and edit appropriately
|
||||
|
||||
To have smartd start at boot
|
||||
cp ${PREFIX}/etc/rc.d/smartd.sample ${PREFIX}/etc/rc.d/smartd.sh
|
||||
cp ${PREFIX}/etc/rc.d/smartd.sh.sample ${PREFIX}/etc/rc.d/smartd.sh
|
||||
chmod 555 ${PREFIX}/etc/rc.d/smartd.sh
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user