Attachment 250883 Details for Bug 279237 – git diff for net-im/openfire

[patch] git diff for net-im/openfire

openfire-4.8.1,1.diff (text/plain), 5.06 KB, created by Nikita Druba on 2024-05-22 21:32:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikita Druba

Created: 2024-05-22 21:32:38 UTC

Size: 5.06 KB

patch

obsolete

>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

Flags:

nikita: maintainer-approval+

Actions: View | Diff

Attachments on bug 279237: 250883