Attachment #208740 for bug #241583

Lines 2-10 Link Here

(-)devel/libzookeeper/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zookeeper	4	PORTNAME= zookeeper
5	PORTVERSION= 3.5.5	5	PORTVERSION= 3.5.6
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= APACHE/${PORTNAME}/current	7	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8	PKGNAMEPREFIX= lib	8	PKGNAMEPREFIX= lib
9	DISTNAME= apache-${PORTNAME}-${PORTVERSION}	9	DISTNAME= apache-${PORTNAME}-${PORTVERSION}
10		10

Lines 1-3 Link Here

(-)devel/libzookeeper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559402372	1	TIMESTAMP = 1572426311
2	SHA256 (apache-zookeeper-3.5.5.tar.gz) = 60d527254b3816c75a1c46517768b873af5767dfcc2083d6c527b567461c546c	2	SHA256 (apache-zookeeper-3.5.6.tar.gz) = 3d11e467f01ff0936d8bdb51f80a18d1f38dd4f394b43a1d89cc7afc5cdb418d
3	SIZE (apache-zookeeper-3.5.5.tar.gz) = 3230972	3	SIZE (apache-zookeeper-3.5.6.tar.gz) = 3132621




# $FreeBSD$

PORTNAME=	zookeeper
PORTVERSION=	3.5.6
CATEGORIES=	devel java
MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin

MAINTAINER=	skreuzer@FreeBSD.org


RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper

ZOOKEEPER_CONFS?=	configuration.xsl log4j.properties zoo.cfg
ZOOKEEPER_USER?=	zookeeper
ZOOKEEPER_GROUP?=	zookeeper
ZOOKEEPER_DBDIR?=	/var/db/zookeeper
ZOOKEEPER_LOGDIR?=	/var/log/zookeeper

USERS=	${ZOOKEEPER_USER}
GROUPS=	${ZOOKEEPER_GROUP}

DATADIR=	${JAVASHAREDIR}/${PORTNAME}

USE_RC_SUBR=	zookeeper
ZOOKEEPER_LOGDIR?=	/var/log/zookeeper

SUB_FILES=	zookeeper zkCli.sh
SUB_LIST=	JAVA=${JAVA} \
		JAVALIBDIR=${JAVALIBDIR} \
		ETCDIR=${ETCDIR} \
		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}

PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}


NO_BUILD=	yes
NO_ARCH=	yes
USE_JAVA=	yes
JAVA_VERSION=	8+
JAVA_RUN=	yes
USE_RC_SUBR=	zookeeper

PORTDOCS=	*


Lines 1-3 Link Here

(-)devel/zookeeper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559404113	1	TIMESTAMP = 1572426286
2	SHA256 (apache-zookeeper-3.5.5-bin.tar.gz) = c5ff531cbda56c157199ab80632dc50ffefa8b7cbe866a0431345d3c4d72bbd1	2	SHA256 (apache-zookeeper-3.5.6-bin.tar.gz) = db24700e453f2ad4b6b789d553fe828ccceef3977a7e6b36389580ec92397a7e
3	SIZE (apache-zookeeper-3.5.5-bin.tar.gz) = 10622522	3	SIZE (apache-zookeeper-3.5.6-bin.tar.gz) = 9230052




load_rc_config "${name}"

