From nobody Wed Oct 12 11:59:24 2022 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 4MnWR10XlYz4fBXd; Wed, 12 Oct 2022 11:59:25 +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 4MnWR10JcTz3sgj; Wed, 12 Oct 2022 11:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665575965; 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=y03xpCxUJsFCpsqMS6NQzvpbCTN7TDvOjGCfmU3Schc=; b=gJKFSuOeIoyEj59C4haLMOp1pxjuBPxB0ISHMeo8oaN7Dm3QNK2Fsk0duKxFpt1KykO93X BB01MZ76eTaY8ORCEeYWi2PXfIaDjDhO4CNkrFBhFtCqD3INZrbdGNjl+/llUu1Qg5/ROO cJvqgkkZVp3OYQAOrr84xGEie2NCkMx4Qj+o8VJv/jgr0F9W8BQ/j6qqZRFFly+tdaUW/x QNSbzndFz94HLlmYAIAOHv6nWJK0E1+sM7zQ8I1Uv+GG4bm6jS8j83omWLcWNK0mZvyz0A rC5dYInC8evI/qwyD4r920Lo8XGdo+EfJKs3B607gJbfqCuONDzc6KW4xTE7mw== 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 4MnWR06SmWz1J5f; Wed, 12 Oct 2022 11:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29CBxOOL044827; Wed, 12 Oct 2022 11:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CBxOx7044826; Wed, 12 Oct 2022 11:59:24 GMT (envelope-from git) Date: Wed, 12 Oct 2022 11:59:24 GMT Message-Id: <202210121159.29CBxOx7044826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 91ef273ce62b - main - net/kafka: Use Java 11 or 17. 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/main X-Git-Reftype: branch X-Git-Commit: 91ef273ce62b466b99abfcbcb06922148fbb450d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665575965; 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=y03xpCxUJsFCpsqMS6NQzvpbCTN7TDvOjGCfmU3Schc=; b=aYmm3Ua9MZwJhegYUtlKK77RecsHT9w4I8cFYIzaI52EsuL0c9HEMnMmp0/qqwDLGFlmoq gbUjSxqgbqHHq6Fe18OTCnsEa3Sa98+3Ve7ivhEZc6w8UJG0za4oU7zuD6B9RNhz0Q+y88 yYr/1rfHguUYY2nJRcTgYyZqyoo+mPJu8OzOqQZiwextcbRhTj+Bl8TEXlH+WIElxlCJnU Acjdy0g0ujSnM7DYIghiR17kBii2BDfqBGg/vKMrvre8VVBG53GBnIehaOWxLT2BItxr5w 7zPk2eRBnMVsAyRg6MXZYzy1JbIXFckgrPpz/AAGmqHa9vkNN26318N8ypDwgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665575965; a=rsa-sha256; cv=none; b=VyoCkTZMNLTmXlumn5ojxQwEVoLG6uWrMR6sI2PVUEERCXSD7iZgw3SciLmoDiVlQ6lcO0 zjzh5AXjbzcgU1Imhfz4SwffBRX/eiVoN9lU7gCmLyMrY1h+MgxSWRkVPlcmTzoDcg6O08 kJS+YydtF+39+m/2vTMclvXTfP5MtqSilHACEK452mceThRzBTw03RMaPLaYwofaEJ3kk/ X/PIIqRm9BKPfqCXZMcx8m+K+LzlOgzkquZsQFhJasZxcgp5u5qFLJM2TRP04aQD/je48O qiQz+72EIWfvo2caItpbXBG5w/XMKTcEIFVqJXHmVKaZBzPNB+s4NFTaeBTMOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=91ef273ce62b466b99abfcbcb06922148fbb450d commit 91ef273ce62b466b99abfcbcb06922148fbb450d Author: Pavel Timofeev AuthorDate: 2022-10-12 08:30:18 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-12 11:55:44 +0000 net/kafka: Use Java 11 or 17. Java 8 is deprecated in 3.0.0. PR: 266616 Reported by: yonas.yanfa@gmail.com (maintainer) Approved by: timp87@gmail.com (maintainer) --- net/kafka/Makefile | 53 ++++++++++++-------- net/kafka/distinfo | 6 +-- net/kafka/files/pkg-message.in | 12 +++++ net/kafka/pkg-plist | 108 +++++++++++++++++++++++------------------ 4 files changed, 109 insertions(+), 70 deletions(-) diff --git a/net/kafka/Makefile b/net/kafka/Makefile index 3baafd24b018..071168c1bfd0 100644 --- a/net/kafka/Makefile +++ b/net/kafka/Makefile @@ -1,5 +1,5 @@ PORTNAME= kafka -DISTVERSION= 3.1.0 +DISTVERSION= 3.3.1 CATEGORIES= net java MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}_2.13-${PORTVERSION} @@ -16,19 +16,33 @@ RUN_DEPENDS= bash:shells/bash USES= cpe shebangfix tar:tgz CPE_VENDOR= apache -SHEBANG_FILES= bin/*.sh +USE_JAVA= yes +JAVA_VERSION= 11+ +JAVA_RUN= jre -OPTIONS_DEFINE= DOCS +USE_RC_SUBR= kafka kafka_connect + +SHEBANG_FILES= bin/*.sh KAFKA_USER?= kafka KAFKA_GROUP?= kafka KAFKA_DBDIR?= /var/db/${PORTNAME} KAFKA_LOGDIR?= /var/log/${PORTNAME} +DATADIR= ${JAVASHAREDIR}/${PORTNAME} + +NO_ARCH= yes +NO_BUILD= yes + +SUB_FILES= pkg-message +SUB_LIST= JAVA=${JAVA} \ + KAFKA_USER=${KAFKA_USER} \ + KAFKA_GROUP=${KAFKA_GROUP} \ + KAFKA_LOGDIR=${KAFKA_LOGDIR} \ + KAFKA_DBDIR=${KAFKA_DBDIR} USERS= ${KAFKA_USER} GROUPS= ${KAFKA_GROUP} -DATADIR= ${JAVASHAREDIR}/${PORTNAME} KAFKA_BINS= connect-distributed.sh connect-mirror-maker.sh \ connect-standalone.sh kafka-acls.sh \ kafka-broker-api-versions.sh kafka-cluster.sh kafka-configs.sh \ @@ -37,6 +51,7 @@ KAFKA_BINS= connect-distributed.sh connect-mirror-maker.sh \ kafka-delegation-tokens.sh kafka-delete-records.sh \ kafka-dump-log.sh kafka-features.sh kafka-get-offsets.sh \ kafka-leader-election.sh kafka-log-dirs.sh \ + kafka-metadata-quorum.sh kafka-metadata-shell.sh \ kafka-mirror-maker.sh kafka-producer-perf-test.sh \ kafka-reassign-partitions.sh kafka-replica-verification.sh \ kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \ @@ -47,17 +62,11 @@ KAFKA_BINS= connect-distributed.sh connect-mirror-maker.sh \ KAFKA_CONFIGS= connect-console-sink.properties \ connect-console-source.properties \ connect-distributed.properties connect-file-sink.properties \ - connect-file-source.properties \ - connect-log4j.properties connect-mirror-maker.properties \ - connect-standalone.properties consumer.properties \ - log4j.properties producer.properties server.properties \ - tools-log4j.properties trogdor.conf - -USE_RC_SUBR= kafka kafka_connect -SUB_LIST= JAVA=${JAVA} \ - KAFKA_USER=${KAFKA_USER} \ - KAFKA_GROUP=${KAFKA_GROUP} \ - KAFKA_LOGDIR=${KAFKA_LOGDIR} + connect-file-source.properties connect-log4j.properties \ + connect-mirror-maker.properties connect-standalone.properties \ + consumer.properties log4j.properties producer.properties \ + server.properties tools-log4j.properties trogdor.conf +KAFKA_KRAFT= broker.properties controller.properties server.properties PLIST_SUB= PORTVERSION=${PORTVERSION} \ KAFKA_USER=${KAFKA_USER} \ @@ -65,11 +74,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ KAFKA_LOGDIR=${KAFKA_LOGDIR} \ KAFKA_DBDIR=${KAFKA_DBDIR} -NO_BUILD= yes -NO_ARCH= yes -USE_JAVA= yes -JAVA_VERSION= 8+ -JAVA_RUN= yes +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} "s|JAVA=\"java\"|JAVA=\"${JAVA}\"|" ${WRKSRC}/bin/kafka-run-class.sh @@ -77,10 +82,15 @@ post-patch: @${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_DBDIR}|" ${WRKSRC}/config/server.properties +.for f in ${KAFKA_KRAFT} + @${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}/kraft/|" ${WRKSRC}/config/kraft/${f} +.endfor do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR}/kraft ${MKDIR} ${STAGEDIR}${KAFKA_DBDIR} + ${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft ${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin .for f in ${KAFKA_BINS} @@ -94,6 +104,9 @@ do-install: .for f in ${KAFKA_CONFIGS} ${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor +.for f in ${KAFKA_KRAFT} + ${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample +.endfor do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net/kafka/distinfo b/net/kafka/distinfo index 6ca10bdc3ba4..d53e511b1ce1 100644 --- a/net/kafka/distinfo +++ b/net/kafka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642864304 -SHA256 (kafka_2.13-3.1.0.tgz) = 3fd643f16d11ccdb81a7b296f305d7fa0ae6c9e39e1a701bac56929e2e4d6710 -SIZE (kafka_2.13-3.1.0.tgz) = 88130011 +TIMESTAMP = 1665443581 +SHA256 (kafka_2.13-3.3.1.tgz) = 18ad8a365fb111de249d3bb8bf3c96cd1af060ec8fb3e3d1fc4a7ae10d9042de +SIZE (kafka_2.13-3.3.1.tgz) = 105053134 diff --git a/net/kafka/files/pkg-message.in b/net/kafka/files/pkg-message.in new file mode 100644 index 000000000000..f5f0fe1b65a0 --- /dev/null +++ b/net/kafka/files/pkg-message.in @@ -0,0 +1,12 @@ +[ +{ type: install + message: <