diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile index 8f2abf72eeb5..f902cc866b00 100644 --- a/devel/libzookeeper/Makefile +++ b/devel/libzookeeper/Makefile @@ -1,34 +1,34 @@ PORTNAME= zookeeper -PORTVERSION= 3.8.0 +PORTVERSION= 3.8.1 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 WWW= https://zookeeper.apache.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcppunit.so:devel/cppunit USES= autoreconf cpe libtool pkgconfig CPE_VENDOR= apache USE_LDCONFIG= yes GNU_CONFIGURE= 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 diff --git a/devel/libzookeeper/distinfo b/devel/libzookeeper/distinfo index 61aa5c1b8b02..a54b8b785180 100644 --- a/devel/libzookeeper/distinfo +++ b/devel/libzookeeper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647248602 -SHA256 (apache-zookeeper-3.8.0.tar.gz) = b0c5684640bea2d8bd6610b47ff41be2aefd6c910ba48fcad5949bd2bf2fa1ac -SIZE (apache-zookeeper-3.8.0.tar.gz) = 3485515 +TIMESTAMP = 1676890494 +SHA256 (apache-zookeeper-3.8.1.tar.gz) = ccc16850c8ab2553583583234d11c813061b5ea5f3b8ff1d740cde6c1fd1e219 +SIZE (apache-zookeeper-3.8.1.tar.gz) = 3539502 diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile index 112e6bb489e0..06015aa1816e 100644 --- a/devel/zookeeper/Makefile +++ b/devel/zookeeper/Makefile @@ -1,90 +1,90 @@ PORTNAME= zookeeper -PORTVERSION= 3.8.0 +PORTVERSION= 3.8.1 CATEGORIES= devel java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ APACHE/logging/log4j/${ZOOKEEPER_LOG4J2_VERSION}/:log4j2 DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= dmitry.wagin@ya.ru COMMENT= Coordination Service for Distributed Applications WWW= https://zookeeper.apache.org/ LICENSE= APACHE20 RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper USES= cpe CPE_VENDOR= apache USE_JAVA= yes JAVA_VERSION= 8+ JAVA_RUN= yes USE_RC_SUBR= zookeeper DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_ARCH= yes NO_BUILD= yes SUB_FILES= zkCli.sh SUB_LIST= JAVA=${JAVA} \ ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \ ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \ ZOOKEEPER_USER=${ZOOKEEPER_USER} ZOOKEEPER_CONFS= configuration.xsl zoo.cfg ZOOKEEPER_USER?= zookeeper ZOOKEEPER_GROUP?= zookeeper ZOOKEEPER_DBDIR?= /var/db/zookeeper ZOOKEEPER_LOGDIR?= /var/log/zookeeper -ZOOKEEPER_LOG4J2_VERSION?= 2.17.2 +ZOOKEEPER_LOG4J2_VERSION?= 2.19.0 USERS= ${ZOOKEEPER_USER} GROUPS= ${ZOOKEEPER_GROUP} PLIST_SUB= PORTVERSION=${PORTVERSION} \ ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \ ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \ ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \ ZOOKEEPER_USER=${ZOOKEEPER_USER} PORTDOCS= * OPTIONS_DEFINE= DOCS LOG4J2 OPTIONS_SUB= yes LOG4J2_DESC= Use log4j-2 instead Logback LOG4J2_DISTFILES= apache-log4j-${ZOOKEEPER_LOG4J2_VERSION}-bin${EXTRACT_SUFX}:log4j2 LOG4J2_PLIST_SUB= ZOOKEEPER_LOG4J2_VERSION=${ZOOKEEPER_LOG4J2_VERSION} LOG4J2_JARS= log4j-api-${ZOOKEEPER_LOG4J2_VERSION}.jar \ log4j-core-${ZOOKEEPER_LOG4J2_VERSION}.jar \ log4j-slf4j-impl-${ZOOKEEPER_LOG4J2_VERSION}.jar 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}) do-install-LOG4J2-on: ${RM} ${STAGEDIR}${DATADIR}/logback-* .for f in ${LOG4J2_JARS} ${INSTALL_DATA} ${WRKDIR}/apache-log4j-${ZOOKEEPER_LOG4J2_VERSION}-bin/${f} ${STAGEDIR}${DATADIR}/ .endfor ${INSTALL_DATA} ${FILESDIR}/log4j2.properties ${STAGEDIR}${ETCDIR}/log4j2.properties.sample do-install-LOG4J2-off: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample .include diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo index cbbbf522f690..d0adb9e30259 100644 --- a/devel/zookeeper/distinfo +++ b/devel/zookeeper/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1647248481 -SHA256 (apache-zookeeper-3.8.0-bin.tar.gz) = 0b26adea71631989c3e2c08a30984edc5663aa912823b8d02e43c6a7d4e8128b -SIZE (apache-zookeeper-3.8.0-bin.tar.gz) = 13185104 -SHA256 (apache-log4j-2.17.2-bin.tar.gz) = c8f7cfe4ac9825043432b310709dee2661398573de28c83e603e80e0e86df9bb -SIZE (apache-log4j-2.17.2-bin.tar.gz) = 15406684 +TIMESTAMP = 1676890437 +SHA256 (apache-zookeeper-3.8.1-bin.tar.gz) = f78dd1e1ddffc5692f0dd0055aa3beab08dc57f328254a414b0301fbd36e07f5 +SIZE (apache-zookeeper-3.8.1-bin.tar.gz) = 13368512 +SHA256 (apache-log4j-2.19.0-bin.tar.gz) = cb9bb503ce0b2681c364ac4aaa44f3192ec465944da24f2fe1e5e33883297b8e +SIZE (apache-log4j-2.19.0-bin.tar.gz) = 17712320 diff --git a/devel/zookeeper/pkg-plist b/devel/zookeeper/pkg-plist index a32713427cf6..8207486ad319 100644 --- a/devel/zookeeper/pkg-plist +++ b/devel/zookeeper/pkg-plist @@ -1,49 +1,47 @@ bin/zkCli.sh %%DATADIR%%/audience-annotations-0.12.0.jar -%%DATADIR%%/commons-cli-1.4.jar +%%DATADIR%%/commons-cli-1.5.0.jar %%DATADIR%%/commons-io-2.11.0.jar -%%DATADIR%%/jackson-annotations-2.13.1.jar -%%DATADIR%%/jackson-core-2.13.1.jar -%%DATADIR%%/jackson-databind-2.13.1.jar +%%DATADIR%%/jackson-annotations-2.13.4.jar +%%DATADIR%%/jackson-core-2.13.4.jar +%%DATADIR%%/jackson-databind-2.13.4.2.jar %%DATADIR%%/javax.servlet-api-3.1.0.jar -%%DATADIR%%/jetty-http-9.4.43.v20210629.jar -%%DATADIR%%/jetty-io-9.4.43.v20210629.jar -%%DATADIR%%/jetty-security-9.4.43.v20210629.jar -%%DATADIR%%/jetty-server-9.4.43.v20210629.jar -%%DATADIR%%/jetty-servlet-9.4.43.v20210629.jar -%%DATADIR%%/jetty-util-9.4.43.v20210629.jar -%%DATADIR%%/jetty-util-ajax-9.4.43.v20210629.jar +%%DATADIR%%/jetty-http-9.4.49.v20220914.jar +%%DATADIR%%/jetty-io-9.4.49.v20220914.jar +%%DATADIR%%/jetty-security-9.4.49.v20220914.jar +%%DATADIR%%/jetty-server-9.4.49.v20220914.jar +%%DATADIR%%/jetty-servlet-9.4.49.v20220914.jar +%%DATADIR%%/jetty-util-9.4.49.v20220914.jar +%%DATADIR%%/jetty-util-ajax-9.4.49.v20220914.jar %%DATADIR%%/jline-2.14.6.jar %%DATADIR%%/metrics-core-4.1.12.1.jar -%%DATADIR%%/netty-buffer-4.1.73.Final.jar -%%DATADIR%%/netty-codec-4.1.73.Final.jar -%%DATADIR%%/netty-common-4.1.73.Final.jar -%%DATADIR%%/netty-handler-4.1.73.Final.jar -%%DATADIR%%/netty-resolver-4.1.73.Final.jar -%%DATADIR%%/netty-tcnative-2.0.48.Final.jar -%%DATADIR%%/netty-tcnative-classes-2.0.48.Final.jar -%%DATADIR%%/netty-transport-4.1.73.Final.jar -%%DATADIR%%/netty-transport-classes-epoll-4.1.73.Final.jar -%%DATADIR%%/netty-transport-native-epoll-4.1.73.Final.jar -%%DATADIR%%/netty-transport-native-unix-common-4.1.73.Final.jar +%%DATADIR%%/netty-buffer-4.1.86.Final.jar +%%DATADIR%%/netty-codec-4.1.86.Final.jar +%%DATADIR%%/netty-common-4.1.86.Final.jar +%%DATADIR%%/netty-handler-4.1.86.Final.jar +%%DATADIR%%/netty-resolver-4.1.86.Final.jar +%%DATADIR%%/netty-transport-4.1.86.Final.jar +%%DATADIR%%/netty-transport-classes-epoll-4.1.86.Final.jar +%%DATADIR%%/netty-transport-native-epoll-4.1.86.Final.jar +%%DATADIR%%/netty-transport-native-unix-common-4.1.86.Final.jar %%DATADIR%%/simpleclient-0.9.0.jar %%DATADIR%%/simpleclient_common-0.9.0.jar %%DATADIR%%/simpleclient_hotspot-0.9.0.jar %%DATADIR%%/simpleclient_servlet-0.9.0.jar %%DATADIR%%/slf4j-api-1.7.30.jar %%DATADIR%%/snappy-java-1.1.7.7.jar %%DATADIR%%/zookeeper-%%PORTVERSION%%.jar %%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar %%DATADIR%%/zookeeper-prometheus-metrics-%%PORTVERSION%%.jar %%LOG4J2%%%%DATADIR%%/log4j-api-%%ZOOKEEPER_LOG4J2_VERSION%%.jar %%LOG4J2%%%%DATADIR%%/log4j-core-%%ZOOKEEPER_LOG4J2_VERSION%%.jar %%LOG4J2%%%%DATADIR%%/log4j-slf4j-impl-%%ZOOKEEPER_LOG4J2_VERSION%%.jar %%LOG4J2%%@sample %%ETCDIR%%/log4j2.properties.sample %%NO_LOG4J2%%%%DATADIR%%/logback-classic-1.2.10.jar %%NO_LOG4J2%%%%DATADIR%%/logback-core-1.2.10.jar %%NO_LOG4J2%%@sample %%ETCDIR%%/logback.xml.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%%