Attachment 207594 Details for Bug 240016 – Udpated patch

[patch] Udpated patch

unifi5.diff.2 (text/plain), 3.76 KB, created by Greg Lewis on 2019-09-18 03:05:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Lewis

Created: 2019-09-18 03:05:02 UTC

Size: 3.76 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 512034)
>+++ Makefile	(working copy)
>@@ -5,9 +5,14 @@
> PORTVERSION=	5.11.39
> PORTREVISION=	0
> CATEGORIES=	net-mgmt java
>-MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}/
>-DISTNAME=	unifi_sysvinit_all
>-EXTRACT_SUFX=	.deb
>+MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
>+		https://repo1.maven.org/maven2/%SUBDIR%/:jax
>+MASTER_SITE_SUBDIR=	${PORTVERSION}/:unifi \
>+			javax/activation/${JAX_DISTNAME}/${JAX_VERSION}/:jax
>+DISTFILES=	unifi_sysvinit_all.deb:unifi \
>+		${JAX_DISTNAME}-${JAX_VERSION}.jar:jax
>+EXTRACT_ONLY=	unifi_sysvinit_all.deb
>+
> DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	feld@FreeBSD.org
>@@ -17,7 +22,7 @@
> 		snappyjava>0:archivers/snappy-java
> 
> SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
>-		JAVA=${JAVA}
>+		JAVA=${JAVA} JAVA_HOME=${JAVA_HOME}
> 
> EXTRACT_CMD=	/usr/bin/ar
> EXTRACT_BEFORE_ARGS=	-p
>@@ -27,7 +32,7 @@
> CPE_VENDOR=	ubnt
> CPE_PRODUCT=	unifi_controller
> USE_JAVA=	yes
>-JAVA_VERSION=	1.8
>+JAVA_VERSION=	8+
> JAVA_OS=	native
> JAVA_VENDOR=	openjdk bsdjava
> JAVA_RUN=	yes
>@@ -40,6 +45,9 @@
> USERS=		unifi
> GROUPS=		unifi
> 
>+JAX_DISTNAME=	javax.activation-api
>+JAX_VERSION=	1.2.0
>+
> NO_WRKSUBDIR=	yes
> 
> CONFLICTS=	unifi-devel-*
>@@ -46,6 +54,10 @@
> 
> DIR_LIST=	conf data logs run work
> 
>+post-extract:
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${JAX_DISTNAME}-${JAX_VERSION}.jar \
>+		${WRKSRC}/usr/lib/unifi/lib/
>+
> post-patch:
> 	(cd ${WRKSRC}/usr/lib/unifi/lib && ${LN} -f -s ${JAVAJARDIR}/snappy-java.jar snappy-java-*.jar)
> 	${RM} -r ${WRKSRC}/usr/lib/unifi/lib/native
>Index: distinfo
>===================================================================
>--- distinfo	(revision 512034)
>+++ distinfo	(working copy)
>@@ -1,3 +1,5 @@
> TIMESTAMP = 1568307406
> SHA256 (unifi5-5.11.39/unifi_sysvinit_all.deb) = d2736dababcf96596a2c9ad82ee2fcbd02ee4d3a864284175b43f5afdab62f6c
> SIZE (unifi5-5.11.39/unifi_sysvinit_all.deb) = 97384556
>+SHA256 (unifi5-5.11.39/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
>+SIZE (unifi5-5.11.39/javax.activation-api-1.2.0.jar) = 56674
>Index: files/unifi.in
>===================================================================
>--- files/unifi.in	(revision 512034)
>+++ files/unifi.in	(working copy)
>@@ -12,7 +12,31 @@
> # Add the following line to /etc/rc.conf to enable `unifi':
> #
> # unifi_enable="YES"
>+#
>+# Other configuration settings for unifi that can be set in /etc/rc.conf:
>+#
>+# unifi_user (str)
>+#   This is the user that unifi runs as
>+#   Set to %%USERS%% by default
>+#
>+# unifi_group (str)
>+#   This is the group that unifi runs as
>+#   Set to %%GROUPS%% by default
>+#
>+# unifi_chdir (str)
>+#   This is the directory that unifi chdirs into before starting
>+#   Set to %%JAVASHAREDIR%%/unifi by default
>+#
>+# unifi_java_home (str)
>+#   The path to the base directory for the Java to use to run unifi
>+#   Defaults to %%JAVA_HOME%%
>+#
>+# unifi_javaflags (str)
>+#   Flags passed to Java to run unifi
>+#   Set to "-Djava.awt.headless=true -Xmx1024M" by default
>+#
> 
>+
> . /etc/rc.subr
> name=unifi
> 
>@@ -23,12 +47,14 @@
> : ${unifi_user:=%%USERS%%}
> : ${unifi_group:=%%GROUPS%%}
> : ${unifi_chdir=%%JAVASHAREDIR%%/unifi}
>+: ${unifi_java_home=%%JAVA_HOME%%}
> : ${unifi_javaflags:="-Djava.awt.headless=true -Xmx1024M"}
> 
> pidfile="/var/run/unifi/${name}.pid"
>-procname=%%JAVA%%
>+procname=${unifi_java_home}/bin/java
> command="/usr/sbin/daemon"
>-command_args="-f -p ${pidfile} %%JAVA%% ${unifi_javaflags} -jar lib/ace.jar start"
>+classpath=`echo ${unifi_chdir}/lib/*.jar | sed -e 's/ /:/g'`
>+command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} -cp ${classpath} com.ubnt.ace.Launcher start"
> start_precmd=start_precmd
> stop_precmd=stop_precmd
> stop_postcmd=stop_postcmd

Actions: View | Diff

Attachments on bug 240016: 206754 | 207594