Attachment 210117 Details for Bug 242782 – kafka.diff

[patch] kafka.diff

kafka.diff (text/plain), 18.46 KB, created by Dmitry Wagin on 2019-12-21 19:49:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-12-21 19:49:49 UTC

Size: 18.46 KB

patch

obsolete

>Index: net/kafka/Makefile
>===================================================================
>--- net/kafka/Makefile	(revision 520147)
>+++ net/kafka/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kafka
>-PORTVERSION=	2.3.0
>+PORTVERSION=	2.4.0
> CATEGORIES=	net java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
> DISTNAME=	${PORTNAME}_2.12-${PORTVERSION}
>@@ -20,12 +20,15 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>-USERS=		kafka
>-GROUPS=		kafka
>+KAFKA_USER?=	kafka
>+KAFKA_GROUP?=	kafka
>+KAFKA_DATADIR?=	/var/db/${PORTNAME}
>+KAFKA_LOGDIR?=	/var/log/${PORTNAME}
> 
>+USERS=		${KAFKA_USER}
>+GROUPS=		${KAFKA_GROUP}
>+
> DATADIR=	${JAVASHAREDIR}/${PORTNAME}
>-KAFKA_DATADIR=	/var/db/${PORTNAME}
>-KAFKA_LOGDIR=	/var/log/${PORTNAME}
> KAFKA_BINS=	connect-distributed.sh connect-standalone.sh kafka-acls.sh \
> 		kafka-broker-api-versions.sh kafka-configs.sh \
> 		kafka-console-consumer.sh kafka-console-producer.sh \
>@@ -46,25 +49,25 @@
> 		log4j.properties producer.properties server.properties \
> 		tools-log4j.properties trogdor.conf
> 
>-SUB_FILES=	kafka
>-SUB_LIST=	ETCDIR=${ETCDIR} \
>-		GROUPS=${GROUPS} \
>-		JAVA=${JAVA} \
>-		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
>-		USERS=${USERS}
>+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=	ETCDIR=${ETCDIR} \
>-		GROUPS=${GROUPS} \
>-		KAFKA_DATADIR=${KAFKA_DATADIR} \
>+PLIST_SUB=	PORTVERSION=${PORTVERSION} \
>+		ETCDIR=${ETCDIR} \
>+		KAFKA_USER=${KAFKA_USER} \
>+		KAFKA_GROUP=${KAFKA_GROUP} \
> 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
>-		PORTVERSION=${PORTVERSION} \
>-		USERS=${USERS}
>+		KAFKA_DATADIR=${KAFKA_DATADIR}
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
> USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
>-USE_RC_SUBR=	kafka
>+JAVA_VERSION=	8+
>+JAVA_RUN=	yes
> 
> post-patch:
> 	@${REINPLACE_CMD} "s|JAVA=\"java\"|JAVA=\"${JAVA}\"|" ${WRKSRC}/bin/kafka-run-class.sh
>@@ -79,13 +82,12 @@
> 	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
> 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
> .for f in ${KAFKA_BINS}
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin/
>+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin/
> .endfor
>-	(cd ${WRKSRC} && ${COPYTREE_SHARE} libs ${STAGEDIR}${DATADIR} "-not ( \
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} libs ${STAGEDIR}${DATADIR} "-not ( \
> 		-name kafka_*-javadoc\.jar -or -name kafka_*-scaladoc\.jar -or \
> 		-name kafka_*-sources\.jar -or -name kafka_*-test\.jar -or \
>-		-name *\.asc \
>-		)" \
>+		-name *\.asc )" \
> 	)
> .for f in ${KAFKA_CONFIGS}
> 	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
>Index: net/kafka/distinfo
>===================================================================
>--- net/kafka/distinfo	(revision 520147)
>+++ net/kafka/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500285144
>-SHA256 (kafka_2.12-2.3.0.tgz) = d86f5121a9f0c44477ae6b6f235daecc3f04ecb7bf98596fd91f402336eee3e7
>-SIZE (kafka_2.12-2.3.0.tgz) = 57215197
>+TIMESTAMP = 1576953302
>+SHA256 (kafka_2.12-2.4.0.tgz) = b9582bab0c3e8d131953b1afa72d6885ca1caae0061c2623071e7f396f2ccfee
>+SIZE (kafka_2.12-2.4.0.tgz) = 62283588
>Index: net/kafka/files/kafka.in
>===================================================================
>--- net/kafka/files/kafka.in	(revision 520147)
>+++ net/kafka/files/kafka.in	(working copy)
>@@ -9,21 +9,21 @@
> #
> # Additional variables you can define are:
> #
>-# kafka_user:		Username to run Kafka
>-#			Default: %%USERS%%
>-# kafka_config:		Configuration file to run Kafka
>-#			Default: %%ETCDIR%%/server.properties
>-# kafka_log4j_profile:	Profile for Kafka logging
>-#			Default: %%ETCDIR%%/log4j.properties
>-# kafka_log_dir:	Directory to store Kafka logs
>-#			Default: %%KAFKA_LOGDIR%%
>-# kafka_java_opts:	Options passed to JVM to start Kafka
>-#			Default: None
>-# kafka_pidfile:	Full path of the Kafka process PID file
>-#			Default: /var/run/kafka.pid
>+# kafka_user:				Username to run Kafka
>+#					Default: %%KAFKA_USER%%
>+# kafka_config:				Configuration file to run Kafka
>+#					Default: %%ETCDIR%%/server.properties
>+# kafka_log4j_config:			Configuration file for Kafka logging
>+#					Default: %%ETCDIR%%/log4j.properties
>+# kafka_log_dir:			Directory to store Kafka logs
>+#					Default: %%KAFKA_LOGDIR%%
>+# kafka_java_opts:			Options passed to JVM to start Kafka
>+#					Default: None
>+# kafka_pidfile:			Full path of the Kafka process PID file
>+#					Default: /var/run/kafka.pid
> # kafka_syslog_output_enable:		Set to enable syslog output.
> #					Default: YES
>-# kafka_syslog_output_priority: 	Set syslog priority if syslog enabled.
>+# kafka_syslog_output_priority:		Set syslog priority if syslog enabled.
> #					Default: info
> # kafka_syslog_output_facility:		Set syslog facility if syslog enabled.
> #					Default: daemon
>@@ -36,14 +36,21 @@
> load_rc_config "${name}"
> 
> : ${kafka_enable:=NO}
>-: ${kafka_user:=%%USERS%%}
>+: ${kafka_user:=%%KAFKA_USER%%}
> : ${kafka_config:=%%ETCDIR%%/server.properties}
>-: ${kafka_log4j_profile:=%%ETCDIR%%/log4j.properties}
>+: ${kafka_log4j_config:=%%ETCDIR%%/log4j.properties}
> : ${kafka_log_dir:=%%KAFKA_LOGDIR%%}
>-: ${kafka_java_opts:=}
> : ${kafka_pidfile:=/var/run/kafka.pid}
> : ${kafka_syslog_output_enable:="YES"}
> 
>+_kafka_user=${kafka_user}
>+unset kafka_user
>+
>+# backwards compatibility
>+if [ -n "${kafka_log4j_profile}" ]; then
>+	kafka_log4j_config="${kafka_log4j_profile#file:}"
>+fi
>+
> if checkyesno kafka_syslog_output_enable; then
> 	kafka_syslog_output_flags="-T ${name}"
> 	if [ -n "${kafka_syslog_output_priority}" ]; then
>@@ -54,19 +61,17 @@
> 	fi
> fi
> 
>-JAVA=%%JAVA%%
>-
>+JAVA="%%JAVA%%"
> CLASSPATH=":%%DATADIR%%/libs/*"
> 
>-kafka_log_opts="-Dkafka.logs.dir=${kafka_log_dir} -Dlog4j.configuration=file:${kafka_log4j_profile}"
>-kafka_main="${kafka_java_opts} ${kafka_log_opts} -cp ${CLASSPATH} kafka.Kafka ${kafka_config}"
>-pidfile=${kafka_pidfile}
>+kafka_class="kafka.Kafka"
>+kafka_log_opts="-Dkafka.logs.dir=${kafka_log_dir} -Dlog4j.configuration=file:${kafka_log4j_config}"
>+kafka_main="${kafka_java_opts} ${kafka_log_opts} -cp ${CLASSPATH} ${kafka_class} ${kafka_config}"
>+pidfile="${kafka_pidfile}"
> required_dirs="${kafka_log_dir}"
>-required_files="${kafka_config} ${kafka_log4j_profile}"
>+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}"
>-unset kafka_user
>+command_args="-f ${kafka_syslog_output_flags} -P ${pidfile} -u ${_kafka_user} -t ${name} ${JAVA} ${kafka_main}"
> 
> run_rc_command "$1"
>Index: net/kafka/files/kafka_connect.in
>===================================================================
>--- net/kafka/files/kafka_connect.in	(nonexistent)
>+++ net/kafka/files/kafka_connect.in	(working copy)
>@@ -0,0 +1,80 @@
>+#!/bin/sh
>+# $FreeBSD$
>+#
>+# PROVIDE: kafka_connect
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+#
>+# Add kafka_connect_enable="YES" to /etc/rc.conf to enable Kafka Connect:
>+#
>+# Additional variables you can define are:
>+#
>+# kafka_connect_user:			Username to run Kafka Connect
>+#					Default: %%KAFKA_USER%%
>+# kafka_connect_config:			Configuration file to run Kafka Connect
>+#					Default: %%ETCDIR%%/connect.properties
>+# kafka_connect_log4j_config:		Configuration file for Kafka Connect logging
>+#					Default: %%ETCDIR%%/connect-log4j.properties
>+# kafka_connect_log_dir:		Directory to store Kafka Connect logs
>+#					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
>+#					Default: /var/run/kafka_connect.pid
>+# kafka_connect_syslog_output_enable:	Set to enable syslog output.
>+#					Default: YES
>+# kafka_connect_syslog_output_priority:	Set syslog priority if syslog enabled.
>+#					Default: info
>+# kafka_connect_syslog_output_facility:	Set syslog facility if syslog enabled.
>+#					Default: daemon
>+
>+. /etc/rc.subr
>+
>+name=kafka_connect
>+rcvar=kafka_connect_enable
>+
>+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_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
>+
>+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_connect_syslog_output_priority}" ]; then
>+		kafka_connect_syslog_output_flags="${kafka_connect_syslog_output_flags} -s ${kafka_connect_syslog_output_priority}"
>+	fi
>+	if [ -n "${kafka_connect_syslog_output_facility}" ]; then
>+		kafka_connect_syslog_output_flags="${kafka_connect_syslog_output_flags} -l ${kafka_connect_syslog_output_facility}"
>+	fi
>+fi
>+
>+if checkyesno kafka_connect_standalone; then
>+	kafka_connect_class="org.apache.kafka.connect.cli.ConnectStandalone"
>+else
>+	kafka_connect_class="org.apache.kafka.connect.cli.ConnectDistributed"
>+fi
>+
>+JAVA="%%JAVA%%"
>+CLASSPATH=":%%DATADIR%%/libs/*"
>+
>+kafka_connect_log_opts="-Dkafka_connect.log.dir=${kafka_connect_log_dir} -Dlog4j.configuration=file:${kafka_connect_log4j_config}"
>+kafka_connect_main="${kafka_connect_java_opts} ${kafka_connect_log_opts} -cp ${CLASSPATH} ${kafka_connect_class} ${kafka_connect_config}"
>+pidfile="${kafka_connect_pidfile}"
>+required_dirs="${kafka_connect_log_dir}"
>+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}"
>+
>+run_rc_command "$1"
>
>Property changes on: net/kafka/files/kafka_connect.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/kafka/pkg-plist
>===================================================================
>--- net/kafka/pkg-plist	(revision 520147)
>+++ net/kafka/pkg-plist	(working copy)
>@@ -29,11 +29,14 @@
> %%DATADIR%%/libs/aopalliance-repackaged-2.5.0.jar
> %%DATADIR%%/libs/argparse4j-0.7.0.jar
> %%DATADIR%%/libs/audience-annotations-0.5.0.jar
>+%%DATADIR%%/libs/commons-cli-1.4.jar
> %%DATADIR%%/libs/commons-lang3-3.8.1.jar
> %%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/connect-basic-auth-extension-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/connect-json-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/connect-mirror-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/connect-mirror-client-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/guava-20.0.jar
>@@ -40,19 +43,21 @@
> %%DATADIR%%/libs/hk2-api-2.5.0.jar
> %%DATADIR%%/libs/hk2-locator-2.5.0.jar
> %%DATADIR%%/libs/hk2-utils-2.5.0.jar
>-%%DATADIR%%/libs/jackson-annotations-2.9.9.jar
>-%%DATADIR%%/libs/jackson-core-2.9.9.jar
>-%%DATADIR%%/libs/jackson-databind-2.9.9.jar
>-%%DATADIR%%/libs/jackson-dataformat-csv-2.9.9.jar
>-%%DATADIR%%/libs/jackson-datatype-jdk8-2.9.9.jar
>-%%DATADIR%%/libs/jackson-jaxrs-base-2.9.9.jar
>-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.9.jar
>-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.9.jar
>-%%DATADIR%%/libs/jackson-module-paranamer-2.9.9.jar
>-%%DATADIR%%/libs/jackson-module-scala_2.12-2.9.9.jar
>+%%DATADIR%%/libs/jackson-annotations-2.10.0.jar
>+%%DATADIR%%/libs/jackson-core-2.10.0.jar
>+%%DATADIR%%/libs/jackson-databind-2.10.0.jar
>+%%DATADIR%%/libs/jackson-dataformat-csv-2.10.0.jar
>+%%DATADIR%%/libs/jackson-datatype-jdk8-2.10.0.jar
>+%%DATADIR%%/libs/jackson-jaxrs-base-2.10.0.jar
>+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.10.0.jar
>+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.10.0.jar
>+%%DATADIR%%/libs/jackson-module-paranamer-2.10.0.jar
>+%%DATADIR%%/libs/jackson-module-scala_2.12-2.10.0.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
> %%DATADIR%%/libs/jakarta.ws.rs-api-2.1.5.jar
>+%%DATADIR%%/libs/jakarta.xml.bind-api-2.3.2.jar
> %%DATADIR%%/libs/javassist-3.22.0-CR2.jar
> %%DATADIR%%/libs/javax.servlet-api-3.1.0.jar
> %%DATADIR%%/libs/javax.ws.rs-api-2.1.1.jar
>@@ -64,18 +69,16 @@
> %%DATADIR%%/libs/jersey-hk2-2.28.jar
> %%DATADIR%%/libs/jersey-media-jaxb-2.28.jar
> %%DATADIR%%/libs/jersey-server-2.28.jar
>-%%DATADIR%%/libs/jetty-client-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-continuation-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-http-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-io-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-security-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-server-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-servlet-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-servlets-9.4.18.v20190429.jar
>-%%DATADIR%%/libs/jetty-util-9.4.18.v20190429.jar
>+%%DATADIR%%/libs/jetty-client-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-continuation-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-http-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-io-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-security-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-server-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-servlet-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-servlets-9.4.20.v20190813.jar
>+%%DATADIR%%/libs/jetty-util-9.4.20.v20190813.jar
> %%DATADIR%%/libs/jopt-simple-5.0.4.jar
>-%%DATADIR%%/libs/jsr305-3.0.2.jar
>-%%DATADIR%%/libs/kafka_2.12-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
> %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
>@@ -83,27 +86,36 @@
> %%DATADIR%%/libs/kafka-streams-scala_2.12-%%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/log4j-1.2.17.jar
> %%DATADIR%%/libs/lz4-java-1.6.0.jar
> %%DATADIR%%/libs/maven-artifact-3.6.1.jar
> %%DATADIR%%/libs/metrics-core-2.2.0.jar
>+%%DATADIR%%/libs/netty-buffer-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-codec-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-common-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-handler-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-resolver-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-transport-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.42.Final.jar
>+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.42.Final.jar
> %%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar
> %%DATADIR%%/libs/paranamer-2.8.jar
> %%DATADIR%%/libs/plexus-utils-3.2.0.jar
> %%DATADIR%%/libs/reflections-0.9.11.jar
> %%DATADIR%%/libs/rocksdbjni-5.18.3.jar
>-%%DATADIR%%/libs/scala-library-2.12.8.jar
>-%%DATADIR%%/libs/scala-logging_2.12-3.9.0.jar
>-%%DATADIR%%/libs/scala-reflect-2.12.8.jar
>-%%DATADIR%%/libs/slf4j-api-1.7.26.jar
>-%%DATADIR%%/libs/slf4j-log4j12-1.7.26.jar
>+%%DATADIR%%/libs/scala-collection-compat_2.12-2.1.2.jar
>+%%DATADIR%%/libs/scala-java8-compat_2.12-0.9.0.jar
>+%%DATADIR%%/libs/scala-library-2.12.10.jar
>+%%DATADIR%%/libs/scala-logging_2.12-3.9.2.jar
>+%%DATADIR%%/libs/scala-reflect-2.12.10.jar
>+%%DATADIR%%/libs/slf4j-api-1.7.28.jar
>+%%DATADIR%%/libs/slf4j-log4j12-1.7.28.jar
> %%DATADIR%%/libs/snappy-java-1.1.7.3.jar
>-%%DATADIR%%/libs/spotbugs-annotations-3.1.9.jar
> %%DATADIR%%/libs/validation-api-2.0.1.Final.jar
>-%%DATADIR%%/libs/zkclient-0.11.jar
>-%%DATADIR%%/libs/zookeeper-3.4.14.jar
>-%%DATADIR%%/libs/zstd-jni-1.4.0-1.jar
>-%%ETCDIR%%/trogdor.conf.sample
>+%%DATADIR%%/libs/zookeeper-3.5.6.jar
>+%%DATADIR%%/libs/zookeeper-jute-3.5.6.jar
>+%%DATADIR%%/libs/zstd-jni-1.4.3-1.jar
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
>@@ -148,6 +160,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/streams_config.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/topic_config.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/consumer-groups.png
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/NYT.jpg
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture--white.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/documentation--white.png
>@@ -154,15 +167,14 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/documentation.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/line.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/new-york.png
>-%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/NYT.jpg
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/rabobank.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials--white.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/zalando.png
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka-apis.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_log.png
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc_complex.png
>-%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png
>-%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka-apis.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_anatomy.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_cleaner_anatomy.png
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_compaction.png
>@@ -210,6 +222,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/config-streams.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/datatypes.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/dsl-api.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/dsl-topology-naming.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/index.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/interactive-queries.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/manage-topics.html
>@@ -226,8 +239,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/toc.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/upgrade.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/uses.html
>-@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_DATADIR%%
>-@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_LOGDIR%%
> @sample %%ETCDIR%%/connect-console-sink.properties.sample
> @sample %%ETCDIR%%/connect-console-source.properties.sample
> @sample %%ETCDIR%%/connect-distributed.properties.sample
>@@ -240,3 +251,6 @@
> @sample %%ETCDIR%%/producer.properties.sample
> @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_LOGDIR%%

Flags:

dmitry.wagin: maintainer-approval+

Actions: View | Diff

Attachments on bug 242782: 210117