Attachment 143789 Details for Bug 191046 – moosefs-chunkserver

[patch] moosefs-chunkserver

moosefs-chunkserver.diff (text/plain), 5.50 KB, created by takeda on 2014-06-15 02:01:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takeda

Created: 2014-06-15 02:01:43 UTC

Size: 5.50 KB

patch

obsolete

>diff -urN moosefs-chunkserver.orig/Makefile moosefs-chunkserver/Makefile
>--- moosefs-chunkserver.orig/Makefile	2014-06-14 21:21:29.000000000 +0000
>+++ moosefs-chunkserver/Makefile	2014-06-15 00:57:04.000000000 +0000
>@@ -2,46 +2,39 @@
> # $FreeBSD: head/sysutils/moosefs-chunkserver/Makefile 327772 2013-09-20 23:05:58Z bapt $
> 
> PORTNAME=	moosefs
>-PORTVERSION=	#
>+DISTVERSION=	1.6.27-5
> CATEGORIES=	sysutils
>+MASTER_SITES=	http://www.moosefs.org/tl_files/mfscode/ \
>+		http://ports.quxingwen.com/dist/mfs/
> PKGNAMESUFFIX=	-chunkserver
>-NO_STAGE=	yes
>-.include "${.CURDIR}/../moosefs-master/bsd.port.moosefs.mk"
>+DISTNAME=	mfs-${DISTVERSION}
> 
> MAINTAINER=	chifeng@gmail.com
> COMMENT=	Storing files data and synchronizing it among themselves
> 
>-DISTINFO_FILE=	${.CURDIR}/../moosefs-master/distinfo
>-USE_RC_SUBR=	mfschunkserver
>+LICENSE=	GPLv3
>+
>+WRKSRC=		${WRKDIR}/mfs-1.6.27
>+USERS=		mfs
>+GROUPS=		mfs
>+GNU_CONFIGURE=	yes
> 
>-MAN5=		mfschunkserver.cfg.5 mfshdd.cfg.5
>-MAN8=		mfschunkserver.8
>+USE_RC_SUBR=	mfschunkserver
> 
>-SUB_FILES+=	pkg-message pkg-deinstall
>-SUB_LIST+=	MFS_WORKDIR="${MFS_WORKDIR}"
>+SUB_FILES=	pkg-message
> 
>-CONFIGURE_ARGS=	--localstatedir=${MFS_WORKDIR} \
>-		--bindir=${PREFIX}/sbin \
>-		--with-default-user=${MFSUSER} \
>-		--with-default-group=${MFSGROUP} \
>+CONFIGURE_ARGS=	--localstatedir=/var \
>+		--enable-mfschunkserver \
> 		--disable-mfsmaster \
> 		--disable-mfsmount \
> 		--disable-mfscgi \
> 		--disable-mfscgiserv \
>-		--enable-mfschunkserver
>-
>-.include <bsd.port.pre.mk>
>+		--bindir=${PREFIX}/sbin \
>+		--with-default-user=mfs \
>+		--with-default-group=mfs
> 
> post-patch:
> 	${REINPLACE_CMD} -e 's;^general_mans;#general_mans;g' ${WRKSRC}/doc/Makefile.am \
> 		${WRKSRC}/doc/Makefile.in
> 
>-post-install:
>-.for FILE in mfschunkserver mfshdd
>-	@if [ ! -f ${PREFIX}/etc/${i}.cfg ]; then \
>-		${CP} ${PREFIX}/etc/mfs/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
>-	fi
>-.endfor
>-	@${CAT} ${PKGMESSAGE}
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN moosefs-chunkserver.orig/distinfo moosefs-chunkserver/distinfo
>--- moosefs-chunkserver.orig/distinfo	1970-01-01 00:00:00.000000000 +0000
>+++ moosefs-chunkserver/distinfo	2014-06-14 22:20:14.000000000 +0000
>@@ -0,0 +1,2 @@
>+SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
>+SIZE (mfs-1.6.27-5.tar.gz) = 784507
>diff -urN moosefs-chunkserver.orig/files/mfschunkserver.in moosefs-chunkserver/files/mfschunkserver.in
>--- moosefs-chunkserver.orig/files/mfschunkserver.in	2014-06-14 21:21:29.000000000 +0000
>+++ moosefs-chunkserver/files/mfschunkserver.in	2014-06-15 00:47:28.000000000 +0000
>@@ -8,9 +8,14 @@
> # KEYWORD: shutdown
> 
> #
>-# Add the following lines to /etc/rc.conf or or /etc/rc.conf to enable mfschunkserver:
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfschunkserver:
> #
>-# mfschunkserver_enable="YES"
>+# mfschunkserver_enable (bool):   Set to NO by default.
>+#                                 Set it to YES to enable mfschunkserver.
>+# mfschunkserver_config (path):   Set to %%PREFIX%%/etc/mfs/mfschunkserver.cfg
>+#                                 by default.
>+# mfschunkserver_flags (str):     Set to ""  by default.
>+#                                 Extra flags passed to mfschunkserver.
> #
> 
> . /etc/rc.subr
>@@ -18,18 +23,13 @@
> name=mfschunkserver
> rcvar=mfschunkserver_enable
> 
>-command=%%PREFIX%%/sbin/${name}
>+load_rc_config $name
> 
>-stop_postcmd=stop_postcmd
>+: ${mfschunkserver_enable=NO}
>+: ${mfschunkserver_config=%%PREFIX%%/etc/mfs/mfschunkserver.cfg}
> 
>-stop_postcmd()
>-{
>-  rm -f $pidfile
>-}
>-
>-# set defaults
>-mfschunkserver_enable=${mfschunkserver_enable:-"NO"}
>-mfschunkserver_flags=${mfschunkserver_flags:-"-c %%PREFIX%%/etc/mfschunkserver.cfg"}
>+extra_commands=reload
>+command=%%PREFIX%%/sbin/${name}
>+command_args="-c ${mfschunkserver_config}"
> 
>-load_rc_config $name
> run_rc_command "$1"
>diff -urN moosefs-chunkserver.orig/files/pkg-deinstall.in moosefs-chunkserver/files/pkg-deinstall.in
>--- moosefs-chunkserver.orig/files/pkg-deinstall.in	2014-06-14 21:21:29.000000000 +0000
>+++ moosefs-chunkserver/files/pkg-deinstall.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>-#!/bin/sh
>-
>-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
>-
>-WORKDIR=%%MFS_WORKDIR%%/mfs
>-
>-if [ "$2" = "POST-DEINSTALL" ]; then
>-	echo "=> Deleting ${WORKDIR} if empty..."
>-	rm -d ${WORKDIR} 2>/dev/null || true
>-fi
>diff -urN moosefs-chunkserver.orig/pkg-plist moosefs-chunkserver/pkg-plist
>--- moosefs-chunkserver.orig/pkg-plist	2014-06-14 21:21:29.000000000 +0000
>+++ moosefs-chunkserver/pkg-plist	2014-06-15 01:31:26.000000000 +0000
>@@ -1,8 +1,14 @@
>-@exec  if [ ! -f %D/etc/mfshdd.cfg ]; then /bin/cp %D/%F %D/etc/mfshdd.cfg; fi
>-@exec  if [ ! -f %D/etc/mfschunkserver.cfg ]; then /bin/cp %D/%F %D/etc/mfschunkserver.cfg; fi
>-@unexec if cmp -s %D/etc/mfs/mfshdd.cfg.dist %D/etc/mfshdd.cfg; then rm -f %D/etc/mfshdd.cfg; fi
>-@unexec if cmp -s %D/etc/mfs/mfschunkserver.cfg.dist %D/etc/mfschunkserver.cfg; then rm -f %D/etc/mfschunkserver.cfg; fi
>+@unexec if cmp -s %D/%F %B/mfschunkserver.cfg; then rm -f %B/mfschunkserver.cfg; fi
> etc/mfs/mfschunkserver.cfg.dist
>+@exec if [ ! -f %B/mfschunkserver.cfg ]; then cp %D/%F %B/mfschunkserver.cfg; chmod u+w %B/mfschunkserver.cfg; fi
>+@unexec if cmp -s %D/%F %B/mfshdd.cfg; then rm -f %B/mfshdd.cfg; fi
> etc/mfs/mfshdd.cfg.dist
>+@exec if [ ! -f %B/mfshdd.cfg ]; then cp %D/%F %B/mfshdd.cfg; chmod u+w %B/mfshdd.cfg; fi
>+man/man5/mfschunkserver.cfg.5.gz
>+man/man5/mfshdd.cfg.5.gz
>+man/man8/mfschunkserver.8.gz
> sbin/mfschunkserver
> @dirrm etc/mfs
>+@owner mfs
>+@group mfs
>+@unexec rmdir "/var/mfs" >/dev/null 2>&1 || :

Actions: View | Diff

Attachments on bug 191046: 143788 | 143789 | 143790 | 143791