Attachment 217187 Details for Bug 248638 – kafka.diff

[patch] kafka.diff

kafka.diff (text/plain), 10.93 KB, created by Dmitry Wagin on 2020-08-13 09:50:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2020-08-13 09:50:37 UTC

Size: 10.93 KB

patch

obsolete

>Index: net/kafka/Makefile
>===================================================================
>--- net/kafka/Makefile	(revision 544772)
>+++ net/kafka/Makefile	(working copy)
>@@ -2,9 +2,10 @@
> 
> PORTNAME=	kafka
> PORTVERSION=	2.6.0
>+PORTREVISION=	1
> CATEGORIES=	net java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
>-DISTNAME=	${PORTNAME}_2.12-${PORTVERSION}
>+DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
> 
> MAINTAINER=	timp87@gmail.com
> COMMENT=	Distributed streaming platform
>@@ -22,7 +23,7 @@
> 
> KAFKA_USER?=	kafka
> KAFKA_GROUP?=	kafka
>-KAFKA_DATADIR?=	/var/db/${PORTNAME}
>+KAFKA_DBDIR?=	/var/db/${PORTNAME}
> KAFKA_LOGDIR?=	/var/log/${PORTNAME}
> 
> USERS=		${KAFKA_USER}
>@@ -54,17 +55,15 @@
> 
> USE_RC_SUBR=	kafka kafka_connect
> SUB_LIST=	JAVA=${JAVA} \
>-		ETCDIR=${ETCDIR} \
> 		KAFKA_USER=${KAFKA_USER} \
> 		KAFKA_GROUP=${KAFKA_GROUP} \
> 		KAFKA_LOGDIR=${KAFKA_LOGDIR}
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION} \
>-		ETCDIR=${ETCDIR} \
> 		KAFKA_USER=${KAFKA_USER} \
> 		KAFKA_GROUP=${KAFKA_GROUP} \
> 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
>-		KAFKA_DATADIR=${KAFKA_DATADIR}
>+		KAFKA_DBDIR=${KAFKA_DBDIR}
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
>@@ -77,11 +76,11 @@
> 	@${REINPLACE_CMD} "/LOG_DIR=/s|\$$base_dir/logs|${KAFKA_LOGDIR}|" ${WRKSRC}/bin/kafka-run-class.sh
> 	@${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_DATADIR}|" ${WRKSRC}/config/server.properties
>+	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
>-	${MKDIR} ${STAGEDIR}${KAFKA_DATADIR}
>+	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
> 	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
> 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
> .for f in ${KAFKA_BINS}
>@@ -98,6 +97,6 @@
> 
> do-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.12-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
>+	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.13-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: net/kafka/distinfo
>===================================================================
>--- net/kafka/distinfo	(revision 544772)
>+++ net/kafka/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1596614828
>-SHA256 (kafka_2.12-2.6.0.tgz) = 086bf9ca1fcbe2abe5c62e73d6f172adb1ee5a5b42732e153fb4d4ec82dab69f
>-SIZE (kafka_2.12-2.6.0.tgz) = 65671917
>+TIMESTAMP = 1597270671
>+SHA256 (kafka_2.13-2.6.0.tgz) = 7c789adaa89654d935a5558d0dacff7466e2cfec9620cb8177cec141e7b0fb92
>+SIZE (kafka_2.13-2.6.0.tgz) = 65537909
>Index: net/kafka/files/kafka.in
>===================================================================
>--- net/kafka/files/kafka.in	(revision 544772)
>+++ net/kafka/files/kafka.in	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #
> # PROVIDE: kafka
>-# REQUIRE: LOGIN
>+# REQUIRE: NETWORKING SERVERS DAEMON
> # KEYWORD: shutdown
> #
> # Add kafka_enable="YES" to /etc/rc.conf to enable Kafka:
>@@ -11,6 +11,8 @@
> #
> # kafka_user:				Username to run Kafka
> #					Default: %%KAFKA_USER%%
>+# kafka_group:				Group to run Kafka
>+#					Default: %%KAFKA_GROUP%%
> # kafka_config:				Configuration file to run Kafka
> #					Default: %%ETCDIR%%/server.properties
> # kafka_log4j_config:			Configuration file for Kafka logging
>@@ -23,6 +25,8 @@
> #					Default: /var/run/kafka.pid
> # kafka_syslog_output_enable:		Set to enable syslog output.
> #					Default: YES
>+# kafka_syslog_output_tag:		Set syslog tag if syslog enabled.
>+#					Default: kafka
> # kafka_syslog_output_priority:		Set syslog priority if syslog enabled.
> #					Default: info
> # kafka_syslog_output_facility:		Set syslog facility if syslog enabled.
>@@ -35,16 +39,16 @@
> 
> load_rc_config "${name}"
> 
>-: ${kafka_enable:=NO}
>-: ${kafka_user:=%%KAFKA_USER%%}
>-: ${kafka_config:=%%ETCDIR%%/server.properties}
>-: ${kafka_log4j_config:=%%ETCDIR%%/log4j.properties}
>-: ${kafka_log_dir:=%%KAFKA_LOGDIR%%}
>+: ${kafka_enable:="NO"}
>+: ${kafka_user:="%%KAFKA_USER%%"}
>+: ${kafka_group:="%%KAFKA_GROUP%%"}
>+: ${kafka_config:="%%ETCDIR%%/server.properties"}
>+: ${kafka_log4j_config:="%%ETCDIR%%/log4j.properties"}
>+: ${kafka_log_dir:="%%KAFKA_LOGDIR%%"}
> : ${kafka_pidfile:=/var/run/kafka.pid}
> : ${kafka_syslog_output_enable:="YES"}
> 
>-_kafka_user=${kafka_user}
>-unset kafka_user
>+start_precmd="kafka_start_precmd"
> 
> # backwards compatibility
> if [ -n "${kafka_log4j_profile}" ]; then
>@@ -52,7 +56,11 @@
> fi
> 
> if checkyesno kafka_syslog_output_enable; then
>-	kafka_syslog_output_flags="-T ${name}"
>+	if [ -n "${kafka_syslog_output_tag}" ]; then
>+		kafka_syslog_output_flags="-T ${kafka_syslog_output_tag}"
>+	else
>+		kafka_syslog_output_flags="-T ${name}"
>+	fi
> 	if [ -n "${kafka_syslog_output_priority}" ]; then
> 		kafka_syslog_output_flags="${kafka_syslog_output_flags} -s ${kafka_syslog_output_priority}"
> 	fi
>@@ -72,6 +80,13 @@
> required_files="${kafka_config} ${kafka_log4j_config}"
> 
> command="/usr/sbin/daemon"
>-command_args="-f ${kafka_syslog_output_flags} -P ${pidfile} -u ${_kafka_user} -t ${name} ${JAVA} ${kafka_main}"
>+command_args="-f ${kafka_syslog_output_flags} -P ${pidfile} -t ${name} ${JAVA} ${kafka_main}"
> 
>+kafka_start_precmd()
>+{
>+	if [ ! -e "${pidfile}" ]; then
>+		install -m 0600 -o "${kafka_user}" -g "${kafka_group}" /dev/null "${pidfile}"
>+	fi
>+}
>+
> run_rc_command "$1"
>Index: net/kafka/files/kafka_connect.in
>===================================================================
>--- net/kafka/files/kafka_connect.in	(revision 544772)
>+++ net/kafka/files/kafka_connect.in	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #
> # PROVIDE: kafka_connect
>-# REQUIRE: LOGIN
>+# REQUIRE: NETWORKING SERVERS DAEMON
> # KEYWORD: shutdown
> #
> # Add kafka_connect_enable="YES" to /etc/rc.conf to enable Kafka Connect:
>@@ -11,6 +11,8 @@
> #
> # kafka_connect_user:			Username to run Kafka Connect
> #					Default: %%KAFKA_USER%%
>+# kafka_connect_group:			Group to run Kafka Connect
>+#					Default: %%KAFKA_GROUP%%
> # kafka_connect_config:			Configuration file to run Kafka Connect
> #					Default: %%ETCDIR%%/connect.properties
> # kafka_connect_log4j_config:		Configuration file for Kafka Connect logging
>@@ -19,10 +21,12 @@
> #					Default: %%KAFKA_LOGDIR%%
> # kafka_connect_java_opts:		Options passed to JVM to start Kafka Connect
> #					Default: None
>-# kafka_connect_pidfile:		Full path of the Kafka process PID file
>+# kafka_connect_pidfile:		Full path of the Kafka Connect process PID file
> #					Default: /var/run/kafka_connect.pid
> # kafka_connect_syslog_output_enable:	Set to enable syslog output.
> #					Default: YES
>+# kafka_connect_syslog_output_tag:	Set syslog tag if syslog enabled.
>+#					Default: kafka_connect
> # kafka_connect_syslog_output_priority:	Set syslog priority if syslog enabled.
> #					Default: info
> # kafka_connect_syslog_output_facility:	Set syslog facility if syslog enabled.
>@@ -35,22 +39,24 @@
> 
> load_rc_config "${name}"
> 
>-: ${kafka_connect_enable:=NO}
>-: ${kafka_connect_user:=%%KAFKA_USER%%}
>-: ${kafka_connect_config:=%%ETCDIR%%/connect.properties}
>-: ${kafka_connect_log4j_config:=%%ETCDIR%%/connect-log4j.properties}
>-: ${kafka_connect_log_dir:=%%KAFKA_LOGDIR%%}
>+: ${kafka_connect_enable:="NO"}
>+: ${kafka_connect_user:="%%KAFKA_USER%%"}
>+: ${kafka_connect_group:="%%KAFKA_GROUP%%"}
>+: ${kafka_connect_config:="%%ETCDIR%%/connect.properties"}
>+: ${kafka_connect_log4j_config:="%%ETCDIR%%/connect-log4j.properties"}
>+: ${kafka_connect_log_dir:="%%KAFKA_LOGDIR%%"}
> : ${kafka_connect_pidfile:=/var/run/kafka_connect.pid}
> : ${kafka_connect_syslog_output_enable:="YES"}
> : ${kafka_connect_standalone:="YES"}
> 
>-_kafka_connect_user=${kafka_connect_user}
>-unset kafka_connect_user
>+start_precmd="kafka_connect_start_precmd"
> 
>-kafka_connect_log4j_config="${kafka_connect_log4j_profile#file:}"
>-
> if checkyesno kafka_connect_syslog_output_enable; then
>-	kafka_connect_syslog_output_flags="-T ${name}"
>+	if [ -n "${kafka_syslog_output_tag}" ]; then
>+		kafka_connect_syslog_output_flags="-T ${kafka_connect_syslog_output_tag}"
>+	else
>+		kafka_connect_syslog_output_flags="-T ${name}"
>+	fi
> 	if [ -n "${kafka_connect_syslog_output_priority}" ]; then
> 		kafka_connect_syslog_output_flags="${kafka_connect_syslog_output_flags} -s ${kafka_connect_syslog_output_priority}"
> 	fi
>@@ -75,6 +81,13 @@
> required_files="${kafka_connect_config} ${kafka_connect_log4j_config}"
> 
> command="/usr/sbin/daemon"
>-command_args="-f ${kafka_connect_syslog_output_flags} -P ${pidfile} -u ${_kafka_connect_user} -t ${name} ${JAVA} ${kafka_connect_main}"
>+command_args="-f ${kafka_connect_syslog_output_flags} -P ${pidfile} -t ${name} ${JAVA} ${kafka_connect_main}"
> 
>+kafka_connect_start_precmd()
>+{
>+	if [ ! -e "${pidfile}" ]; then
>+		install -m 0600 -o "${kafka_connect_user}" -g "${kafka_connect_group}" /dev/null "${pidfile}"
>+	fi
>+}
>+
> run_rc_command "$1"
>Index: net/kafka/pkg-plist
>===================================================================
>--- net/kafka/pkg-plist	(revision 544772)
>+++ net/kafka/pkg-plist	(working copy)
>@@ -53,7 +53,7 @@
> %%DATADIR%%/libs/jackson-jaxrs-json-provider-2.10.2.jar
> %%DATADIR%%/libs/jackson-module-jaxb-annotations-2.10.2.jar
> %%DATADIR%%/libs/jackson-module-paranamer-2.10.2.jar
>-%%DATADIR%%/libs/jackson-module-scala_2.12-2.10.2.jar
>+%%DATADIR%%/libs/jackson-module-scala_2.13-2.10.2.jar
> %%DATADIR%%/libs/jakarta.activation-api-1.2.1.jar
> %%DATADIR%%/libs/jakarta.annotation-api-1.3.4.jar
> %%DATADIR%%/libs/jakarta.inject-2.5.0.jar
>@@ -85,10 +85,10 @@
> %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/kafka-streams-scala_2.12-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/kafka-streams-scala_2.13-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/kafka_2.12-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/log4j-1.2.17.jar
> %%DATADIR%%/libs/lz4-java-1.7.1.jar
> %%DATADIR%%/libs/maven-artifact-3.6.3.jar
>@@ -106,11 +106,11 @@
> %%DATADIR%%/libs/plexus-utils-3.2.1.jar
> %%DATADIR%%/libs/reflections-0.9.12.jar
> %%DATADIR%%/libs/rocksdbjni-5.18.4.jar
>-%%DATADIR%%/libs/scala-collection-compat_2.12-2.1.6.jar
>-%%DATADIR%%/libs/scala-java8-compat_2.12-0.9.1.jar
>-%%DATADIR%%/libs/scala-library-2.12.11.jar
>-%%DATADIR%%/libs/scala-logging_2.12-3.9.2.jar
>-%%DATADIR%%/libs/scala-reflect-2.12.11.jar
>+%%DATADIR%%/libs/scala-collection-compat_2.13-2.1.6.jar
>+%%DATADIR%%/libs/scala-java8-compat_2.13-0.9.1.jar
>+%%DATADIR%%/libs/scala-library-2.13.2.jar
>+%%DATADIR%%/libs/scala-logging_2.13-3.9.2.jar
>+%%DATADIR%%/libs/scala-reflect-2.13.2.jar
> %%DATADIR%%/libs/slf4j-api-1.7.30.jar
> %%DATADIR%%/libs/slf4j-log4j12-1.7.30.jar
> %%DATADIR%%/libs/snappy-java-1.1.7.3.jar
>@@ -257,5 +257,5 @@
> @sample %%ETCDIR%%/server.properties.sample
> @sample %%ETCDIR%%/tools-log4j.properties.sample
> @sample %%ETCDIR%%/trogdor.conf.sample
>-@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DATADIR%%
>+@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%
> @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 248638: 217187