diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile index c37f9a259198..8fa2df514a6f 100644 --- a/net-im/openfire/Makefile +++ b/net-im/openfire/Makefile @@ -1,113 +1,108 @@ PORTNAME= openfire DISTVERSIONPREFIX= v -DISTVERSION= 5.0.3 -PORTREVISION= 2 +DISTVERSION= 5.0.4 PORTEPOCH= 1 CATEGORIES= net-im java -MASTER_SITES= LOCAL/vvd:maven MAINTAINER= nikita@druba.su COMMENT= Enterprise instant messaging server WWW= https://www.igniterealtime.org/projects/openfire/index.jsp LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= maven>0:devel/maven - -USES= java cpe +USES= cpe java CPE_VENDOR= igniterealtime -USE_GITHUB= YES +USE_GITHUB= yes GH_ACCOUNT= igniterealtime GH_PROJECT= Openfire USE_RC_SUBR= ${PORTNAME} DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_ARCH= yes -SUB_FILES+= pkg-message -SUB_LIST= JAVA_VERSION=${JAVA_VERSION} +SUB_FILES= pkg-message +SUB_LIST= JAVA_VERSION=${JAVA_PORT_VERSION} -INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/ +INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base VARLOG= /var/log/${PORTNAME} VARDB= /var/db/${PORTNAME} USERS= ${PORTNAME} GROUPS= ${USERS} -PLIST_SUB+= VARDB=${VARDB} \ +PLIST_SUB= VARDB=${VARDB} \ VARLOG=${VARLOG} OPTIONS_DEFINE= DOCS TEST OPTIONS_DEFAULT= MAVEN_LOCAL OPENJDK17 OPTIONS_SINGLE= JAVA MAVEN -OPTIONS_SINGLE_JAVA= OPENJDK17 OPENJDK21 +OPTIONS_SINGLE_JAVA= OPENJDK17 OPENJDK21 OPENJDK25 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= ${PORTNAME}-${DISTVERSION}-deps.tar.zst:maven +MAVEN_LOCAL_DESC= Use prefetch plugins from FreeBSD repository and fixed mvn version +MAVEN_ONLINE_DESC= Download last plugins during build process (into ~/.m2) and use system mvn version +OPENJDK17_DESC= Use OpenJDK 17 +OPENJDK21_DESC= Use OpenJDK 21 +OPENJDK25_DESC= Use OpenJDK 25 (EXPERIMENTAL) + +MAVEN_LOCAL_BUILD_DEPENDS= maven>=3.8<3.9:devel/maven +MAVEN_LOCAL_GH_TUPLE= n1dr00:openfire-deps:${DISTVERSION}:maven +MAVEN_LOCAL_VARS= MVN_OPTS+="-o -Dmaven.repo.local=${WRKDIR}/openfire-deps-${DISTVERSION}" \ + MAVEN_HOME="${JAVASHAREDIR}/apache-maven-3.8" +MAVEN_ONLINE_BUILD_DEPENDS= maven>0:devel/maven +MAVEN_ONLINE_VARS= MVN_OPTS+="-U" + +OPENJDK17_VARS= JAVA_VERSION=17 +OPENJDK21_VARS= JAVA_VERSION=21 +OPENJDK25_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-xmppserver_src_main_java_org_jivesoftware_database_JNDIDataSourceProvider.java +OPENJDK25_VARS= JAVA_VERSION=25 + +TEST_VARS= MVN_OPTS+="-DskipTests=false" +TEST_VARS_OFF= MVN_OPTS+="-DskipTests=true" MVN= mvn MVN_TARGET= package -.include - -.if ${PORT_OPTIONS:MOPENJDK17} -JAVA_VERSION= 17 -.elif ${PORT_OPTIONS:MOPENJDK21} -JAVA_VERSION= 21 -.endif - -.if ${PORT_OPTIONS:MTEST} -MVN_OPTS= -DskipTests=false -.else -MVN_OPTS= -DskipTests=true -.endif - -.if ${PORT_OPTIONS:MMAVEN_LOCAL} -MVN_OPTS+= -o -Dmaven.repo.local=${WRKDIR}/m2 -.elif ${PORT_OPTIONS:MMAVEN_ONLINE} -MVN_OPTS+= -U -.endif - do-build: - @(cd ${WRKSRC} && JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET}) + @(cd ${WRKSRC} && \ + JAVA_VERSION=${JAVA_PORT_VERSION} ${MAVEN_HOME:DMAVEN_HOME=${MAVEN_HOME}} \ + ${MVN} ${MVN_OPTS} ${MVN_TARGET}) do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/lib - @${MKDIR} ${STAGEDIR}${ETCDIR} - @${MKDIR} ${STAGEDIR}${VARDB} - @${MKDIR} ${STAGEDIR}${VARLOG} - - (cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${STAGEDIR}${DATADIR}/lib) - (cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j2.xml ${STAGEDIR}${DATADIR}/lib) + @${MKDIR} ${STAGEDIR}${DATADIR}/lib \ + ${STAGEDIR}${ETCDIR}/archive \ + ${STAGEDIR}${VARDB} \ + ${STAGEDIR}${VARLOG} + (cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar log4j2.xml ${STAGEDIR}${DATADIR}/lib) (cd ${INSTALL_WRKSRC}/resources && \ - ${FIND} . \! -path ./security\* \! -path ./nativeAuth\* | \ - ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} \ - ${STAGEDIR}${DATADIR}/resources) + ${FIND} . \! -path ./security\* \! -path ./nativeAuth\* | \ + ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} \ + ${STAGEDIR}${DATADIR}/resources) + (cd ${INSTALL_WRKSRC}/plugins && ${COPYTREE_SHARE} admin ${STAGEDIR}${DATADIR}/plugins) - (cd ${INSTALL_WRKSRC}/plugins/admin && ${FIND} . \ - | ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins/admin) + ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf + ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security + ${RLN} ${STAGEDIR}${VARDB} ${STAGEDIR}${DATADIR}/embedded-db + ${RLN} ${STAGEDIR}${VARLOG} ${STAGEDIR}${DATADIR}/logs - ${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf - ${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security - ${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db - ${LN} -sf ${VARLOG} ${STAGEDIR}${DATADIR}/logs ${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/${PORTNAME}.xml \ ${STAGEDIR}${ETCDIR}/${PORTNAME}.xml.sample ${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/security.xml \ ${STAGEDIR}${ETCDIR}/security.xml.sample ${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/crowd.properties \ ${STAGEDIR}${ETCDIR}/crowd.properties.sample + ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/client.truststore \ + ${STAGEDIR}${ETCDIR}/client.truststore.sample ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \ ${STAGEDIR}${ETCDIR}/truststore.sample ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \ ${STAGEDIR}${ETCDIR}/keystore.sample + ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/java.security \ + ${STAGEDIR}${ETCDIR}/java.security.sample + ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/archive/readme.txt \ + ${STAGEDIR}${ETCDIR}/archive/readme.txt do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${INSTALL_WRKSRC}/documentation && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 ) + (cd ${INSTALL_WRKSRC}/documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo index 83f08d76e690..3fd86ab6bbc8 100644 --- a/net-im/openfire/distinfo +++ b/net-im/openfire/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1767343581 -SHA256 (openfire-5.0.3-deps.tar.zst) = 7016876b77c81c01eff052a182e5f76b991df9bfa245f561a996d6264ad36831 -SIZE (openfire-5.0.3-deps.tar.zst) = 172855513 -SHA256 (igniterealtime-Openfire-v5.0.3_GH0.tar.gz) = 8fb538b04b3a437216499f4b2b4071d843822c1f870c4bb9dc198509ff32e3fa -SIZE (igniterealtime-Openfire-v5.0.3_GH0.tar.gz) = 9749172 +TIMESTAMP = 1775656565 +SHA256 (igniterealtime-Openfire-v5.0.4_GH0.tar.gz) = 99bb848efb5206f54386a3300c18796dfa30458b92b3a1e551c6daecd58cc117 +SIZE (igniterealtime-Openfire-v5.0.4_GH0.tar.gz) = 9754454 +SHA256 (n1dr00-openfire-deps-5.0.4_GH0.tar.gz) = 64455dce4dea39f7165b19be678daee13c892b766a4bf0c0ef1315e9c32fe926 +SIZE (n1dr00-openfire-deps-5.0.4_GH0.tar.gz) = 115478816 diff --git a/net-im/openfire/files/extrapatch-xmppserver_src_main_java_org_jivesoftware_database_JNDIDataSourceProvider.java b/net-im/openfire/files/extrapatch-xmppserver_src_main_java_org_jivesoftware_database_JNDIDataSourceProvider.java new file mode 100644 index 000000000000..ee468ebdc5ea --- /dev/null +++ b/net-im/openfire/files/extrapatch-xmppserver_src_main_java_org_jivesoftware_database_JNDIDataSourceProvider.java @@ -0,0 +1,11 @@ +--- xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java.orig 2026-03-17 18:25:26 UTC ++++ xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java +@@ -52,7 +52,7 @@ public class JNDIDataSourceProvider implements Connect + * Keys of JNDI properties to query PropertyManager for. + */ + public static final String[] jndiPropertyKeys = { +- Context.APPLET, ++// Context.APPLET, + Context.AUTHORITATIVE, + Context.BATCHSIZE, + Context.DNS_URL, diff --git a/net-im/openfire/files/pkg-message.in b/net-im/openfire/files/pkg-message.in index 28c4fece12b9..5b7a7250e0ec 100644 --- a/net-im/openfire/files/pkg-message.in +++ b/net-im/openfire/files/pkg-message.in @@ -1,17 +1,19 @@ [ { type: install message: <