: ${zookeeper_enable:=NO}
: ${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

CLASSPATH=":%%DATADIR%%/*"

log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=${zookeeper_log4jpropfile} -Dzookeeper.root.logger=${zookeeper_rootlogger}"
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

run_rc_command "$1"

Lines 1-9 Link Here

(-)devel/zookeeper/pkg-plist (-6 / +14 lines)
1	bin/zkCli.sh	1	bin/zkCli.sh
2	%%DATADIR%%/audience-annotations-0.5.0.jar	2	%%DATADIR%%/audience-annotations-0.5.0.jar
3	%%DATADIR%%/commons-cli-1.2.jar	3	%%DATADIR%%/commons-cli-1.2.jar
4	%%DATADIR%%/jackson-annotations-2.9.0.jar	4	%%DATADIR%%/jackson-annotations-2.9.10.jar
5	%%DATADIR%%/jackson-core-2.9.8.jar	5	%%DATADIR%%/jackson-core-2.9.10.jar
6	%%DATADIR%%/jackson-databind-2.9.8.jar	6	%%DATADIR%%/jackson-databind-2.9.10.jar
7	%%DATADIR%%/javax.servlet-api-3.1.0.jar	7	%%DATADIR%%/javax.servlet-api-3.1.0.jar
8	%%DATADIR%%/jetty-http-9.4.17.v20190418.jar	8	%%DATADIR%%/jetty-http-9.4.17.v20190418.jar
9	%%DATADIR%%/jetty-io-9.4.17.v20190418.jar	9	%%DATADIR%%/jetty-io-9.4.17.v20190418.jar
Lines 14-20 Link Here
14	%%DATADIR%%/jline-2.11.jar	14	%%DATADIR%%/jline-2.11.jar
15	%%DATADIR%%/json-simple-1.1.1.jar	15	%%DATADIR%%/json-simple-1.1.1.jar
16	%%DATADIR%%/log4j-1.2.17.jar	16	%%DATADIR%%/log4j-1.2.17.jar
17	%%DATADIR%%/netty-all-4.1.29.Final.jar	17	%%DATADIR%%/netty-buffer-4.1.42.Final.jar
		18	%%DATADIR%%/netty-codec-4.1.42.Final.jar
		19	%%DATADIR%%/netty-common-4.1.42.Final.jar
		20	%%DATADIR%%/netty-handler-4.1.42.Final.jar
		21	%%DATADIR%%/netty-resolver-4.1.42.Final.jar
		22	%%DATADIR%%/netty-transport-4.1.42.Final.jar
		23	%%DATADIR%%/netty-transport-native-epoll-4.1.42.Final.jar
		24	%%DATADIR%%/netty-transport-native-unix-common-4.1.42.Final.jar
18	%%DATADIR%%/slf4j-api-1.7.25.jar	25	%%DATADIR%%/slf4j-api-1.7.25.jar
19	%%DATADIR%%/slf4j-log4j12-1.7.25.jar	26	%%DATADIR%%/slf4j-log4j12-1.7.25.jar
20	%%DATADIR%%/zookeeper-%%PORTVERSION%%.jar	27	%%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
Lines 22-26 Link Here
22	@sample %%ETCDIR%%/log4j.properties.sample	29	@sample %%ETCDIR%%/log4j.properties.sample
23	@sample %%ETCDIR%%/configuration.xsl.sample	30	@sample %%ETCDIR%%/configuration.xsl.sample
24	@sample %%ETCDIR%%/zoo.cfg.sample	31	@sample %%ETCDIR%%/zoo.cfg.sample
25	@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%	32	@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ETCDIR%%
26	@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%	33	@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_DBDIR%%
		34	@dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_LOGDIR%%

Return to bug 241583

Lines 1-9 Link Here

(-)devel/zookeeper/Makefile (-16 / +16 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zookeeper	3	PORTNAME= zookeeper
4	PORTVERSION= 3.5.5	4	PORTVERSION= 3.5.6
5	CATEGORIES= devel java	5	CATEGORIES= devel java
6	MASTER_SITES= APACHE/${PORTNAME}/current	6	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
7	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin	7	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin
8		8
9	MAINTAINER= skreuzer@FreeBSD.org	9	MAINTAINER= skreuzer@FreeBSD.org
Lines 13-39 Link Here
13		13
14	RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper	14	RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper
15		15
16	USERS= zookeeper	16	ZOOKEEPER_CONFS?= configuration.xsl log4j.properties zoo.cfg
17	GROUPS= zookeeper	17	ZOOKEEPER_USER?= zookeeper
		18	ZOOKEEPER_GROUP?= zookeeper
		19	ZOOKEEPER_DBDIR?= /var/db/zookeeper
		20	ZOOKEEPER_LOGDIR?= /var/log/zookeeper
18		21
19	ZOOKEEPER_CONFS= configuration.xsl log4j.properties zoo.cfg	22	USERS= ${ZOOKEEPER_USER}
		23	GROUPS= ${ZOOKEEPER_GROUP}
20		24
21	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	25	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
22		26
23	ZOOKEEPER_DBDIR?= /var/db/zookeeper	27	USE_RC_SUBR= zookeeper
24	ZOOKEEPER_LOGDIR?= /var/log/zookeeper
25
26	SUB_FILES= zookeeper zkCli.sh	28	SUB_FILES= zookeeper zkCli.sh
27	SUB_LIST= JAVA=${JAVA} \	29	SUB_LIST= JAVA=${JAVA} \
28	JAVALIBDIR=${JAVALIBDIR} \
29	ETCDIR=${ETCDIR} \	30	ETCDIR=${ETCDIR} \
30	USERS=${USERS} \	31	ZOOKEEPER_USER=${ZOOKEEPER_USER} \
31	GROUPS=${GROUPS} \	32	ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
32	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}	33	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
33		34
34	PLIST_SUB+= PORTVERSION=${PORTVERSION} \	35	PLIST_SUB+= PORTVERSION=${PORTVERSION} \
35	USERS=${USERS} \	36	ZOOKEEPER_USER=${ZOOKEEPER_USER} \
36	GROUPS=${GROUPS} \	37	ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
37	ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \	38	ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
38	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}	39	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
39		40
Lines 40-48 Link Here
40	NO_BUILD= yes	41	NO_BUILD= yes
41	NO_ARCH= yes	42	NO_ARCH= yes
42	USE_JAVA= yes	43	USE_JAVA= yes
43	JAVA_VERSION= 1.8+	44	JAVA_VERSION= 8+
44	JAVA_RUN= yes	45	JAVA_RUN= yes
45	USE_RC_SUBR= zookeeper
46		46
47	PORTDOCS= *	47	PORTDOCS= *
48		48

