git: 0257d7243559 - main - devel/zookeeper: Update version 3.8.1=>3.8.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Fri, 29 Dec 2023 18:24:54 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0257d72435595ce611582aec2f80e0f174ea92d2

commit 0257d72435595ce611582aec2f80e0f174ea92d2
Author:     Dmitry Wagin <dmitry.wagin@ya.ru>
AuthorDate: 2023-12-19 07:32:13 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-29 18:24:40 +0000

    devel/zookeeper: Update version 3.8.1=>3.8.3
    
    - Fixes critical security vulnerability
    - Return to pool
    - Add entry in vuxml
    
    PR:             275999
    Approved by:    submitter is maintainer
---
 devel/libzookeeper/Makefile  |  4 ++--
 devel/libzookeeper/distinfo  |  6 +++---
 devel/zookeeper/Makefile     | 10 +++++-----
 devel/zookeeper/distinfo     | 10 +++++-----
 devel/zookeeper/pkg-plist    | 40 ++++++++++++++++++++--------------------
 security/vuxml/vuln/2023.xml |  4 +++-
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index f902cc866b00..806d11b72016 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	zookeeper
-PORTVERSION=	3.8.1
+PORTVERSION=	3.8.3
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	lib
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	dmitry.wagin@ya.ru
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C client interface to Zookeeper server
 WWW=		https://zookeeper.apache.org/
 
diff --git a/devel/libzookeeper/distinfo b/devel/libzookeeper/distinfo
index a54b8b785180..8455aa1a9d6d 100644
--- a/devel/libzookeeper/distinfo
+++ b/devel/libzookeeper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676890494
-SHA256 (apache-zookeeper-3.8.1.tar.gz) = ccc16850c8ab2553583583234d11c813061b5ea5f3b8ff1d740cde6c1fd1e219
-SIZE (apache-zookeeper-3.8.1.tar.gz) = 3539502
+TIMESTAMP = 1702929563
+SHA256 (apache-zookeeper-3.8.3.tar.gz) = aa9ab7f832baa4a67bfac9f25828532dfe9330ba78ffeaf2ac6e2159632363f9
+SIZE (apache-zookeeper-3.8.3.tar.gz) = 3560340
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 06015aa1816e..eb0f138936db 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	zookeeper
-PORTVERSION=	3.8.1
+PORTVERSION=	3.8.3
 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
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Coordination Service for Distributed Applications
 WWW=		https://zookeeper.apache.org/
 
@@ -35,7 +35,7 @@ ZOOKEEPER_USER?=		zookeeper
 ZOOKEEPER_GROUP?=		zookeeper
 ZOOKEEPER_DBDIR?=		/var/db/zookeeper
 ZOOKEEPER_LOGDIR?=		/var/log/zookeeper
-ZOOKEEPER_LOG4J2_VERSION?=	2.19.0
+ZOOKEEPER_LOG4J2_VERSION?=	2.22.0
 
 USERS=		${ZOOKEEPER_USER}
 GROUPS=		${ZOOKEEPER_GROUP}
@@ -51,7 +51,7 @@ 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_DISTFILES=	apache-log4j-${ZOOKEEPER_LOG4J2_VERSION}-bin.zip:log4j2
 LOG4J2_PLIST_SUB=	ZOOKEEPER_LOG4J2_VERSION=${ZOOKEEPER_LOG4J2_VERSION}
 LOG4J2_JARS=		log4j-api-${ZOOKEEPER_LOG4J2_VERSION}.jar \
 			log4j-core-${ZOOKEEPER_LOG4J2_VERSION}.jar \
@@ -80,7 +80,7 @@ do-install-DOCS-on:
 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}/
+	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DATADIR}/
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/log4j2.properties ${STAGEDIR}${ETCDIR}/log4j2.properties.sample
 
diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo
index d0adb9e30259..5aeb15d2e2bb 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1702929653
+SHA256 (apache-zookeeper-3.8.3-bin.tar.gz) = e8abdad74fd1c76e8f4f41b25ed5a0c1ed3b59c8642281396a16d2cd5bf22ad4
+SIZE (apache-zookeeper-3.8.3-bin.tar.gz) = 14853274
+SHA256 (apache-log4j-2.22.0-bin.zip) = c6d61ecf2563b1200e02587b89b7c75b58b6e62e6a16cdb6f333c2482167c2dc
+SIZE (apache-log4j-2.22.0-bin.zip) = 3797048
diff --git a/devel/zookeeper/pkg-plist b/devel/zookeeper/pkg-plist
index 8207486ad319..b206bedf145b 100644
--- a/devel/zookeeper/pkg-plist
+++ b/devel/zookeeper/pkg-plist
@@ -2,34 +2,34 @@ bin/zkCli.sh
 %%DATADIR%%/audience-annotations-0.12.0.jar
 %%DATADIR%%/commons-cli-1.5.0.jar
 %%DATADIR%%/commons-io-2.11.0.jar
-%%DATADIR%%/jackson-annotations-2.13.4.jar
-%%DATADIR%%/jackson-core-2.13.4.jar
-%%DATADIR%%/jackson-databind-2.13.4.2.jar
+%%DATADIR%%/jackson-annotations-2.15.2.jar
+%%DATADIR%%/jackson-core-2.15.2.jar
+%%DATADIR%%/jackson-databind-2.15.2.jar
 %%DATADIR%%/javax.servlet-api-3.1.0.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%%/jetty-http-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-io-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-security-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-server-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-servlet-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-util-9.4.52.v20230823.jar
+%%DATADIR%%/jetty-util-ajax-9.4.52.v20230823.jar
 %%DATADIR%%/jline-2.14.6.jar
 %%DATADIR%%/metrics-core-4.1.12.1.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%%/netty-buffer-4.1.94.Final.jar
+%%DATADIR%%/netty-codec-4.1.94.Final.jar
+%%DATADIR%%/netty-common-4.1.94.Final.jar
+%%DATADIR%%/netty-handler-4.1.94.Final.jar
+%%DATADIR%%/netty-resolver-4.1.94.Final.jar
+%%DATADIR%%/netty-transport-4.1.94.Final.jar
+%%DATADIR%%/netty-transport-classes-epoll-4.1.94.Final.jar
+%%DATADIR%%/netty-transport-native-epoll-4.1.94.Final.jar
+%%DATADIR%%/netty-transport-native-unix-common-4.1.94.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%%/snappy-java-1.1.10.5.jar
 %%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
 %%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar
 %%DATADIR%%/zookeeper-prometheus-metrics-%%PORTVERSION%%.jar
diff --git a/security/vuxml/vuln/2023.xml b/security/vuxml/vuln/2023.xml
index cbbbbe300e6c..509b4a9be424 100644
--- a/security/vuxml/vuln/2023.xml
+++ b/security/vuxml/vuln/2023.xml
@@ -509,8 +509,10 @@
     <topic>apache -- Apache ZooKeeper: Authorization bypass in SASL Quorum Peer Authentication</topic>
     <affects>
       <package>
-	<name>apache</name>
+	<name>zookeeper</name>
 	<range><lt>3.7.2</lt></range>
+       <range><ge>3.8.0</ge><lt>3.8.3</lt></range>
+       <range><ge>3.9.0</ge><lt>3.9.1</lt></range>
       </package>
     </affects>
     <description>