diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile index 0436a7b2824c..fb4fdc2e9fbd 100644 --- a/net-mgmt/unifi7/Makefile +++ b/net-mgmt/unifi7/Makefile @@ -1,91 +1,98 @@ PORTNAME= unifi7 -PORTVERSION= 7.4.162 +PORTVERSION= 7.5.187 CATEGORIES= net-mgmt java 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 DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= unifi_sysvinit_all.deb MAINTAINER= otis@FreeBSD.org COMMENT= UniFi Controller v7 WWW= https://help.ui.com/hc/en-us/categories/200320654-UniFi-Wireless RUN_DEPENDS= snappyjava>0:archivers/snappy-java +FLAVORS= default externaldb +FLAVOR?= ${FLAVORS:[1]} + +externaldb_PKGNAMESUFFIX= -externaldb + USES= cpe CPE_VENDOR= ui CPE_PRODUCT= unifi_controller USE_JAVA= yes -JAVA_VERSION= 11 -JAVA_OS= native -JAVA_VENDOR= openjdk bsdjava -JAVA_RUN= yes +JAVA_VERSION= 17 +JAVA_RUN= jre USE_RC_SUBR= unifi CONFLICTS_INSTALL= unifi6 EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= data.tar.xz | ${TAR} -xf - NO_ARCH= yes NO_BUILD= yes SUB_FILES= pkg-message SUB_LIST+= GROUPS=${GROUPS} \ JAVA=${JAVA} \ JAVA_HOME=${JAVA_HOME} \ JAVASHAREDIR=${JAVASHAREDIR} \ USERS=${USERS} NO_WRKSUBDIR= yes USERS= unifi GROUPS= unifi OPTIONS_DEFINE= EXTERNALDB +.if (empty(FLAVOR) || ${FLAVOR:U} == externaldb) +OPTIONS_DEFAULT+= EXTERNALDB +.endif + EXTERNALDB_DESC= Use external MongoDB server EXTERNALDB_VARS= PKGMESSAGE+=${WRKSRC}/pkg-message.extdb \ SUB_FILES+=pkg-message.extdb EXTERNALDB_VARS_OFF= RUN_DEPENDS+=mongodb44>0:databases/mongodb44 _DIR_LIST= conf data logs run work _JAX_DISTNAME= javax.activation-api _JAX_VERSION= 1.2.0 post-extract: ${INSTALL_DATA} ${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 do-install: ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi (cd ${WRKSRC}/usr/lib/unifi && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) # Create directories that will be writable by unifi .for i in data logs run work ${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i} .endfor do-install-EXTERNALDB-off: ${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod post-install: @${FIND} -s ${STAGEDIR}${JAVASHAREDIR}/unifi -not -type d | \ ${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} .for dir in ${_DIR_LIST} @${ECHO} "@dir(unifi,wheel,) ${JAVASHAREDIR}/unifi/${dir}" >> \ ${TMPPLIST} .endfor .include diff --git a/net-mgmt/unifi7/distinfo b/net-mgmt/unifi7/distinfo index 89c1143175bd..98d8dc6f0722 100644 --- a/net-mgmt/unifi7/distinfo +++ b/net-mgmt/unifi7/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1690130298 -SHA256 (unifi7-7.4.162/unifi_sysvinit_all.deb) = 069652f793498124468c985537a569f3fe1d8dd404be3fb69df6b2d18b153c4c -SIZE (unifi7-7.4.162/unifi_sysvinit_all.deb) = 144141778 -SHA256 (unifi7-7.4.162/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 -SIZE (unifi7-7.4.162/javax.activation-api-1.2.0.jar) = 56674 +TIMESTAMP = 1697637669 +SHA256 (unifi7-7.5.187/unifi_sysvinit_all.deb) = 6b9925f2065b467852fe9d6298f97bb28334fd04851dd334fb66cd9837dcd666 +SIZE (unifi7-7.5.187/unifi_sysvinit_all.deb) = 149836568 +SHA256 (unifi7-7.5.187/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 +SIZE (unifi7-7.5.187/javax.activation-api-1.2.0.jar) = 56674 diff --git a/net-mgmt/unifi7/files/unifi.in b/net-mgmt/unifi7/files/unifi.in index e39127bb2c40..a3cdc54627a1 100644 --- a/net-mgmt/unifi7/files/unifi.in +++ b/net-mgmt/unifi7/files/unifi.in @@ -1,84 +1,89 @@ #!/bin/sh # # Created by: Mark Felder # PROVIDE: unifi # REQUIRE: LOGIN # KEYWORD: shutdown # # 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 rcvar=unifi_enable load_rc_config ${name} : ${unifi_enable:=NO} : ${unifi_user:=%%USERS%%} : ${unifi_group:=%%GROUPS%%} : ${unifi_chdir=%%JAVASHAREDIR%%/unifi} : ${unifi_java_home=%%JAVA_HOME%%} -: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M"} +: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M \ + --add-opens java.base/java.lang=ALL-UNNAMED \ + --add-opens java.base/java.time=ALL-UNNAMED \ + --add-opens java.base/sun.security.util=ALL-UNNAMED \ + --add-opens java.base/java.io=ALL-UNNAMED \ + --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} pidfile="/var/run/unifi/${name}.pid" procname=${unifi_java_home}/bin/java command=/usr/sbin/daemon command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} -jar lib/ace.jar start" start_precmd=start_precmd stop_precmd=stop_precmd stop_postcmd=stop_postcmd export CLASSPATH=$(echo ${unifi_chdir}/lib/*.jar | tr ' ' ':') start_precmd() { if [ ! -e /var/run/unifi ] ; then install -d -o %%USERS%% -g %%GROUPS%% /var/run/unifi; fi } stop_precmd() { if [ -r ${pidfile} ]; then _UNIFIPID=$(check_pidfile ${pidfile} ${procname}) export _UNIFI_CHILDREN=$(pgrep -P ${_UNIFIPID}) fi } stop_postcmd() { if ! [ -z ${_UNIFI_CHILDREN} ]; then echo "Cleaning up leftover child processes." kill $sig_stop ${_UNIFI_CHILDREN} wait_for_pids ${_UNIFI_CHILDREN} fi } run_rc_command "$1"