Lines 18-32 Link Here

(-)devel/zookeeper/files/zookeeper.in (-5 / +11 lines)
18	load_rc_config "${name}"	18	load_rc_config "${name}"
19		19
20	: ${zookeeper_enable:=NO}	20	: ${zookeeper_enable:=NO}
21	: ${zookeeper_user:=%%USERS%%}	21	: ${zookeeper_user:=%%ZOOKEEPER_USER%%}
22	: ${zookeeper_pidfile:=/var/run/zookeeper.pid}	22	: ${zookeeper_pidfile:=/var/run/zookeeper.pid}
23	: ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}	23	: ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}
24	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}	24	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
25	: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}	25	: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
26	: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}	26	: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
27	: ${zookeeper_jvmopts:=}
28	: ${zookeeper_syslog_output_enable:="YES"}	27	: ${zookeeper_syslog_output_enable:="YES"}
29		28
		29	_zookeeper_user=${zookeeper_user}
		30	unset zookeeper_user
		31
		32	# backwards compatibility
		33	if [ -n "${zookeeper_jvmopts}"; ]; then
		34	zookeeper_java_opts=${zookeeper_jvmopts}
		35	fi
		36
30	if checkyesno zookeeper_syslog_output_enable; then	37	if checkyesno zookeeper_syslog_output_enable; then
31	zookeeper_syslog_output_flags="-T ${name}"	38	zookeeper_syslog_output_flags="-T ${name}"
32	if [ -n "${zookeeper_syslog_output_priority}" ]; then	39	if [ -n "${zookeeper_syslog_output_priority}" ]; then
Lines 42-54 Link Here
42	CLASSPATH=":%%DATADIR%%/*"	49	CLASSPATH=":%%DATADIR%%/*"
43		50
44	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=${zookeeper_log4jpropfile} -Dzookeeper.root.logger=${zookeeper_rootlogger}"	51	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=${zookeeper_log4jpropfile} -Dzookeeper.root.logger=${zookeeper_rootlogger}"
45	zookeeper_main="${zookeeper_jvmopts} ${log4j_params} -cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"	52	zookeeper_main="${zookeeper_java_opts} ${log4j_params} -cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
46	pidfile="${zookeeper_pidfile}"	53	pidfile="${zookeeper_pidfile}"
47	required_dirs="${zookeeper_logdir}"	54	required_dirs="${zookeeper_logdir}"
48	required_files="${zookeeper_config}"	55	required_files="${zookeeper_config}"
49		56
50	command="/usr/sbin/daemon"	57	command="/usr/sbin/daemon"
51	command_args="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -u ${zookeeper_user} -t ${name} ${JAVA} ${zookeeper_main}"	58	command_args="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -u ${_zookeeper_user} -t ${name} ${JAVA} ${zookeeper_main}"
52	unset zookeeper_user
53		59
54	run_rc_command "$1"	60	run_rc_command "$1"