Index: head/devel/libzookeeper/Makefile =================================================================== --- head/devel/libzookeeper/Makefile (revision 552568) +++ head/devel/libzookeeper/Makefile (revision 552569) @@ -1,35 +1,35 @@ # Created by: skreuzer@FreeBSD.org # $FreeBSD$ PORTNAME= zookeeper -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.2 CATEGORIES= devel MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= lib DISTNAME= apache-${PORTNAME}-${PORTVERSION} MAINTAINER= dmitry.wagin@ya.ru COMMENT= C client interface to Zookeeper server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcppunit.so:devel/cppunit USES= autoreconf libtool pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/zookeeper-client/zookeeper-client-c post-extract: @${MKDIR} ${WRKSRC}/generated/ @cd ${FILESDIR} && ${CP} -p zookeeper.jute.* ${WRKSRC}/generated/ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so ${LN} -sf libzookeeper_mt.so.2 ${STAGEDIR}${PREFIX}/lib/libzookeeper_mt.so ${LN} -sf libzookeeper_st.so.2 ${STAGEDIR}${PREFIX}/lib/libzookeeper_st.so .include Index: head/devel/libzookeeper/distinfo =================================================================== --- head/devel/libzookeeper/distinfo (revision 552568) +++ head/devel/libzookeeper/distinfo (revision 552569) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588788912 -SHA256 (apache-zookeeper-3.6.1.tar.gz) = 0fc25db4ee790e04e7de42d4ce64bde63136d5ea5db01fb643bd37b52b05968d -SIZE (apache-zookeeper-3.6.1.tar.gz) = 3348479 +TIMESTAMP = 1601308293 +SHA256 (apache-zookeeper-3.6.2.tar.gz) = 62d9e865a7b1da5e906ff39ebf40cfa1880303c04b4cf38e2c88d328bc2bcd6f +SIZE (apache-zookeeper-3.6.2.tar.gz) = 3372391 Index: head/devel/zookeeper/Makefile =================================================================== --- head/devel/zookeeper/Makefile (revision 552568) +++ head/devel/zookeeper/Makefile (revision 552569) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= zookeeper -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.2 CATEGORIES= devel java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin MAINTAINER= dmitry.wagin@ya.ru COMMENT= Coordination Service for Distributed Applications LICENSE= APACHE20 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 SUB_FILES= zookeeper zkCli.sh SUB_LIST= JAVA=${JAVA} \ 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 PORTDOCS= * OPTIONS_DEFINE= DOCS post-extract: @${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg @${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg do-install: @${MKDIR} ${STAGEDIR}${ETCDIR} .for f in ${ZOOKEEPER_CONFS} ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-name *\.jar") ${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} ${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKDIR}/${DISTNAME}/docs && \ ${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/zookeeper/distinfo =================================================================== --- head/devel/zookeeper/distinfo (revision 552568) +++ head/devel/zookeeper/distinfo (revision 552569) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588788874 -SHA256 (apache-zookeeper-3.6.1-bin.tar.gz) = 5066dd085cee2a7435a1bb25677102f0d4ea585f314bd026799f333b0956a06d -SIZE (apache-zookeeper-3.6.1-bin.tar.gz) = 12436328 +TIMESTAMP = 1601309538 +SHA256 (apache-zookeeper-3.6.2-bin.tar.gz) = 476f6fce10f9528e3a4ad00e6cd1714563f602dd4924db78e506c0df28fea1e5 +SIZE (apache-zookeeper-3.6.2-bin.tar.gz) = 12515974 Index: head/devel/zookeeper/files/zookeeper.in =================================================================== --- head/devel/zookeeper/files/zookeeper.in (revision 552568) +++ head/devel/zookeeper/files/zookeeper.in (revision 552569) @@ -1,73 +1,73 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: zookeeper -# REQUIRE: LOGIN +# REQUIRE: NETWORKING SERVERS DAEMON # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable zookeeper: # # zookeeper_enable="YES" . /etc/rc.subr name=zookeeper rcvar=zookeeper_enable load_rc_config "${name}" : ${zookeeper_enable:="NO"} : ${zookeeper_user:="%%ZOOKEEPER_USER%%"} : ${zookeeper_group:="%%ZOOKEEPER_GROUP%%"} : ${zookeeper_config:="%%ETCDIR%%/zoo.cfg"} : ${zookeeper_log4j_config:="%%ETCDIR%%/log4j.properties"} : ${zookeeper_rootlogger:="INFO,ROLLINGFILE"} : ${zookeeper_logdir:="%%ZOOKEEPER_LOGDIR%%"} : ${zookeeper_syslog_output_enable:="YES"} start_precmd="zookeeper_start_precmd" # backwards compatibility if [ -n "${zookeeper_jvmopts}" ]; then zookeeper_java_opts=${zookeeper_jvmopts} fi if [ -n "${zookeeper_log4jpropfile}" ]; then zookeeper_log4j_config="${zookeeper_log4jpropfile#file:}" fi if checkyesno zookeeper_syslog_output_enable; then if [ -n "${zookeeper_syslog_output_tag}" ]; then zookeeper_syslog_output_flags="-T ${zookeeper_syslog_output_tag}" else zookeeper_syslog_output_flags="-T ${name}" fi 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%%" CLASSPATH=":%%DATADIR%%/*" log4j_params="-Dzookeeper.root.logger=${zookeeper_rootlogger} -Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=file:${zookeeper_log4j_config}" zookeeper_main="${zookeeper_java_opts} ${log4j_params} -cp ${CLASSPATH} org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}" pidfile="/var/run/${name}.pid" required_dirs="${zookeeper_logdir}" required_files="${zookeeper_config} ${zookeeper_log4j_config}" command="/usr/sbin/daemon" command_args="-f ${zookeeper_syslog_output_flags} -P ${pidfile} -t ${name} ${JAVA} ${zookeeper_main}" zookeeper_start_precmd() { if [ ! -e "${pidfile}" ]; then install -m 0600 -o "${zookeeper_user}" -g "${zookeeper_group}" /dev/null "${pidfile}" fi } run_rc_command "$1" Index: head/devel/zookeeper/pkg-descr =================================================================== --- head/devel/zookeeper/pkg-descr (revision 552568) +++ head/devel/zookeeper/pkg-descr (revision 552569) @@ -1,14 +1,14 @@ ZooKeeper is a distributed, open-source coordination service for distributed applications. It exposes a simple set of primitives that distributed applications can build upon to implement higher level services for synchronization, configuration maintenance, and groups and naming. It is designed to be easy to program to, and uses a data model styled after the familiar directory tree structure of file systems. It runs in Java and has bindings for both Java and C. Coordination services are notoriously hard to get right. They are especially prone to errors such as race conditions and deadlock. The motivation behind ZooKeeper is to relieve distributed applications the responsibility of implementing coordination services from scratch. -WWW: http://zookeeper.apache.org/ +WWW: https://zookeeper.apache.org/ Index: head/devel/zookeeper/pkg-plist =================================================================== --- head/devel/zookeeper/pkg-plist (revision 552568) +++ head/devel/zookeeper/pkg-plist (revision 552569) @@ -1,42 +1,42 @@ bin/zkCli.sh %%DATADIR%%/audience-annotations-0.5.0.jar %%DATADIR%%/commons-cli-1.2.jar %%DATADIR%%/commons-lang-2.6.jar %%DATADIR%%/jackson-annotations-2.10.3.jar %%DATADIR%%/jackson-core-2.10.3.jar %%DATADIR%%/jackson-databind-2.10.3.jar %%DATADIR%%/javax.servlet-api-3.1.0.jar %%DATADIR%%/jetty-http-9.4.24.v20191120.jar %%DATADIR%%/jetty-io-9.4.24.v20191120.jar %%DATADIR%%/jetty-security-9.4.24.v20191120.jar %%DATADIR%%/jetty-server-9.4.24.v20191120.jar %%DATADIR%%/jetty-servlet-9.4.24.v20191120.jar %%DATADIR%%/jetty-util-9.4.24.v20191120.jar -%%DATADIR%%/jline-2.11.jar +%%DATADIR%%/jline-2.14.6.jar %%DATADIR%%/json-simple-1.1.1.jar %%DATADIR%%/log4j-1.2.17.jar %%DATADIR%%/metrics-core-3.2.5.jar -%%DATADIR%%/netty-buffer-4.1.48.Final.jar -%%DATADIR%%/netty-codec-4.1.48.Final.jar -%%DATADIR%%/netty-common-4.1.48.Final.jar -%%DATADIR%%/netty-handler-4.1.48.Final.jar -%%DATADIR%%/netty-resolver-4.1.48.Final.jar -%%DATADIR%%/netty-transport-4.1.48.Final.jar -%%DATADIR%%/netty-transport-native-epoll-4.1.48.Final.jar -%%DATADIR%%/netty-transport-native-unix-common-4.1.48.Final.jar +%%DATADIR%%/netty-buffer-4.1.50.Final.jar +%%DATADIR%%/netty-codec-4.1.50.Final.jar +%%DATADIR%%/netty-common-4.1.50.Final.jar +%%DATADIR%%/netty-handler-4.1.50.Final.jar +%%DATADIR%%/netty-resolver-4.1.50.Final.jar +%%DATADIR%%/netty-transport-4.1.50.Final.jar +%%DATADIR%%/netty-transport-native-epoll-4.1.50.Final.jar +%%DATADIR%%/netty-transport-native-unix-common-4.1.50.Final.jar %%DATADIR%%/simpleclient_common-0.6.0.jar %%DATADIR%%/simpleclient_hotspot-0.6.0.jar %%DATADIR%%/simpleclient_servlet-0.6.0.jar %%DATADIR%%/simpleclient-0.6.0.jar %%DATADIR%%/slf4j-api-1.7.25.jar %%DATADIR%%/slf4j-log4j12-1.7.25.jar %%DATADIR%%/snappy-java-1.1.7.jar %%DATADIR%%/zookeeper-%%PORTVERSION%%.jar %%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar %%DATADIR%%/zookeeper-prometheus-metrics-%%PORTVERSION%%.jar @sample %%ETCDIR%%/log4j.properties.sample @sample %%ETCDIR%%/configuration.xsl.sample @sample %%ETCDIR%%/zoo.cfg.sample @dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ETCDIR%% @dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_DBDIR%% @dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ZOOKEEPER_LOGDIR%%