From nobody Sun Dec 18 19:25:59 2022 X-Original-To: dev-commits-ports-main@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 4NZt9M50mKzsyf9; Sun, 18 Dec 2022 19:25:59 +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 4NZt9M4Zy3z3KtR; Sun, 18 Dec 2022 19:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671391559; 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=ZqGwbgN9QDRl2RSShJVkpyz1D/QcGuLDXFs82Vedp9U=; b=YQXsZEegOvxAJFNgaHVn0uIWtyGFUz5AFChwsFQiLVNBhrwaqFfs8+EHwlHXfiI8BzoxDj IP38pGeJj8NyYkqiLG9qfabrIMe2w5E6sDGtGISpvgK2/BKHUkBi9VPiZj/853C9ksWV12 GXgvA0BOu31kJTTs80pei7GH05HoueHh3xmzeyDd0wCssp7ByVhMkI4wToDHaw6qZThZma eyLJb+z6FvpcV3635qn+M1q5H8wQk/hTV81bmOVIdVlf06wrHiqnJVX8/fB5uSzDjZXGI1 xz29kNDzb9rcABIhV6uxXb5HfpB7LRkE2N2iHsWBfhq/uA91Wog6/Cqbpr3Zlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671391559; 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=ZqGwbgN9QDRl2RSShJVkpyz1D/QcGuLDXFs82Vedp9U=; b=yMJyRSVvEa/gT7MCNcxM82K1pfr1Fw7L5IKZ8w6NcP8bJ37m2fTIdTv44KJKQIBqn2ZQCD n5JuQ5Xk7OvNQZP40QOHWD3EaIXBW1KnVAF2k41gtb2fPgE+wJgO+uOY6WhyWhJ3O4LdPX Rc2X8WXbJOJQQdNZplgF4I1kyMbYo5JMP9+H3YvFJXaCP5jiklVpqnoZgufm03TE/UyMpd jkQyivYm9gWvcq0q2SjNuNgDigQ06KqEqr28x+S+zOKiLQEjFmfHkJwXhFvsy5eBwdkGxw Df6427xnfBoAagG7Yr8o0DyKwR7OLi4z9Q0GUO7MpPEmDZ3Z4RyRFsJxa0ABOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671391559; a=rsa-sha256; cv=none; b=sXgN3Fg1GkBHdXHqxJPUdHrJ+V17b/SAx5i6W6eb7VSVafQ6Zix/pSfgSiCnDbuK+Bh+7m 2QaxXckdg3/tK9fKqHyz+sO5BYRG4YbvxvwZH9pDRyHypefUsPcG72tOQLO3RBbcZwO040 Yx9CoOFxtB5OdIeD6YCn4766AQuidgrVBcevK1yt09yZiqlyP+CYY9ep5gXe9QxPEszZdq KmKogYORjpx1gWv3joJmd68gBYkrcpYNkG37AR8ztJtMqKTyFkpnX4xjO+yhSLAa7VxV7m h+dUyy5UP7Jao+OQUVwjAb6F3S7ycFmpJwBsMYCA76vp1ksZNVWFkr8VeReMMw== 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 4NZt9M3XTszSQM; Sun, 18 Dec 2022 19:25:59 +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 2BIJPx8o051160; Sun, 18 Dec 2022 19:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIJPxmE051159; Sun, 18 Dec 2022 19:25:59 GMT (envelope-from git) Date: Sun, 18 Dec 2022 19:25:59 GMT Message-Id: <202212181925.2BIJPxmE051159@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 93b244dc10ce - main - net/kafka: fix regression in non-Kraft mode after update to 3.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93b244dc10ce303f458a8e73683c18033de44fc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=93b244dc10ce303f458a8e73683c18033de44fc0 commit 93b244dc10ce303f458a8e73683c18033de44fc0 Author: Pavel Timofeev AuthorDate: 2022-12-18 09:31:11 +0000 Commit: Ronald Klop CommitDate: 2022-12-18 19:21:55 +0000 net/kafka: fix regression in non-Kraft mode after update to 3.3.1 "There's a regression after update to 3.3.1 in non-Kraft mode The port always creates /var/db/kafka/kraft dir. But it brokes the Kafka environment." PR: 267309 Approved by: rene Differential Revision: https://reviews.freebsd.org/D37731 --- net/kafka/Makefile | 18 +++++++++++------- net/kafka/pkg-plist | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/net/kafka/Makefile b/net/kafka/Makefile index 071168c1bfd0..7ad71de43f4e 100644 --- a/net/kafka/Makefile +++ b/net/kafka/Makefile @@ -1,5 +1,6 @@ PORTNAME= kafka DISTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= net java MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}_2.13-${PORTVERSION} @@ -27,6 +28,7 @@ SHEBANG_FILES= bin/*.sh KAFKA_USER?= kafka KAFKA_GROUP?= kafka KAFKA_DBDIR?= /var/db/${PORTNAME} +KAFKA_DBDIR_KRAFT?= ${KAFKA_DBDIR}-kraft KAFKA_LOGDIR?= /var/log/${PORTNAME} DATADIR= ${JAVASHAREDIR}/${PORTNAME} @@ -39,7 +41,8 @@ SUB_LIST= JAVA=${JAVA} \ KAFKA_USER=${KAFKA_USER} \ KAFKA_GROUP=${KAFKA_GROUP} \ KAFKA_LOGDIR=${KAFKA_LOGDIR} \ - KAFKA_DBDIR=${KAFKA_DBDIR} + KAFKA_DBDIR=${KAFKA_DBDIR} \ + KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT} USERS= ${KAFKA_USER} GROUPS= ${KAFKA_GROUP} @@ -66,13 +69,14 @@ KAFKA_CONFIGS= connect-console-sink.properties \ connect-mirror-maker.properties connect-standalone.properties \ consumer.properties log4j.properties producer.properties \ server.properties tools-log4j.properties trogdor.conf -KAFKA_KRAFT= broker.properties controller.properties server.properties +KAFKA_CONFIGS_KRAFT= broker.properties controller.properties server.properties PLIST_SUB= PORTVERSION=${PORTVERSION} \ KAFKA_USER=${KAFKA_USER} \ KAFKA_GROUP=${KAFKA_GROUP} \ KAFKA_LOGDIR=${KAFKA_LOGDIR} \ - KAFKA_DBDIR=${KAFKA_DBDIR} + KAFKA_DBDIR=${KAFKA_DBDIR} \ + KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT} OPTIONS_DEFINE= DOCS @@ -82,15 +86,15 @@ post-patch: @${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh @${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh @${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties -.for f in ${KAFKA_KRAFT} - @${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}/kraft/|" ${WRKSRC}/config/kraft/${f} +.for f in ${KAFKA_CONFIGS_KRAFT} + @${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR_KRAFT}|" ${WRKSRC}/config/kraft/${f} .endfor do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${ETCDIR}/kraft ${MKDIR} ${STAGEDIR}${KAFKA_DBDIR} - ${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft + ${MKDIR} ${STAGEDIR}${KAFKA_DBDIR_KRAFT} ${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin .for f in ${KAFKA_BINS} @@ -104,7 +108,7 @@ do-install: .for f in ${KAFKA_CONFIGS} ${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor -.for f in ${KAFKA_KRAFT} +.for f in ${KAFKA_CONFIGS_KRAFT} ${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample .endfor diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist index 206622d584de..6abe22d3b24d 100644 --- a/net/kafka/pkg-plist +++ b/net/kafka/pkg-plist @@ -285,5 +285,5 @@ @sample %%ETCDIR%%/kraft/controller.properties.sample @sample %%ETCDIR%%/kraft/server.properties.sample @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%% -@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%/kraft +@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR_KRAFT%% @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%