Attachment 204908 Details for Bug 238283 – zookeeper.diff

[patch] zookeeper.diff

zookeeper.diff (text/plain), 7.21 KB, created by Dmitry Wagin on 2019-06-08 17:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-06-08 17:53:34 UTC

Size: 7.21 KB

patch

obsolete

>Index: devel/zookeeper/Makefile
>===================================================================
>--- devel/zookeeper/Makefile	(revision 503721)
>+++ devel/zookeeper/Makefile	(working copy)
>@@ -1,9 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	zookeeper
>-PORTVERSION=	3.4.12
>+PORTVERSION=	3.5.5
> CATEGORIES=	devel java
> MASTER_SITES=	APACHE/${PORTNAME}/current
>+DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
> 
> MAINTAINER=	skreuzer@FreeBSD.org
> COMMENT=	Coordination Service for Distributed Applications
>@@ -10,11 +11,7 @@
> 
> LICENSE=	APACHE20
> 
>-RUN_DEPENDS=	slf4j>=1.7.5:devel/slf4j \
>-		netty>=3.5.5:java/netty \
>-		jline>=0.9.94:devel/jline \
>-		log4j>=1.2.16:devel/log4j \
>-		libzookeeper>=${PORTVERSION}:devel/libzookeeper
>+RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
> 
> USERS=	zookeeper
> GROUPS=	zookeeper
>@@ -21,28 +18,29 @@
> 
> ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg
> 
>-ZOOKEEPER_JAR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
>+DATADIR=		${JAVASHAREDIR}/${PORTNAME}
> 
> ZOOKEEPER_DBDIR?=	/var/db/zookeeper
> ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
> 
>-SUB_FILES=	zookeeper zkCli.sh zkServer.sh
>+SUB_FILES=	zookeeper zkCli.sh
> SUB_LIST=	JAVA=${JAVA} \
> 		JAVALIBDIR=${JAVALIBDIR} \
> 		ETCDIR=${ETCDIR} \
>-		ZOOKEEPER_USER=${USERS} \
>-		ZOOKEEPER_GROUP=${GROUPS} \
>+		USERS=${USERS} \
>+		GROUPS=${GROUPS} \
> 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
> 
> PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
>+		USERS=${USERS} \
>+		GROUPS=${GROUPS} \
> 		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
>-		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
>-		JAVALIBDIR=${JAVALIBDIR}
>+		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
> USE_JAVA=	yes
>-JAVA_VERSION=	1.7+
>+JAVA_VERSION=	1.8+
> JAVA_RUN=	yes
> USE_RC_SUBR=	zookeeper
> 
>@@ -59,12 +57,10 @@
> .for f in ${ZOOKEEPER_CONFS}
> 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
> .endfor
>-	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}
>-	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \
>-		${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-name *\.jar")
> 
> 	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
>-	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/
> 
> 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR}
> 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR}
>Index: devel/zookeeper/distinfo
>===================================================================
>--- devel/zookeeper/distinfo	(revision 503721)
>+++ devel/zookeeper/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1525190291
>-SHA256 (zookeeper-3.4.12.tar.gz) = c686f9319050565b58e642149cb9e4c9cc8c7207aacc2cb70c5c0672849594b9
>-SIZE (zookeeper-3.4.12.tar.gz) = 36667596
>+TIMESTAMP = 1559404113
>+SHA256 (apache-zookeeper-3.5.5-bin.tar.gz) = c5ff531cbda56c157199ab80632dc50ffefa8b7cbe866a0431345d3c4d72bbd1
>+SIZE (apache-zookeeper-3.5.5-bin.tar.gz) = 10622522
>Index: devel/zookeeper/files/zkCli.sh.in
>===================================================================
>--- devel/zookeeper/files/zkCli.sh.in	(revision 503721)
>+++ devel/zookeeper/files/zkCli.sh.in	(working copy)
>@@ -6,18 +6,13 @@
> zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"
> 
> JAVA=%%JAVA%%
>-JAVAJARDIR=%%JAVAJARDIR%%
> 
>-for i in zookeeper jline slf4j-api netty log4j
>-do
>-    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
>-done
>-CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
>+CLASSPATH=":%%DATADIR%%/*"
> 
> zookeeper_main="org.apache.zookeeper.ZooKeeperMain"
> log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \
>-            -Dzookeeper.root.logger=${zookeeper_rootlogger} \
>-            -Dlog4j.configuration=${zookeeper_log4jpropfile}"
>+		-Dzookeeper.root.logger=${zookeeper_rootlogger} \
>+		-Dlog4j.configuration=${zookeeper_log4jpropfile}"
> 
> ${JAVA} -cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
>-    ${log4j_params} ${zookeeper_main} $@
>+	${log4j_params} ${zookeeper_main} $@
>Index: devel/zookeeper/files/zookeeper.in
>===================================================================
>--- devel/zookeeper/files/zookeeper.in	(revision 503721)
>+++ devel/zookeeper/files/zookeeper.in	(working copy)
>@@ -18,8 +18,7 @@
> load_rc_config "${name}"
> 
> : ${zookeeper_enable:=NO}
>-: ${zookeeper_user:=%%ZOOKEEPER_USER%%}
>-: ${zookeeper_group:=%%ZOOKEEPER_GROUP%%}
>+: ${zookeeper_user:=%%USERS%%}
> : ${zookeeper_pidfile:=/var/run/zookeeper.pid}
> : ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}
> : ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
>@@ -28,32 +27,18 @@
> : ${zookeeper_jvmopts:=}
> 
> JAVA=%%JAVA%%
>-JAVAJARDIR=%%JAVAJARDIR%%
> 
>-for i in zookeeper jline slf4j-api netty log4j
>-do
>-    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
>-done
>-CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
>+CLASSPATH=":%%DATADIR%%/*"
> 
> zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
>-log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \
>-            -Dlog4j.configuration=${zookeeper_log4jpropfile} \
>-            -Dzookeeper.root.logger=${zookeeper_rootlogger}"
>-pidfile=${zookeeper_pidfile}
>-procname=${JAVA}
>+log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=${zookeeper_log4jpropfile} \
>+		-Dzookeeper.root.logger=${zookeeper_rootlogger}"
>+pidfile="${zookeeper_pidfile}"
>+required_dirs="${zookeeper_logdir}"
> required_files="${zookeeper_config}"
> 
> command="/usr/sbin/daemon"
>-command_args="-p ${pidfile} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
>+command_args="-f -P '${pidfile}' -u ${zookeeper_user} -t ${name} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
>+unset zookeeper_user
> 
>-start_precmd="zookeeper_init"
>-
>-zookeeper_init()
>-{
>-    touch ${pidfile}
>-    chown ${zookeeper_user}:${zookeeper_group} ${pidfile}
>-    install -d -m 755 -o ${zookeeper_user} -g ${zookeeper_group} ${zookeeper_logdir}
>-}
>-
> run_rc_command "$1"
>Index: devel/zookeeper/pkg-plist
>===================================================================
>--- devel/zookeeper/pkg-plist	(revision 503721)
>+++ devel/zookeeper/pkg-plist	(working copy)
>@@ -1,9 +1,26 @@
> bin/zkCli.sh
>-bin/zkServer.sh
>-%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
>-%%JAVAJARDIR%%/zookeeper.jar
>+%%DATADIR%%/audience-annotations-0.5.0.jar
>+%%DATADIR%%/commons-cli-1.2.jar
>+%%DATADIR%%/jackson-annotations-2.9.0.jar
>+%%DATADIR%%/jackson-core-2.9.8.jar
>+%%DATADIR%%/jackson-databind-2.9.8.jar
>+%%DATADIR%%/javax.servlet-api-3.1.0.jar
>+%%DATADIR%%/jetty-http-9.4.17.v20190418.jar
>+%%DATADIR%%/jetty-io-9.4.17.v20190418.jar
>+%%DATADIR%%/jetty-security-9.4.17.v20190418.jar
>+%%DATADIR%%/jetty-server-9.4.17.v20190418.jar
>+%%DATADIR%%/jetty-servlet-9.4.17.v20190418.jar
>+%%DATADIR%%/jetty-util-9.4.17.v20190418.jar
>+%%DATADIR%%/jline-2.11.jar
>+%%DATADIR%%/json-simple-1.1.1.jar
>+%%DATADIR%%/log4j-1.2.17.jar
>+%%DATADIR%%/netty-all-4.1.29.Final.jar
>+%%DATADIR%%/slf4j-api-1.7.25.jar
>+%%DATADIR%%/slf4j-log4j12-1.7.25.jar
>+%%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
>+%%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar
> @sample %%ETCDIR%%/log4j.properties.sample
> @sample %%ETCDIR%%/configuration.xsl.sample
> @sample %%ETCDIR%%/zoo.cfg.sample
>-@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
>-@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%
>+@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%
>+@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%

Actions: View | Diff

Attachments on bug 238283: 204766 | 204767 | 204772 | 204773 | 204902 | 204904 | 204908 | 204915