git: 1dd965b53658 - main - devel/zookeeper: Update to 3.8.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Jun 2022 05:52:15 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1dd965b53658eb14631cf41cb79f2f2037608c26
commit 1dd965b53658eb14631cf41cb79f2f2037608c26
Author: Dmitry Wagin <dmitry.wagin@ya.ru>
AuthorDate: 2022-06-12 16:04:40 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-06-14 05:47:55 +0000
devel/zookeeper: Update to 3.8.0
ChangeLog: https://zookeeper.apache.org/doc/r3.8.0/releasenotes.html
Add note in pkg-message on how to properly update from to 3.8.0
PR: 264616
Reported by: dmitry.wagin@ya.ru (maintainer)
Reviewed by: eduardo@
---
devel/libzookeeper/Makefile | 2 +-
devel/libzookeeper/distinfo | 6 ++---
devel/zookeeper/Makefile | 23 +++++++++----------
devel/zookeeper/distinfo | 10 ++++-----
devel/zookeeper/files/pkg-message | 15 +++++++++++++
devel/zookeeper/files/zookeeper.in | 15 +++++--------
devel/zookeeper/pkg-plist | 46 +++++++++++++++++++++-----------------
7 files changed, 66 insertions(+), 51 deletions(-)
diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index f9296e1b3443..ed7a5cae65d7 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -1,7 +1,7 @@
# Created by: skreuzer@FreeBSD.org
PORTNAME= zookeeper
-PORTVERSION= 3.7.0
+PORTVERSION= 3.8.0
CATEGORIES= devel
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= lib
diff --git a/devel/libzookeeper/distinfo b/devel/libzookeeper/distinfo
index d7909bd177a0..61aa5c1b8b02 100644
--- a/devel/libzookeeper/distinfo
+++ b/devel/libzookeeper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617193329
-SHA256 (apache-zookeeper-3.7.0.tar.gz) = cb3980f61b66babe550dcb717c940160ba813512c0aca26c2b8a718fac5d465d
-SIZE (apache-zookeeper-3.7.0.tar.gz) = 3438672
+TIMESTAMP = 1647248602
+SHA256 (apache-zookeeper-3.8.0.tar.gz) = b0c5684640bea2d8bd6610b47ff41be2aefd6c910ba48fcad5949bd2bf2fa1ac
+SIZE (apache-zookeeper-3.8.0.tar.gz) = 3485515
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index e8e9c6b19cbe..3afe505891de 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,6 +1,5 @@
PORTNAME= zookeeper
-PORTVERSION= 3.7.0
-PORTREVISION= 2
+PORTVERSION= 3.8.0
CATEGORIES= devel java
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
APACHE/logging/log4j/${ZOOKEEPER_LOG4J2_VERSION}/:log4j2
@@ -14,13 +13,6 @@ LICENSE= APACHE20
RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper
-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.0
-
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
@@ -37,6 +29,13 @@ SUB_LIST= JAVA=${JAVA} \
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
+
USERS= ${ZOOKEEPER_USER}
GROUPS= ${ZOOKEEPER_GROUP}
@@ -50,7 +49,7 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS LOG4J2
OPTIONS_SUB= yes
-LOG4J2_DESC= Use log4j-2 instead log4j-1.2
+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 \
@@ -78,13 +77,13 @@ do-install-DOCS-on:
${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR})
do-install-LOG4J2-on:
- ${RM} ${STAGEDIR}${DATADIR}/log4j-1.2* ${STAGEDIR}${DATADIR}/slf4j-log4j12*
+ ${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/log4j.properties ${STAGEDIR}${ETCDIR}/log4j.properties.sample
+ ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
.include <bsd.port.mk>
diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo
index df999573761d..cbbbf522f690 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1639985755
-SHA256 (apache-zookeeper-3.7.0-bin.tar.gz) = 2f265d27b40fcba5ccf6c56c4c38fb224e24e4155a0bea65ee681a7e20f7c215
-SIZE (apache-zookeeper-3.7.0-bin.tar.gz) = 12387614
-SHA256 (apache-log4j-2.17.0-bin.tar.gz) = 48f9c24d71d884c959012f3bcd3d0e9a9f51dbab6992765387b94b2edfb83333
-SIZE (apache-log4j-2.17.0-bin.tar.gz) = 14991268
+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
diff --git a/devel/zookeeper/files/pkg-message b/devel/zookeeper/files/pkg-message
new file mode 100644
index 000000000000..618f463c8da4
--- /dev/null
+++ b/devel/zookeeper/files/pkg-message
@@ -0,0 +1,15 @@
+[
+{ type: upgrade
+ maximum_version: "3.8.0"
+ message: <<EOM
+Builtin logger framework log4j-12 has been replaced by Logback at 3.8.0 (ZOOKEEPER-4427).
+
+When upgrading from before 3.8.0 these variables, if used, should be taken into
+account:
+* zookeeper_log4j_config, zookeeper_rootlogger and zookeeper_log4jpropfile are
+ obsoleted for using with Logback.
+* zookeeper_logback_config is used instead zookeeper_log4j_config for Logback.
+* zookeeper_log4j_config is still used only for log4j-2.
+EOM
+}
+]
diff --git a/devel/zookeeper/files/zookeeper.in b/devel/zookeeper/files/zookeeper.in
index bb010bd1ae07..adf5d52f6e67 100644
--- a/devel/zookeeper/files/zookeeper.in
+++ b/devel/zookeeper/files/zookeeper.in
@@ -19,8 +19,7 @@ load_rc_config "${name}"
: ${zookeeper_user:="%%ZOOKEEPER_USER%%"}
: ${zookeeper_group:="%%ZOOKEEPER_GROUP%%"}
: ${zookeeper_config:="%%ETCDIR%%/zoo.cfg"}
-%%NO_LOG4J2%%: ${zookeeper_log4j_config:="%%ETCDIR%%/log4j.properties"}
-%%NO_LOG4J2%%: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
+%%NO_LOG4J2%%: ${zookeeper_logback_config:="%%ETCDIR%%/logback.xml"}
%%LOG4J2%%: ${zookeeper_log4j_config:="%%ETCDIR%%/log4j2.properties"}
: ${zookeeper_logdir:="%%ZOOKEEPER_LOGDIR%%"}
: ${zookeeper_syslog_output_enable:="YES"}
@@ -31,9 +30,6 @@ start_precmd="zookeeper_start_precmd"
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
@@ -53,12 +49,13 @@ JAVA="%%JAVA%%"
CLASSPATH=":%%DATADIR%%/*"
-%%NO_LOG4J2%%log4j_params="-Dzookeeper.root.logger=${zookeeper_rootlogger} -Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=file:${zookeeper_log4j_config}"
-%%LOG4J2%%log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j2.configurationFile=file:${zookeeper_log4j_config}"
-zookeeper_main="${zookeeper_java_opts} ${log4j_params} -cp ${CLASSPATH} org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
+%%NO_LOG4J2%%zookeeper_log_opts="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlogback.configurationFile=file:${zookeeper_logback_config}"
+%%LOG4J2%%zookeeper_log_opts="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j2.configurationFile=file:${zookeeper_log4j_config}"
+zookeeper_main="${zookeeper_java_opts} ${zookeeper_log_opts} -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}"
+%%NO_LOG4J2%%required_files="${zookeeper_config} ${zookeeper_logback_config}"
+%%LOG4J2%%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}"
diff --git a/devel/zookeeper/pkg-plist b/devel/zookeeper/pkg-plist
index 7c06c0c71523..a32713427cf6 100644
--- a/devel/zookeeper/pkg-plist
+++ b/devel/zookeeper/pkg-plist
@@ -1,27 +1,31 @@
bin/zkCli.sh
%%DATADIR%%/audience-annotations-0.12.0.jar
%%DATADIR%%/commons-cli-1.4.jar
-%%DATADIR%%/jackson-annotations-2.10.5.jar
-%%DATADIR%%/jackson-core-2.10.5.jar
-%%DATADIR%%/jackson-databind-2.10.5.1.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%%/javax.servlet-api-3.1.0.jar
-%%DATADIR%%/jetty-http-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-io-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-security-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-server-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-servlet-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-util-9.4.38.v20210224.jar
-%%DATADIR%%/jetty-util-ajax-9.4.38.v20210224.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%%/jline-2.14.6.jar
%%DATADIR%%/metrics-core-4.1.12.1.jar
-%%DATADIR%%/netty-buffer-4.1.59.Final.jar
-%%DATADIR%%/netty-codec-4.1.59.Final.jar
-%%DATADIR%%/netty-common-4.1.59.Final.jar
-%%DATADIR%%/netty-handler-4.1.59.Final.jar
-%%DATADIR%%/netty-resolver-4.1.59.Final.jar
-%%DATADIR%%/netty-transport-4.1.59.Final.jar
-%%DATADIR%%/netty-transport-native-epoll-4.1.59.Final.jar
-%%DATADIR%%/netty-transport-native-unix-common-4.1.59.Final.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%%/simpleclient-0.9.0.jar
%%DATADIR%%/simpleclient_common-0.9.0.jar
%%DATADIR%%/simpleclient_hotspot-0.9.0.jar
@@ -35,9 +39,9 @@ bin/zkCli.sh
%%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%%/log4j-1.2.17.jar
-%%NO_LOG4J2%%%%DATADIR%%/slf4j-log4j12-1.7.30.jar
-%%NO_LOG4J2%%@sample %%ETCDIR%%/log4j.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%%