From nobody Thu May 23 16:10:21 2024 X-Original-To: dev-commits-ports-main@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 4VlY6j4C0jz5KWRq; Thu, 23 May 2024 16:10:21 +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 4VlY6j3cYfz4bdL; Thu, 23 May 2024 16:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716480621; 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=YVHdBSlI3hTr0jw85Pu+YN7p5e3wQZwmIN1kvN+FssI=; b=rT8lwcn+/VgAzSnlGV7wPiphAL4s//dvdSBd/jP2ONrvAg74AM8RV56D7rFCFmai05rcwv A2J3vEf1eCu7MqMQWROaDCisX1eT3JZ5viXPs82fkQnS3HsrdZxTG9+GbxWyddaQyJM0BY I8xkZWPBQ/qPcIinsbE5/8wvvM11N+2zQoTOZ+BSGi8JMo5SZPYJ9c+19dtaLUcpnQS+Tx iRzlyb2ANWcxH8F4AUgFbuaPbp6JGtoXs1p86PaYAQgi/jR3ygRjGE86P/9MfJEOOgUMKp iZHvCyIvTI5c8ZmBS/O2oK8QUcVRbZ0R9esroBYbwfr/utrWWGxZACSBJZ++NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716480621; a=rsa-sha256; cv=none; b=n7GxF9OzHfQNcg3CZdullgiFACRBRp1CGqcX2NXaRSTeafxsrYCTUZt6Cgy9bFZn1+egiu 5Zns7KaCfVNV9w5ttrS4jo/IrjQDJqR6EGd6HblZiVv3MpTD1mqgQwJsoE44YouhsINcBR TZESe19sU5NwLeX6OFyJj0MgcAjt05+a6nkvC87J0GBOGz4O7yLitzsqaH65CRUp/wzWxt 8lpsOr7o6Cqhw3SiJdyAlQCM7w3cgHezSFxjt1YWj5xF+RjRw3ZpHOOvgVnMflB27TKqZe Fij2CqJdybLdOpV3F5//oJ8BH7nVeFPYZ0DEcw4D/9yJlTl92ULd++SaF5JLTw== 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=1716480621; 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=YVHdBSlI3hTr0jw85Pu+YN7p5e3wQZwmIN1kvN+FssI=; b=isiy/hH9zJgggaQRNOsiQeBMBGk+1AwHVXimn+3y6GTXy9j4Wny826u6F7X6bT2TCuHqL/ fH/V4F3vdb0AVXvbtquv0nj2GurXRzjn24QejqwBr/JceBKutgwJiHdJM8WRvVt7ITKguH bbd4GG5oAC4A4fATBdK1YGg/jqbCqhK4VYLhCDZLKm2UCwTEDBpFB7Ka3WPO7tBgX1CqLI QAOf28lWEaU6pyYnoQTl2MNn4/eUj6EWQgzsdYrZB1iWzhnarjEa9eO0alryPQ11j61Y4l qbISRbKjWaIW8wGerIXKtxWnvPraYBbDOzyscsNSQhwOnm7chV7SZ9l+h2EnBg== 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 4VlY6j36Jtzwcd; Thu, 23 May 2024 16:10:21 +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 44NGALRH022525; Thu, 23 May 2024 16:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NGALdi022522; Thu, 23 May 2024 16:10:21 GMT (envelope-from git) Date: Thu, 23 May 2024 16:10:21 GMT Message-Id: <202405231610.44NGALdi022522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: bf091cdd79ff - main - net-im/openfire: Update to 4.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: bf091cdd79ff30dde67f1c9f866bad5c994bc0d4 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf091cdd79ff30dde67f1c9f866bad5c994bc0d4 commit bf091cdd79ff30dde67f1c9f866bad5c994bc0d4 Author: Nikita Druba AuthorDate: 2024-05-23 06:34:18 +0000 Commit: Fernando Apesteguía CommitDate: 2024-05-23 16:10:13 +0000 net-im/openfire: Update to 4.8.1 ChangeLog: https://download.igniterealtime.org/openfire/docs/4.8.1/changelog.html Improvement * Give explict names to Netty's threads * Have distinct thread pools for each type of connection * Announce support for PubSub delete-item * Admin Console should warn end-user if plugin installation failed * Guard against a surplus of database connection errors being logged * Upgrade postgresql database driver for CVE-2024-1597 New Feature * Add service administration support Bug * When deleting a user, remove it from transient MUC rooms * Cache data inconsistency: MUC * Deleting an admin user does not remove the name from \`admin.authorizedJIDs\` * Do not use default value for user's creation / last modified date * 4.8.0 not counting "whitespace ping" as session activity * RSS News Feed appears empty * Misbehaving Shared-With-Group option for Contact List sharing * Duplicate \(group\)chat messages are received * SerializableCache appears to be unusable \(ClassCastException on creation\) * SerializableCache instances do not get recreated on cluster switch * Cache-summary page shows wrong stats when using Clustering * Delete MUC-based authorization when deleting user * OccupantManager doesn't remove all items when clustering * Session details shows 'resource' column, but does not show resources * Routing Servers cache inconsistency doesn't list the missing items * Contact List \(Roster\) Sharing changes are not immediately applied * Stream Management Resume fails * Disabling client idle time breaks websockets * Resumed stream is no longer resumable PR: 279237 Reported by: nikita@druba.su (maintainer) --- net-im/openfire/Makefile | 22 ++++++++++------------ net-im/openfire/distinfo | 10 +++++----- net-im/openfire/files/openfire.in | 2 +- net-im/openfire/pkg-plist | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile index 8b19ce817bdc..b66db1cbc148 100644 --- a/net-im/openfire/Makefile +++ b/net-im/openfire/Makefile @@ -1,6 +1,6 @@ PORTNAME= openfire DISTVERSIONPREFIX= v -DISTVERSION= 4.8.0 +DISTVERSION= 4.8.1 PORTEPOCH= 1 CATEGORIES= net-im java @@ -23,11 +23,12 @@ GH_PROJECT= Openfire USE_JAVA= yes USE_RC_SUBR= ${PORTNAME} +DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_ARCH= yes SUB_FILES+= pkg-message +SUB_LIST= JAVA_VERSION=${JAVA_VERSION} INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/ -DATADIR= ${JAVASHAREDIR}/${PORTNAME} VARLOG= /var/log/${PORTNAME} VARDB= /var/db/${PORTNAME} USERS= ${PORTNAME} @@ -37,15 +38,15 @@ PLIST_SUB+= VARDB=${VARDB} \ OPTIONS_DEFINE= DOCS TEST OPTIONS_DEFAULT= MAVEN_LOCAL OPENJDK11 -OPTIONS_SINGLE= MAVEN JAVA -OPTIONS_SINGLE_JAVA= OPENJDK11 OPENJDK17 +OPTIONS_SINGLE= JAVA MAVEN +OPTIONS_SINGLE_JAVA= OPENJDK11 OPENJDK17 OPENJDK21 OPTIONS_SINGLE_MAVEN= MAVEN_LOCAL MAVEN_ONLINE MAVEN_DESC= Source of Maven build plugins MAVEN_LOCAL_DESC= Use prefetch plugins from FreeBSD repository MAVEN_ONLINE_DESC= Download last plugins during build process and store them into ~/.m2 -MAVEN_LOCAL_DISTFILES= FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven +MAVEN_LOCAL_DISTFILES= ${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven MVN= mvn MVN_TARGET= package @@ -54,10 +55,10 @@ MVN_TARGET= package .if ${PORT_OPTIONS:MOPENJDK11} JAVA_VERSION= 11 -.endif - -.if ${PORT_OPTIONS:MOPENJDK17} +.elif ${PORT_OPTIONS:MOPENJDK17} JAVA_VERSION= 17 +.elif ${PORT_OPTIONS:MOPENJDK21} +JAVA_VERSION= 21 .endif .if ${PORT_OPTIONS:MTEST} @@ -68,14 +69,11 @@ MVN_OPTS= -DskipTests=true .if ${PORT_OPTIONS:MMAVEN_LOCAL} MVN_OPTS+= -o -Dmaven.repo.local=${WRKDIR}/m2 -.endif - -.if ${PORT_OPTIONS:MMAVEN_ONLINE} +.elif ${PORT_OPTIONS:MMAVEN_ONLINE} MVN_OPTS+= -U .endif do-build: - ${ECHO_CMD} "cd ${WRKSRC &&} JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET}" @(cd ${WRKSRC} && JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET}) do-install: diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo index 64b780d57bda..2fc4c5c0ff0c 100644 --- a/net-im/openfire/distinfo +++ b/net-im/openfire/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707929810 -SHA256 (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 20d919a9eec6a530189ba75b859501b3d99845df0e18b9e12ed3e646e67dd568 -SIZE (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 8836109 -SHA256 (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 55b1c50a7c62092af476ef6ce75b9937df5098e1aee13906445e95c72dd0ca5b -SIZE (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 289799753 +TIMESTAMP = 1716394324 +SHA256 (igniterealtime-Openfire-v4.8.1_GH0.tar.gz) = 5d0a3010903f997b3193b8aa79df6586a5ad36acc42d41719cbaf5e914b7e2f4 +SIZE (igniterealtime-Openfire-v4.8.1_GH0.tar.gz) = 8858392 +SHA256 (openfire-4.8.1-deps.tar.gz) = 5f3a4f3a83d3ceff30a0c9d1fec0dae2eb8156ef646e675776a23daf5397b3b1 +SIZE (openfire-4.8.1-deps.tar.gz) = 289863629 diff --git a/net-im/openfire/files/openfire.in b/net-im/openfire/files/openfire.in index 8bb48c00747a..bc19f81a16ce 100644 --- a/net-im/openfire/files/openfire.in +++ b/net-im/openfire/files/openfire.in @@ -43,7 +43,7 @@ java_options=" -server -jar ${openfire_javargs} \ -DopenfireHome=${openfire_home} \ -Dlog4j.configurationFile=${openfire_libdir}/log4j2.xml" -java_command=" %%LOCALBASE%%/bin/java ${java_options} \ +java_command=" %%LOCALBASE%%/openjdk%%JAVA_VERSION%%/bin/java ${java_options} \ %%DATADIR%%/lib/startup.jar" # Subvert the check_pid_file procname check. diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist index ba9e322be7fd..5f302ad171c8 100644 --- a/net-im/openfire/pkg-plist +++ b/net-im/openfire/pkg-plist @@ -95,7 +95,7 @@ %%DATADIR%%/lib/bcprov-jdk18on-1.76.jar %%DATADIR%%/lib/bcutil-jdk18on-1.76.jar %%DATADIR%%/lib/caffeine-2.7.0.jar -%%DATADIR%%/lib/checker-qual-3.31.0.jar +%%DATADIR%%/lib/checker-qual-3.42.0.jar %%DATADIR%%/lib/common-image-3.9.4.jar %%DATADIR%%/lib/common-io-3.9.4.jar %%DATADIR%%/lib/common-lang-3.9.4.jar @@ -117,7 +117,7 @@ %%DATADIR%%/lib/hsqldb-2.7.1.jar %%DATADIR%%/lib/httpclient-4.5.13.jar %%DATADIR%%/lib/httpcore-4.4.13.jar -%%DATADIR%%/lib/i18n-4.8.0.jar +%%DATADIR%%/lib/i18n-4.8.1.jar %%DATADIR%%/lib/imageio-bmp-3.9.4.jar %%DATADIR%%/lib/imageio-core-3.9.4.jar %%DATADIR%%/lib/istack-commons-runtime-3.0.11.jar @@ -197,7 +197,7 @@ %%DATADIR%%/lib/netty-transport-rxtx-4.1.100.Final.jar %%DATADIR%%/lib/netty-transport-sctp-4.1.100.Final.jar %%DATADIR%%/lib/netty-transport-udt-4.1.100.Final.jar -%%DATADIR%%/lib/postgresql-42.6.0.jar +%%DATADIR%%/lib/postgresql-42.7.2.jar %%DATADIR%%/lib/shaj-0.5.jar %%DATADIR%%/lib/sitemesh-2.4.2.jar %%DATADIR%%/lib/slf4j-api-2.0.9.jar @@ -212,7 +212,7 @@ %%DATADIR%%/lib/websocket-jetty-common-10.0.18.jar %%DATADIR%%/lib/websocket-jetty-server-10.0.18.jar %%DATADIR%%/lib/websocket-servlet-10.0.18.jar -%%DATADIR%%/lib/xmppserver-4.8.0.jar +%%DATADIR%%/lib/xmppserver-4.8.1.jar %%DATADIR%%/lib/xpp3-1.1.4c.jar %%DATADIR%%/logs %%DATADIR%%/plugins/admin/plugin.xml