Attachment 237821 Details for Bug 267309 – port patch

[patch] port patch

0001-net-kafka-fix-non-kraft-installation.patch (text/plain), 3.44 KB, created by Pavel Timofeev on 2022-11-02 15:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2022-11-02 15:38:12 UTC

Size: 3.44 KB

patch

obsolete

>From 84b71848a4be9e6fa103476ff9a4b89860ec4074 Mon Sep 17 00:00:00 2001
>From: Pavel Timofeev <timp87@gmail.com>
>Date: Wed, 2 Nov 2022 09:35:16 -0600
>Subject: [PATCH] net/kafka: fix non-kraft installation
>
>---
> 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%%
>-- 
>2.38.1
>

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 267309: 237821