svn commit: r506595 - in head/devel/zookeeper: . files
Steven Kreuzer
skreuzer at FreeBSD.org
Sun Jul 14 02:46:46 UTC 2019
Author: skreuzer
Date: Sun Jul 14 02:46:42 2019
New Revision: 506595
URL: https://svnweb.freebsd.org/changeset/ports/506595
Log:
Update to version 3.5.5
PR: 238283
Submitted by: Dmitry Wagin <dmitry.wagin at ya.ru>
Modified:
head/devel/zookeeper/Makefile
head/devel/zookeeper/distinfo
head/devel/zookeeper/files/zkCli.sh.in
head/devel/zookeeper/files/zookeeper.in
head/devel/zookeeper/pkg-plist
Modified: head/devel/zookeeper/Makefile
==============================================================================
--- head/devel/zookeeper/Makefile Sun Jul 14 02:42:50 2019 (r506594)
+++ head/devel/zookeeper/Makefile Sun Jul 14 02:46:42 2019 (r506595)
@@ -1,48 +1,46 @@
# $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 at FreeBSD.org
COMMENT= Coordination Service for Distributed Applications
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
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 @@ do-install:
.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}
Modified: head/devel/zookeeper/distinfo
==============================================================================
--- head/devel/zookeeper/distinfo Sun Jul 14 02:42:50 2019 (r506594)
+++ head/devel/zookeeper/distinfo Sun Jul 14 02:46:42 2019 (r506595)
@@ -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
Modified: head/devel/zookeeper/files/zkCli.sh.in
==============================================================================
--- head/devel/zookeeper/files/zkCli.sh.in Sun Jul 14 02:42:50 2019 (r506594)
+++ head/devel/zookeeper/files/zkCli.sh.in Sun Jul 14 02:46:42 2019 (r506595)
@@ -6,18 +6,13 @@ zookeeper_rootlogger="WARN,CONSOLE"
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} $@
Modified: head/devel/zookeeper/files/zookeeper.in
==============================================================================
--- head/devel/zookeeper/files/zookeeper.in Sun Jul 14 02:42:50 2019 (r506594)
+++ head/devel/zookeeper/files/zookeeper.in Sun Jul 14 02:46:42 2019 (r506595)
@@ -18,42 +18,37 @@ rcvar=zookeeper_enable
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}
: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
: ${zookeeper_jvmopts:=}
+: ${zookeeper_syslog_output_enable:="YES"}
+if checkyesno zookeeper_syslog_output_enable; then
+ zookeeper_syslog_output_flags="-T ${name}"
+ if [ -n "${zookeeper_syslog_output_priority}" ]; then
+ zookeeper_syslog_output_flags="${zookeeper_syslog_output_flags} -s ${zookeeper_syslog_output_priority}"
+ fi
+ if [ -n "${zookeeper_syslog_output_facility}" ]; then
+ zookeeper_syslog_output_flags="${zookeeper_syslog_output_flags} -l ${zookeeper_syslog_output_facility}"
+ fi
+fi
+
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}"
+zookeeper_main="${zookeeper_jvmopts} ${log4j_params} -cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
+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}"
-
-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}
-}
+command_args="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -u ${zookeeper_user} -t ${name} ${JAVA} ${zookeeper_main}"
+unset zookeeper_user
run_rc_command "$1"
Modified: head/devel/zookeeper/pkg-plist
==============================================================================
--- head/devel/zookeeper/pkg-plist Sun Jul 14 02:42:50 2019 (r506594)
+++ head/devel/zookeeper/pkg-plist Sun Jul 14 02:46:42 2019 (r506595)
@@ -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
- at dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
- at dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%
+ at dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%
+ at dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%
More information about the svn-ports-head
mailing list