Attachment 136583 Details for Bug 181836 – smartmontools.patch

[patch] smartmontools.patch

smartmontools.patch (text/x-patch), 3.66 KB, created by Tijl Coosemans on 2013-12-25 20:27:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2013-12-25 20:27:18 UTC

Size: 3.66 KB

patch

obsolete

>Index: sysutils/smartmontools/Makefile
>===================================================================
>--- sysutils/smartmontools/Makefile	(revision 337328)
>+++ sysutils/smartmontools/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	smartmontools
> PORTVERSION=	6.2
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>@@ -13,7 +14,11 @@ LICENSE=	GPLv2
> 
> CONFLICTS=	smartmontools-devel-[0-9]*
> 
>-USE_GMAKE=	yes
>+OPTIONS_DEFINE=	DOCS
>+DOCS_CONFIGURE_OFF=	--without-docdir --without-exampledir
>+DOCS_CONFIGURE_ON=	--with-docdir=${DOCSDIR}
>+
>+USES=		gmake
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-dependency-tracking \
> 		--enable-drivedb --enable-sample \
>@@ -22,29 +27,18 @@ CONFIGURE_ARGS=	--disable-dependency-tra
> SUB_FILES=	pkg-message smart
> USE_RC_SUBR=	smartd
> 
>-MAN5=		smartd.conf.5
>-MAN8=		smartd.8 smartctl.8
>-
> PORTDOCS=	*
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
>-.if ! ${PORT_OPTIONS:MDOCS}
>-CONFIGURE_ARGS+=	--without-docdir --without-exampledir
>-.else
>-CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
>-.endif
>-
> CFLAGS:=	${CFLAGS:S/-O2/-O/} -Wno-write-strings
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's| install-initdDATA| |' ${WRKSRC}/Makefile.in
> 
> post-install:
>-	${MKDIR} ${PREFIX}/etc/periodic/daily
>-	${INSTALL_SCRIPT} ${WRKDIR}/smart ${PREFIX}/etc/periodic/daily/smart
>-
>-	@${CAT} ${PKGMESSAGE}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
>+	${INSTALL_SCRIPT} ${WRKDIR}/smart \
>+		${STAGEDIR}${PREFIX}/etc/periodic/daily
> 
> .include <bsd.port.mk>
>Index: sysutils/smartmontools/files/patch-os_freebsd.cpp
>===================================================================
>--- sysutils/smartmontools/files/patch-os_freebsd.cpp	(revision 0)
>+++ sysutils/smartmontools/files/patch-os_freebsd.cpp	(working copy)
>@@ -0,0 +1,31 @@
>+--- os_freebsd.cpp.orig	2013-07-05 12:40:38.000000000 +0200
>++++ os_freebsd.cpp	2013-12-25 20:54:46.000000000 +0100
>+@@ -445,7 +445,8 @@
>+   }
>+ 
>+   if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
>+-    cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
>++    if(scsi_debugmode > 0)
>++      cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
>+     set_err(EIO);
>+     return -1;
>+   }
>+@@ -997,13 +998,15 @@
>+ 
>+   if (cam_send_ccb(m_camdev,ccb) < 0) {
>+     warn("error sending SCSI ccb");
>+-    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>++    if (report > 0)
>++      cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>+     cam_freeccb(ccb);
>+     return -EIO;
>+   }
>+ 
>+-  if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
>+-    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>++  if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
>++    if(report > 0)
>++      cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
>+     cam_freeccb(ccb);
>+     return -EIO;
>+   }
>
>Property changes on: sysutils/smartmontools/files/patch-os_freebsd.cpp
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: sysutils/smartmontools/pkg-plist
>===================================================================
>--- sysutils/smartmontools/pkg-plist	(revision 337328)
>+++ sysutils/smartmontools/pkg-plist	(working copy)
>@@ -1,7 +1,9 @@
>-@stopdaemon smartd
> etc/periodic/daily/smart
> etc/smartd.conf.sample
> etc/smartd_warning.sh
>+man/man5/smartd.conf.5.gz
>+man/man8/smartd.8.gz
>+man/man8/smartctl.8.gz
> sbin/smartctl
> sbin/smartd
> sbin/update-smart-drivedb

Actions: View | Diff

Attachments on bug 181836: 136582 | 136583