FreeBSD Bugzilla – Attachment 205548 Details for
Bug 239000
net/kafka: upgrade to 2.3.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
kafka-2.3.0.diff
kafka-2.3.0.diff (text/plain), 11.92 KB, created by
Dmitry Wagin
on 2019-07-06 17:33:06 UTC
(
hide
)
Description:
kafka-2.3.0.diff
Filename:
MIME Type:
Creator:
Dmitry Wagin
Created:
2019-07-06 17:33:06 UTC
Size:
11.92 KB
patch
obsolete
>Index: net/kafka/Makefile >=================================================================== >--- net/kafka/Makefile (revision 505998) >+++ net/kafka/Makefile (working copy) >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= kafka >-PORTVERSION= 2.2.0 >+PORTVERSION= 2.3.0 > CATEGORIES= net java > MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION} > DISTNAME= ${PORTNAME}_2.12-${PORTVERSION} >@@ -26,7 +26,6 @@ > DATADIR= ${JAVASHAREDIR}/${PORTNAME} > KAFKA_DATADIR= /var/db/${PORTNAME} > KAFKA_LOGDIR= /var/log/${PORTNAME} >-KAFKA_RUNDIR= /var/run/${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 \ >@@ -53,7 +52,6 @@ > ETCDIR=${ETCDIR} \ > USERS=${USERS} \ > GROUPS=${GROUPS} \ >- KAFKA_RUNDIR=${KAFKA_RUNDIR} \ > KAFKA_LOGDIR=${KAFKA_LOGDIR} > > PLIST_SUB= PORTVERSION=${PORTVERSION} \ >@@ -60,7 +58,6 @@ > USERS=${USERS} \ > GROUPS=${GROUPS} \ > KAFKA_DATADIR=${KAFKA_DATADIR} \ >- KAFKA_RUNDIR=${KAFKA_RUNDIR} \ > KAFKA_LOGDIR=${KAFKA_LOGDIR} \ > ETCDIR=${ETCDIR} > >@@ -81,7 +78,6 @@ > ${MKDIR} ${STAGEDIR}${ETCDIR} > ${MKDIR} ${STAGEDIR}${KAFKA_DATADIR} > ${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR} >- ${MKDIR} ${STAGEDIR}${KAFKA_RUNDIR} > ${MKDIR} ${STAGEDIR}${DATADIR}/bin > .for f in ${KAFKA_BINS} > ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin/ >Index: net/kafka/distinfo >=================================================================== >--- net/kafka/distinfo (revision 505998) >+++ net/kafka/distinfo (working copy) >@@ -1,3 +1,3 @@ > TIMESTAMP = 1500285144 >-SHA256 (kafka_2.12-2.2.0.tgz) = a009624fae678fa35968f945e18e45fbea9a30fa8080d5dcce7fdea726120027 >-SIZE (kafka_2.12-2.2.0.tgz) = 57028557 >+SHA256 (kafka_2.12-2.3.0.tgz) = d86f5121a9f0c44477ae6b6f235daecc3f04ecb7bf98596fd91f402336eee3e7 >+SIZE (kafka_2.12-2.3.0.tgz) = 57215197 >Index: net/kafka/files/kafka.in >=================================================================== >--- net/kafka/files/kafka.in (revision 505998) >+++ net/kafka/files/kafka.in (working copy) >@@ -11,8 +11,6 @@ > # > # kafka_user: Username to run Kafka > # Default: %%USERS%% >-# kafka_group: Groupname to run Kafka >-# Default: %%GROUPS%% > # kafka_config: Configuration file to run Kafka > # Default: %%ETCDIR%%/server.properties > # kafka_log4j_profile: Profile for Kafka logging >@@ -21,8 +19,8 @@ > # Default: %%KAFKA_LOGDIR%% > # kafka_java_opts: Options passed to JVM to start Kafka > # Default: None >-# kafka_pid_file: Full path of the Kafka process PID file >-# Default: %%KAFKA_RUNDIR%%/kafka.pid >+# 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. >@@ -39,16 +37,15 @@ > > : ${kafka_enable:=NO} > : ${kafka_user:=%%USERS%%} >-: ${kafka_group:=%%GROUPS%%} > : ${kafka_config:=%%ETCDIR%%/server.properties} > : ${kafka_log4j_profile:=%%ETCDIR%%/log4j.properties} > : ${kafka_log_dir:=%%KAFKA_LOGDIR%%} > : ${kafka_java_opts:=} >-: ${kafka_pid_file:=%%KAFKA_RUNDIR%%/kafka.pid} >+: ${kafka_pidfile:=/var/run/kafka.pid} > : ${kafka_syslog_output_enable:="YES"} > > if checkyesno kafka_syslog_output_enable; then >- kafka_syslog_output_flags="-t ${name} -T ${name}" >+ kafka_syslog_output_flags="-T ${name}" > if [ -n "${kafka_syslog_output_priority}" ]; then > kafka_syslog_output_flags="${kafka_syslog_output_flags} -s ${kafka_syslog_output_priority}" > fi >@@ -62,22 +59,14 @@ > 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" >-pidfile=${kafka_pid_file} >-procname=${JAVA} >+kafka_main="${kafka_java_opts} ${kafka_log_opts} -cp ${CLASSPATH} kafka.Kafka ${kafka_config}" >+pidfile=${kafka_pidfile} >+required_dirs="${kafka_log_dir}" > required_files="${kafka_config} ${kafka_log4j_profile}" > > > command="/usr/sbin/daemon" >-command_args="-f ${kafka_syslog_output_flags} -p ${pidfile} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config}" >+command_args="-f ${kafka_syslog_output_flags} -P ${pidfile} -u ${kafka_user} -t ${name} ${JAVA} ${kafka_main}" >+unset kafka_user > >-start_precmd="kafka_init" >- >- >-kafka_init() >-{ >- [ -d "$kafka_log_dir" ] || mkdir -p "$kafka_log_dir" >- chown ${kafka_user}:${kafka_group} ${pidfile%/*} ${kafka_log_dir} ${kafka_config} ${kafka_log4j_profile} >-} >- > run_rc_command "$1" >Index: net/kafka/pkg-plist >=================================================================== >--- net/kafka/pkg-plist (revision 505998) >+++ net/kafka/pkg-plist (working copy) >@@ -26,7 +26,7 @@ > %%DATADIR%%/bin/trogdor.sh > %%DATADIR%%/bin/zookeeper-security-migration.sh > %%DATADIR%%/libs/activation-1.1.1.jar >-%%DATADIR%%/libs/aopalliance-repackaged-2.5.0-b42.jar >+%%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-lang3-3.8.1.jar >@@ -37,41 +37,45 @@ > %%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar > %%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar > %%DATADIR%%/libs/guava-20.0.jar >-%%DATADIR%%/libs/hk2-api-2.5.0-b42.jar >-%%DATADIR%%/libs/hk2-locator-2.5.0-b42.jar >-%%DATADIR%%/libs/hk2-utils-2.5.0-b42.jar >-%%DATADIR%%/libs/jackson-annotations-2.9.8.jar >-%%DATADIR%%/libs/jackson-core-2.9.8.jar >-%%DATADIR%%/libs/jackson-databind-2.9.8.jar >-%%DATADIR%%/libs/jackson-datatype-jdk8-2.9.8.jar >-%%DATADIR%%/libs/jackson-jaxrs-base-2.9.8.jar >-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.8.jar >-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.8.jar >+%%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/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/javassist-3.22.0-CR2.jar >-%%DATADIR%%/libs/javax.annotation-api-1.2.jar >-%%DATADIR%%/libs/javax.inject-1.jar >-%%DATADIR%%/libs/javax.inject-2.5.0-b42.jar > %%DATADIR%%/libs/javax.servlet-api-3.1.0.jar >-%%DATADIR%%/libs/javax.ws.rs-api-2.1.jar > %%DATADIR%%/libs/javax.ws.rs-api-2.1.1.jar > %%DATADIR%%/libs/jaxb-api-2.3.0.jar >-%%DATADIR%%/libs/jersey-client-2.27.jar >-%%DATADIR%%/libs/jersey-common-2.27.jar >-%%DATADIR%%/libs/jersey-container-servlet-2.27.jar >-%%DATADIR%%/libs/jersey-container-servlet-core-2.27.jar >-%%DATADIR%%/libs/jersey-hk2-2.27.jar >-%%DATADIR%%/libs/jersey-media-jaxb-2.27.jar >-%%DATADIR%%/libs/jersey-server-2.27.jar >-%%DATADIR%%/libs/jetty-client-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-continuation-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-http-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-io-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-security-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-server-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-servlet-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-servlets-9.4.14.v20181114.jar >-%%DATADIR%%/libs/jetty-util-9.4.14.v20181114.jar >+%%DATADIR%%/libs/jersey-client-2.28.jar >+%%DATADIR%%/libs/jersey-common-2.28.jar >+%%DATADIR%%/libs/jersey-container-servlet-2.28.jar >+%%DATADIR%%/libs/jersey-container-servlet-core-2.28.jar >+%%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/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 >@@ -79,25 +83,26 @@ > %%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.5.0.jar >-%%DATADIR%%/libs/maven-artifact-3.6.0.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/osgi-resource-locator-1.0.1.jar >-%%DATADIR%%/libs/plexus-utils-3.1.0.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.15.10.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.25.jar >-%%DATADIR%%/libs/slf4j-log4j12-1.7.25.jar >-%%DATADIR%%/libs/snappy-java-1.1.7.2.jar >-%%DATADIR%%/libs/validation-api-1.1.0.Final.jar >+%%DATADIR%%/libs/slf4j-api-1.7.26.jar >+%%DATADIR%%/libs/slf4j-log4j12-1.7.26.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.13.jar >-%%DATADIR%%/libs/zstd-jni-1.3.8-1.jar >+%%DATADIR%%/libs/zookeeper-3.4.14.jar >+%%DATADIR%%/libs/zstd-jni-1.4.0-1.jar > %%ETCDIR%%/trogdor.conf.sample > %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html > %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html >@@ -143,7 +148,6 @@ > %%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 >@@ -150,14 +154,15 @@ > %%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_complex.png > %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png >-%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc_complex.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 >@@ -223,7 +228,6 @@ > %%PORTDOCS%%%%DOCSDIR%%/site-docs/uses.html > @dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_DATADIR%% > @dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_LOGDIR%% >-@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_RUNDIR%% > @sample %%ETCDIR%%/connect-console-sink.properties.sample > @sample %%ETCDIR%%/connect-console-source.properties.sample > @sample %%ETCDIR%%/connect-distributed.properties.sample
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
dmitry.wagin
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 239000
:
205526
|
205548
|
205796