Attachment 159804 Details for Bug 199343 – MooseFS Chunkserver Port 2.0.72-1 - update

[patch] MooseFS Chunkserver Port 2.0.72-1 - update

moosefs-chunkserver.diff (text/plain), 8.83 KB, created by MooseFS FreeBSD Team on 2015-08-12 14:46:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: MooseFS FreeBSD Team

Created: 2015-08-12 14:46:52 UTC

Size: 8.83 KB

patch

obsolete

>diff -ruN moosefs-chunkserver.orig/Makefile moosefs-chunkserver/Makefile
>--- moosefs-chunkserver.orig/Makefile	2015-06-10 19:31:59.000000000 +0200
>+++ moosefs-chunkserver/Makefile	2015-07-09 16:36:24.273261000 +0200
>@@ -1,40 +1,14 @@
>-# Created by: Chifeng Qu <chifeng@gmail.com>
>-# $FreeBSD: head/sysutils/moosefs-chunkserver/Makefile 389100 2015-06-10 17:31:59Z amdmi3 $
>+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
>+# $FreeBSD$
> 
>-PORTNAME=	moosefs
>-DISTVERSION=	1.6.27-5
>-CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.moosefs.org/tl_files/mfscode/ \
>-		http://ports.quxingwen.com/dist/mfs/
> PKGNAMESUFFIX=	-chunkserver
>-DISTNAME=	mfs-${DISTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Storing file data and synchronizing it among themselves
>+COMMENT=	Storing files data and synchronizing it among themselves
> 
>-LICENSE=	GPLv3
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE=	GPLv2
> 
>-WRKSRC=		${WRKDIR}/mfs-1.6.27
>-USERS=		mfs
>-GROUPS=		mfs
>-GNU_CONFIGURE=	yes
>-
>-USE_RC_SUBR=	mfschunkserver
>-SUB_FILES=	pkg-message
>-
>-CONFIGURE_ARGS=	--localstatedir=/var \
>-		--enable-mfschunkserver \
>-		--disable-mfsmaster \
>-		--disable-mfsmount \
>-		--disable-mfscgi \
>-		--disable-mfscgiserv \
>-		--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
>+MFS_COMPONENT=	chunkserver
> 
>-.include <bsd.port.mk>
>+MASTERDIR=	${.CURDIR}/../moosefs-master
>+
>+.include "${MASTERDIR}/Makefile"
>diff -ruN moosefs-chunkserver.orig/distinfo moosefs-chunkserver/distinfo
>--- moosefs-chunkserver.orig/distinfo	2014-07-12 12:16:57.000000000 +0200
>+++ moosefs-chunkserver/distinfo	1970-01-01 01:00:00.000000000 +0100
>@@ -1,2 +0,0 @@
>-SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
>-SIZE (mfs-1.6.27-5.tar.gz) = 784507
>diff -ruN moosefs-chunkserver.orig/files/mfschunkserver.in moosefs-chunkserver/files/mfschunkserver.in
>--- moosefs-chunkserver.orig/files/mfschunkserver.in	2014-07-12 12:16:57.000000000 +0200
>+++ moosefs-chunkserver/files/mfschunkserver.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,35 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: head/sysutils/moosefs-chunkserver/files/mfschunkserver.in 361607 2014-07-12 10:16:57Z marino $
>-#
>-
>-# PROVIDE: mfschunkserver
>-# REQUIRE: LOGIN 
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfschunkserver:
>-#
>-# 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
>-
>-name=mfschunkserver
>-rcvar=mfschunkserver_enable
>-
>-load_rc_config $name
>-
>-: ${mfschunkserver_enable=NO}
>-: ${mfschunkserver_config=%%PREFIX%%/etc/mfs/mfschunkserver.cfg}
>-
>-extra_commands=reload
>-command=%%PREFIX%%/sbin/${name}
>-command_args="-c ${mfschunkserver_config}"
>-
>-run_rc_command "$1"
>diff -ruN moosefs-chunkserver.orig/files/patch-mfsdata_Makefile.in moosefs-chunkserver/files/patch-mfsdata_Makefile.in
>--- moosefs-chunkserver.orig/files/patch-mfsdata_Makefile.in	2014-07-12 12:16:57.000000000 +0200
>+++ moosefs-chunkserver/files/patch-mfsdata_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,36 +0,0 @@
>---- mfsdata/Makefile.in.orig	2013-11-26 11:22:48.000000000 +0000
>-+++ mfsdata/Makefile.in
>-@@ -470,26 +470,20 @@ install-data-hook:
>- 	if [ ! -d $(DESTDIR)$(sysconfdir)"/mfs" ]; then \
>- 		$(MKDIR_P) $(DESTDIR)$(sysconfdir)"/mfs" ; \
>- 	fi
>--@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(builddir)/mfschunkserver.cfg $(DESTDIR)$(sysconfdir)/mfs/mfschunkserver.cfg.dist
>--@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(srcdir)/mfshdd.cfg $(DESTDIR)$(sysconfdir)/mfs/mfshdd.cfg.dist
>-+@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(builddir)/mfschunkserver.cfg $(DESTDIR)$(sysconfdir)/mfs/mfschunkserver.cfg.sample
>-+@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(srcdir)/mfshdd.cfg $(DESTDIR)$(sysconfdir)/mfs/mfshdd.cfg.sample
>- @BUILD_CHUNKSERVER_TRUE@	if [ ! -d $(DESTDIR)$(DATA_PATH) ]; then \
>- @BUILD_CHUNKSERVER_TRUE@		$(MKDIR_P) $(DESTDIR)$(DATA_PATH) ; \
>--@BUILD_CHUNKSERVER_TRUE@		if [ "`id -u`" = "0" ]; then \
>--@BUILD_CHUNKSERVER_TRUE@			chown $(DEFAULT_USER):$(DEFAULT_GROUP) $(DESTDIR)$(DATA_PATH) ; \
>--@BUILD_CHUNKSERVER_TRUE@		fi ; \
>- @BUILD_CHUNKSERVER_TRUE@	fi
>--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.cfg.dist
>--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmaster.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmaster.cfg.dist
>--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsexports.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsexports.cfg.dist
>--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfstopology.cfg $(DESTDIR)$(sysconfdir)/mfs/mfstopology.cfg.dist
>-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.cfg.sample
>-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmaster.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmaster.cfg.sample
>-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsexports.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsexports.cfg.sample
>-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfstopology.cfg $(DESTDIR)$(sysconfdir)/mfs/mfstopology.cfg.sample
>- @BUILD_MASTER_TRUE@	if [ ! -d $(DESTDIR)$(DATA_PATH) ]; then \
>- @BUILD_MASTER_TRUE@		$(MKDIR_P) $(DESTDIR)$(DATA_PATH) ; \
>--@BUILD_MASTER_TRUE@		if [ "`id -u`" = "0" ]; then \
>--@BUILD_MASTER_TRUE@			chown $(DEFAULT_USER):$(DEFAULT_GROUP) $(DESTDIR)$(DATA_PATH) ; \
>--@BUILD_MASTER_TRUE@		fi ; \
>- @BUILD_MASTER_TRUE@	fi
>- @BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(srcdir)/metadata.mfs $(DESTDIR)$(DATA_PATH)/metadata.mfs.empty
>--@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.dist
>-+@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.sample
>- 
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -ruN moosefs-chunkserver.orig/files/pkg-message.in moosefs-chunkserver/files/pkg-message.in
>--- moosefs-chunkserver.orig/files/pkg-message.in	2014-01-22 16:52:06.000000000 +0100
>+++ moosefs-chunkserver/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>-************************************************************************
>-
>-A startup script has been installed as: 
>-
>-%%PREFIX%%/etc/rc.d/mfschunkserver
>-
>-Use it to start/stop the mfschunkserver service after you have added
>-the following line to your rc.conf file:
>-
>-mfschunkserver_enable="YES"
>-
>-************************************************************************
>diff -ruN moosefs-chunkserver.orig/pkg-descr moosefs-chunkserver/pkg-descr
>--- moosefs-chunkserver.orig/pkg-descr	2013-05-17 22:09:11.000000000 +0200
>+++ moosefs-chunkserver/pkg-descr	2015-07-09 16:36:24.273261000 +0200
>@@ -1,7 +1,9 @@
>-MooseFS is a fault tolerant, network distributed file system.
>+MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out,
>+network distributed file system. It spreads data over several physical commodity
>+servers, which are visible to the user as one resource.
> 
>-mfschunkserver is any number of commodity servers storing files
>-data and synchronizing it among themselves (if a certain file
>-is supposed to exist in more than one copy).
>+For standard file operations MooseFS acts like any other Unix-like file system.
> 
>-WWW: http://www.moosefs.org/
>+This port provides: MooseFS data server.
>+
>+WWW: https://moosefs.com/
>diff -ruN moosefs-chunkserver.orig/pkg-plist moosefs-chunkserver/pkg-plist
>--- moosefs-chunkserver.orig/pkg-plist	2015-06-10 19:31:59.000000000 +0200
>+++ moosefs-chunkserver/pkg-plist	2015-07-19 23:27:49.712887000 +0200
>@@ -1,13 +1,14 @@
>-@owner mfs
>-@group mfs
>-@sample etc/mfs/mfschunkserver.cfg.sample
>-@sample etc/mfs/mfshdd.cfg.sample
>-@owner
>-@group
>+@unexec if cmp -s %D/etc/mfs/mfschunkserver.cfg.dist %D/etc/mfs/mfschunkserver.cfg; then rm -f %D/etc/mfs/mfschunkserver.cfg; fi
>+@unexec if cmp -s %D/etc/mfs/mfshdd.cfg.dist %D/etc/mfs/mfshdd.cfg; then rm -f %D/etc/mfs/mfshdd.cfg; fi
>+etc/mfs/mfschunkserver.cfg.dist
>+etc/mfs/mfshdd.cfg.dist
>+sbin/mfschunkserver
>+sbin/mfschunktool
> man/man5/mfschunkserver.cfg.5.gz
> man/man5/mfshdd.cfg.5.gz
> man/man8/mfschunkserver.8.gz
>-sbin/mfschunkserver
>+@exec  if [ ! -f %D/etc/mfs/mfschunkserver.cfg ]; then /bin/cp %D/etc/mfs/mfschunkserver.cfg.dist %D/etc/mfs/mfschunkserver.cfg; fi
>+@exec  if [ ! -f %D/etc/mfs/mfshdd.cfg ]; then /bin/cp %D/etc/mfs/mfshdd.cfg.dist %D/etc/mfs/mfshdd.cfg; fi
> @owner mfs
> @group mfs
>-@unexec rmdir "/var/mfs" >/dev/null 2>&1 || :
>+@dir %%MFS_WORKDIR%%/mfs

Actions: View | Diff

Attachments on bug 199343: 155416 | 155808 | 159524 | 159804