Attachment 145138 Details for Bug 191115 – 3dm.patch

[patch] 3dm.patch

3dm.patch (text/plain), 7.30 KB, created by takefu on 2014-07-30 03:48:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-07-30 03:48:41 UTC

Size: 7.30 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/3dm/Makefile ./Makefile
>--- /usr/ports/sysutils/3dm/Makefile	2014-06-05 18:41:33.000000000 +0900
>+++ ./Makefile	2014-07-30 12:28:10.000000000 +0900
>@@ -2,76 +2,52 @@
> # $FreeBSD: head/sysutils/3dm/Makefile 356623 2014-06-05 09:41:33Z cs $
> 
> PORTNAME=	3dm
>-PORTVERSION=	2.11.00.019
>+PORTVERSION=	2.11.00.021
> PORTEPOCH=	1
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://a.aranea.brtsvcs.net/3dm2/ \
>-		http://b.aranea.brtsvcs.net/3dm2/
>-DISTFILES=	tdmCliBSD_${PORTVERSION}.tar.gz
>+MASTER_SITES=	http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip?source=1/
>+DISTFILES=	3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip
> DIST_SUBDIR=	3dm2
> 
> MAINTAINER=	takefu@airport.fm
> COMMENT=	3ware RAID controller monitoring daemon and web server
> 
>-USE_RC_SUBR=	3dm2
>-
>-SUB_FILES=	pkg-message
>+RESTRICTED=	Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/Pages/user/eula.aspx
> 
>-OPTIONS_DEFINE=	SSLFIX
>-SSLFIX_DESC=	Install KB16625-patched binaries
>-OPTIONS_DEFAULT=	SSLFIX
>-
>-.include <bsd.port.options.mk>
>-
>-.if !empty(PORT_OPTIONS:MSSLFIX)
>-DISTFILES+=	kb16625_${PORTVERSION}.tar.gz
>-BINPREFIX=	${WRKSRC}/kb16625
>-.else
>-BINPREFIX=	${WRKSRC}
>-.endif
>+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
> 
>+USE_RC_SUBR=	3dm2
>+SUB_FILES=	pkg-message 3dm2.conf.sample
>+SUB_LIST=	HOSTNAME=`hostname`
> ONLY_FOR_ARCHS=	i386 amd64
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
>-
>-BINSRC=		${BINPREFIX}/7x
>+BINSRC=		${WRKSRC}/7x
> HELPSRC=	${WRKSRC}/en
>-HELPDIR=	${PREFIX}/share/3dm2/help/en
>-ETCDIR=		${PREFIX}/etc/3dm2
>-MSGDIR=		${ETCDIR}/msg
>+HELPDIR=	${DATADIR}2/help/en
>+MSGDIR=		${ETCDIR}2/msg
> 
> post-extract:
>+	@${TAR} zxf ${WRKSRC}/tdmCliBSD.tgz -C ${WRKSRC}
> 	@${TAR} zxf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC}
> 	@${TAR} zxf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC}
> 
>-post-configure:
>-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
>-	< ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
>-
> do-install:
>-.for i in ${ETCDIR} ${MSGDIR} ${HELPDIR} \
>-    ${HELPDIR}/css ${HELPDIR}/images ${HELPDIR}/scripts
>-	${MKDIR} ${STAGEDIR}${PREFIX}${i}
>-	# XXX rene not sure why ${PREFIX} is ommitted from ${i} here
>-.endfor
>-	${INSTALL_DATA} ${HELPSRC}/*.html ${STAGEDIR}${HELPDIR}
>-	${INSTALL_DATA} ${HELPSRC}/*.gif ${STAGEDIR}${HELPDIR}
>-	${INSTALL_DATA} ${HELPSRC}/*.jpg ${STAGEDIR}${HELPDIR}
>-	${INSTALL_DATA} ${HELPSRC}/css/* ${STAGEDIR}${HELPDIR}/css
>-	${INSTALL_DATA} ${HELPSRC}/images/* ${STAGEDIR}${HELPDIR}/images
>-	${INSTALL_DATA} ${HELPSRC}/scripts/* ${STAGEDIR}${HELPDIR}/scripts
>-
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}2
>+	@${MKDIR} ${STAGEDIR}${MSGDIR}
>+	@cd ${HELPSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${HELPDIR}
> 	${INSTALL_PROGRAM} ${BINSRC}/3dm2.${ARCH:S,i386,x86,:S,amd64,x86_64,}\
> 		${STAGEDIR}${PREFIX}/sbin/3dm2
>-
> 	${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${STAGEDIR}${MSGDIR}
> 	${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${STAGEDIR}${MSGDIR}
>-	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}
>+	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}2
> 
> # 3ware uses a hardcoded config dir location that doesn't match hier(9)
> 
>-	${MKDIR} ${STAGEDIR}/etc/3dm2
>+	@${MKDIR} ${STAGEDIR}/etc/3dm2
> 	(cd ${STAGEDIR} && ${LN} -s ${PREFIX}/etc/3dm2/3dm2.conf etc/3dm2/3dm2.conf)
> 	(cd ${STAGEDIR} && ${LN} -s ${PREFIX}/etc/3dm2/3dm2.pem etc/3dm2/3dm2.pem)
> 
>+#.include <bsd.port.post.mk>
> .include <bsd.port.mk>
>+
>diff -ruN /usr/ports/sysutils/3dm/distinfo ./distinfo
>--- /usr/ports/sysutils/3dm/distinfo	2014-01-23 00:30:13.000000000 +0900
>+++ ./distinfo	2014-03-21 16:29:07.000000000 +0900
>@@ -1,4 +1,2 @@
>-SHA256 (3dm2/tdmCliBSD_2.11.00.019.tar.gz) = 70b8ccd1b8b8f3e89fd19d5666e27c7cc86a3b78a240dbb58e3189cb920dde95
>-SIZE (3dm2/tdmCliBSD_2.11.00.019.tar.gz) = 9987174
>-SHA256 (3dm2/kb16625_2.11.00.019.tar.gz) = ce61fe3cf1a3a83572c7d008408f55e77e02d21aa908d6e2dad50e4aaf1e4c60
>-SIZE (3dm2/kb16625_2.11.00.019.tar.gz) = 4120297
>+SHA256 (3dm2/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip) = 0f9445288949973f454c6f7bd7aaace32469ecce80854a4318b7c01117e468d0
>+SIZE (3dm2/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip) = 12159916
>diff -ruN /usr/ports/sysutils/3dm/files/3dm2.conf.sample ./files/3dm2.conf.sample
>--- /usr/ports/sysutils/3dm/files/3dm2.conf.sample	2014-01-24 09:14:07.000000000 +0900
>+++ ./files/3dm2.conf.sample	1970-01-01 09:00:00.000000000 +0900
>@@ -1,28 +0,0 @@
>-Port 888
>-EmailEnable 0
>-EmailSender 
>-EmailServer 
>-EmailServerLogin 
>-EmailServerPasswd 
>-EmailRecipient 
>-EmailServerPortLastSetTo 25
>-EmailServerNoSSLPort 25
>-EmailServerSSLPort 465
>-EmailSeverity 1
>-EmailServerPortFlag 0
>-ROpwd twOmwmsK8lKk2
>-ADMINpwd twOmwmsK8lKk2
>-RemoteAccess 1
>-Language 0
>-Logger 0
>-Refresh 5
>-BGRate 3333333333333333
>-MsgPath %%PREFIX%%/etc/3dm2/msg
>-imgPath %%PREFIX%%/etc/3dm2
>-Help %%PREFIX%%/share/3dm2/help
>-OEM 0
>-OEMBrand 3ware
>-AutoLogout 0
>-CommandLog 1
>-EnclosureMonitor 1
>-EnclMonitorSleepMinutes 2
>diff -ruN /usr/ports/sysutils/3dm/files/3dm2.conf.sample.in ./files/3dm2.conf.sample.in
>--- /usr/ports/sysutils/3dm/files/3dm2.conf.sample.in	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/3dm2.conf.sample.in	2012-07-14 23:29:18.000000000 +0900
>@@ -0,0 +1,28 @@
>+Port 888
>+EmailEnable 0
>+EmailSender 
>+EmailServer 
>+EmailServerLogin 
>+EmailServerPasswd 
>+EmailRecipient 
>+EmailServerPortLastSetTo 25
>+EmailServerNoSSLPort 25
>+EmailServerSSLPort 465
>+EmailSeverity 1
>+EmailServerPortFlag 0
>+ROpwd twOmwmsK8lKk2
>+ADMINpwd twOmwmsK8lKk2
>+RemoteAccess 1
>+Language 0
>+Logger 0
>+Refresh 5
>+BGRate 3333333333333333
>+MsgPath %%PREFIX%%/etc/3dm2/msg
>+imgPath %%PREFIX%%/etc/3dm2
>+Help %%PREFIX%%/share/3dm2/help
>+OEM 0
>+OEMBrand 3ware
>+AutoLogout 0
>+CommandLog 1
>+EnclosureMonitor 1
>+EnclMonitorSleepMinutes 2
>diff -ruN /usr/ports/sysutils/3dm/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/sysutils/3dm/files/pkg-message.in	2014-04-06 22:26:24.000000000 +0900
>+++ ./files/pkg-message.in	2014-04-07 08:12:25.000000000 +0900
>@@ -2,4 +2,4 @@
> To run 3DM2 at startup, add twdm2_enable="YES" to your /etc/rc.conf.
> 
>         Do not forget to edit '%%PREFIX%%/etc/3dm2/3dm2.conf'
>-        Visit https://`hostname`:888/
>+        Visit https://%%HOSTNAME%%:888/
>diff -ruN /usr/ports/sysutils/3dm/pkg-install ./pkg-install
>--- /usr/ports/sysutils/3dm/pkg-install	2014-01-23 00:52:06.000000000 +0900
>+++ ./pkg-install	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>-#!/bin/sh
>-
>-# 3ware hardcoded /etc/3dm2 into the binary, so we need to fake it
>-# in order to meet hier(9).
>-
>-case $2 in
>-POST-INSTALL)
>-	mkdir /etc/3dm2
>-	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf
>-	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem
>-	;;
>-*)
>-	;;
>-esac
>-exit 0
>diff -ruN /usr/ports/sysutils/3dm/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/3dm/pkg-plist	2014-04-06 22:26:24.000000000 +0900
>+++ ./pkg-plist	2014-07-30 12:18:30.000000000 +0900
>@@ -1,9 +1,7 @@
> @stopdaemon 3dm2
>-@unexec if cmp -s %D/etc/3dm2/3dm2.conf.sample %D/etc/3dm2/3dm2.conf; then rm -f %D/etc/3dm2/3dm2.conf; fi
>-@mode 0400
>-etc/3dm2/3dm2.conf.sample
>+@mode u+r
>+@sample etc/3dm2/3dm2.conf.sample
> @mode
>-@exec if [ ! -f %B/3dm2.conf ] ; then cp -p %D/%F %B/3dm2.conf && chmod 0600 %B/3dm2.conf; fi
> etc/3dm2/msg/tdm_msg_en
> etc/3dm2/msg/tw_msg_en
> sbin/3dm2
>@@ -383,8 +381,8 @@
> @cwd /
> etc/3dm2/3dm2.conf
> etc/3dm2/3dm2.pem
>+@dirrm etc/3dm2
> @cwd
>-@unexec rmdir /etc/3dm2 2>/dev/null || true
> @dirrmtry etc/3dm2/msg
> @dirrmtry etc/3dm2
> @dirrmtry share/3dm2/help/en/css

Actions: View | Diff

Attachments on bug 191115: 143859 | 145138