Attachment 197018 Details for Bug 231295 – Patch to upgrade existing kafka v1 port to v2

[patch] Patch to upgrade existing kafka v1 port to v2

kafka_2.0.0.patch (text/plain), 10.58 KB, created by pete on 2018-09-10 23:45:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pete

Created: 2018-09-10 23:45:46 UTC

Size: 10.58 KB

patch

obsolete

>diff --git a/net/kafka/Makefile b/net/kafka/Makefile
>index 58aecb7edbd3..55554dd78794 100644
>--- a/net/kafka/Makefile
>+++ b/net/kafka/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kafka
>-PORTVERSION=	1.0.0
>+PORTVERSION=	2.0.0
> CATEGORIES=	net java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
> DISTNAME=	${PORTNAME}_2.12-${PORTVERSION}
>@@ -31,12 +31,11 @@ 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 \
> 		kafka-consumer-groups.sh kafka-consumer-perf-test.sh \
>-		kafka-delete-records.sh kafka-log-dirs.sh \
>+		kafka-delegation-tokens.sh kafka-delete-records.sh kafka-log-dirs.sh \
> 		kafka-mirror-maker.sh kafka-preferred-replica-election.sh \
> 		kafka-producer-perf-test.sh kafka-reassign-partitions.sh \
>-		kafka-replay-log-producer.sh kafka-replica-verification.sh \
>+		kafka-replica-verification.sh \
> 		kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \
>-		kafka-simple-consumer-shell.sh \
> 		kafka-streams-application-reset.sh kafka-topics.sh \
> 		kafka-verifiable-consumer.sh kafka-verifiable-producer.sh \
> 		trogdor.sh zookeeper-security-migration.sh
>diff --git a/net/kafka/distinfo b/net/kafka/distinfo
>index 1a9184e99653..808b41771336 100644
>--- a/net/kafka/distinfo
>+++ b/net/kafka/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500285144
>-SHA256 (kafka_2.12-1.0.0.tgz) = d5b1d00752252d9c129e9284f26f8280e9899dd374167f257e29d5346eb544b3
>-SIZE (kafka_2.12-1.0.0.tgz) = 44352403
>+TIMESTAMP = 1534454667
>+SHA256 (kafka_2.12-2.0.0.tgz) = b5f1539c4030e6f6e64d0c14a9acea31156e7cbf2cb66c93ca2b6ca732ba7955
>+SIZE (kafka_2.12-2.0.0.tgz) = 49405896
>diff --git a/net/kafka/files/patch-bin_kafka-run-class.sh b/net/kafka/files/patch-bin_kafka-run-class.sh
>deleted file mode 100644
>index a0d2cc8ed9dd..000000000000
>--- a/net/kafka/files/patch-bin_kafka-run-class.sh
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- bin/kafka-run-class.sh.orig	2017-07-14 16:36:53 UTC
>-+++ bin/kafka-run-class.sh
>-@@ -125,12 +125,7 @@ do
>- done
>- 
>- # classpath addition for release
>--for file in "$base_dir"/libs/*;
>--do
>--  if should_include_file "$file"; then
>--    CLASSPATH="$CLASSPATH":"$file"
>--  fi
>--done
>-+CLASSPATH="$CLASSPATH":"$base_dir"/libs/*
>- 
>- for file in "$base_dir"/core/build/libs/kafka_${SCALA_BINARY_VERSION}*.jar;
>- do
>diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
>index 0dafa193a089..be7432cd508f 100644
>--- a/net/kafka/pkg-plist
>+++ b/net/kafka/pkg-plist
>@@ -6,11 +6,23 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/index.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/architecture.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/core-concepts.html
>-%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/index.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/quickstart.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/tutorial.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/upgrade-guide.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/app-reset-tool.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/config-streams.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/datatypes.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/dsl-api.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/interactive-queries.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/interactive-queries.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/memory-mgmt.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/processor-api.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/running-app.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/security.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/testing.html
>+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/write-streams.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/ecosystem.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/admin_client_config.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_config.html
>@@ -78,7 +90,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/security.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/architecture.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/core-concepts.html
>-%%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/index.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/quickstart.html
> %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/tutorial.html
>@@ -101,80 +112,85 @@
> %%DATADIR%%/bin/kafka-preferred-replica-election.sh
> %%DATADIR%%/bin/kafka-producer-perf-test.sh
> %%DATADIR%%/bin/kafka-reassign-partitions.sh
>-%%DATADIR%%/bin/kafka-replay-log-producer.sh
> %%DATADIR%%/bin/kafka-replica-verification.sh
> %%DATADIR%%/bin/kafka-run-class.sh
> %%DATADIR%%/bin/kafka-server-start.sh
> %%DATADIR%%/bin/kafka-server-stop.sh
>-%%DATADIR%%/bin/kafka-simple-consumer-shell.sh
> %%DATADIR%%/bin/kafka-streams-application-reset.sh
> %%DATADIR%%/bin/kafka-topics.sh
> %%DATADIR%%/bin/kafka-verifiable-consumer.sh
> %%DATADIR%%/bin/kafka-verifiable-producer.sh
> %%DATADIR%%/bin/trogdor.sh
> %%DATADIR%%/bin/zookeeper-security-migration.sh
>-%%DATADIR%%/libs/aopalliance-repackaged-2.5.0-b32.jar
>+%%DATADIR%%/libs/activation-1.1.1.jar
>+%%DATADIR%%/libs/aopalliance-repackaged-2.5.0-b42.jar
> %%DATADIR%%/libs/argparse4j-0.7.0.jar
>+%%DATADIR%%/libs/audience-annotations-0.5.0.jar
> %%DATADIR%%/libs/commons-lang3-3.5.jar
>-%%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/connect-json-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar
>-%%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/connect-api-2.0.0.jar
>+%%DATADIR%%/libs/connect-basic-auth-extension-2.0.0.jar
>+%%DATADIR%%/libs/connect-file-2.0.0.jar
>+%%DATADIR%%/libs/connect-json-2.0.0.jar
>+%%DATADIR%%/libs/connect-runtime-2.0.0.jar
>+%%DATADIR%%/libs/connect-transforms-2.0.0.jar
> %%DATADIR%%/libs/guava-20.0.jar
>-%%DATADIR%%/libs/hk2-api-2.5.0-b32.jar
>-%%DATADIR%%/libs/hk2-locator-2.5.0-b32.jar
>-%%DATADIR%%/libs/hk2-utils-2.5.0-b32.jar
>-%%DATADIR%%/libs/jackson-annotations-2.9.1.jar
>-%%DATADIR%%/libs/jackson-core-2.9.1.jar
>-%%DATADIR%%/libs/jackson-databind-2.9.1.jar
>-%%DATADIR%%/libs/jackson-jaxrs-base-2.9.1.jar
>-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.1.jar
>-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.1.jar
>-%%DATADIR%%/libs/javassist-3.20.0-GA.jar
>-%%DATADIR%%/libs/javassist-3.21.0-GA.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.6.jar
>+%%DATADIR%%/libs/jackson-core-2.9.6.jar
>+%%DATADIR%%/libs/jackson-databind-2.9.6.jar
>+%%DATADIR%%/libs/jackson-jaxrs-base-2.9.6.jar
>+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.6.jar
>+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.6.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-b32.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.0.1.jar
>-%%DATADIR%%/libs/jersey-client-2.25.1.jar
>-%%DATADIR%%/libs/jersey-common-2.25.1.jar
>-%%DATADIR%%/libs/jersey-container-servlet-2.25.1.jar
>-%%DATADIR%%/libs/jersey-container-servlet-core-2.25.1.jar
>-%%DATADIR%%/libs/jersey-guava-2.25.1.jar
>-%%DATADIR%%/libs/jersey-media-jaxb-2.25.1.jar
>-%%DATADIR%%/libs/jersey-server-2.25.1.jar
>-%%DATADIR%%/libs/jetty-continuation-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-http-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-io-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-security-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-server-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-servlet-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-servlets-9.2.22.v20170606.jar
>-%%DATADIR%%/libs/jetty-util-9.2.22.v20170606.jar
>+%%DATADIR%%/libs/javax.ws.rs-api-2.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.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-continuation-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-http-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-io-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-security-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-server-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-servlet-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-servlets-9.4.11.v20180605.jar
>+%%DATADIR%%/libs/jetty-util-9.4.11.v20180605.jar
> %%DATADIR%%/libs/jopt-simple-5.0.4.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
> %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
>+%%DATADIR%%/libs/kafka-streams-scala_2.12-%%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.4.jar
>-%%DATADIR%%/libs/maven-artifact-3.5.0.jar
>+%%DATADIR%%/libs/lz4-java-1.4.1.jar
>+%%DATADIR%%/libs/maven-artifact-3.5.3.jar
> %%DATADIR%%/libs/metrics-core-2.2.0.jar
> %%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar
>-%%DATADIR%%/libs/plexus-utils-3.0.24.jar
>+%%DATADIR%%/libs/plexus-utils-3.1.0.jar
> %%DATADIR%%/libs/reflections-0.9.11.jar
> %%DATADIR%%/libs/rocksdbjni-5.7.3.jar
>-%%DATADIR%%/libs/scala-library-2.12.3.jar
>+%%DATADIR%%/libs/scala-library-2.12.6.jar
>+%%DATADIR%%/libs/scala-logging_2.12-3.9.0.jar
>+%%DATADIR%%/libs/scala-reflect-2.12.6.jar
> %%DATADIR%%/libs/slf4j-api-1.7.25.jar
> %%DATADIR%%/libs/slf4j-log4j12-1.7.25.jar
>-%%DATADIR%%/libs/snappy-java-1.1.4.jar
>+%%DATADIR%%/libs/snappy-java-1.1.7.1.jar
> %%DATADIR%%/libs/validation-api-1.1.0.Final.jar
> %%DATADIR%%/libs/zkclient-0.10.jar
>-%%DATADIR%%/libs/zookeeper-3.4.10.jar
>+%%DATADIR%%/libs/zookeeper-3.4.13.jar
> @dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_DATADIR%%
> @dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_LOGDIR%%
> @dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_RUNDIR%%

Actions: View | Diff

Attachments on bug 231295: 197018 | 197376