From nobody Wed Dec 13 08:12:20 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sqp9w2bGQz53P4B; Wed, 13 Dec 2023 08:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sqp9w26vYz3dJn; Wed, 13 Dec 2023 08:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702455140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6NucEekGAAbLw7hYUuEr1Jnold1jsfxsYWZ90v3vFM=; b=A+aZNvNg47cfcY4Y9n7Sdd+9sQoqcQvltTy6VBdeYYYGgsUwmR9eDu8lZO7pkG2w1wO2h8 Yi9PtYzJKRi4Iv+6U+wq9egmuC6byMbme54UJI9t0jtjArYBPhKB/hELMPwsjy6d33IL0b hnqdTAAqFze7pOEIAA6SCxz3CTR4n7vznrwv8RZ1/Vbg8UpFl7cqEaJpa1LHgVNh6OJsKD iEiGbRybjxO78DqF8tb42PoplJUkbur2J0Mg0X1/IIzwQRwWs3/zSGg5fZ21zTautywKUj Rp6msWBd5lQ7mSJxXIE+4iRukhkn2Bi7wF8epMw26Y/9smw0B1XD00BV0SGaTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702455140; a=rsa-sha256; cv=none; b=O4Wkg9WbcL/cskMg3+qe+aPLdWpthFGrnoAEIgmCngCzRNES9ZKbvwUoagTr/RbI00VXSI WZ/6l4DMM2SY93ys/eRmKq8qIn1E1Hxgn7kDtvq1TTFO6ap0ad9+YZ4d+Xx6ow41NK0Ika 2Fy4wAPm25rxofhoBvIpR/pTrD9z8ugN7a+sFtNIDxuFcH+cm/T9owvX1YTmX6y4SghT2b 2qkBuFM3gHgX5kXPmCxkDhRBS+hJ4tB9RJRyD5iWc80dej+qGQwdgvVzRn5QJFoP/2CqT0 VBhggnjNeR4byTRNxT25uoCDxDFnXQ/jHDCka8NigDzretwJQDT5zqkoiyTtjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702455140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6NucEekGAAbLw7hYUuEr1Jnold1jsfxsYWZ90v3vFM=; b=Dy8qOl3bO07VECmKdno+H9VP6K39ZEqg8xHPOZNpOLpj/XRjqGZIDK5+Psz00Qxl6KAq8V ix/wlf3OTgXzPJF4e+s67ZNny/MzgVaKdlFrcuYaO1S0U4x/UsTlPeyylVT5ylNYFK7jiW lfxqwH4hHqazQ5M9q8vszwONd4Q6MBg6GrOcw/n9Jqd368PMyj9RWr5ShgCBeR3uw51Ar+ Dv/MCQPiGdjCNFI7zBBMr773BGkzYncFZfvtdKxhxV0H3877wFd1gHo+8DsFje3QqSFyEw Et52qoViffWBV4sXcf+GBkJiqR/qU4DI+GK/x8Da7yUoGGP9XAII/rSgA+UTZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sqp9w1B70zr5k; Wed, 13 Dec 2023 08:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BD8CKN5095938; Wed, 13 Dec 2023 08:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BD8CKGq095935; Wed, 13 Dec 2023 08:12:20 GMT (envelope-from git) Date: Wed, 13 Dec 2023 08:12:20 GMT Message-Id: <202312130812.3BD8CKGq095935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 7564810957ae - 2023Q4 - net/kafka: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 7564810957ae853b5f8c1ff6febc9f44373245cd Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7564810957ae853b5f8c1ff6febc9f44373245cd commit 7564810957ae853b5f8c1ff6febc9f44373245cd Author: Fernando Apesteguía AuthorDate: 2023-12-13 08:09:05 +0000 Commit: Fernando Apesteguía CommitDate: 2023-12-13 08:09:05 +0000 net/kafka: Fix build Merge of security bugfix 3.6.1 was faulty. PR: 275727 Reported by: Andrew Fyfe Fixes: 92795b2fe3d12632f463d2821ce67f46416f453e --- net/kafka/pkg-plist | 65 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist index 24e0faab0905..ece7a5402926 100644 --- a/net/kafka/pkg-plist +++ b/net/kafka/pkg-plist @@ -1,5 +1,6 @@ %%DATADIR%%/bin/connect-distributed.sh %%DATADIR%%/bin/connect-mirror-maker.sh +%%DATADIR%%/bin/connect-plugin-path.sh %%DATADIR%%/bin/connect-standalone.sh %%DATADIR%%/bin/kafka-acls.sh %%DATADIR%%/bin/kafka-broker-api-versions.sh @@ -39,9 +40,17 @@ %%DATADIR%%/libs/activation-1.1.1.jar %%DATADIR%%/libs/aopalliance-repackaged-2.6.1.jar %%DATADIR%%/libs/argparse4j-0.7.0.jar -%%DATADIR%%/libs/audience-annotations-0.13.0.jar +%%DATADIR%%/libs/audience-annotations-0.12.0.jar +%%DATADIR%%/libs/caffeine-2.9.3.jar +%%DATADIR%%/libs/checker-qual-3.19.0.jar +%%DATADIR%%/libs/commons-beanutils-1.9.4.jar %%DATADIR%%/libs/commons-cli-1.4.jar +%%DATADIR%%/libs/commons-collections-3.2.2.jar +%%DATADIR%%/libs/commons-digester-2.1.jar +%%DATADIR%%/libs/commons-io-2.11.0.jar %%DATADIR%%/libs/commons-lang3-3.8.1.jar +%%DATADIR%%/libs/commons-logging-1.2.jar +%%DATADIR%%/libs/commons-validator-1.7.jar %%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar %%DATADIR%%/libs/connect-basic-auth-extension-%%PORTVERSION%%.jar %%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar @@ -50,6 +59,7 @@ %%DATADIR%%/libs/connect-mirror-client-%%PORTVERSION%%.jar %%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar %%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar +%%DATADIR%%/libs/error_prone_annotations-2.10.0.jar %%DATADIR%%/libs/hk2-api-2.6.1.jar %%DATADIR%%/libs/hk2-locator-2.6.1.jar %%DATADIR%%/libs/hk2-utils-2.6.1.jar @@ -80,20 +90,20 @@ %%DATADIR%%/libs/jersey-container-servlet-core-2.39.1.jar %%DATADIR%%/libs/jersey-hk2-2.39.1.jar %%DATADIR%%/libs/jersey-server-2.39.1.jar -%%DATADIR%%/libs/jetty-client-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-continuation-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-http-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-io-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-security-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-server-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-servlet-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-servlets-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-util-9.4.51.v20230217.jar -%%DATADIR%%/libs/jetty-util-ajax-9.4.51.v20230217.jar +%%DATADIR%%/libs/jetty-client-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-continuation-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-http-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-io-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-security-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-server-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-servlet-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-servlets-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-util-9.4.52.v20230823.jar +%%DATADIR%%/libs/jetty-util-ajax-9.4.52.v20230823.jar %%DATADIR%%/libs/jline-3.22.0.jar %%DATADIR%%/libs/jopt-simple-5.0.4.jar %%DATADIR%%/libs/jose4j-0.9.3.jar -%%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar +%%DATADIR%%/libs/jsr305-3.0.2.jar %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar %%DATADIR%%/libs/kafka-group-coordinator-%%PORTVERSION%%.jar %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar @@ -109,6 +119,7 @@ %%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar %%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar %%DATADIR%%/libs/kafka-tools-api-%%PORTVERSION%%.jar +%%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar %%DATADIR%%/libs/lz4-java-1.8.0.jar %%DATADIR%%/libs/maven-artifact-3.8.8.jar %%DATADIR%%/libs/metrics-core-2.2.0.jar @@ -124,15 +135,16 @@ %%DATADIR%%/libs/netty-transport-native-unix-common-4.1.100.Final.jar %%DATADIR%%/libs/osgi-resource-locator-1.0.3.jar %%DATADIR%%/libs/paranamer-2.8.jar +%%DATADIR%%/libs/pcollections-4.0.1.jar %%DATADIR%%/libs/plexus-utils-3.3.1.jar -%%DATADIR%%/libs/reflections-0.9.12.jar +%%DATADIR%%/libs/reflections-0.10.2.jar %%DATADIR%%/libs/reload4j-1.2.25.jar -%%DATADIR%%/libs/rocksdbjni-7.1.2.jar +%%DATADIR%%/libs/rocksdbjni-7.9.2.jar %%DATADIR%%/libs/scala-collection-compat_2.13-2.10.0.jar %%DATADIR%%/libs/scala-java8-compat_2.13-1.0.2.jar -%%DATADIR%%/libs/scala-library-2.13.10.jar +%%DATADIR%%/libs/scala-library-2.13.11.jar %%DATADIR%%/libs/scala-logging_2.13-3.9.4.jar -%%DATADIR%%/libs/scala-reflect-2.13.10.jar +%%DATADIR%%/libs/scala-reflect-2.13.11.jar %%DATADIR%%/libs/slf4j-api-1.7.36.jar %%DATADIR%%/libs/slf4j-reload4j-1.7.36.jar %%DATADIR%%/libs/snappy-java-1.1.10.5.jar @@ -178,6 +190,7 @@ %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_metrics.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/kafka_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/mirror_checkpoint_config.html +%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/mirror_connector_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/mirror_heartbeat_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/mirror_source_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/producer_config.html @@ -186,28 +199,30 @@ %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_errors.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_messages.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_types.html +%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/remote_log_manager_config.html +%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/remote_log_metadata_manager_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/sink_connector_config.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/source_connector_config.html %%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/creating-streams-iframe-placeholder.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 %%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/intro_to_streams-iframe-placeholder.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-apis.png +%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc_complex.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 @@ -275,6 +290,9 @@ %%PORTDOCS%%%%DOCSDIR%%/site-docs/toc.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/uses.html +@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%% +@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR_KRAFT%% +@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%% @sample %%ETCDIR%%/connect-console-sink.properties.sample @sample %%ETCDIR%%/connect-console-source.properties.sample @sample %%ETCDIR%%/connect-distributed.properties.sample @@ -284,14 +302,11 @@ @sample %%ETCDIR%%/connect-mirror-maker.properties.sample @sample %%ETCDIR%%/connect-standalone.properties.sample @sample %%ETCDIR%%/consumer.properties.sample +@sample %%ETCDIR%%/kraft/broker.properties.sample +@sample %%ETCDIR%%/kraft/controller.properties.sample +@sample %%ETCDIR%%/kraft/server.properties.sample @sample %%ETCDIR%%/log4j.properties.sample @sample %%ETCDIR%%/producer.properties.sample @sample %%ETCDIR%%/server.properties.sample @sample %%ETCDIR%%/tools-log4j.properties.sample @sample %%ETCDIR%%/trogdor.conf.sample -@sample %%ETCDIR%%/kraft/broker.properties.sample -@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_LOGDIR%%