From nobody Tue Jun 14 05:52:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E76048451E5; Tue, 14 Jun 2022 05:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LMcyl6DV7z4sp9; Tue, 14 Jun 2022 05:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655185935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eGA0W04W0uPRKnNFd1lnrAJqsC95GEzXJPTJT1iYK4I=; b=uvr44i4de1eB1itSLnpfSv6dsERMlh5QEkYUx6Udh/HUuQshTFVq1AiuHNVLZJrT4UaGHt xyaW/NvzrhSAUWXJBW17NEHGrK3ZruCiPhZ8SOMLwBt280rLfklrSRNw5A+wGalGDX3o7J 0i1RmfMgkrgcn9OSyq+mrcSZc6ncDP+vICdZhicfTNapl66dPhH6B7//kb2JrjaNsg/xcI uj+O40m+zAlnzh1Vk60CaL0EGyuHjjx0hDqOLrG0b3/1KBfDjkPFTtvf+5rIO3KyhR13tD vr+HCemY5MtcZR8D6Yov2u76BrtsNSScgpBnykqj3p8lDtx/uZQKe91VQtJbPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5C35245DC; Tue, 14 Jun 2022 05:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25E5qFja060954; Tue, 14 Jun 2022 05:52:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25E5qFJo060953; Tue, 14 Jun 2022 05:52:15 GMT (envelope-from git) Date: Tue, 14 Jun 2022 05:52:15 GMT Message-Id: <202206140552.25E5qFJo060953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 1dd965b53658 - main - devel/zookeeper: Update to 3.8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dd965b53658eb14631cf41cb79f2f2037608c26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655185935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eGA0W04W0uPRKnNFd1lnrAJqsC95GEzXJPTJT1iYK4I=; b=Zo+Cilhpvq5sQKwPcD88FLClnO5cAX+ko17g23jDs69Cjt9zbbFqDdPT6Gg0ZmdExmq7W/ Ck173Q3J4716RPgDIXaBVvZ4Dgq5kpaauK6/IURMor7wt/0/cbEp2yTjYgtnVtpovejVqp Y/FLF5/u2q7u3SF/MH+j4dy/S+kd0im6GbRueAPccQ7ZWzWI1yGYrXEGd/teBU3UZIDPJb CWtU6Zd+sWtkwKiAQ/wnNrT9JQgFlG4o6zPum/3G/eGe6HTM1BmWFt9jyX+1LKXomvRhxi OsljwNTg9Mmoo2quxajIUiVwjS+yZAA+c3w7iHJH65XNUJwfRvbAZtHaD9BzZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655185935; a=rsa-sha256; cv=none; b=Ax1piecmHBndxjvtrbbzMhpxYgCBLZs0rLILi5nP9X+AP/gwLFAzbrAU3WSGsAtzwkfEj/ HZ50zUfD7NT8aUnBoFUISTjtyALBK/WxGbvA7LMr/vnamdgyQ8FYbMgTXt6zEwf0drgtNO XwV4fgnWcCCH7n71oOnWJbHnYodAj4J1mmGhoDua3Mr0RgoCwUV2vb+2t09OROYmNBPSns ec8RVTCpSfVCgynl7y4xWW9/7hEXDoVodq+YG4SO6PvrlcoOtlk0vedNEkJk8E/r989DYr nGBPNSe3PxIqlHYvjxfMSqPn4t2/EpNxh+4PpXI2wda9STCTaudGgW8uavSloQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=1dd965b53658eb14631cf41cb79f2f2037608c26 commit 1dd965b53658eb14631cf41cb79f2f2037608c26 Author: Dmitry Wagin AuthorDate: 2022-06-12 16:04:40 +0000 Commit: Fernando Apesteguía 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 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: <