Attachment 208814 Details for Bug 241583 – zookeeper.diff

[patch] zookeeper.diff

zookeeper.diff (text/plain), 7.01 KB, created by Dmitry Wagin on 2019-11-03 09:12:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-11-03 09:12:49 UTC

Size: 7.01 KB

patch

obsolete

>Index: devel/libzookeeper/Makefile
>===================================================================
>--- devel/libzookeeper/Makefile	(revision 516328)
>+++ devel/libzookeeper/Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	zookeeper
>-PORTVERSION=	3.5.5
>+PORTVERSION=	3.5.6
> CATEGORIES=	devel
>-MASTER_SITES=	APACHE/${PORTNAME}/current
>+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> PKGNAMEPREFIX=	lib
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
> 
>Index: devel/libzookeeper/distinfo
>===================================================================
>--- devel/libzookeeper/distinfo	(revision 516328)
>+++ devel/libzookeeper/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559402372
>-SHA256 (apache-zookeeper-3.5.5.tar.gz) = 60d527254b3816c75a1c46517768b873af5767dfcc2083d6c527b567461c546c
>-SIZE (apache-zookeeper-3.5.5.tar.gz) = 3230972
>+TIMESTAMP = 1572426311
>+SHA256 (apache-zookeeper-3.5.6.tar.gz) = 3d11e467f01ff0936d8bdb51f80a18d1f38dd4f394b43a1d89cc7afc5cdb418d
>+SIZE (apache-zookeeper-3.5.6.tar.gz) = 3132621
>Index: devel/zookeeper/Makefile
>===================================================================
>--- devel/zookeeper/Makefile	(revision 516328)
>+++ devel/zookeeper/Makefile	(working copy)
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	zookeeper
>-PORTVERSION=	3.5.5
>+PORTVERSION=	3.5.6
> CATEGORIES=	devel java
>-MASTER_SITES=	APACHE/${PORTNAME}/current
>+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
> 
> MAINTAINER=	skreuzer@FreeBSD.org
>@@ -13,27 +13,28 @@
> 
> RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
> 
>-USERS=	zookeeper
>-GROUPS=	zookeeper
>+ZOOKEEPER_CONFS?=	configuration.xsl log4j.properties zoo.cfg
>+ZOOKEEPER_USER?=	zookeeper
>+ZOOKEEPER_GROUP?=	zookeeper
>+ZOOKEEPER_DBDIR?=	/var/db/zookeeper
>+ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
> 
>-ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg
>+USERS=	${ZOOKEEPER_USER}
>+GROUPS=	${ZOOKEEPER_GROUP}
> 
>-DATADIR=		${JAVASHAREDIR}/${PORTNAME}
>+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
> 
>-ZOOKEEPER_DBDIR?=	/var/db/zookeeper
>-ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
>-
>+USE_RC_SUBR=	zookeeper
> SUB_FILES=	zookeeper zkCli.sh
> SUB_LIST=	JAVA=${JAVA} \
>-		JAVALIBDIR=${JAVALIBDIR} \
> 		ETCDIR=${ETCDIR} \
>-		USERS=${USERS} \
>-		GROUPS=${GROUPS} \
>+		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
>+		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
> 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
> 
> PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
>-		USERS=${USERS} \
>-		GROUPS=${GROUPS} \
>+		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
>+		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
> 		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
> 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
> 
>@@ -40,9 +41,8 @@
> NO_BUILD=	yes
> NO_ARCH=	yes
> USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
>+JAVA_VERSION=	8+
> JAVA_RUN=	yes
>-USE_RC_SUBR=	zookeeper
> 
> PORTDOCS=	*
> 
>Index: devel/zookeeper/distinfo
>===================================================================
>--- devel/zookeeper/distinfo	(revision 516328)
>+++ devel/zookeeper/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559404113
>-SHA256 (apache-zookeeper-3.5.5-bin.tar.gz) = c5ff531cbda56c157199ab80632dc50ffefa8b7cbe866a0431345d3c4d72bbd1
>-SIZE (apache-zookeeper-3.5.5-bin.tar.gz) = 10622522
>+TIMESTAMP = 1572426286
>+SHA256 (apache-zookeeper-3.5.6-bin.tar.gz) = db24700e453f2ad4b6b789d553fe828ccceef3977a7e6b36389580ec92397a7e
>+SIZE (apache-zookeeper-3.5.6-bin.tar.gz) = 9230052
>Index: devel/zookeeper/files/zookeeper.in
>===================================================================
>--- devel/zookeeper/files/zookeeper.in	(revision 516328)
>+++ devel/zookeeper/files/zookeeper.in	(working copy)
>@@ -18,15 +18,22 @@
> load_rc_config "${name}"
> 
> : ${zookeeper_enable:=NO}
>-: ${zookeeper_user:=%%USERS%%}
>+: ${zookeeper_user:=%%ZOOKEEPER_USER%%}
> : ${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"}
> 
>+_zookeeper_user=${zookeeper_user}
>+unset zookeeper_user
>+
>+# backwards compatibility
>+if [ -n "${zookeeper_jvmopts}" ]; then
>+	zookeeper_java_opts=${zookeeper_jvmopts}
>+fi
>+
> if checkyesno zookeeper_syslog_output_enable; then
> 	zookeeper_syslog_output_flags="-T ${name}"
> 	if [ -n "${zookeeper_syslog_output_priority}" ]; then
>@@ -37,18 +44,17 @@
> 	fi
> fi
> 
>-JAVA=%%JAVA%%
>+JAVA="%%JAVA%%"
> 
> CLASSPATH=":%%DATADIR%%/*"
> 
> 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}"
>+zookeeper_main="${zookeeper_java_opts} ${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="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -u ${zookeeper_user} -t ${name} ${JAVA} ${zookeeper_main}"
>-unset zookeeper_user
>+command_args="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -u ${_zookeeper_user} -t ${name} ${JAVA} ${zookeeper_main}"
> 
> run_rc_command "$1"
>Index: devel/zookeeper/pkg-plist
>===================================================================
>--- devel/zookeeper/pkg-plist	(revision 516328)
>+++ devel/zookeeper/pkg-plist	(working copy)
>@@ -1,9 +1,9 @@
> bin/zkCli.sh
> %%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%%/jackson-annotations-2.9.10.jar
>+%%DATADIR%%/jackson-core-2.9.10.jar
>+%%DATADIR%%/jackson-databind-2.9.10.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
>@@ -14,7 +14,14 @@
> %%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%%/netty-buffer-4.1.42.Final.jar
>+%%DATADIR%%/netty-codec-4.1.42.Final.jar
>+%%DATADIR%%/netty-common-4.1.42.Final.jar
>+%%DATADIR%%/netty-handler-4.1.42.Final.jar
>+%%DATADIR%%/netty-resolver-4.1.42.Final.jar
>+%%DATADIR%%/netty-transport-4.1.42.Final.jar
>+%%DATADIR%%/netty-transport-native-epoll-4.1.42.Final.jar
>+%%DATADIR%%/netty-transport-native-unix-common-4.1.42.Final.jar
> %%DATADIR%%/slf4j-api-1.7.25.jar
> %%DATADIR%%/slf4j-log4j12-1.7.25.jar
> %%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
>@@ -22,5 +29,6 @@
> @sample %%ETCDIR%%/log4j.properties.sample
> @sample %%ETCDIR%%/configuration.xsl.sample
> @sample %%ETCDIR%%/zoo.cfg.sample
>-@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%
>-@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%
>+@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ETCDIR%%
>+@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_DBDIR%%
>+@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_LOGDIR%%

Actions: View | Diff

Attachments on bug 241583: 208693 | 208695 | 208697 | 208732 | 208740 | 208812 | 208814 | 208861 | 208865 | 209778 | 211876